Re: merging of po files done? Send email to translators?

[Georg Baum]

Scott Kostyshak wrote:

> So is the merging indeed complete or still not yet?

Not yet. I fixed some minor issues with the script. This is what I get now:

$ 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 0 translations. 
Merging ../lyx-2.1-git/po/ja.po into po/ja.po: Updated 8 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 5 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 0 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 17 translations.
Merging ../lyx-2.1-git/po/cs.po into po/cs.po: Updated 0 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 0 translations. 
Merging ../lyx-2.1-git/po/de.po into po/de.po: Updated 0 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 5 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 0 translations. 
Merging ../lyx-2.1-git/po/ro.po into po/ro.po: Updated 0 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 3 translations. 
Merging ../lyx-2.1-git/po/ru.po into po/ru.po: Updated 0 translations. 
Merging ../lyx-2.1-git/po/he.po into po/he.po: Updated 115 translations.
Merging ../lyx-2.1-git/po/sk.po into po/sk.po: Updated 0 translations. 
Merging ../lyx-2.1-git/po/da.po into po/da.po: Updated 0 translations. 
Merging ../lyx-2.1-git/po/nb.po into po/nb.po: Updated 116 translations.
Merging ../lyx-2.1-git/po/es.po into po/es.po: Updated 3 translations. 
Merging ../lyx-2.1-git/po/pl.po into po/pl.po: Updated 247 translations.
Merging ../lyx-2.1-git/po/eu.po into po/eu.po: Updated 0 translations. 
Merging ../lyx-2.1-git/po/gl.po into po/gl.po: Updated 0 translations. 
Merging ../lyx-2.1-git/po/ca.po into po/ca.po: Updated 0 translations. 
Merging ../lyx-2.1-git/po/sv.po into po/sv.po: Updated 45 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 0 translations. 
Merging ../lyx-2.1-git/po/zh_TW.po into po/zh_TW.po: Updated 0 translations. 

I could not find any wrong looking translations by a quick glance at the 
resulting diff, so I would recommend to run this command and commit the 
result as a first step.

I also added an option to overtake changed translations. As an example, the 
result of running

python -tt development/tools/mergepo.py -l de -o ../lyx-2.1-git/po

is attached. Although it is my mother tongue I can hardly tell whether the 
new or old translation is correct (except for the keyboard short cuts, here 
one simply has to look at the corresponding menu). Therefore I think that 
this step should be done by the individual translators of each language (if 
needed). Unfortunately running the script with -o is quite slow (I did not 
consider performance when writing it at all), but since one does not need it 
too often it is hopefully OK.


Georg
diff --git a/po/de.po b/po/de.po
index 4709ec2..d3d4880 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1035,7 +1035,7 @@ msgstr "Alle Eintragstypen"
 
 #: src/frontends/qt4/ui/CitationUi.ui:358
 msgid "Search as you &type"
-msgstr "Während der &Eingabe suchen"
+msgstr "&Während der Eingabe suchen"
 
 #: src/frontends/qt4/ui/CitationUi.ui:374
 msgid "For&matting"
@@ -10948,11 +10948,11 @@ msgstr "Modern CV"
 
 #: lib/layouts/moderncv.layout:37
 msgid "CVStyle"
-msgstr "Lebenslauf-Stil"
+msgstr "CVStil"
 
 #: lib/layouts/moderncv.layout:46
 msgid "CV Style:"
-msgstr "Lebenslauf-Stil:"
+msgstr "CV-Stil:"
 
 #: lib/layouts/moderncv.layout:52
 msgid "Style Options"
@@ -10964,11 +10964,11 @@ msgstr "Option(en) für den Lebenslauf-Stil"
 
 #: lib/layouts/moderncv.layout:57
 msgid "CVColor"
-msgstr "Lebenslauf-Farbe"
+msgstr "CV-Farbe"
 
 #: lib/layouts/moderncv.layout:60
 msgid "CV Color Scheme:"
-msgstr "Lebenslauf-Farbschema:"
+msgstr "CV-Farbschema:"
 
 #: lib/layouts/moderncv.layout:63
 msgid "CVIcons"
@@ -13254,7 +13254,7 @@ msgstr "Standard (basic)"
 #: lib/layouts/basic.module:6 lib/layouts/jurabib.module:8
 #: lib/layouts/natbib.module:9
 msgid "Citation engine"
-msgstr "Literatursystem"
+msgstr "Literatur-System"
 
 #: lib/layouts/basic.module:22 lib/layouts/jurabib.module:49
 #: lib/layouts/natbib.module:44
@@ -14738,7 +14738,7 @@ msgstr ""
 
 #: lib/layouts/rsphrase.module:11 lib/layouts/rsphrase.module:16
 msgid "R-S number"
-msgstr "R-S-Nummer"
+msgstr "R-S Nummer"
 
 #: lib/layouts/rsphrase.module:33 lib/layouts/rsphrase.module:36
 msgid "R-S phrase"
@@ -16628,7 +16628,7 @@ msgstr "Einfügung schließen|s"
 #: lib/ui/stdcontext.inc:147 lib/ui/stdcontext.inc:153
 #: lib/ui/stdcontext.inc:612
 msgid "Dissolve Inset|D"
-msgstr "Einfügung auflösen|ü"
+msgstr "Einfügung auflösen|E"
 
 #: lib/ui/stdcontext.inc:152
 msgid "Show Label|L"
@@ -16892,7 +16892,7 @@ msgstr "Einfügen (vorherige Auswahl)|h"
 
 #: lib/ui/stdcontext.inc:323
 msgid "Jump Back to Saved Bookmark|B"
-msgstr "Zum gespeicherten Lesezeichen springen|L"
+msgstr "Zum gespeicherten Lesezeichen springen|z"
 
 #: lib/ui/stdcontext.inc:324 lib/ui/stdmenus.inc:558
 msgid "Forward Search|F"
@@ -16936,11 +16936,11 @@ msgstr "Änderung ablehnen|b"
 
 #: lib/ui/stdcontext.inc:341
 msgid "Apply Last Text Style|A"
-msgstr "Zuletzt verwendeten Textstil verwenden|w"
+msgstr "Zuletzt verwendeten Textstil verwenden|x"
 
 #: lib/ui/stdcontext.inc:342
 msgid "Text Style|x"
-msgstr "Textstil|x"
+msgstr "Textstil|T"
 
 #: lib/ui/stdcontext.inc:343 lib/ui/stdmenus.inc:121
 msgid "Paragraph Settings...|P"
@@ -17541,7 +17541,7 @@ msgstr "Formaler Stil|a"
 
 #: lib/ui/stdmenus.inc:197
 msgid "Multicolumn|M"
-msgstr "Mehrfachspalte|s"
+msgstr "Mehrfachspalte|h"
 
 #: lib/ui/stdmenus.inc:198
 msgid "Multirow|u"
@@ -18029,7 +18029,7 @@ msgstr "Hauptdokument ansehen|H"
 
 #: lib/ui/stdmenus.inc:532
 msgid "Update Master Document|a"
-msgstr "Hauptdokument aktualisieren|m"
+msgstr "Hauptdokument aktualisieren|p"
 
 #: lib/ui/stdmenus.inc:534
 msgid "Compressed|o"
@@ -18203,7 +18203,7 @@ msgstr "Farbige Boxen|F"
 
 #: lib/ui/stdmenus.inc:617
 msgid "Feynman-diagram|F"
-msgstr "Feynman-Diagramm|y"
+msgstr "Feynman-Diagramm|F"
 
 #: lib/ui/stdmenus.inc:618
 msgid "Knitr|K"
@@ -24501,14 +24501,11 @@ msgid ""
 "\n"
 "Choose an appropriate document encoding (such as utf8)\n"
 "or change the spelling of the author name."
-msgstr ""
-"Der Name des Autors '%1$s',\n"
-"der bei der Änderungsverfolgung verwendet wird, enthält Zeichen,\n"
-"die in der aktuellen Kodierung nicht dargestellt werden können (%2$s).\n"
-"Die betroffenen Zeichen werden in der LaTeX-Ausgabe weggelassen.\n"
-"\n"
-"Wählen Sie eine passende Kodierung (bspw. utf8)\n"
-"oder ändern Sie die Schreibweise des betroffenen Autornamens."
+msgstr "Der Name des Autors '%1$s',\nder bei der Änderungsverfolgung "
+"verwendet wird, enthält Zeichen,\ndie in der aktuellen Kodierung (%2$s) "
+"nicht dargestellt werden können.\nDie betroffenen Zeichen werden in der "
+"LaTeX-Ausgabe weggelassen.\n\nWählen Sie eine passende Kodierung (bspw. "
+"utf8)\noder ändern Sie die Schreibweise des betroffenen Autornamens."
 
 #: src/Chktex.cpp:62
 #, c-format