Jean-Pierre Chrétien wrote: > Is it correct to merge fr.po in trunk and fr.po in branch like this > (trunk is under lyx-devel and branch under lyx-1.6.x here): > > # cd lyx-devel/po > # msgmerge ../../lyx-1.6.x/po/fr.po fr.po >frnew.po > # msgfmt --statistics frnew.po > 4710 messages traduits, 257 traductions approximatives, 17 messages non > traduits. > > 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. Jürgen
