Jürgen Spitzmüller a écrit :
Jean-Pierre Chrétien wrote:
Is it correct to merge fr.po in trunk and fr.po in branch like this
to backport my branch updates in trunk ?
I usually do this manually, using Lokalize (the KDE 4 po editor), which
provides nifty abilities to sync/merge two po files. You can select branch's
fr.po as "secondary sync source", navigate through all messages that are
different there and directly copy them to trunk's po file.
I could do this with XEmacs po-mode, but I went to poedit when the
po-files were converted to UTF-8.
I run Debian stable, KDE-4 is not available so I can't use loKalize. I
guess I will test the msgmerge path, seems efficient as it found
53-17 = 36 messages in branch that came translated in trunk (these come
from string changes committed both in branch and in trunk).
I guess also that most of the 257-143=114 new fuzzies come from the
branch file unification steps.
--
Jean-Pierre
