Merge.rc: Fix bitbucket issue#125. The order of controls seems to be important

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 3a2076c..a46316a 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -903,26 +903,26 @@ CAPTION "Select Files or Folders"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
 //     LOGO                    res\\logo.jpg :: Height = 80px, Width=336px (extended fully to Right)\r
-    GROUPBOX        "&1st File or Folder",IDC_FILES_DIRS_GROUP0,6,54,454,46\r
     CONTROL         "",IDC_PATH0_COMBO,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,10,66,446,95\r
     CONTROL         "Re&ad-only",IDC_PATH0_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,84,100,10\r
     PUSHBUTTON      "",IDC_SWAP01_BUTTON,120,82,15,14\r
     LTEXT           "Swap 1st | 2nd",IDC_SWAP01_STATIC,138,84,88,12\r
     PUSHBUTTON      "&Browse...",IDC_PATH0_BUTTON,383,82,73,14\r
+    GROUPBOX        "&1st File or Folder",IDC_FILES_DIRS_GROUP0,6,54,454,46\r
 \r
-    GROUPBOX        "&2nd File or Folder",IDC_FILES_DIRS_GROUP1,6,102,454,46\r
     CONTROL         "",IDC_PATH1_COMBO,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,10,114,446,95\r
     CONTROL         "Rea&d-only",IDC_PATH1_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,132,100,10\r
     PUSHBUTTON      "",IDC_SWAP12_BUTTON,120,130,15,14\r
     LTEXT           "Swap 2nd | 3rd",IDC_SWAP12_STATIC,138,132,88,12\r
     PUSHBUTTON      "B&rowse...",IDC_PATH1_BUTTON,383,130,73,14\r
+    GROUPBOX        "&2nd File or Folder",IDC_FILES_DIRS_GROUP1,6,102,454,46\r
 \r
-    GROUPBOX        "&3rd File or Folder (Optional)",IDC_FILES_DIRS_GROUP2,6,150,454,46\r
     CONTROL         "",IDC_PATH2_COMBO,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,10,162,446,95\r
     CONTROL         "Read-o&nly",IDC_PATH2_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,180,100,10\r
     PUSHBUTTON      "",IDC_SWAP02_BUTTON,120,178,15,14\r
     LTEXT           "Swap 1st | 3rd",IDC_SWAP02_STATIC,138,180,88,12\r
     PUSHBUTTON      "Browse...",IDC_PATH2_BUTTON,383,178,73,14\r
+    GROUPBOX        "&3rd File or Folder (Optional)",IDC_FILES_DIRS_GROUP2,6,150,454,46\r
 \r
     GROUPBOX        "",IDC_FILES_DIRS_GROUP3X,6,197,224,42\r
     LTEXT           " Folder: Filter",IDC_FILES_DIRS_GROUP3,10,198,86,11\r

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index a5df75e..3e591c3 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -1414,11 +1414,6 @@ msgstr "&Laguntzaileak"
 msgid "Select Files or Folders"
 msgstr "Hautatu Agiriak edo Agiritegiak"
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1434,9 +1429,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "Bil&atu..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1454,9 +1449,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Bi&latu..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1474,6 +1469,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Bilatu..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index ab19cf1..247dd32 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -1413,11 +1413,6 @@ msgstr "Contribuidores"
 msgid "Select Files or Folders"
 msgstr "Selecionar Arquivos ou Pastas"
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1433,9 +1428,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Procurar..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1453,9 +1448,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "P&rocurar..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1473,6 +1468,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Procurar..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index d835f41..18d2c51 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -1411,11 +1411,6 @@ msgstr "Дарители"
 msgid "Select Files or Folders"
 msgstr "Избери Файл или директория..."
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1431,9 +1426,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Потърси..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1451,9 +1446,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Преглед"
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1471,6 +1466,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Потърси..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index fded5c7..0fa9be9 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -1410,11 +1410,6 @@ msgstr "Col·laboradors"
 msgid "Select Files or Folders"
 msgstr "Tria de fitxers o directoris..."
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1430,9 +1425,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Navega..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1450,9 +1445,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr ""
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1470,6 +1465,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "N&avega..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index b0ff0c0..bb8cced 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -1412,11 +1412,6 @@ msgstr "贡献者"
 msgid "Select Files or Folders"
 msgstr "选择文件或文件夹..."
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1432,9 +1427,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "浏览(&B)..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1452,9 +1447,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "浏览(&R)..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1472,6 +1467,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "浏览..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index 37233bf..fce95f8 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -1419,11 +1419,6 @@ msgstr "貢獻者"
 msgid "Select Files or Folders"
 msgstr "選取檔案或資料夾"
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1439,9 +1434,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "瀏覽(&B)..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1459,9 +1454,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "瀏覽(&R)..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1479,6 +1474,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "瀏覽..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index c800114..2389a8c 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -1411,11 +1411,6 @@ msgstr "Suradnici"
 msgid "Select Files or Folders"
 msgstr "Odabir datoteke ili mape"
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1431,9 +1426,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Odabir..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1451,9 +1446,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "&Odabir..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1471,6 +1466,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Odabir..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 7396853..c8d73bd 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -1411,11 +1411,6 @@ msgstr "Přispěvatelé"
 msgid "Select Files or Folders"
 msgstr "Vybrat soubory nebo složky..."
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1431,9 +1426,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Procházet..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1451,9 +1446,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Pr&ocházet..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1471,6 +1466,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Pr&ocházet..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index bf99115..f961d8f 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -1412,11 +1412,6 @@ msgstr "Deltagere"
 msgid "Select Files or Folders"
 msgstr "Vælg filer eller mapper..."
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1432,9 +1427,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Gennemse..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1452,9 +1447,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "G&ennemse..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1472,6 +1467,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Gennemse..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index 53c71b0..01cd741 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -1413,11 +1413,6 @@ msgstr "Medewerkers"
 msgid "Select Files or Folders"
 msgstr "Bestanden of mappen selecteren"
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1433,9 +1428,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "Bladeren..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1453,9 +1448,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Bladeren..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1473,6 +1468,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Bladeren..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index e834446..ab80695 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-30 06:26+0000\n"
+"POT-Creation-Date: 2018-11-12 23:16+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -1144,10 +1144,6 @@ msgstr ""
 msgid "Select Files or Folders"
 msgstr ""
 
-#: Merge.rc:6DE6F874
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 msgid "Re&ad-only"
 msgstr ""
@@ -1160,8 +1156,8 @@ msgstr ""
 msgid "&Browse..."
 msgstr ""
 
-#: Merge.rc:6DE6F875
-msgid "&2nd File or Folder"
+#: Merge.rc:6DE6F874
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1176,8 +1172,8 @@ msgstr ""
 msgid "B&rowse..."
 msgstr ""
 
-#: Merge.rc:3C1ECDDA
-msgid "&3rd File or Folder (Optional)"
+#: Merge.rc:6DE6F875
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1192,6 +1188,10 @@ msgstr ""
 msgid "Browse..."
 msgstr ""
 
+#: Merge.rc:3C1ECDDA
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 msgid " Folder: Filter"
 msgstr ""

diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index 92411fd..664877e 100644 (file)
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -1407,11 +1407,6 @@ msgstr "Avustajat"
 msgid "Select Files or Folders"
 msgstr "Valitse tiedostoja tai kansioita"
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1427,9 +1422,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "Selaa..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1447,9 +1442,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Selaa..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1467,6 +1462,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Selaa..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index 028d8ae..73f9265 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -1415,11 +1415,6 @@ msgstr "Contributeurs"
 msgid "Select Files or Folders"
 msgstr "Sélection des fichiers ou des répertoires..."
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1435,9 +1430,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "P&arcourir..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1455,9 +1450,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Parc&ourir..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1475,6 +1470,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Parc&ourir..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index 5298395..4ae4173 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -1411,11 +1411,6 @@ msgstr "Colaboradores"
 msgid "Select Files or Folders"
 msgstr "Seleccionar arquivos ou cartafoles"
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1431,9 +1426,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Explorar..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1451,9 +1446,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Explo&rar..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1471,6 +1466,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Explorar..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index 937c4bb..41e7098 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -1411,11 +1411,6 @@ msgstr "Mitwirkende"
 msgid "Select Files or Folders"
 msgstr "Dateien oder Ordner auswählen"
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr "&1. Datei oder Ordner"
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1431,10 +1426,10 @@ msgstr "Vertausche 1. | 2."
 msgid "&Browse..."
 msgstr "&Suchen..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
-msgstr "&2. Datei oder Ordner"
+msgid "&1st File or Folder"
+msgstr "&1. Datei oder Ordner"
 
 #: Merge.rc:39174D97
 #, c-format
@@ -1451,10 +1446,10 @@ msgstr "Vertausche 2. | 3."
 msgid "B&rowse..."
 msgstr "Su&chen..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
-msgstr "&3. Datei oder Ordner (Optional)"
+msgid "&2nd File or Folder"
+msgstr "&2. Datei oder Ordner"
 
 #: Merge.rc:39174D98
 #, c-format
@@ -1471,6 +1466,11 @@ msgstr "Vertausche 1. | 3."
 msgid "Browse..."
 msgstr "Suchen..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr "&3. Datei oder Ordner (Optional)"
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index ee31dd8..e7cb7d6 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -1410,11 +1410,6 @@ msgstr "Συντελεστές"
 msgid "Select Files or Folders"
 msgstr "Επιλογή Αρχείων ή Φακέλων"
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1430,9 +1425,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "Ανα&ζήτηση..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1450,9 +1445,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Ανα&ζήτηση..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1470,6 +1465,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Ανα&ζήτηση..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index bf57472..0c48cd4 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -1411,11 +1411,6 @@ msgstr "Közreműködők"
 msgid "Select Files or Folders"
 msgstr "Válaszd ki a fájlokat vagy könyvtárakat..."
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1431,9 +1426,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Tallózás..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1451,9 +1446,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Tallóz..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1471,6 +1466,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Tallózás..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index afa1e01..778f315 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -1411,11 +1411,6 @@ msgstr "Hanno contribuito"
 msgid "Select Files or Folders"
 msgstr "Seleziona i file o le cartelle"
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1431,9 +1426,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "S&foglia..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1451,9 +1446,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "&Sfoglia..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1471,6 +1466,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Sfoglia..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index f29d8f7..e416b94 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -1411,11 +1411,6 @@ msgstr "貢献者"
 msgid "Select Files or Folders"
 msgstr "ファイルまたはフォルダーの選択..."
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr "&1 番目のファイルまたはフォルダ"
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1431,10 +1426,10 @@ msgstr "1 番目と 2 番目を交換"
 msgid "&Browse..."
 msgstr "参照(&B)..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
-msgstr "&2 番目のファイルまたはフォルダ"
+msgid "&1st File or Folder"
+msgstr "&1 番目のファイルまたはフォルダ"
 
 #: Merge.rc:39174D97
 #, c-format
@@ -1451,10 +1446,10 @@ msgstr "2 番目と 3 番目を交換"
 msgid "B&rowse..."
 msgstr "参照(&R)"
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
-msgstr "&3 番目のファイルまたはフォルダ(オプション)"
+msgid "&2nd File or Folder"
+msgstr "&2 番目のファイルまたはフォルダ"
 
 #: Merge.rc:39174D98
 #, c-format
@@ -1471,6 +1466,11 @@ msgstr "1 番目と 3 番目を交換"
 msgid "Browse..."
 msgstr "参照..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr "&3 番目のファイルまたはフォルダ(オプション)"
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index cabd5ae..f73872e 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -1415,11 +1415,6 @@ msgstr "공헌자"
 msgid "Select Files or Folders"
 msgstr "폴더/파일 선택"
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1435,9 +1430,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "찾아보기(&B)"
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1455,9 +1450,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "찾아보기(&R)"
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1475,6 +1470,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "찾아보기..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index de967ef..f8fab0d 100644 (file)
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -1153,10 +1153,6 @@ msgstr "Talkininkai"
 msgid "Select Files or Folders"
 msgstr "Parinkite failus ar katalogus"
 
-#: Merge.rc:6DE6F874
-msgid "&1st File or Folder"
-msgstr "&1-as failas ar katalogas"
-
 #: Merge.rc:39174D96
 msgid "Re&ad-only"
 msgstr "Tik sk&aitymui"
@@ -1169,9 +1165,9 @@ msgstr "Sukeisti 1-ą | 2-ą"
 msgid "&Browse..."
 msgstr "&Rasti..."
 
-#: Merge.rc:6DE6F875
-msgid "&2nd File or Folder"
-msgstr "&2-as failas ar katalogas"
+#: Merge.rc:6DE6F874
+msgid "&1st File or Folder"
+msgstr "&1-as failas ar katalogas"
 
 #: Merge.rc:39174D97
 msgid "Rea&d-only"
@@ -1185,9 +1181,9 @@ msgstr "Sukeisti 2-ą | 3-ią"
 msgid "B&rowse..."
 msgstr "R&asti..."
 
-#: Merge.rc:3C1ECDDA
-msgid "&3rd File or Folder (Optional)"
-msgstr "&3-ias failas ar katalogas (nebūtinas)"
+#: Merge.rc:6DE6F875
+msgid "&2nd File or Folder"
+msgstr "&2-as failas ar katalogas"
 
 #: Merge.rc:39174D98
 msgid "Read-o&nly"
@@ -1201,6 +1197,10 @@ msgstr "Sukeisti 1-ą | 3-ią"
 msgid "Browse..."
 msgstr "Rasti..."
 
+#: Merge.rc:3C1ECDDA
+msgid "&3rd File or Folder (Optional)"
+msgstr "&3-ias failas ar katalogas (nebūtinas)"
+
 #: Merge.rc:22467E6E
 msgid " Folder: Filter"
 msgstr " Katalogams: Filtras"

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index a2bbd7b..6457427 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -1411,11 +1411,6 @@ msgstr "Bidragsytere"
 msgid "Select Files or Folders"
 msgstr "Velg filer eller mapper..."
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1431,9 +1426,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Bla gjennom.."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1451,9 +1446,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "B&la gjennom.."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1471,6 +1466,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Bla gjennom.."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index 3e8078b..dd8c278 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -1412,11 +1412,6 @@ msgstr " شرکت کننده ها "
 msgid "Select Files or Folders"
 msgstr " انتخاب پرونده ها يا پوشه ها "
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1432,9 +1427,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&B مرور "
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1452,9 +1447,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "&r مرور ... "
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1472,6 +1467,11 @@ msgstr ""
 msgid "Browse..."
 msgstr " مرور ... "
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index b98c00e..a812be0 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -1412,11 +1412,6 @@ msgstr "Współtwórcy"
 msgid "Select Files or Folders"
 msgstr "Wybierz pliki lub foldery..."
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1432,9 +1427,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Przeglądaj..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1452,9 +1447,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "P&rzeglądaj"
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1472,6 +1467,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Przeglądaj..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index c086e57..188f9f0 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -1411,11 +1411,6 @@ msgstr "Colaboradores"
 msgid "Select Files or Folders"
 msgstr "Selecione Ficheiros ou Pastas"
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr "&1º Ficheiro ou Pasta"
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1431,10 +1426,10 @@ msgstr "Trocar 1º | 2º"
 msgid "&Browse..."
 msgstr "Procurar..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
-msgstr "&2º Ficheiro ou Pasta"
+msgid "&1st File or Folder"
+msgstr "&1º Ficheiro ou Pasta"
 
 #: Merge.rc:39174D97
 #, c-format
@@ -1451,10 +1446,10 @@ msgstr "Trocar 2º | 3º"
 msgid "B&rowse..."
 msgstr "Procurar..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
-msgstr "&3º Ficheiro ou Pasta (Opcional)"
+msgid "&2nd File or Folder"
+msgstr "&2º Ficheiro ou Pasta"
 
 #: Merge.rc:39174D98
 #, c-format
@@ -1471,6 +1466,11 @@ msgstr "Trocar 1º | 3º"
 msgid "Browse..."
 msgstr "Procurar..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr "&3º Ficheiro ou Pasta (Opcional)"
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index c1bb3fd..4fd209b 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -1411,11 +1411,6 @@ msgstr "Contribuitori"
 msgid "Select Files or Folders"
 msgstr "Selectează fişiere sau directoare"
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1431,9 +1426,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "Răsf&oieşte..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1451,9 +1446,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "&Răsfoieşte..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1471,6 +1466,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Răsfoieşte:"
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index 832c51a..f704b96 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -1413,11 +1413,6 @@ msgstr "Участники"
 msgid "Select Files or Folders"
 msgstr "Выберите файлы или папки..."
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1433,9 +1428,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Обзор..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1453,9 +1448,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Обзор"
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1473,6 +1468,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Обзор..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index 8e064f0..68ad529 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -1410,11 +1410,6 @@ msgstr "Ñàðàäíèöè"
 msgid "Select Files or Folders"
 msgstr "Èçàáåðè äàòîòåêå èëè ôàñöèêëå"
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1430,9 +1425,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Ïðåãëåäà¼..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1450,9 +1445,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Ï&ðåãëåäà¼..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1470,6 +1465,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Ïðåãëåä..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index 895370b..428da0e 100644 (file)
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -1408,11 +1408,6 @@ msgstr "දායක වුවන්"
 msgid "Select Files or Folders"
 msgstr "ගොනු සහ ෆෝල්ඩර තෝරන්න"
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1428,9 +1423,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "සැරි සරන්න..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1448,9 +1443,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "සැරි සරන්න..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1468,6 +1463,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "සැරි සරන්න..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index 822d0e7..2b52e70 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -1411,11 +1411,6 @@ msgstr "Prispievatelia"
 msgid "Select Files or Folders"
 msgstr "Výber súborov a adresárov..."
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1431,9 +1426,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Prechádzať..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1451,9 +1446,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "P&rechádzať..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1471,6 +1466,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Prehľadávať..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 924e6a6..9700bee 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -1412,11 +1412,6 @@ msgstr "Donatorji"
 msgid "Select Files or Folders"
 msgstr "Izberite datoteke ali mape"
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1432,9 +1427,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Brskaj ..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1452,9 +1447,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "B&rskaj ..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1472,6 +1467,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Brskaj ..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index 63e69c7..6ae1a31 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -1413,11 +1413,6 @@ msgstr "Colaboradores"
 msgid "Select Files or Folders"
 msgstr "Seleccione archivos o carpetas..."
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1433,9 +1428,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Examinar..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1453,9 +1448,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Examina&r"
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1473,6 +1468,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Examinar..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index c13e01b..da3b19d 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -1411,11 +1411,6 @@ msgstr "Medarbetare"
 msgid "Select Files or Folders"
 msgstr "Välj filer eller kataloger..."
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1431,9 +1426,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Bläddra..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1451,9 +1446,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Bläddra..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1471,6 +1466,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Bläddra..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index fae8c25..7d44df0 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -1412,11 +1412,6 @@ msgstr "Katkı Yapanlar"
 msgid "Select Files or Folders"
 msgstr "Dosya ya da Klasör Seçin"
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1432,9 +1427,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Gözat..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1452,9 +1447,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Gö&zat..."
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1472,6 +1467,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Gözat..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index d880930..8678286 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -1412,11 +1412,6 @@ msgstr "Автори"
 msgid "Select Files or Folders"
 msgstr "Виберіть файли або теки..."
 
-#: Merge.rc:6DE6F874
-#, c-format
-msgid "&1st File or Folder"
-msgstr ""
-
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1432,9 +1427,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Перегляд..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:6DE6F874
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&1st File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1452,9 +1447,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Переглядання "
 
-#: Merge.rc:3C1ECDDA
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&3rd File or Folder (Optional)"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1472,6 +1467,11 @@ msgstr ""
 msgid "Browse..."
 msgstr "Перегляд ..."
 
+#: Merge.rc:3C1ECDDA
+#, c-format
+msgid "&3rd File or Folder (Optional)"
+msgstr ""
+
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"