Georg Baum wrote:

> I can update the script to produce readable diffs (currently there are
> many re-formattings which hide the real changes), then we could actually
> use it, but last time I asked I got no feedback, so I did not do it so
> far.

Actually I just did it:

$ python -tt development/tools/mergepo.py ../lyx-2.1-git/po
Merging ../lyx-2.1-git/po/pt_PT.po into po/pt_PT.po: Updated 6 translations. 
Merging ../lyx-2.1-git/po/ja.po into po/ja.po: Updated 9 translations. 
Merging ../lyx-2.1-git/po/sl.po into po/sl.po: Updated 0 translations. 
Merging ../lyx-2.1-git/po/bg.po into po/bg.po: Updated 0 translations. 
Merging ../lyx-2.1-git/po/fr.po into po/fr.po: Updated 14 translations.
Merging ../lyx-2.1-git/po/id.po into po/id.po: Updated 0 translations. 
Merging ../lyx-2.1-git/po/fi.po into po/fi.po: Updated 3 translations. 
Merging ../lyx-2.1-git/po/ar.po into po/ar.po: Updated 0 translations. 
Merging ../lyx-2.1-git/po/ia.po into po/ia.po: Updated 21 translations.
Merging ../lyx-2.1-git/po/cs.po into po/cs.po: Updated 1 translations. 
Merging ../lyx-2.1-git/po/zh_CN.po into po/zh_CN.po: Updated 0 translations. 
Merging ../lyx-2.1-git/po/nl.po into po/nl.po: Updated 0 translations. 
Merging ../lyx-2.1-git/po/el.po into po/el.po: Updated 4 translations. 
Merging ../lyx-2.1-git/po/de.po into po/de.po: Updated 4 translations. 
Merging ../lyx-2.1-git/po/en.po into po/en.po: Updated 0 translations. 
Merging ../lyx-2.1-git/po/pt_BR.po into po/pt_BR.po: Updated 10 
translations.
Merging ../lyx-2.1-git/po/wa.po into po/wa.po: Updated 0 translations. 
Merging ../lyx-2.1-git/po/sr.po into po/sr.po: Updated 0 translations. 
Merging ../lyx-2.1-git/po/ko.po into po/ko.po: Updated 0 translations. 
Merging ../lyx-2.1-git/po/hu.po into po/hu.po: Updated 1 translations. 
Merging ../lyx-2.1-git/po/ro.po into po/ro.po: Updated 2 translations. 
Merging ../lyx-2.1-git/po/tr.po into po/tr.po: Updated 0 translations. 
Merging ../lyx-2.1-git/po/uk.po into po/uk.po: Updated 10 translations.
Merging ../lyx-2.1-git/po/ru.po into po/ru.po: Updated 6 translations. 
Merging ../lyx-2.1-git/po/he.po into po/he.po: Updated 110 translations.
Merging ../lyx-2.1-git/po/sk.po into po/sk.po: Updated 2 translations. 
Merging ../lyx-2.1-git/po/da.po into po/da.po: Updated 3 translations. 
Merging ../lyx-2.1-git/po/nb.po into po/nb.po: Updated 114 translations.
Merging ../lyx-2.1-git/po/es.po into po/es.po: Updated 8 translations. 
Merging ../lyx-2.1-git/po/pl.po into po/pl.po: Updated 222 translations.
Merging ../lyx-2.1-git/po/eu.po into po/eu.po: Updated 6 translations. 
Merging ../lyx-2.1-git/po/gl.po into po/gl.po: Updated 4 translations. 
Merging ../lyx-2.1-git/po/ca.po into po/ca.po: Updated 2 translations. 
Merging ../lyx-2.1-git/po/sv.po into po/sv.po: Updated 47 translations.
Merging ../lyx-2.1-git/po/nn.po into po/nn.po: Updated 0 translations. 
Merging ../lyx-2.1-git/po/it.po into po/it.po: Updated 3 translations. 
Merging ../lyx-2.1-git/po/zh_TW.po into po/zh_TW.po: Updated 0 translations. 

The diffs are readable now, and you can also update only one language, by 
giving an additional argument:

python -tt development/tools/mergepo.py ../lyx-2.1-git/po fr

The numbers above do also include outdated messages, so the actual situation 
is better, but I included the outdated ones since it does not make sense to 
have an outdated message without translation: If it is not translated, it 
cannot be re-used if the message appears again, and it cannot be used as 
source for fuzzy translations.


Georg

Reply via email to