Update English.pot #216

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 40be4fe..d217ebe 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -425,11 +425,11 @@ msgstr "Запазване на &десния като…"
 msgid "&Print..."
 msgstr "&Отпечатване…"
 
-msgid "Page Set&up"
-msgstr "Настройки на &страницата"
+msgid "Page Set&up..."
+msgstr "Настройки на &страницата..."
 
-msgid "Print Previe&w"
-msgstr "П&реглед преди отпечатване"
+msgid "Print Previe&w..."
+msgstr "П&реглед преди отпечатване..."
 
 msgid "&Convert Line Endings to"
 msgstr "Про&меняне на знака за нов ред"
@@ -617,11 +617,11 @@ msgstr "Корирай от ляво\tAlt+Shift+Right"
 msgid "Copy from Right\tAlt+Shift+Left"
 msgstr "Корирай от дясно\tAlt+Shift+Left"
 
-msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
-msgstr "К&опирай в дясно и се премести\tAlt+Ctrl+Right"
+msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
+msgstr "К&опирай в дясно и се премести\tCtrl+Alt+Right"
 
-msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "Копирай &в ляво и се премести\tAlt+Ctrl+Left"
+msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
+msgstr "Копирай &в ляво и се премести\tCtrl+Alt+Left"
 
 msgid "Copy &All to Right"
 msgstr "Копирай &всичко в дясно"
@@ -629,8 +629,8 @@ msgstr "Копирай &всичко в дясно"
 msgid "Cop&y All to Left"
 msgstr "Копира&й всичко в ляво"
 
-msgid "A&uto Merge\tAlt+Ctrl+M"
-msgstr "А&втоматично сливане\tAlt+Ctrl+M"
+msgid "A&uto Merge\tCtrl+Alt+M"
+msgstr "А&втоматично сливане\tCtrl+Alt+M"
 
 msgid "Add &Synchronization Point\tAlt+S"
 msgstr "Добавяне точка за &синхронизация\tAlt+S"
@@ -1349,8 +1349,8 @@ msgstr "Символ за пренасяне на &дума:"
 msgid "Filefilters"
 msgstr "Филтри за файлове"
 
-msgid "Test"
-msgstr "Изпробване"
+msgid "Test..."
+msgstr "Изпробване..."
 
 msgid "Install..."
 msgstr "Инсталиране…"
@@ -1594,7 +1594,7 @@ msgstr "&Отменяне"
 msgid "Test Filter"
 msgstr "Изпробване на филтър"
 
-msgid "Testing filter ..."
+msgid "Testing filter..."
 msgstr "Изпробване на филтър…"
 
 msgid "&Enter text to test:"
@@ -1736,9 +1736,7 @@ msgstr "Ограничение на &бързото сравняване (МБ):
 msgid "&Binary compare limit (MB):"
 msgstr "Ограничение на &двоичното сравняване (МБ):"
 
-msgid ""
-"&Number of compare threads (a negative value implies addition of the number "
-"of available CPU cores):"
+msgid "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
 msgstr ""
 
 msgctxt "Options dialog|Categories"
@@ -2256,20 +2254,14 @@ msgstr ""
 "Да продължа ли?"
 
 #, c-format
-msgid ""
-"Saving file failed.\n"
-"%1\n"
-"%2\n"
-"Do you want to:\n"
-"\t-use a different filename (Press Ok)\n"
-"\t-abort the current operation (Press Cancel)?"
+msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t- use a different filename (Press Ok)\n\t- abort the current operation (Press Cancel)?"
 msgstr ""
 "Грешка при записването на файла.\n"
 "%1\n"
 "%2\n"
 "Искате ли да:\n"
-"\t-използвате различно име (натиснете Ok)\n"
-"\t-отмените текущата операция (натиснете Отмени)?"
+"\t- използвате различно име (натиснете Ok)\n"
+"\t- отмените текущата операция (натиснете Отмени)?"
 
 #, c-format
 msgid ""
@@ -2898,14 +2890,9 @@ msgid "Do you want to move to the previous page?"
 msgstr "Искате ли да преминете към предишната страница?"
 
 #, c-format
-msgid ""
-"Different codepages found in left (cp%d) and right (cp%d) files. \n"
-"Displaying each file in its codepage will give a better display but merging/"
-"copying will be dangerous.\n"
-"Would you like to treat both files as being in the default Windows codepage "
-"(recommended)?"
+msgid "Different codepages found in left (cp%d) and right (cp%d) files.\nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default Windows codepage (recommended)?"
 msgstr ""
-"Намерена е различна кодова страница в левия (cp%d) и десния (cp%d) файл. \n"
+"Намерена е различна кодова страница в левия (cp%d) и десния (cp%d) файл.\n"
 "Показването на всеки файл с неговата кодова страница ще даде по-добра видимост, но "
 "сливането или копирането ще е рисковано.\n"
 "Желаете ли файловете да бъдат третирани със зададената кодова страница на "

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index 7794c6a..0c766a7 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -556,12 +556,11 @@ msgstr ""
 msgid "&Print..."
 msgstr "&Imprimeix..."
 
-msgid "Page Set&up"
-msgstr "Configuració de la pàgina"
+msgid "Page Set&up..."
+msgstr "Configuració de la pàgina..."
 
-#, c-format
-msgid "Print Previe&w"
-msgstr "&Visualització prèvia de la impressió"
+msgid "Print Previe&w..."
+msgstr "&Visualització prèvia de la impressió..."
 
 #, c-format
 msgid "&Convert Line Endings to"
@@ -811,13 +810,11 @@ msgstr ""
 msgid "Copy from Right\tAlt+Shift+Left"
 msgstr ""
 
-#, c-format
-msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
-msgstr "Copia a la dreta i a&vança\tAlt+Control+Dreta"
+msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
+msgstr "Copia a la dreta i a&vança\tAlt+Control+Dreta..."
 
-#, c-format
-msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "Copia a l'esquerra i avan&ça\tAlt+Control+Esquerra"
+msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
+msgstr "Copia a l'esquerra i avan&ça\tAlt+Control+Esquerra..."
 
 #, c-format
 msgid "Copy &All to Right"
@@ -827,8 +824,7 @@ msgstr "Copia-ho &tot a la dreta"
 msgid "Cop&y All to Left"
 msgstr "Copia-ho t&ot a l'esquerra"
 
-#, c-format
-msgid "A&uto Merge\tAlt+Ctrl+M"
+msgid "A&uto Merge\tCtrl+Alt+M"
 msgstr ""
 
 #, c-format
@@ -1749,9 +1745,8 @@ msgstr ""
 msgid "Filefilters"
 msgstr "Filtres de fitxer"
 
-#, c-format
-msgid "Test"
-msgstr "&Prova"
+msgid "Test..."
+msgstr "&Prova..."
 
 #, c-format
 msgid "Install..."
@@ -2065,9 +2060,8 @@ msgstr "&Cancel·la"
 msgid "Test Filter"
 msgstr "Prova de filtre"
 
-#, c-format
-msgid "Testing filter ..."
-msgstr "Provant el filtre ..."
+msgid "Testing filter..."
+msgstr "Provant el filtre..."
 
 #, c-format
 msgid "&Enter text to test:"
@@ -2249,8 +2243,7 @@ msgstr ""
 msgid "&Binary compare limit (MB):"
 msgstr ""
 
-#, c-format
-msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
+msgid "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
 msgstr ""
 
 msgctxt "Options dialog|Categories"
@@ -2790,20 +2783,14 @@ msgstr ""
 "Voleu continuar tot i així?"
 
 #, c-format
-msgid ""
-"Saving file failed.\n"
-"%1\n"
-"%2\n"
-"Do you want to:\n"
-"\t-use a different filename (Press Ok)\n"
-"\t-abort the current operation (Press Cancel)?"
+msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t- use a different filename (Press Ok)\n\t- abort the current operation (Press Cancel)?"
 msgstr ""
 "Hi ha hagut un error en desar el fitxer.\n"
 "%1\n"
 "%2\n"
 "Voleu:\n"
-"\t-desar-lo amb un nom diferent (premeu D'acord)\n"
-"\t-avortar l'operació actual (Premeu Cancel·lar)?"
+"\t- desar-lo amb un nom diferent (premeu D'acord)\n"
+"\t- avortar l'operació actual (Premeu Cancel·lar)?"
 
 #, c-format
 msgid ""
@@ -3502,10 +3489,7 @@ msgid "Do you want to move to the previous page?"
 msgstr ""
 
 #, c-format
-msgid ""
-"Different codepages found in left (cp%d) and right (cp%d) files. \n"
-"Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n"
-"Would you like to treat both files as being in the default Windows codepage (recommended)?"
+msgid "Different codepages found in left (cp%d) and right (cp%d) files.\nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default Windows codepage (recommended)?"
 msgstr ""
 "Els fitxers de l'esquerra (cp%d) i de la dreta (cp%d) no tenen la mateixa pàgina de codis.\n"
 "En mostrar cada fitxer en la seva pròpia pàgina de codis millora la seva visualització però fa perillosa la combinació/còpia.\n"

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index b776eb0..79cfb7a 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -559,12 +559,11 @@ msgstr "另存为右侧(&R)"
 msgid "&Print..."
 msgstr "打印(&P)..."
 
-msgid "Page Set&up"
-msgstr "页面设置(&U)"
+msgid "Page Set&up..."
+msgstr "页面设置(&U)..."
 
-#, c-format
-msgid "Print Previe&w"
-msgstr "打印预览(&W)"
+msgid "Print Previe&w..."
+msgstr "打印预览(&W)..."
 
 #, c-format
 msgid "&Convert Line Endings to"
@@ -814,13 +813,11 @@ msgstr "从左侧复制\tAlt+Shift+Right"
 msgid "Copy from Right\tAlt+Shift+Left"
 msgstr "从右侧复制\tAlt+Shift+Right"
 
-#, c-format
-msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
-msgstr "复制到右侧并前进\tAlt+Ctrl+Right"
+msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
+msgstr "复制到右侧并前进\tCtrl+Alt+Right"
 
-#, c-format
-msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "复制到左侧并前进\tAlt+Ctrl+Left"
+msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
+msgstr "复制到左侧并前进\tCtrl+Alt+Left"
 
 #, c-format
 msgid "Copy &All to Right"
@@ -830,9 +827,8 @@ msgstr "全部复制到右侧(&A)"
 msgid "Cop&y All to Left"
 msgstr "全部复制到左侧(&Y)"
 
-#, c-format
-msgid "A&uto Merge\tAlt+Ctrl+M"
-msgstr "自动合并(&U)"
+msgid "A&uto Merge\tCtrl+Alt+M"
+msgstr "自动合并(&U)\tCtrl+Alt+M"
 
 #, c-format
 msgid "Add &Synchronization Point\tAlt+S"
@@ -1752,9 +1748,8 @@ msgstr "单词分隔字符:"
 msgid "Filefilters"
 msgstr "文件过滤器"
 
-#, c-format
-msgid "Test"
-msgstr "测试"
+msgid "Test..."
+msgstr "测试..."
 
 #, c-format
 msgid "Install..."
@@ -2068,9 +2063,8 @@ msgstr "取消(&C)"
 msgid "Test Filter"
 msgstr "测试过滤器"
 
-#, c-format
-msgid "Testing filter ..."
-msgstr "正在测试 ..."
+msgid "Testing filter..."
+msgstr "正在测试..."
 
 #, c-format
 msgid "&Enter text to test:"
@@ -2252,9 +2246,8 @@ msgstr "快速比较限制 (MB) (&Q):"
 msgid "&Binary compare limit (MB):"
 msgstr ""
 
-#, c-format
-msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
-msgstr "比较使用的线程数 (负数表示使用所有可用的 CPU 核心数) (&N):"
+msgid "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
+msgstr "\n比较使用的线程数 (负数表示使用所有可用的 CPU 核心数) (&N):"
 
 msgctxt "Options dialog|Categories"
 msgid "Binary"
@@ -2792,20 +2785,14 @@ msgstr ""
 "仍然继续吗?"
 
 #, c-format
-msgid ""
-"Saving file failed.\n"
-"%1\n"
-"%2\n"
-"Do you want to:\n"
-"\t-use a different filename (Press Ok)\n"
-"\t-abort the current operation (Press Cancel)?"
+msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t- use a different filename (Press Ok)\n\t- abort the current operation (Press Cancel)?"
 msgstr ""
 "保存文件失败.\n"
 "%1\n"
 "%2\n"
 "请选择:\n"
-"\t-使用其它文件名保存 (点击\"确定\")\n"
-"\t-中止当前操作 (点击\"取消\")?"
+"\t- 使用其它文件名保存 (点击\"确定\")\n"
+"\t- 中止当前操作 (点击\"取消\")?"
 
 #, c-format
 msgid ""
@@ -3505,10 +3492,7 @@ msgid "Do you want to move to the previous page?"
 msgstr "您是否要移动到上一页?"
 
 #, c-format
-msgid ""
-"Different codepages found in left (cp%d) and right (cp%d) files. \n"
-"Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n"
-"Would you like to treat both files as being in the default Windows codepage (recommended)?"
+msgid "Different codepages found in left (cp%d) and right (cp%d) files.\nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default Windows codepage (recommended)?"
 msgstr ""
 "左右两侧为不同代码页的文件 (左侧为 cp%d, 右侧为 cp%d).\n"
 "分别以不同代码页显示将会有较好的效果, 但是合并/复制会有风险.\n"

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index abc689f..39b4498 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -561,12 +561,11 @@ msgstr "儲存右邊為(&R)..."
 msgid "&Print..."
 msgstr "列印(&P)..."
 
-msgid "Page Set&up"
-msgstr "設定列印格式(&U)"
+msgid "Page Set&up..."
+msgstr "設定列印格式(&U)..."
 
-#, c-format
-msgid "Print Previe&w"
-msgstr "預覽列印(&R)"
+msgid "Print Previe&w..."
+msgstr "預覽列印(&R)..."
 
 #, c-format
 msgid "&Convert Line Endings to"
@@ -820,13 +819,11 @@ msgstr "從左邊複製\tAlt+Shift+Right"
 msgid "Copy from Right\tAlt+Shift+Left"
 msgstr "從右邊複製\tAlt+Shift+Right"
 
-#, c-format
-msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
-msgstr "複製到右邊後到下一個(&O)\tAlt+Ctrl+Right"
+msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
+msgstr "複製到右邊後到下一個(&O)\tCtrl+Alt+Right"
 
-#, c-format
-msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "複製到左邊後到下一個(&T)\tAlt+Ctrl+Left"
+msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
+msgstr "複製到左邊後到下一個(&T)\tCtrl+Alt+Left"
 
 #, c-format
 msgid "Copy &All to Right"
@@ -836,9 +833,8 @@ msgstr "全部複製到右邊(&A)"
 msgid "Cop&y All to Left"
 msgstr "全部複製到左邊(&Y)"
 
-#, c-format
-msgid "A&uto Merge\tAlt+Ctrl+M"
-msgstr "自動合併(&U)\tAlt+Ctrl+M"
+msgid "A&uto Merge\tCtrl+Alt+M"
+msgstr "自動合併(&U)\tCtrl+Alt+M"
 
 #, c-format
 msgid "Add &Synchronization Point\tAlt+S"
@@ -1760,9 +1756,8 @@ msgstr "斷句字元(&O)："
 msgid "Filefilters"
 msgstr "檔案篩選器"
 
-#, c-format
-msgid "Test"
-msgstr "測試"
+msgid "Test..."
+msgstr "測試..."
 
 #, c-format
 msgid "Install..."
@@ -2081,9 +2076,8 @@ msgstr "取消(&C)"
 msgid "Test Filter"
 msgstr "測試篩選器"
 
-#, c-format
-msgid "Testing filter ..."
-msgstr "測試篩選器 ..."
+msgid "Testing filter..."
+msgstr "測試篩選器..."
 
 #, c-format
 msgid "&Enter text to test:"
@@ -2265,9 +2259,8 @@ msgstr "快速比較之檔案大小上限 (MB)(&Q)："
 msgid "&Binary compare limit (MB):"
 msgstr ""
 
-#, c-format
-msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
-msgstr "比較進程數(&N)(負數表示附加可用的CPU內核數量)："
+msgid "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
+msgstr "\n比較進程數(&N)(負數表示附加可用的CPU內核數量)："
 
 msgctxt "Options dialog|Categories"
 msgid "Binary"
@@ -2849,20 +2842,14 @@ msgstr ""
 "仍舊繼續嗎？"
 
 #, c-format
-msgid ""
-"Saving file failed.\n"
-"%1\n"
-"%2\n"
-"Do you want to:\n"
-"\t-use a different filename (Press Ok)\n"
-"\t-abort the current operation (Press Cancel)?"
+msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t- use a different filename (Press Ok)\n\t- abort the current operation (Press Cancel)?"
 msgstr ""
 "無法儲存檔案。\n"
 "%1\n"
 "%2\n"
 "要：\n"
-"\t-以不同名稱儲存檔案 (按「確定」)\n"
-"\t-放棄目前操作(按「取消」)？"
+"\t- 以不同名稱儲存檔案 (按「確定」)\n"
+"\t- 放棄目前操作(按「取消」)？"
 
 #, c-format
 msgid ""
@@ -3584,10 +3571,7 @@ msgid "Do you want to move to the previous page?"
 msgstr "你想要移動到上一頁嗎？"
 
 #, c-format
-msgid ""
-"Different codepages found in left (cp%d) and right (cp%d) files. \n"
-"Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n"
-"Would you like to treat both files as being in the default Windows codepage (recommended)?"
+msgid "Different codepages found in left (cp%d) and right (cp%d) files.\nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default Windows codepage (recommended)?"
 msgstr ""
 "左邊 (cp%d) 和右邊 (cp%d) 檔案所用的編碼頁不同。\n"
 "即使維持各別碼頁會分別看到文字，但合併/複製會有危險。\n"