Update translations

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index f93a3c8..6327b28 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -1934,6 +1934,11 @@ msgstr "Ezikusi &lerro zuriak"
 msgid "Ignore &case"
 msgstr "Ezikusi &kasua"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3173,9 +3178,9 @@ msgstr "Theirs Agiria"
 msgid "Mine File"
 msgstr "Mine Agiria"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3183,9 +3188,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Lerroa: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3649,7 +3654,7 @@ msgstr "Biak (%1)"
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Ezkerraldea - hautatu helmuga agiritegia:"

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index 93abccc..e06175a 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -1933,6 +1933,11 @@ msgstr "Ignorar as li&nhas em branco"
 msgid "Ignore &case"
 msgstr "Ignorar &caso sensitivo"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3172,9 +3177,9 @@ msgstr "O Arquivo Deles"
 msgid "Mine File"
 msgstr "Meu Arquivo"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3182,9 +3187,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Linha: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3648,7 +3653,7 @@ msgstr "Ambos (%1)"
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Lado esquerdo - selecionar a pasta de destino:"

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index efc91c7..9cb0a28 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -1931,6 +1931,11 @@ msgstr "
 msgid "Ignore &case"
 msgstr "Èãíîðèðàé &Ãîëåìè/ìàëêè áóêâè"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3128,9 +3133,9 @@ msgstr "
 msgid "Mine File"
 msgstr "Ìîé ôàéë"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3138,9 +3143,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Ðåä: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3582,7 +3587,7 @@ msgstr "
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Ëÿâà ÷àñò - èçáåðåòå ïàïêà:"

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index 7574e21..64ed920 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -1930,6 +1930,11 @@ msgstr "&Ignora les l
 msgid "Ignore &case"
 msgstr "Ignora &majúscules/minúscules"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3127,9 +3132,9 @@ msgstr ""
 msgid "Mine File"
 msgstr ""
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3137,9 +3142,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Línia: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3581,7 +3586,7 @@ msgstr "Ambd
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Costat esquerre - seleccioneu la carpeta de destinació:"

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index b3153d7..e2ad267 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -1931,6 +1931,11 @@ msgstr "
 msgid "Ignore &case"
 msgstr "ºöÂÔ´óСд(&C)"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3127,9 +3132,9 @@ msgstr "
 msgid "Mine File"
 msgstr "ÎÒµÄÎļþ"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3137,9 +3142,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "ÐÐ: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3581,7 +3586,7 @@ msgstr "
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "×ó²à - ÇëÑ¡ÔñÄ¿±êÎļþ¼Ð:"

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index 8473d90..259b8ee 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -1939,6 +1939,11 @@ msgstr "
 msgid "Ignore &case"
 msgstr "©¿²¤¤j¤p¼g(&C)"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3180,9 +3185,9 @@ msgstr "
 msgid "Mine File"
 msgstr "§Úªº(ÀÉ®×)"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3190,9 +3195,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "¦æ¡G %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3653,7 +3658,7 @@ msgstr "
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "¥ªÃä - ¿ï¨ú¥Ø¼Ð¸ê®Æ§¨¡G"

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index 98e3d44..ee7cbdf 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -1931,6 +1931,11 @@ msgstr "Zanemari prazne &retke"
 msgid "Ignore &case"
 msgstr "Zanemari V/m &slova"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3170,9 +3175,9 @@ msgstr "Tu
 msgid "Mine File"
 msgstr "Moje datoteke"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3180,9 +3185,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Redak: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3646,7 +3651,7 @@ msgstr "Oba panela (%1)"
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Lijeva strana - odaberite odredi\9anu mapu:"

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index db5d181..a0b6730 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -1933,6 +1933,11 @@ msgstr "Ignorovat pr
 msgid "Ignore &case"
 msgstr "Ignorovat &malá a velká písmena"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3130,9 +3135,9 @@ msgstr ""
 msgid "Mine File"
 msgstr ""
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3140,9 +3145,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Øádek: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3579,7 +3584,7 @@ msgstr "O&boje (%1)"
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Zvolte cílovou slo\9eku pro polo\9eky z levé strany:"

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index 7dbbe2d..feada29 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -1936,6 +1936,11 @@ msgstr "Ignorer blan&ke linjer"
 msgid "Ignore &case"
 msgstr "Ignorer store/små &bogstaver"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3190,9 +3195,9 @@ msgstr "Deres fil"
 msgid "Mine File"
 msgstr "Min fil"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3200,9 +3205,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Linje: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3687,7 +3692,7 @@ msgstr "Begge (%1)"
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Venstre side - vælg destinationsmappen"

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index 8ce8b54..c0c74ac 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -1937,6 +1937,11 @@ msgstr "Lege regels negeren"
 msgid "Ignore &case"
 msgstr "N&iet hoofdlettergevoelig"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3193,9 +3198,9 @@ msgstr "Hun bestand"
 msgid "Mine File"
 msgstr "Mijn bestand"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3203,9 +3208,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Regel: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3685,7 +3690,7 @@ msgstr "Beide (%1)"
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Linkerkant - selecteer doelmap:"

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index 36bb6f4..d67fa27 100644 (file)
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2016-03-13 11:08+0000\n"
+"POT-Creation-Date: 2016-03-15 00:30+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -1927,9 +1927,9 @@ msgstr ""
 msgid "Ignore &case"
 msgstr ""
 
-#: Merge.rc:51F11514
+#: Merge.rc:6C318DC8
 #, c-format
-msgid "Ignore codepage differences"
+msgid "Ignore codepage &differences"
 msgstr ""
 
 #: Merge.rc:285B56CE

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index c99dcdf..618497e 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -1935,6 +1935,11 @@ msgstr "Ignorer les lignes &vides"
 msgid "Ignore &case"
 msgstr "Ignorer la ca&sse"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3173,9 +3178,9 @@ msgstr "Leur fichier"
 msgid "Mine File"
 msgstr "Mon fichier"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3183,9 +3188,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Ligne: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3649,7 +3654,7 @@ msgstr "Des deux c
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Côté gauche - choisir répertoire de destination:"

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index b9d7c4d..a5d4166 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -1931,6 +1931,11 @@ msgstr "Ignorar &li
 msgid "Ignore &case"
 msgstr "Ignorar maiúsc/minús."
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3171,9 +3176,9 @@ msgstr "O Arquivo Deles"
 msgid "Mine File"
 msgstr "O Meu Arquivo"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3181,9 +3186,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Liña: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3641,7 +3646,7 @@ msgstr "Ambas (%1)"
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Banda esquerda - escoller cartafol de destino:"

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index 4a68c84..e26314e 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -1936,6 +1936,11 @@ msgstr "&Leerzeilen ignorieren"
 msgid "Ignore &case"
 msgstr "&Groß-/Kleinschreibung ignorieren"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3147,9 +3152,9 @@ msgstr "Deren Datei"
 msgid "Mine File"
 msgstr "Meine Datei"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3157,9 +3162,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Zeile: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3607,7 +3612,7 @@ msgstr "Beide (%1)"
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Linke Seite - Zielordner auswählen:"

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index 01efa85..25d5e71 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -1930,6 +1930,11 @@ msgstr "
 msgid "Ignore &case"
 msgstr "ÄéÜêñéóç ìåôáîý Ðåæþí/&Êåöáëáßùí áíåíåñãüò"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3159,9 +3164,9 @@ msgstr "
 msgid "Mine File"
 msgstr "Áñ÷åßï Äéêü ìïõ"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3169,9 +3174,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "ÃñáììÞ: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3619,7 +3624,7 @@ msgstr "
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "ÁñéóôåñÞ ðëåõñÜ - åðéëïãÞ öáêÝëïõ ðñïïñéóìïý:"

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 9b18cb1..4b03566 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -1931,6 +1931,11 @@ msgstr "&
 msgid "Ignore &case"
 msgstr "&Kis-nagybetû különbségek kihagyása"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3107,9 +3112,9 @@ msgstr ""
 msgid "Mine File"
 msgstr ""
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3117,9 +3122,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Sor: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3556,7 +3561,7 @@ msgstr "Mindkett
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Bal oldal - válassz úticél mappát:"

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 6a42639..ce558b4 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -1931,6 +1931,11 @@ msgstr "Ign&ora le linee vuote"
 msgid "Ignore &case"
 msgstr "Ig&nora le differenze tra maiuscole e minuscole"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3153,9 +3158,9 @@ msgstr "Loro file"
 msgid "Mine File"
 msgstr "Miei file"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3163,9 +3168,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Linea: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3613,7 +3618,7 @@ msgstr "Entrambi (%1)"
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Lato sinistro - scegli cartella di destinazione:"

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index a6f72cf..e38cf52 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -1940,6 +1940,11 @@ msgstr "
 msgid "Ignore &case"
 msgstr "\91å\95¶\8e\9a\82Æ\8f¬\95¶\8e\9a\82ð\8bæ\95Ê\82µ\82È\82¢(&C)"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr "\83R\81[\83h\83y\81[\83W\82Ì\88á\82¢\82ð\96³\8e\8b\82·\82é(&D)"
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3219,20 +3224,20 @@ msgstr "Theirs File"
 msgid "Mine File"
 msgstr "Mine File"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
-msgstr "\8ds: %s  \97ñ: %d/%d  \95¶\8e\9a: %d/%d  EOL: %s  \83R\81[\83h\83y\81[\83W: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
+msgstr "\8ds: %s  \97ñ: %d/%d  \95¶\8e\9a: %d/%d  EOL: %s"
 
 #: Merge.rc:15875423
 #, c-format
 msgid "Line: %s"
 msgstr "\8ds: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
-msgstr "\8ds: %s  \97ñ: %d/%d  \95¶\8e\9a: %d/%d  \83R\81[\83h\83y\81[\83W: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
+msgstr "\8ds: %s  \97ñ: %d/%d  \95¶\8e\9a: %d/%d"
 
 #: Merge.rc:7C664E1
 #, c-format
@@ -3710,7 +3715,7 @@ msgstr "
 msgid "All (%1)"
 msgstr "\91S\82Ä (%1)"
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "\8d¶\91¤ - \83R\83s\81[/\88Ú\93®\90æ\83t\83H\83\8b\83_\82Ì\8ew\92è:"

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 97d7b71..6ce3c49 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -1932,6 +1932,11 @@ msgstr "
 msgid "Ignore &case"
 msgstr "´ë¼Ò¹®ÀÚ ¹«½Ã(&C)"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3160,9 +3165,9 @@ msgstr "
 msgid "Mine File"
 msgstr "¸¶ÀÎ ÆÄÀÏ"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3170,9 +3175,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "¶óÀÎ: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3603,7 +3608,7 @@ msgstr "
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "¿ÞÂÊ - À̵¿ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:"

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index d0ea2be..8dee275 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -1931,6 +1931,11 @@ msgstr "Ignorer blan&ke linjer"
 msgid "Ignore &case"
 msgstr "Ignorer store/små &bokstaver"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3170,9 +3175,9 @@ msgstr "Deres fil"
 msgid "Mine File"
 msgstr "Min fil"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3180,9 +3185,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Linje: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3646,7 +3651,7 @@ msgstr "Begge (%1)"
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Venstre side - velg målmappe:"

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index eb4dac8..4dc0598 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -1930,6 +1930,11 @@ msgstr "&k 
 msgid "Ignore &case"
 msgstr "&c \8dÔã \81æÔí ÇÒ ÇäÏÇÒå ÍÑæÝ "
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3167,9 +3172,9 @@ msgstr " 
 msgid "Mine File"
 msgstr " \81ÑæäÏå ÎæÏã "
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3177,9 +3182,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr " ÎØ : %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3644,7 +3649,7 @@ msgstr " 
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr " ØÑÝ \8d\81 - ÇäÊÎÇÈ \81æÔå ãÞÕÏ : "

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index 28bd66e..1af9b7f 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -1932,6 +1932,11 @@ msgstr "Ignoruj r
 msgid "Ignore &case"
 msgstr "Ignoruj ró¿nice wielko\9cci liter"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3171,9 +3176,9 @@ msgstr "Ich plik"
 msgid "Mine File"
 msgstr "Mój plik"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3181,9 +3186,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Linia: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3647,7 +3652,7 @@ msgstr "Obie (%1)"
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Lewa strona - wybierz folder docelowy:"

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index f3b3da2..c5ca3ad 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -1930,6 +1930,11 @@ msgstr "Ignorar linhas em branco"
 msgid "Ignore &case"
 msgstr "Ignorar maiúsculas/minúsculas"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3085,9 +3090,9 @@ msgstr ""
 msgid "Mine File"
 msgstr ""
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3095,9 +3100,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Linha: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3461,7 +3466,7 @@ msgstr "Ambos (%1)"
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Lado esquerdo - seleccione pasta de destino:"

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index 44afc64..5ae5fd7 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -1931,6 +1931,11 @@ msgstr "Ignor
 msgid "Ignore &case"
 msgstr "Ignorã minus&cule/majuscule"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3160,9 +3165,9 @@ msgstr "Fi
 msgid "Mine File"
 msgstr "Fiºierul meu"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3170,9 +3175,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Linie: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3620,7 +3625,7 @@ msgstr "Ambele (%1)"
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Partea stângã - selectare director destinaþie:"

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index 12fe4fe..b011848 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -1933,6 +1933,11 @@ msgstr "
 msgid "Ignore &case"
 msgstr "Èãíîðèðîâàòü ð&åãèñòð"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3171,9 +3176,9 @@ msgstr "
 msgid "Mine File"
 msgstr "Ìîé ôàéë"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3181,9 +3186,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Ñòðîêà: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3645,7 +3650,7 @@ msgstr "
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Ëåâàÿ ñòîðîíà - âûáîð ïàïêè íàçíà÷åíèÿ:"

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index 5441a41..e8fa969 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -1930,6 +1930,11 @@ msgstr "
 msgid "Ignore &case"
 msgstr "Çàíåìàðè ïîä&óäàðíîñò"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3169,9 +3174,9 @@ msgstr "
 msgid "Mine File"
 msgstr "Ìî¼å äàòîòåêå"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3179,9 +3184,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Ðåä: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3643,7 +3648,7 @@ msgstr "
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Ëåâà ñòðàíà - îäàáåðè ôàñöèêëó îäðåäèøòà:"

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index f2288e9..d10f596 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -1931,6 +1931,11 @@ msgstr "Ignorova
 msgid "Ignore &case"
 msgstr "Ignorova\9d m&alé/VE¼KÉ"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3142,9 +3147,9 @@ msgstr "Ich s
 msgid "Mine File"
 msgstr "Môj súbor"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3152,9 +3157,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Riadok: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3602,7 +3607,7 @@ msgstr "Zmaza
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "¼avá strana - vyberte cie¾ový adresár:"

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 9fda772..978733c 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -1934,6 +1934,11 @@ msgstr "Ignoriraj prazne &vrstice"
 msgid "Ignore &case"
 msgstr "Zanemari &velikost znakov"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3174,9 +3179,9 @@ msgstr "Njihova datoteka"
 msgid "Mine File"
 msgstr "Va\9aa datoteka"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3184,9 +3189,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Vrstica: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3650,7 +3655,7 @@ msgstr "Obe (%1)"
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Leva stran - izberite ciljno mapo:"

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index 8c4b541..65f71c1 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -1933,6 +1933,11 @@ msgstr "Ignorar diferencias de l
 msgid "Ignore &case"
 msgstr "Ignorar MAYÚSCULAS/minús&culas"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3172,9 +3177,9 @@ msgstr "Archivo externo"
 msgid "Mine File"
 msgstr "Archivo interno"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3182,9 +3187,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Línea: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3648,7 +3653,7 @@ msgstr "Ambos lados (%1)"
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Izquierda - Seleccione carpeta destino:"

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index c9a7507..2558016 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -1931,6 +1931,11 @@ msgstr "Ignorera blan&ka rader"
 msgid "Ignore &case"
 msgstr "&Ignorera VERSAL/gemen-skillnader"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3170,9 +3175,9 @@ msgstr "Deras fil"
 msgid "Mine File"
 msgstr "Min fil"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3180,9 +3185,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Rad: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3646,7 +3651,7 @@ msgstr "B
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Vänster sida - välj destinationskatalog:"

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index 4f73d9d..168038c 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -1934,6 +1934,11 @@ msgstr "Bo
 msgid "Ignore &case"
 msgstr "BÜYÜK-Küçük harf &umursama"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3173,9 +3178,9 @@ msgstr "Onlar
 msgid "Mine File"
 msgstr "Benim Dosyam"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3183,9 +3188,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Satýr: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3649,7 +3654,7 @@ msgstr "Her ikisini de (%1 tane)"
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "Sol tarafýn hedef klasörünü seç:"

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index a953e8e..d8c778a 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -1932,6 +1932,11 @@ msgstr "
 msgid "Ignore &case"
 msgstr "Íåõòóâàòè ð&åã³ñòð"
 
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr ""
+
 #: Merge.rc:285B56CE
 #, c-format
 msgid "E&nable moved block detection"
@@ -3171,9 +3176,9 @@ msgstr "
 msgid "Mine File"
 msgstr "̳é ôàéë"
 
-#: Merge.rc:55269C51
+#: Merge.rc:DD21174
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  EOL: %s"
 msgstr ""
 
 #: Merge.rc:15875423
@@ -3181,9 +3186,9 @@ msgstr ""
 msgid "Line: %s"
 msgstr "Ðÿäîê: %s"
 
-#: Merge.rc:50DE3D68
+#: Merge.rc:6F3BCB35
 #, c-format
-msgid "Ln: %s  Col: %d/%d  Ch: %d/%d  Cp: %d(%s)"
+msgid "Ln: %s  Col: %d/%d  Ch: %d/%d"
 msgstr ""
 
 #: Merge.rc:7C664E1
@@ -3645,7 +3650,7 @@ msgstr "
 msgid "All (%1)"
 msgstr ""
 
-#: Merge.rc:DD21174
+#: Merge.rc:DD21175
 #, c-format
 msgid "Left side - select destination folder:"
 msgstr "˳âà ñòîðîíà - âèá³ð òåêè ïðèçíà÷åííÿ:"