mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 12:11:13 +00:00
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 is likely to 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.
This commit is contained in:
parent
49110bbdb9
commit
e060eec302
32 changed files with 37 additions and 8494 deletions
|
@ -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
|
||||
|
||||
|
|
275
po/en_GB.po
275
po/en_GB.po
File diff suppressed because it is too large
Load diff
275
po/pt_BR.po
275
po/pt_BR.po
File diff suppressed because it is too large
Load diff
275
po/zh_CN.po
275
po/zh_CN.po
File diff suppressed because it is too large
Load diff
275
po/zh_TW.po
275
po/zh_TW.po
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue