From: Nguyen Thai Ngoc Duy Date: Sun, 03 Jun 2012 09:19:31 GMT Subject: Re: [PATCH] l10n: de.po: translate 2 new, 3 fuzzy messages Message-ID: In-Reply-To: 2012/6/3 Jiang Xin : > The modifications of location lines (#: filename:line) are tedious. > You can exclude them out of the diff file by a little: > >  1. Creae a diff driver with a textconv program: > >     $ git config --global diff.podiff.textconv "sed -e '/^#/ d'" > >  2. Set attribute for '.po' files > >     $ echo "*.po diff=podiff" >> $(git rev-parse --git-dir)/info/attributes > > Next time the diff you generated is more clear. It also creates a non-applicable patch. The problem with .po files is there are two sources of modification: msgmerge and human. It'd be much better if git could learn (with user's help) to separate those and allow to track/show human changes only. I'm also gnome translator coordinator and what I'm doing now is create two commits each time I receive a translation update: one with msgmerge wrapped in 70 chars, then translator's changes (also re-wrapped in 70 chars as different editors produce different default wrapping). It's not perfect as msgmerge can move translations up and down (randomly to me), but that's all I can do. -- Duy