Commit f2c2f670 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller

po: avoid conflicts of local *.po files with files in git

Make it so that filenames and line numbers are only stored in the *.pot file
(which is not in git), but not in the individual *.po files. This information
is hardly useful for translators in our case, and it should avoid the constant
conflicts of local *.po files with the ones in git which are caused by the
source files changing and the line numbers being updated. This commit might
cause one last merge conflict for you, which you can work around with
"git checkout po/*.po" before merging or pulling. After that there should
(hopefully) not be any more local modifications of these files (unless
someone committed additions or changes to translated strings and the
*.po files haven't been updated yet, that is).
parent a18128a3
......@@ -39,3 +39,9 @@ MSGID_BUGS_ADDRESS = http://bugzilla.gnome.org/
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
EXTRA_LOCALE_CATEGORIES =
# Avoid line numbers in *.po, but keep them in *.pot.
MSGMERGE = msgmerge --no-location
MSGMERGE_UPDATE = msgmerge --no-location --update
MSGFILTER = msgfilter --no-location
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment