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:
Tim-Philipp Müller 2009-02-05 23:11:07 +00:00
parent 49110bbdb9
commit e060eec302
32 changed files with 37 additions and 8494 deletions

View file

@ -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/af.po

File diff suppressed because it is too large Load diff

275
po/az.po

File diff suppressed because it is too large Load diff

275
po/be.po

File diff suppressed because it is too large Load diff

275
po/bg.po

File diff suppressed because it is too large Load diff

275
po/ca.po

File diff suppressed because it is too large Load diff

275
po/cs.po

File diff suppressed because it is too large Load diff

275
po/da.po

File diff suppressed because it is too large Load diff

275
po/de.po

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

275
po/es.po

File diff suppressed because it is too large Load diff

275
po/fi.po

File diff suppressed because it is too large Load diff

275
po/fr.po

File diff suppressed because it is too large Load diff

275
po/hu.po

File diff suppressed because it is too large Load diff

275
po/id.po

File diff suppressed because it is too large Load diff

275
po/it.po

File diff suppressed because it is too large Load diff

275
po/ja.po

File diff suppressed because it is too large Load diff

275
po/nb.po

File diff suppressed because it is too large Load diff

275
po/nl.po

File diff suppressed because it is too large Load diff

275
po/pl.po

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

275
po/ru.po

File diff suppressed because it is too large Load diff

275
po/rw.po

File diff suppressed because it is too large Load diff

275
po/sk.po

File diff suppressed because it is too large Load diff

275
po/sq.po

File diff suppressed because it is too large Load diff

275
po/sr.po

File diff suppressed because it is too large Load diff

275
po/sv.po

File diff suppressed because it is too large Load diff

275
po/tr.po

File diff suppressed because it is too large Load diff

275
po/uk.po

File diff suppressed because it is too large Load diff

275
po/vi.po

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff