Merge.rc: Replace 'Compare' with 'Co&mpare' in OpenDlg. bitbucket#121

--HG--
branch : stable

diff --git a/Src/Merge.rc b/Src/Merge.rc
index c186fe4..dce050b 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -933,8 +933,8 @@ BEGIN
     PUSHBUTTON      "Se&lect...",IDC_SELECT_UNPACKER,383,209,73,14\r
 \r
     CONTROL         "Sa&ve Project...",ID_SAVE_PROJECT,"Button",BS_SPLITBUTTON | WS_TABSTOP,10,245,90,14\r
-    DEFPUSHBUTTON   "Compare",IDOK,356,245,50,20\r
-    PUSHBUTTON      "Cancel",IDCANCEL,410,245,50,20\r
+    DEFPUSHBUTTON   "Co&mpare",IDOK,316,245,70,20\r
+    PUSHBUTTON      "Cancel",IDCANCEL,390,245,70,20\r
     LTEXT           "Status:",IDC_OPEN_STATUS,6,272,440,12\r
 \r
     PUSHBUTTON      "Help",ID_HELP,383,10,72,14\r

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index 9913aca..a5df75e 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -1494,10 +1494,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Alderatu"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1944,7 +1943,7 @@ msgstr "Gelditu"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1999,6 +1998,11 @@ msgstr "&Ezberdintasuna"
 msgid "&Go To"
 msgstr "&Joan Hona"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Alderatu"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2044,7 +2048,7 @@ msgstr "Gaitu bloke &mugitu atzematea"
 msgid "&Match similar lines"
 msgstr "&Berdindu antzeko lerroak"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Aipamenak"
@@ -2204,7 +2208,7 @@ msgstr "B&aztertu aldaketak"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Kode-orrialdea"

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index 0cded83..ab19cf1 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -1493,10 +1493,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Comparar"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1943,7 +1942,7 @@ msgstr "Parar"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1998,6 +1997,11 @@ msgstr "&Diferença"
 msgid "&Go To"
 msgstr "&Ir Para"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Comparar"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2043,7 +2047,7 @@ msgstr "A&tivar a detecção dos blocos movidos"
 msgid "&Match similar lines"
 msgstr "&Combinar as linhas similares"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Comentários"
@@ -2203,7 +2207,7 @@ msgstr "Des&cartar mudanças"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Código da página"

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 9243c4c..d835f41 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -1491,10 +1491,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Сравняване"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1941,7 +1940,7 @@ msgstr "Спри"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1996,6 +1995,11 @@ msgstr "&Разлика"
 msgid "&Go To"
 msgstr "&Отиди"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Сравняване"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2041,7 +2045,7 @@ msgstr "Позволи разпознаване на преместен &бло
 msgid "&Match similar lines"
 msgstr "Съответствие на подобни редове"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Коментари"
@@ -2201,7 +2205,7 @@ msgstr "О&тмени промените"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Кодировка"

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index 9ef21ef..fded5c7 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -1490,10 +1490,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Comparació"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1940,7 +1939,7 @@ msgstr "&Atura"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1995,6 +1994,11 @@ msgstr "&Diferència"
 msgid "&Go To"
 msgstr "&Vés-hi"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Comparació"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2040,7 +2044,7 @@ msgstr "&Habilita detecció de blocs desplaçats"
 msgid "&Match similar lines"
 msgstr "Em&parella les línies similars"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Comentaris"
@@ -2200,7 +2204,7 @@ msgstr "Des&carta'n els canvis"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Pàgina de codis"

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index 5c1f692..b0ff0c0 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -1492,10 +1492,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "对比"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1942,7 +1941,7 @@ msgstr "停止"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1997,6 +1996,11 @@ msgstr "不同处(&D)"
 msgid "&Go To"
 msgstr "转到(&G)"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "对比"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2042,7 +2046,7 @@ msgstr "允许检测移动区块(&N)"
 msgid "&Match similar lines"
 msgstr "匹配相似的行(&M)"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "备注"
@@ -2202,7 +2206,7 @@ msgstr "放弃修改(&C)"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "代码页"

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index de6fe20..37233bf 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -1499,10 +1499,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "比較"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1951,7 +1950,7 @@ msgstr "停止"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -2006,6 +2005,11 @@ msgstr "差異區塊(&D)"
 msgid "&Go To"
 msgstr "移至(&G)"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "比較"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2051,7 +2055,7 @@ msgstr "偵測移位的區塊(&N)"
 msgid "&Match similar lines"
 msgstr "找出相似行(&M)"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "備註"
@@ -2211,7 +2215,7 @@ msgstr "放棄變更(&C)"
 msgid "Disca&rd All"
 msgstr "放棄全部(&R)"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "編碼頁"

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index 85b7a90..c800114 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -1491,10 +1491,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Usporedba"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1941,7 +1940,7 @@ msgstr "Stani"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1996,6 +1995,11 @@ msgstr "&razliku"
 msgid "&Go To"
 msgstr "Idi &na"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Usporedba"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2041,7 +2045,7 @@ msgstr "Omogući &razlikovanje premještenih blokova"
 msgid "&Match similar lines"
 msgstr "&Jednake retke"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Komentari"
@@ -2201,7 +2205,7 @@ msgstr "Odustajem od izmjena"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Kodna stranica"

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index b570feb..7396853 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -1491,10 +1491,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Porovnávání"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1943,7 +1942,7 @@ msgstr "Zastavit"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1998,6 +1997,11 @@ msgstr "Ro&zdíl"
 msgid "&Go To"
 msgstr "&Přejít"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Porovnávání"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2043,7 +2047,7 @@ msgstr "Povolit zjišťování přesunutých &bloků"
 msgid "&Match similar lines"
 msgstr "Za&rovnat podobné řádky"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Komentáře"
@@ -2203,7 +2207,7 @@ msgstr "Zr&ušit změny"
 msgid "Disca&rd All"
 msgstr "Zrušit &vše"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Kódování"

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index 57633cd..bf99115 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -1492,10 +1492,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Sammenlign"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1946,7 +1945,7 @@ msgstr "Stop"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -2001,6 +2000,11 @@ msgstr "&Forskel"
 msgid "&Go To"
 msgstr "&Gå til"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Sammenlign"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2046,7 +2050,7 @@ msgstr "&Aktiver detektion af flyttede blokke"
 msgid "&Match similar lines"
 msgstr "&Match ens linjer"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Kommentarer"
@@ -2206,7 +2210,7 @@ msgstr "F&jern ændringer"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Codepage"

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index 757f9ec..53c71b0 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -1493,10 +1493,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Vergelijken"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1948,7 +1947,7 @@ msgstr "Stoppen"
 msgid "Pause"
 msgstr "Pauzeren"
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr "Doorgaan"
@@ -2003,6 +2002,11 @@ msgstr "Verschil"
 msgid "&Go To"
 msgstr "Gaan naar"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Vergelijken"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2048,7 +2052,7 @@ msgstr "Detectie verplaatste blokken inschakelen"
 msgid "&Match similar lines"
 msgstr "Gelijke regels laten overeenkomen"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Opmerkingen"
@@ -2208,7 +2212,7 @@ msgstr "Wijzigingen verwerpen"
 msgid "Disca&rd All"
 msgstr "Alles verwerpen"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Tekenset"

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index 97da8f5..e834446 100644 (file)
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2018-10-27 22:00+0000\n"
+"POT-Creation-Date: 2018-10-30 06:26+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -1208,8 +1208,8 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-msgid "Compare"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
 msgstr ""
 
 #: Merge.rc:4E65D340
@@ -1568,7 +1568,7 @@ msgstr ""
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 msgid "Continue"
 msgstr ""
 
@@ -1612,6 +1612,10 @@ msgstr ""
 msgid "&Go To"
 msgstr ""
 
+#: Merge.rc:7E5494F6
+msgid "Compare"
+msgstr ""
+
 #: Merge.rc:65285570
 msgid "Whitespace"
 msgstr ""
@@ -1648,7 +1652,7 @@ msgstr ""
 msgid "&Match similar lines"
 msgstr ""
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 msgid "Comments"
 msgstr ""
 
@@ -1776,7 +1780,7 @@ msgstr ""
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 msgid "Codepage"
 msgstr ""
 

diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index 3c1b168..92411fd 100644 (file)
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -1487,10 +1487,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Vertaa"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1938,7 +1937,7 @@ msgstr "Pysäytä"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1993,6 +1992,11 @@ msgstr "Erilaisuus"
 msgid "&Go To"
 msgstr "Siirry kohteeseen"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Vertaa"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2038,7 +2042,7 @@ msgstr "Ota siirretyn lohkon tunnistus käyttöön"
 msgid "&Match similar lines"
 msgstr "Täsmää samanlaiset rivit"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Kommentit"
@@ -2198,7 +2202,7 @@ msgstr "Hylkää muutokset"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Koodisivu"

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index b8b9044..028d8ae 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -1495,10 +1495,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Comparaison"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1945,7 +1944,7 @@ msgstr "Arrêter"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -2000,6 +1999,11 @@ msgstr "Di&fférence"
 msgid "&Go To"
 msgstr "&Atteindre"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Comparaison"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2045,7 +2049,7 @@ msgstr "&Activer la détection des blocs déplacés"
 msgid "&Match similar lines"
 msgstr "Assortir les &lignes similaires"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Commentaires"
@@ -2205,7 +2209,7 @@ msgstr "I&gnorer les changements"
 msgid "Disca&rd All"
 msgstr "Ignorer tout"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Page de code"

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index 87c5140..5298395 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -1491,10 +1491,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Comparar"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1941,7 +1940,7 @@ msgstr "Parar"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1996,6 +1995,11 @@ msgstr "&Diferenza"
 msgid "&Go To"
 msgstr "&Ir a"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Comparar"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2041,7 +2045,7 @@ msgstr "A&ctivar detección de bloques movidos"
 msgid "&Match similar lines"
 msgstr "&Combinar as liñas semellantes"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Comentarios"
@@ -2201,7 +2205,7 @@ msgstr "Desbo&tar trocos"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Páxina de códigos"

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index fc3776c..937c4bb 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -1491,10 +1491,9 @@ msgstr " Datei: Entpacker-Plugin"
 msgid "Se&lect..."
 msgstr "Auswählen..."
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Vergleichen"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1943,7 +1942,7 @@ msgstr "Stop"
 msgid "Pause"
 msgstr "Pause"
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr "Fortsetzen"
@@ -1998,6 +1997,11 @@ msgstr "&Unterschied"
 msgid "&Go To"
 msgstr "&Gehe"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Vergleichen"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2043,7 +2047,7 @@ msgstr "Verschobene &Blöcke erkennen"
 msgid "&Match similar lines"
 msgstr "Ä&hnliche Zeilen angleichen"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Kommentare"
@@ -2203,7 +2207,7 @@ msgstr "Änderungen ver&werfen"
 msgid "Disca&rd All"
 msgstr "&Alle verwerfen"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Zeichensatz"

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index ac96a40..ee31dd8 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -1490,10 +1490,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Σύγκριση"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1940,7 +1939,7 @@ msgstr "Τερματισμός"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1995,6 +1994,11 @@ msgstr "&Διαφορά"
 msgid "&Go To"
 msgstr "Μετά&βαση"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Σύγκριση"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2040,7 +2044,7 @@ msgstr "Ενεργοποίηση ανι&χνεύσεως μετακινηθέν
 msgid "&Match similar lines"
 msgstr "Αντιστοίχιση παρομοίων γραμμών"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Σχόλια"
@@ -2200,7 +2204,7 @@ msgstr "Από&ρριψη αλλαγών"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Κωδικοσελίδα"

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index d839d86..bf57472 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -1491,10 +1491,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Összehasonlítás"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1941,7 +1940,7 @@ msgstr "Leállítás"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1996,6 +1995,11 @@ msgstr "&Eltérésre"
 msgid "&Go To"
 msgstr "&Ugrás"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Összehasonlítás"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2041,7 +2045,7 @@ msgstr "Mozgatott &blokk észlelés bekapcsolása"
 msgid "&Match similar lines"
 msgstr ""
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Megjegyzések"
@@ -2201,7 +2205,7 @@ msgstr "Változtatások e&lvetése"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Kódlap"

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 93a4ce6..afa1e01 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -1491,10 +1491,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Confronto"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1941,7 +1940,7 @@ msgstr "Stop"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1996,6 +1995,11 @@ msgstr "Di&fferenza"
 msgid "&Go To"
 msgstr "&Vai"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Confronto"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2041,7 +2045,7 @@ msgstr "Attiva il rilevamento di blocc&hi spostati"
 msgid "&Match similar lines"
 msgstr "&Metti in corrispondenza linee simili"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Commenti"
@@ -2201,7 +2205,7 @@ msgstr "Sca&rta le modifiche"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Codice di pagina"

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index fc6da3b..f29d8f7 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -1491,10 +1491,9 @@ msgstr " ファイル: 展開プラグイン"
 msgid "Se&lect..."
 msgstr "選択(&L)..."
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "比較"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr "比較(&M)"
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1949,7 +1948,7 @@ msgstr "停止"
 msgid "Pause"
 msgstr "一時停止"
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr "再開"
@@ -2004,6 +2003,11 @@ msgstr "差異(&D)"
 msgid "&Go To"
 msgstr "移動(&G)"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "比較"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2049,7 +2053,7 @@ msgstr "移動ブロック検出を有効にする(&N)"
 msgid "&Match similar lines"
 msgstr "類似行をマッチさせる(&M)"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "コメント"
@@ -2209,7 +2213,7 @@ msgstr "変更を破棄する(&C)"
 msgid "Disca&rd All"
 msgstr "すべて破棄する(&R)"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "コードページ"

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 43c2f68..cabd5ae 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -1495,10 +1495,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "비교"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1945,7 +1944,7 @@ msgstr "중지"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -2000,6 +1999,11 @@ msgstr "차이점(&D)"
 msgid "&Go To"
 msgstr "이동(&G)"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "비교"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2045,7 +2049,7 @@ msgstr "이동된 블럭 감지 사용하기"
 msgid "&Match similar lines"
 msgstr "비슷한 줄 일치시키기(&M)"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "코멘트"
@@ -2205,7 +2209,7 @@ msgstr "변경사항 취소(&C)"
 msgid "Disca&rd All"
 msgstr "전부 취소(&R)"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "코드페이지"

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index fee2122..a2bbd7b 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -1491,10 +1491,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Sammenlign"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1941,7 +1940,7 @@ msgstr "Stopp"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1996,6 +1995,11 @@ msgstr "&Forskjell"
 msgid "&Go To"
 msgstr "&Gå til"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Sammenlign"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2041,7 +2045,7 @@ msgstr "&Aktiver flyttet blokk-oppdagelse"
 msgid "&Match similar lines"
 msgstr "&Match lignende linjer"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Kommentarer"
@@ -2201,7 +2205,7 @@ msgstr "Fork&ast endringer"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Tegnsett"

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index 015963b..3e8078b 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -1492,10 +1492,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr " مقايسه کردن "
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1948,7 +1947,7 @@ msgstr " ايست "
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -2003,6 +2002,11 @@ msgstr "&D تفاوت "
 msgid "&Go To"
 msgstr "&G برو به "
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr " مقايسه کردن "
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2048,7 +2052,7 @@ msgstr "&n فعال کردن تشخيص قطعه جابجا شده "
 msgid "&Match similar lines"
 msgstr "&M مطابقت کردن خطوط مشابه "
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr " يادداشتها "
@@ -2208,7 +2212,7 @@ msgstr "&c دورانداختن تغييرات "
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr " صفحه کد "

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index 39c8791..b98c00e 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -1492,10 +1492,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Porównaj"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1942,7 +1941,7 @@ msgstr "Zatrzymaj"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1997,6 +1996,11 @@ msgstr "&Różnica"
 msgid "&Go To"
 msgstr "&Idź do"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Porównaj"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2042,7 +2046,7 @@ msgstr "Włącz &wykrywanie przeniesionych bloków"
 msgid "&Match similar lines"
 msgstr "Dopasuje podobne linie"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Komentarze"
@@ -2202,7 +2206,7 @@ msgstr "Odr&zuć zmiany"
 msgid "Disca&rd All"
 msgstr "Odrzuć &wszystkie"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Strona kodowa"

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index 8142ce0..78347c6 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -1491,10 +1491,9 @@ msgstr " Ficheiro: Unpacker Plugin"
 msgid "Se&lect..."
 msgstr "Se&lecionar..."
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Comparar"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1941,7 +1940,7 @@ msgstr "Parar"
 msgid "Pause"
 msgstr "Pausa"
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr "Continuar"
@@ -1996,6 +1995,11 @@ msgstr "Diferença"
 msgid "&Go To"
 msgstr "Ir Para"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Comparar"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2041,7 +2045,7 @@ msgstr "Ativar deteção de bloco movido"
 msgid "&Match similar lines"
 msgstr "Comparar linhas semelhantes"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Comentários"
@@ -2201,7 +2205,7 @@ msgstr "Rejeitar alterações"
 msgid "Disca&rd All"
 msgstr "Rejei&tar Tudo"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Página de código"

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index 98225d3..c1bb3fd 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -1491,10 +1491,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Comparare"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1941,7 +1940,7 @@ msgstr "Stop"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1996,6 +1995,11 @@ msgstr "&Diferenţă"
 msgid "&Go To"
 msgstr "&Mergi la"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Comparare"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2041,7 +2045,7 @@ msgstr "Activea&ză detecţie blocuri mutate"
 msgid "&Match similar lines"
 msgstr "Potriveşte linii si&milare"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Comentarii"
@@ -2201,7 +2205,7 @@ msgstr "Renunţă la s&chimbări"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Codare caractere"

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index ca5edb3..832c51a 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -1493,10 +1493,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Сравнение"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1943,7 +1942,7 @@ msgstr "Остановить"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1998,6 +1997,11 @@ msgstr "&Отличие"
 msgid "&Go To"
 msgstr "Перейт&и"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Сравнение"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2043,7 +2047,7 @@ msgstr "Обнаружение переме&щенных блоков"
 msgid "&Match similar lines"
 msgstr "Искать похожие строки"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Комментарии"
@@ -2203,7 +2207,7 @@ msgstr "О&тклонить изменения"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Кодовая страница"

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index 1f3dd7b..8e064f0 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -1490,10 +1490,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Óïîðå\90èâàœå"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1940,7 +1939,7 @@ msgstr "Ñòàíè"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1995,6 +1994,11 @@ msgstr "Ðàç&ëèêà"
 msgid "&Go To"
 msgstr "&Èäè íà"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Óïîðå\90èâàœå"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2040,7 +2044,7 @@ msgstr "Îìîãóžè îòêðèâàœå ïðåìåøòåíèõ ãðóïà"
 msgid "&Match similar lines"
 msgstr "Óïîðåäè ñëè÷íå ðåäîâå"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Íàïîìåíå"
@@ -2200,7 +2204,7 @@ msgstr "Îäóñ&òàíè îä èçìåíà"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Êîäíà ñòðàíèöà"

diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index 84c77ce..895370b 100644 (file)
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -1488,10 +1488,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "සසඳන්න"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1938,7 +1937,7 @@ msgstr "නවත්වන්න"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1993,6 +1992,11 @@ msgstr "වෙනස"
 msgid "&Go To"
 msgstr "වෙත යන්න"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "සසඳන්න"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2038,7 +2042,7 @@ msgstr "E&nable moved block detection"
 msgid "&Match similar lines"
 msgstr "සමාන පේළි ගලපන්න"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "විවේචන"
@@ -2198,7 +2202,7 @@ msgstr "වෙනස්කම් ඉවතලන්න"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "ගුප්ත සංඥා "

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index 2361be0..822d0e7 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -1491,10 +1491,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Porovnávanie"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1941,7 +1940,7 @@ msgstr "Zastaviť"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1996,6 +1995,11 @@ msgstr "&Rozdiel"
 msgid "&Go To"
 msgstr "&Prejsť na"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Porovnávanie"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2041,7 +2045,7 @@ msgstr "Zapnúť &detekciu pohyblivého bloku"
 msgid "&Match similar lines"
 msgstr "&Podobné riadky ako zhodné"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Komentáre"
@@ -2201,7 +2205,7 @@ msgstr "Z&ahodiť zmeny"
 msgid "Disca&rd All"
 msgstr "&Zahodiť všetky"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Kódová stránka"

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 68c6e45..924e6a6 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -1492,10 +1492,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Primerjaj"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1944,7 +1943,7 @@ msgstr "Ustavi"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1999,6 +1998,11 @@ msgstr "&Razlika"
 msgid "&Go To"
 msgstr "Pojdi &na"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Primerjaj"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2044,7 +2048,7 @@ msgstr "Omogoči &razlikovanje premaknjenih blokov"
 msgid "&Match similar lines"
 msgstr "&Ujemanje enakih vrstic"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Komentarji"
@@ -2204,7 +2208,7 @@ msgstr "Zavrži spremembe"
 msgid "Disca&rd All"
 msgstr "&Zavrži vse"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Kodna tabela"

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index 0189e99..63e69c7 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -1493,10 +1493,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Comparar"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1943,7 +1942,7 @@ msgstr "Detener"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1998,6 +1997,11 @@ msgstr "&Diferencia"
 msgid "&Go To"
 msgstr "Ir &a"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Comparar"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2043,7 +2047,7 @@ msgstr "Habilitar detecció&n de bloques movidos"
 msgid "&Match similar lines"
 msgstr "Co&mbinar con líneas similares"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Comentarios"
@@ -2203,7 +2207,7 @@ msgstr "Des&cartar cambios"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Página de códigos"

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index e5fd04c..c13e01b 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -1491,10 +1491,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Jämför"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1941,7 +1940,7 @@ msgstr "Stopp"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1996,6 +1995,11 @@ msgstr "&Skillnad"
 msgid "&Go To"
 msgstr "&Gå till"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Jämför"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2041,7 +2045,7 @@ msgstr "M&öjliggör detektion av flyttade textblock"
 msgid "&Match similar lines"
 msgstr "&Matcha liknande rader"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Kommentarer"
@@ -2201,7 +2205,7 @@ msgstr "Ign&orera ändringar"
 msgid "Disca&rd All"
 msgstr "Ign&orera allt"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Codepage"

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index f1b09b1..fae8c25 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -1492,10 +1492,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Karşılaştırma"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1947,7 +1946,7 @@ msgstr "Dur"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -2002,6 +2001,11 @@ msgstr "&Farklılık"
 msgid "&Go To"
 msgstr "&Git"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Karşılaştırma"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2047,7 +2051,7 @@ msgstr "Taşı&nan Blok Algılaması Kullanılsın"
 msgid "&Match similar lines"
 msgstr "&Benzer Satırlar Eşleştirilsin"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Açıklamalar"
@@ -2207,7 +2211,7 @@ msgstr "Değişiklikleri kaydet&me"
 msgid "Disca&rd All"
 msgstr "&Tümünü Yok Say"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Kod Sayfası"

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index 70d6cb4..d880930 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -1492,10 +1492,9 @@ msgstr ""
 msgid "Se&lect..."
 msgstr ""
 
-#: Merge.rc:7E5494F6
-#, c-format
-msgid "Compare"
-msgstr "Порівняння"
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr ""
 
 #: Merge.rc:4E65D340
 #, c-format
@@ -1942,7 +1941,7 @@ msgstr "Зупинити"
 msgid "Pause"
 msgstr ""
 
-#: Merge.rc:4C3E0A2D
+#: Merge.rc:4C3E0A2E
 #, c-format
 msgid "Continue"
 msgstr ""
@@ -1997,6 +1996,11 @@ msgstr "&Відмінність"
 msgid "&Go To"
 msgstr "Перейт&и"
 
+#: Merge.rc:7E5494F6
+#, c-format
+msgid "Compare"
+msgstr "Порівняння"
+
 #: Merge.rc:65285570
 #, c-format
 msgid "Whitespace"
@@ -2042,7 +2046,7 @@ msgstr "Виявлення перемі&щених блоків"
 msgid "&Match similar lines"
 msgstr "Виконати пошук схожих рядків"
 
-#: Merge.rc:4C3E0A2E
+#: Merge.rc:4C3E0A2F
 #, c-format
 msgid "Comments"
 msgstr "Коментарі"
@@ -2202,7 +2206,7 @@ msgstr "Ві&дхилити зміни"
 msgid "Disca&rd All"
 msgstr "Скасу&вати все"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Сторінка кодування"