Update translations

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index 0bc5a84..a603ce1 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -1417,6 +1417,11 @@ 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"
@@ -1432,9 +1437,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "Bil&atu..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1452,9 +1457,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Bi&latu..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1472,11 +1477,6 @@ 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 92e9140..e6e3d51 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -1417,6 +1417,11 @@ msgstr "Contribuidores"
 msgid "Select Files or Folders"
 msgstr "Selecionar Arquivos ou Pastas"
 
+#: Merge.rc:6DE6F874
+#, c-format
+msgid "&1st File or Folder"
+msgstr "&1º Arquivo ou Pasta"
+
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1432,10 +1437,10 @@ msgstr "Trocar o 1º | 2º"
 msgid "&Browse..."
 msgstr "&Procurar..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
-msgstr "&1º Arquivo ou Pasta"
+msgid "&2nd File or Folder"
+msgstr "&2º Arquivo ou Pasta"
 
 #: Merge.rc:39174D97
 #, c-format
@@ -1452,10 +1457,10 @@ msgstr "Trocar o 2º | 3º"
 msgid "B&rowse..."
 msgstr "P&rocurar..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
-msgstr "&2º Arquivo ou Pasta"
+msgid "&3rd File or Folder (Optional)"
+msgstr "&3º Arquivo ou Pasta (Opcional)"
 
 #: Merge.rc:39174D98
 #, c-format
@@ -1472,11 +1477,6 @@ msgstr "Trocar o 1º | 3º"
 msgid "Browse..."
 msgstr "Procurar..."
 
-#: Merge.rc:3C1ECDDA
-#, c-format
-msgid "&3rd File or Folder (Optional)"
-msgstr "&3º Arquivo ou Pasta (Opcional)"
-
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 58f0563..fdffa9c 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -1414,6 +1414,11 @@ 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"
@@ -1429,9 +1434,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Потърси..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1449,9 +1454,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Преглед"
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1469,11 +1474,6 @@ 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 4cceab1..0568123 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -1413,6 +1413,11 @@ 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"
@@ -1428,9 +1433,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Navega..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1448,9 +1453,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr ""
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1468,11 +1473,6 @@ 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 021dbe2..9688b58 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -1415,6 +1415,11 @@ 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 +1435,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "浏览(&B)..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1450,9 +1455,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "浏览(&R)..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1470,11 +1475,6 @@ 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 f6084d2..c172c2b 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -1422,6 +1422,11 @@ 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"
@@ -1437,9 +1442,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "瀏覽(&B)..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1457,9 +1462,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "瀏覽(&R)..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1477,11 +1482,6 @@ 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 28c77d3..da2db7a 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -1414,6 +1414,11 @@ 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"
@@ -1429,9 +1434,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Odabir..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1449,9 +1454,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "&Odabir..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1469,11 +1474,6 @@ 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 1a59c88..fefa50b 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -1414,6 +1414,11 @@ 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"
@@ -1429,9 +1434,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Procházet..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1449,9 +1454,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Pr&ocházet..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1469,11 +1474,6 @@ 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 d9b999e..3c5ec70 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -1415,6 +1415,11 @@ 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"
@@ -1430,9 +1435,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Gennemse..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1450,9 +1455,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "G&ennemse..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1470,11 +1475,6 @@ 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 3b13e8b..8a35e46 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -1416,6 +1416,11 @@ 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"
@@ -1431,9 +1436,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "Bladeren..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1451,9 +1456,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Bladeren..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1471,11 +1476,6 @@ 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 efcae0e..d0df6e7 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-12-13 07:41+0000\n"
+"POT-Creation-Date: 2019-01-07 22:08+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -1148,6 +1148,10 @@ 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 +1164,8 @@ msgstr ""
 msgid "&Browse..."
 msgstr ""
 
-#: Merge.rc:6DE6F874
-msgid "&1st File or Folder"
+#: Merge.rc:6DE6F875
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1176,8 +1180,8 @@ msgstr ""
 msgid "B&rowse..."
 msgstr ""
 
-#: Merge.rc:6DE6F875
-msgid "&2nd File or Folder"
+#: Merge.rc:3C1ECDDA
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1192,10 +1196,6 @@ 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 050d691..5521e19 100644 (file)
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -1410,6 +1410,11 @@ 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"
@@ -1425,9 +1430,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "Selaa..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1445,9 +1450,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Selaa..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1465,11 +1470,6 @@ 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 e30a1e0..2c6f5d2 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -1418,6 +1418,11 @@ 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"
@@ -1433,9 +1438,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "P&arcourir..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1453,9 +1458,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Parc&ourir..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1473,11 +1478,6 @@ 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 b8d9399..960402f 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -1414,6 +1414,11 @@ 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"
@@ -1429,9 +1434,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Explorar..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1449,9 +1454,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Explo&rar..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1469,11 +1474,6 @@ 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 a976d75..463b6b9 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -1414,6 +1414,11 @@ 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"
@@ -1429,10 +1434,10 @@ msgstr "Vertausche 1. | 2."
 msgid "&Browse..."
 msgstr "&Suchen..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
-msgstr "&1. Datei oder Ordner"
+msgid "&2nd File or Folder"
+msgstr "&2. Datei oder Ordner"
 
 #: Merge.rc:39174D97
 #, c-format
@@ -1449,10 +1454,10 @@ msgstr "Vertausche 2. | 3."
 msgid "B&rowse..."
 msgstr "Su&chen..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
-msgstr "&2. Datei oder Ordner"
+msgid "&3rd File or Folder (Optional)"
+msgstr "&3. Datei oder Ordner (Optional)"
 
 #: Merge.rc:39174D98
 #, c-format
@@ -1469,11 +1474,6 @@ 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 7f55afd..43712b1 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -1413,6 +1413,11 @@ 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 +1433,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "Ανα&ζήτηση..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1448,9 +1453,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Ανα&ζήτηση..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1468,11 +1473,6 @@ 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 aa98cbc..11322d6 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -1414,6 +1414,11 @@ 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"
@@ -1429,9 +1434,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Tallózás..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1449,9 +1454,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Tallóz..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1469,11 +1474,6 @@ 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 63cfd57..bab70bc 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -1414,6 +1414,11 @@ 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"
@@ -1429,9 +1434,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "S&foglia..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1449,9 +1454,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "&Sfoglia..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1469,11 +1474,6 @@ 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 2ee5277..d4883dd 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -1155,6 +1155,10 @@ msgstr "貢献者"
 msgid "Select Files or Folders"
 msgstr "ファイルまたはフォルダーの選択..."
 
+#: Merge.rc:6DE6F874
+msgid "&1st File or Folder"
+msgstr "&1 番目のファイルまたはフォルダー"
+
 #: Merge.rc:39174D96
 msgid "Re&ad-only"
 msgstr "読み取り専用(&A)"
@@ -1167,9 +1171,9 @@ msgstr "1 番目と 2 番目を交換"
 msgid "&Browse..."
 msgstr "参照(&B)..."
 
-#: Merge.rc:6DE6F874
-msgid "&1st File or Folder"
-msgstr "&1 番目のファイルまたはフォルダー"
+#: Merge.rc:6DE6F875
+msgid "&2nd File or Folder"
+msgstr "&2 番目のファイルまたはフォルダー"
 
 #: Merge.rc:39174D97
 msgid "Rea&d-only"
@@ -1183,9 +1187,9 @@ msgstr "2 番目と 3 番目を交換"
 msgid "B&rowse..."
 msgstr "参照(&R)..."
 
-#: Merge.rc:6DE6F875
-msgid "&2nd File or Folder"
-msgstr "&2 番目のファイルまたはフォルダー"
+#: Merge.rc:3C1ECDDA
+msgid "&3rd File or Folder (Optional)"
+msgstr "&3 番目のファイルまたはフォルダー (オプション)"
 
 #: Merge.rc:39174D98
 msgid "Read-o&nly"
@@ -1199,10 +1203,6 @@ msgstr "1 番目と 3 番目を交換"
 msgid "Browse..."
 msgstr "参照..."
 
-#: Merge.rc:3C1ECDDA
-msgid "&3rd File or Folder (Optional)"
-msgstr "&3 番目のファイルまたはフォルダー (オプション)"
-
 #: Merge.rc:22467E6E
 msgid " Folder: Filter"
 msgstr " フォルダー: フィルタ"

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 01c3671..27954e3 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -1418,6 +1418,11 @@ 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 +1438,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "찾아보기(&B)"
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1453,9 +1458,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "찾아보기(&R)"
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1473,11 +1478,6 @@ 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 f09a6bf..5e80003 100644 (file)
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -1157,6 +1157,10 @@ 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 +1173,9 @@ msgstr "Sukeisti 1-ą | 2-ą"
 msgid "&Browse..."
 msgstr "&Rasti..."
 
-#: Merge.rc:6DE6F874
-msgid "&1st File or Folder"
-msgstr "&1-as failas ar katalogas"
+#: Merge.rc:6DE6F875
+msgid "&2nd File or Folder"
+msgstr "&2-as failas ar katalogas"
 
 #: Merge.rc:39174D97
 msgid "Rea&d-only"
@@ -1185,9 +1189,9 @@ msgstr "Sukeisti 2-ą | 3-ią"
 msgid "B&rowse..."
 msgstr "R&asti..."
 
-#: Merge.rc:6DE6F875
-msgid "&2nd File or Folder"
-msgstr "&2-as failas ar katalogas"
+#: Merge.rc:3C1ECDDA
+msgid "&3rd File or Folder (Optional)"
+msgstr "&3-ias failas ar katalogas (nebūtinas)"
 
 #: Merge.rc:39174D98
 msgid "Read-o&nly"
@@ -1201,10 +1205,6 @@ 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 7754db0..d6d2b4d 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -1414,6 +1414,11 @@ 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"
@@ -1429,9 +1434,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Bla gjennom.."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1449,9 +1454,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "B&la gjennom.."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1469,11 +1474,6 @@ 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 34f5902..88a95a8 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -1415,6 +1415,11 @@ 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 +1435,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&B مرور "
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1450,9 +1455,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "&r مرور ... "
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1470,11 +1475,6 @@ 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 101294b..c68032e 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -1415,6 +1415,11 @@ 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"
@@ -1430,9 +1435,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Przeglądaj..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1450,9 +1455,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "P&rzeglądaj"
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1470,11 +1475,6 @@ 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 433c31f..400b07a 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -1414,6 +1414,11 @@ 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"
@@ -1429,10 +1434,10 @@ msgstr "Trocar 1º | 2º"
 msgid "&Browse..."
 msgstr "Procurar..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
-msgstr "&1º Ficheiro ou Pasta"
+msgid "&2nd File or Folder"
+msgstr "&2º Ficheiro ou Pasta"
 
 #: Merge.rc:39174D97
 #, c-format
@@ -1449,10 +1454,10 @@ msgstr "Trocar 2º | 3º"
 msgid "B&rowse..."
 msgstr "Procurar..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
-msgstr "&2º Ficheiro ou Pasta"
+msgid "&3rd File or Folder (Optional)"
+msgstr "&3º Ficheiro ou Pasta (Opcional)"
 
 #: Merge.rc:39174D98
 #, c-format
@@ -1469,11 +1474,6 @@ 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 d487d00..0746be4 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -1414,6 +1414,11 @@ 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"
@@ -1429,9 +1434,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "Răsf&oieşte..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1449,9 +1454,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "&Răsfoieşte..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1469,11 +1474,6 @@ 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 17b3993..03b88a1 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -1416,6 +1416,11 @@ 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 +1436,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Обзор..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1451,9 +1456,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Обзор"
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1471,11 +1476,6 @@ 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 b3bd38c..079659f 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -1410,6 +1410,10 @@ msgstr "Сарадници"
 msgid "Select Files or Folders"
 msgstr "Изабери датотеке или фасцикле"
 
+#: Merge.rc:6DE6F874
+msgid "&1st File or Folder"
+msgstr ""
+
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1424,8 +1428,8 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Прегледај..."
 
-#: Merge.rc:6DE6F874
-msgid "&1st File or Folder"
+#: Merge.rc:6DE6F875
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1442,8 +1446,8 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "П&регледај..."
 
-#: Merge.rc:6DE6F875
-msgid "&2nd File or Folder"
+#: Merge.rc:3C1ECDDA
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1460,10 +1464,6 @@ 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/Sinhala.po b/Translations/WinMerge/Sinhala.po
index d9bb06d..31dca18 100644 (file)
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -1411,6 +1411,11 @@ 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"
@@ -1426,9 +1431,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "සැරි සරන්න..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1446,9 +1451,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "සැරි සරන්න..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1466,11 +1471,6 @@ 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 904e279..b6dd804 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -1414,6 +1414,11 @@ 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"
@@ -1429,9 +1434,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Prechádzať..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1449,9 +1454,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "P&rechádzať..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1469,11 +1474,6 @@ 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 3644d89..7f1772c 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -1415,6 +1415,11 @@ 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"
@@ -1430,9 +1435,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Brskaj ..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1450,9 +1455,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "B&rskaj ..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1470,11 +1475,6 @@ 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 88f6faf..18700d2 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -1416,6 +1416,11 @@ 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"
@@ -1431,9 +1436,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Examinar..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1451,9 +1456,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Examina&r"
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1471,11 +1476,6 @@ 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 d7e0766..8af1360 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -1416,6 +1416,11 @@ msgstr "Bidragare"
 msgid "Select Files or Folders"
 msgstr "Välj Filer eller Mappar"
 
+#: Merge.rc:6DE6F874
+#, c-format
+msgid "&1st File or Folder"
+msgstr "1sta Fil eller Mapp"
+
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1431,10 +1436,10 @@ msgstr "Byt 1sta | 2dra"
 msgid "&Browse..."
 msgstr "Bläddra ..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
-msgstr "1sta Fil eller Mapp"
+msgid "&2nd File or Folder"
+msgstr "2dra Fil eller Mapp"
 
 #: Merge.rc:39174D97
 #, c-format
@@ -1451,10 +1456,10 @@ msgstr "Byt 2dra | 3dje"
 msgid "B&rowse..."
 msgstr "Bläddra ..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
-msgstr "2dra Fil eller Mapp"
+msgid "&3rd File or Folder (Optional)"
+msgstr "3dje Fil eller Mapp (valfritt)"
 
 #: Merge.rc:39174D98
 #, c-format
@@ -1471,11 +1476,6 @@ msgstr "Byt 1sta | 3dje"
 msgid "Browse..."
 msgstr "Bläddra ..."
 
-#: Merge.rc:3C1ECDDA
-#, c-format
-msgid "&3rd File or Folder (Optional)"
-msgstr "3dje Fil eller Mapp (valfritt)"
-
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index 8c27fcd..4374c46 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -1415,6 +1415,11 @@ 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 "&1. Dosya ya da Klasör"
+
 #: Merge.rc:39174D96
 #, c-format
 msgid "Re&ad-only"
@@ -1430,10 +1435,10 @@ msgstr "1. ile 2. Ögeyi Değiştir"
 msgid "&Browse..."
 msgstr "&Gözat..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
-msgstr "&1. Dosya ya da Klasör"
+msgid "&2nd File or Folder"
+msgstr "&2. Dosya ya da Klasör"
 
 #: Merge.rc:39174D97
 #, c-format
@@ -1450,10 +1455,10 @@ msgstr "2. ile 3. Ögeyi Değiştir"
 msgid "B&rowse..."
 msgstr "Gö&zat..."
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
-msgstr "&2. Dosya ya da Klasör"
+msgid "&3rd File or Folder (Optional)"
+msgstr "&3. Dosya ya da Klasör"
 
 #: Merge.rc:39174D98
 #, c-format
@@ -1470,11 +1475,6 @@ msgstr "1. ile 3. Ögeyi Değiştir"
 msgid "Browse..."
 msgstr "Gözat..."
 
-#: Merge.rc:3C1ECDDA
-#, c-format
-msgid "&3rd File or Folder (Optional)"
-msgstr "&3. Dosya ya da Klasör"
-
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index 2fc2055..3c48516 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -1415,6 +1415,11 @@ 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 +1435,9 @@ msgstr ""
 msgid "&Browse..."
 msgstr "&Перегляд..."
 
-#: Merge.rc:6DE6F874
+#: Merge.rc:6DE6F875
 #, c-format
-msgid "&1st File or Folder"
+msgid "&2nd File or Folder"
 msgstr ""
 
 #: Merge.rc:39174D97
@@ -1450,9 +1455,9 @@ msgstr ""
 msgid "B&rowse..."
 msgstr "Переглядання "
 
-#: Merge.rc:6DE6F875
+#: Merge.rc:3C1ECDDA
 #, c-format
-msgid "&2nd File or Folder"
+msgid "&3rd File or Folder (Optional)"
 msgstr ""
 
 #: Merge.rc:39174D98
@@ -1470,11 +1475,6 @@ msgstr ""
 msgid "Browse..."
 msgstr "Перегляд ..."
 
-#: Merge.rc:3C1ECDDA
-#, c-format
-msgid "&3rd File or Folder (Optional)"
-msgstr ""
-
 #: Merge.rc:22467E6E
 #, c-format
 msgid " Folder: Filter"