Re: Copying translations from 2.2.x to master?

Sat, 10 Jun 2017 01:35:36 -0700 

Scott Kostyshak wrote:

> On Sat, Jun 03, 2017 at 08:07:39PM -0400, Scott Kostyshak wrote:
> 
>> Unless someone has a different idea, I will replace the Windows
>> linebreaks with non-Windows linebreaks, update the strings on master,
>> and try the mergepo.py call above again.
> 
> After Kornel's fixes to the Windows linebreaks, I tried mergepo.py again
> but it did not update any translations.
> 
> Any other ideas?

Which translation updates do you expect? It seems that they are pretty much 
in sync. I get the attached diff when running

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

from within the master branch.



Georg

PS: Sorry for being so unresponsive, still busy.

diff --git a/po/ar.po b/po/ar.po
index 0830149..35c26b1 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1085,9 +1085,8 @@ msgid "Selected &Citations:"
 msgstr "الاستشهادات المحد&دة:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
-msgstr "ته&يئة"
+msgstr "تهيئة"
 
 #: src/frontends/qt4/ui/CitationUi.ui:279
 msgid "Citation st&yle:"
diff --git a/po/ca.po b/po/ca.po
index 8e0d184..97611a8 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1126,7 +1126,6 @@ msgid "Selected &Citations:"
 msgstr "Citacions &seleccionades:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "S'està donant format"
 
diff --git a/po/cs.po b/po/cs.po
index 87ace39..e038f6d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1098,7 +1098,6 @@ msgid "Selected &Citations:"
 msgstr "&Vybrané citace:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formátování"
 
diff --git a/po/da.po b/po/da.po
index d2c32af..57fb17f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1105,7 +1105,6 @@ msgid "Selected &Citations:"
 msgstr "&Valgte referencer:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formatering"
 
diff --git a/po/el.po b/po/el.po
index 56d5b8d..f20d50e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1105,7 +1105,6 @@ msgid "Selected &Citations:"
 msgstr "&Επιλεγμένες Παραπομπές:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Μορφοποίηση"
 
diff --git a/po/es.po b/po/es.po
index 0a9179a..293b9b2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1093,9 +1093,8 @@ msgid "Selected &Citations:"
 msgstr "Citas &seleccionadas:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
-msgstr "For&mato"
+msgstr "Formato"
 
 #: src/frontends/qt4/ui/CitationUi.ui:279
 msgid "Citation st&yle:"
diff --git a/po/eu.po b/po/eu.po
index 4d127bb..c294207 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1108,7 +1108,6 @@ msgid "Selected &Citations:"
 msgstr "&Hautatutako aipamenak:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formatua ematea"
 
diff --git a/po/gl.po b/po/gl.po
index 5b6d619..f2649fe 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1125,7 +1125,6 @@ msgid "Selected &Citations:"
 msgstr "Citas seleccio&nadas:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formato"
 
diff --git a/po/he.po b/po/he.po
index d1bf07e..b0ada0f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1106,7 +1106,6 @@ msgid "Selected &Citations:"
 msgstr "מובאות נבחרות:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "עיצוב"
 
diff --git a/po/hu.po b/po/hu.po
index d361e52..6bc8f9d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1099,7 +1099,6 @@ msgid "Selected &Citations:"
 msgstr "Kiválasztott &hivatkozások:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formátum"
 
diff --git a/po/ia.po b/po/ia.po
index 9de3029..30a2bda 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -1090,9 +1090,8 @@ msgid "Selected &Citations:"
 msgstr "Citationes &seligite:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
-msgstr "For&mattation"
+msgstr "Formattation"
 
 #: src/frontends/qt4/ui/CitationUi.ui:279
 msgid "Citation st&yle:"
diff --git a/po/id.po b/po/id.po
index cb03aa2..045746a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1102,7 +1102,6 @@ msgid "Selected &Citations:"
 msgstr "A&cuan yang Dipilih:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Pemformatan"
 
diff --git a/po/ko.po b/po/ko.po
index febc114..75809f8 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1093,7 +1093,6 @@ msgid "Selected &Citations:"
 msgstr "선택된 인용(&e):"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "형틀 짜기(Formatting)"
 
diff --git a/po/nb.po b/po/nb.po
index 3f06ac2..6ad7721 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1086,9 +1086,8 @@ msgid "Selected &Citations:"
 msgstr "Valgt&e referanser:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
-msgstr "For&matering"
+msgstr "Formatering"
 
 #: src/frontends/qt4/ui/CitationUi.ui:279
 msgid "Citation st&yle:"
diff --git a/po/nl.po b/po/nl.po
index 0844c26..cf4fb40 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1110,7 +1110,6 @@ msgid "Selected &Citations:"
 msgstr "&Geselecteerde literatuurverwijzingen:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Opmaak"
 
diff --git a/po/nn.po b/po/nn.po
index ae02f24..7d7b956 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1103,7 +1103,6 @@ msgid "Selected &Citations:"
 msgstr "&Valt litteratur:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formatering"
 
diff --git a/po/pl.po b/po/pl.po
index e948f1e..2fa4713 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1112,7 +1112,6 @@ msgid "Selected &Citations:"
 msgstr "Wybran&e cytaty:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formatowanie"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 96322fe..35d7f9c 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1110,7 +1110,6 @@ msgid "Selected &Citations:"
 msgstr "Citações &Seleccionadas:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formatação"
 
diff --git a/po/ro.po b/po/ro.po
index c250bfe..aeb7d95 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1114,7 +1114,6 @@ msgid "Selected &Citations:"
 msgstr "Citări &selectate:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formatatare"
 
diff --git a/po/ru.po b/po/ru.po
index 0420099..bdadf46 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1123,7 +1123,6 @@ msgid "Selected &Citations:"
 msgstr "&Выбранные ссылки:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Форматирование"
 
diff --git a/po/sr.po b/po/sr.po
index 2fa78e9..96b63c6 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1111,7 +1111,6 @@ msgid "Selected &Citations:"
 msgstr "&Izabrani Citati:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formatiranje"
 
diff --git a/po/tr.po b/po/tr.po
index dd42a41..fcf27f1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1121,7 +1121,6 @@ msgid "Selected &Citations:"
 msgstr "&Seçilen Alıntılar:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Biçimleme"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 84544f1..4872e57 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1115,7 +1115,6 @@ msgid "Selected &Citations:"
 msgstr "选中的文献(&s):"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "输出格式"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index cf17dcd..abadc73 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1203,7 +1203,6 @@ msgid "Selected &Citations:"
 msgstr "已選取的引用(&e):"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "格式"

Reply via email to