Quoting Raphael Hertzog (hertzog@debian.org):
> Please don't start translating the master branch until Lenny is released.
> It will complicate merging from one branch to the other.
I'm not convinced this would be a great idea to merge po/ directories
with the VCS merge facilities.
I think that the following would be much more efficient:
(assuming that a copy of the lenny branch is in lenny/ and a copy of
master is in master/)
cd master/po
(do all magic to update dpkg.pot with current source)
mkdir NEW
for i in *.po ; do
if [ -f ../../lenny/po/$i ] ; then
msgcat --use-first ../../lenny/po/$i $i >NEW/$i
msgmerge -U NEW/$i dpkg.pot
fi
done
mv NEW/* .
rmdir NEW
The "git add *.po" and "git commit -m'Resync with lenny branch'"
That would guarantee a better and more efficient merge and fuzzy
matching as that will use the gettext functions for that.
I would recommend repeating this for all po/ directories.
Attachment:
signature.asc
Description: Digital signature