Quoting Daniel Burrows ([EMAIL PROTECTED]): > At the moment I've been ignoring the .po file updates when merging between > branches, because they cause lots of conflicts that I can't figure out how to > resolve. Would it work to just copy the .po files directly between branches > and then run msgmerge? (i.e., not try to get svn to merge them)
Unless you have had translators already sending you updates especially targeted at 0.3, then, yes, you can just pick up files from the stable branch. One better solution (in case someone has updated his/her file in 0.3) would be: (0.2 files in ~/tmp/0.2, current directory is po/ from 0.3): for i in *po ; do msgcat --use-first $i ~/tmp/0.2/$i >$i.new msgmerge -U $i.new aptitude.pot mv $i.new $i done The advantage here is that you give some priority to existing translations in 0.3 over the translations for the same string in 0.2, but keep translations of both in the resulting PO file.
