Update English.pot #216

diff --git a/Src/Merge.rc b/Src/Merge.rc
index ea10608..b28316f 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -405,8 +405,8 @@ BEGIN
         END\r
         MENUITEM SEPARATOR\r
         MENUITEM "&Print...",                   ID_FILE_PRINT\r
-        MENUITEM "Page Set&up",                 ID_FILE_PAGE_SETUP\r
-        MENUITEM "Print Previe&w",              ID_FILE_PRINT_PREVIEW\r
+        MENUITEM "Page Set&up...",              ID_FILE_PAGE_SETUP\r
+        MENUITEM "Print Previe&w...",           ID_FILE_PRINT_PREVIEW\r
         MENUITEM SEPARATOR\r
         POPUP "&Read-only"\r
         BEGIN\r
@@ -565,13 +565,13 @@ BEGIN
         MENUITEM "Copy from Left\tAlt+Shift+Right", ID_COPY_FROM_LEFT\r
         MENUITEM "Copy from Right\tAlt+Shift+Left", ID_COPY_FROM_RIGHT\r
         MENUITEM SEPARATOR\r
-        MENUITEM "C&opy to Right and Advance\tAlt+Ctrl+Right", ID_L2RNEXT\r
-        MENUITEM "Copy &to Left and Advance\tAlt+Ctrl+Left", ID_R2LNEXT\r
+        MENUITEM "C&opy to Right and Advance\tCtrl+Alt+Right", ID_L2RNEXT\r
+        MENUITEM "Copy &to Left and Advance\tCtrl+Alt+Left", ID_R2LNEXT\r
         MENUITEM SEPARATOR\r
         MENUITEM "Copy &All to Right",          ID_ALL_RIGHT\r
         MENUITEM "Cop&y All to Left",           ID_ALL_LEFT\r
         MENUITEM SEPARATOR\r
-        MENUITEM "A&uto Merge\tAlt+Ctrl+M",     ID_AUTO_MERGE\r
+        MENUITEM "A&uto Merge\tCtrl+Alt+M",     ID_AUTO_MERGE\r
         MENUITEM SEPARATOR\r
         MENUITEM "Add &Synchronization Point\tAlt+S", ID_ADD_SYNCPOINT\r
         MENUITEM "Clear Sync&hronization Points", ID_CLEAR_SYNCPOINTS\r
@@ -1356,7 +1356,7 @@ CAPTION "Filefilters"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
     CONTROL         "",IDC_FILTERFILE_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,342,100\r
-    PUSHBUTTON      "Test",IDC_FILTERFILE_TEST_BTN,7,114,50,14\r
+    PUSHBUTTON      "Test...",IDC_FILTERFILE_TEST_BTN,7,114,50,14\r
     PUSHBUTTON      "Install...",IDC_FILTERFILE_INSTALL,137,114,50,14\r
     PUSHBUTTON      "New...",IDC_FILTERFILE_NEWBTN,192,114,50,14\r
     PUSHBUTTON      "Edit...",IDC_FILTERFILE_EDITBTN,246,114,50,14\r
@@ -1643,7 +1643,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION "Test Filter"\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
-    LTEXT           "Testing filter ...",IDC_HEADER,7,7,90,10\r
+    LTEXT           "Testing filter...",IDC_HEADER,7,7,90,10\r
     LTEXT           "(filter name)",IDC_HEADER_FILTER_NAME,100,6,142,10\r
     LTEXT           "&Enter text to test:",IDC_PROMPT_LABEL,7,21,90,10\r
     EDITTEXT        IDC_TEST_TEXT,100,19,142,12,ES_AUTOHSCROLL\r
@@ -1759,7 +1759,7 @@ BEGIN
     EDITTEXT        IDC_COMPARE_QUICKC_LIMIT,7,108,30,14,ES_AUTOHSCROLL\r
     LTEXT           "&Binary compare limit (MB):",IDC_STATIC,7,126,200,10\r
     EDITTEXT        IDC_COMPARE_BINARYC_LIMIT,7,138,30,14,ES_AUTOHSCROLL\r
-    LTEXT           "&Number of compare threads (a negative value implies addition of the number of available CPU cores):",IDC_STATIC,7,154,230,30\r
+    LTEXT           "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):",IDC_STATIC,7,154,230,30\r
     EDITTEXT        IDC_COMPARE_THREAD_COUNT,7,186,30,14,ES_AUTOHSCROLL\r
     PUSHBUTTON      "Defaults",IDC_COMPAREFOLDER_DEFAULTS,7,208,70,14\r
 END\r
@@ -2261,7 +2261,7 @@ BEGIN
     IDS_ERROR_BACKUP        "Error backing up file"\r
     IDS_BACKUP_FAILED_PROMPT \r
                             "Unable to backup original file:\n%1\n\nContinue anyway?"\r
-    IDS_FILESAVE_FAILED     "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)?"\r
+    IDS_FILESAVE_FAILED     "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)?"\r
     IDS_FILEPACK_FAILED_LEFT \r
                             "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"\r
     IDS_FILEPACK_FAILED_RIGHT \r
@@ -2583,7 +2583,7 @@ END
 STRINGTABLE\r
 BEGIN\r
     IDS_SUGGEST_IGNORECODEPAGE \r
-                            "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)?"\r
+                            "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)?"\r
     IDS_LOSSY_TRANSCODING_BOTH \r
                             "Information lost due to encoding errors: both files"\r
     IDS_LOSSY_TRANSCODING_FIRST \r

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index 2ef5a74..7fc40b9 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: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2019-10-14 13:09+0000\n"
+"POT-Creation-Date: 2019-11-10 09:16+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -1619,7 +1619,7 @@ msgstr ""
 msgid "Backup Files"
 msgstr ""
 
-msgid "Create backup files in"
+msgid "Create backup files in:"
 msgstr ""
 
 msgid "&Folder compare"
@@ -1628,7 +1628,7 @@ msgstr ""
 msgid "Fil&e compare"
 msgstr ""
 
-msgid "Create backup files into"
+msgid "Create backup files into:"
 msgstr ""
 
 msgid "&Original file's folder"
@@ -1637,7 +1637,7 @@ msgstr ""
 msgid "&Global backup folder:"
 msgstr ""
 
-msgid "Backup filename"
+msgid "Backup filename:"
 msgstr ""
 
 msgid "&Append .bak -extension"
@@ -1670,7 +1670,7 @@ msgstr ""
 msgid "&Enable plugins"
 msgstr ""
 
-msgid "File filters"
+msgid "File filters:"
 msgstr ""
 
 msgid "Shell Integration"

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index d4a4d92..e542df7 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -430,11 +430,11 @@ msgstr "名前を付けて右側のファイルを保存(&R)..."
 msgid "&Print..."
 msgstr "印刷(&P)..."
 
-msgid "Page Set&up"
-msgstr "ページ設定(&U)"
+msgid "Page Set&up..."
+msgstr "ページ設定(&U)..."
 
-msgid "Print Previe&w"
-msgstr "印刷プレビュー(&W)"
+msgid "Print Previe&w..."
+msgstr "印刷プレビュー(&W)..."
 
 msgid "&Convert Line Endings to"
 msgstr "改行コードの変換(&C)"
@@ -622,11 +622,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 "右側にコピーして次に進む(&O)\tAlt+Ctrl+Right"
+msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
+msgstr "右側にコピーして次に進む(&O)\tCtrl+Alt+Right"
 
-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"
 
 msgid "Copy &All to Right"
 msgstr "すべてを右側にコピー(&A)"
@@ -634,8 +634,8 @@ msgstr "すべてを右側にコピー(&A)"
 msgid "Cop&y All to Left"
 msgstr "すべてを左側にコピー(&Y)"
 
-msgid "A&uto Merge\tAlt+Ctrl+M"
-msgstr "自動マージ(&U)\tAlt+Ctrl+M"
+msgid "A&uto Merge\tCtrl+Alt+M"
+msgstr "自動マージ(&U)\tCtrl+Alt+M"
 
 msgid "Add &Synchronization Point\tAlt+S"
 msgstr "同期ポイントの追加(&S)\tAlt+S"
@@ -1358,8 +1358,8 @@ msgstr "単語区切り文字(&O)"
 msgid "Filefilters"
 msgstr "ファイル フィルタ"
 
-msgid "Test"
-msgstr "テスト"
+msgid "Test..."
+msgstr "テスト..."
 
 msgid "Install..."
 msgstr "インストール..."
@@ -1604,8 +1604,8 @@ msgstr "キャンセル(&C)"
 msgid "Test Filter"
 msgstr "フィルタのテスト"
 
-msgid "Testing filter ..."
-msgstr "テストするフィルタ..."
+msgid "Testing filter..."
+msgstr "テストするフィル..."
 
 msgid "&Enter text to test:"
 msgstr "テストするテキストの入力(&E):"
@@ -1746,9 +1746,7 @@ msgstr "クイック比較切替閾値 (MB)(&Q):"
 msgid "&Binary compare limit (MB):"
 msgstr "バイナリ比較切替閾値 (MB)(&B):"
 
-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 ""
 "比較スレッドの数(&N):\n"
 "負の値を指定した場合、スレッド数は使用可能な CPU コア数を加算した値になりま"
@@ -2280,19 +2278,13 @@ 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"
-"別名で保存する場合は [OK] を、\n"
-"中止する場合は、[キャンセル] を押してください"
+"- 別名で保存する場合は [OK] を、\n"
+"- 中止する場合は、[キャンセル] を押してください"
 
 #, c-format
 msgid ""
@@ -2922,12 +2914,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"
 "各々のファイルをそのコードページで表示すれば、正しく表示されますが、マージや"