Update English.pot #216

Update English.pot & UpdatePoFilesFromPotFile.vbs #221

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index e542df7..da4ce52 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -2619,7 +2619,7 @@ msgstr "右文字コード"
 msgid "Middle Encoding"
 msgstr "中文字コード"
 
-msgid "Ignored Diff."
+msgid "Ignored Diff"
 msgstr "無視した差異数"
 
 msgctxt "DirView|ColumnHeader"
@@ -2786,13 +2786,13 @@ msgstr "右側の属性です。"
 msgid "Middle side attributes."
 msgstr "中央の属性です。"
 
-msgid "Left side file EOL type"
+msgid "Left side file EOL type."
 msgstr "左側の EOL タイプです。"
 
-msgid "Right side file EOL type"
+msgid "Right side file EOL type."
 msgstr "右側の EOL タイプです。"
 
-msgid "Middle side file EOL type"
+msgid "Middle side file EOL type."
 msgstr "中央の EOL タイプです。"
 
 msgid "Left side encoding."

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 26f427b..8d968ab 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -561,12 +561,11 @@ msgstr "오른쪽 저장(&R)..."
 msgid "&Print..."
 msgstr "인쇄(&P)..."
 
-msgid "Page Set&up"
-msgstr "페이지 설정(&T)"
+msgid "Page Set&up..."
+msgstr "페이지 설정(&T)..."
 
-#, c-format
-msgid "Print Previe&w"
-msgstr "인쇄 미리보기(&R)"
+msgid "Print Previe&w..."
+msgstr "인쇄 미리보기(&R)..."
 
 #, c-format
 msgid "&Convert Line Endings to"
@@ -816,13 +815,11 @@ msgstr "왼쪽에서 복사\tAlt+Shift+Right"
 msgid "Copy from Right\tAlt+Shift+Left"
 msgstr "오른쪽에서 복사\tAlt+Shift+Left"
 
-#, 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"
@@ -832,9 +829,8 @@ msgstr "전부 오른쪽으로 복사(&A)"
 msgid "Cop&y All to Left"
 msgstr "전부 왼쪽으로 복사(&E)"
 
-#, 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"
@@ -1754,9 +1750,8 @@ msgstr "단어 분리 문자(&O):"
 msgid "Filefilters"
 msgstr "파일 필터"
 
-#, c-format
-msgid "Test"
-msgstr "테스트"
+msgid "Test..."
+msgstr "테스트..."
 
 #, c-format
 msgid "Install..."
@@ -2078,8 +2073,7 @@ msgstr "취소(&C)"
 msgid "Test Filter"
 msgstr "필터 테스트"
 
-#, c-format
-msgid "Testing filter ..."
+msgid "Testing filter..."
 msgstr "필터 테스트 중..."
 
 #, c-format
@@ -2262,9 +2256,8 @@ msgstr "빠른 비교 제한 (MB):"
 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 코어 개수의 추가를 뜻합니다):"
+msgid "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
+msgstr "\n비교 쓰레드 개수 (음수값은 사용 가능한 CPU 코어 개수의 추가를 뜻합니다):"
 
 msgctxt "Options dialog|Categories"
 msgid "Binary"
@@ -2865,13 +2858,7 @@ 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"
@@ -3249,8 +3236,7 @@ msgstr "오른쪽 인코딩"
 msgid "Middle Encoding"
 msgstr "가운데 인코딩"
 
-#, c-format
-msgid "Ignored Diff."
+msgid "Ignored Diff"
 msgstr "무시된 차이점"
 
 msgctxt "DirView|ColumnHeader"
@@ -3461,16 +3447,13 @@ msgstr "오른쪽 속성"
 msgid "Middle side attributes."
 msgstr "가운데 속성"
 
-#, c-format
-msgid "Left side file EOL type"
+msgid "Left side file EOL type."
 msgstr "왼쪽 파일 줄끝 형식"
 
-#, c-format
-msgid "Right side file EOL type"
+msgid "Right side file EOL type."
 msgstr "오른쪽 파일 줄끝 형식"
 
-#, c-format
-msgid "Middle side file EOL type"
+msgid "Middle side file EOL type."
 msgstr "가운데 파일 줄끝 형식"
 
 #, c-format
@@ -3602,10 +3585,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/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index 8b37be6..d078d86 100644 (file)
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -2138,7 +2138,7 @@ msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOv
 msgstr "Kita programa pakeitė failą\n%1\npo to, kai jis buvo įkeltas į „Winmerge“.\n\nPerrašyti pakeistą failą?"
 
 #, c-format
-msgid "%1\n is marked read-only. Would you like to override the read-only item?"
+msgid "%1\nis marked read-only. Would you like to override the read-only item?"
 msgstr "%1\n pažymėtas „Tik skaitymui“. Ar norite perrašyti „Tik skaitymui“ skirtą elementą?"
 
 #, c-format
@@ -2378,7 +2378,7 @@ msgstr "Dešiniojo koduotė"
 msgid "Middle Encoding"
 msgstr "Vidurinio koduotė"
 
-msgid "Ignored Diff."
+msgid "Ignored Diff"
 msgstr "Ignoruoti skirtumai"
 
 msgctxt "DirView|ColumnHeader"
@@ -2544,13 +2544,13 @@ msgstr "Dešiniosios pusės atributai."
 msgid "Middle side attributes."
 msgstr "Vidurinės pusės atributai."
 
-msgid "Left side file EOL type"
+msgid "Left side file EOL type."
 msgstr "Kairiojo failo eilučių pabaigos formatas."
 
-msgid "Right side file EOL type"
+msgid "Right side file EOL type."
 msgstr "Dešiniojo failo eilučių pabaigos formatas."
 
-msgid "Middle side file EOL type"
+msgid "Middle side file EOL type."
 msgstr "Vidurinio failo eilučių pabaigos formatas."
 
 msgid "Left side encoding."

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index 270e184..ad34df2 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -557,12 +557,11 @@ msgstr ""
 msgid "&Print..."
 msgstr "&Skriv ut..."
 
-msgid "Page Set&up"
-msgstr "&Utskriftsformat"
+msgid "Page Set&up..."
+msgstr "&Utskriftsformat..."
 
-#, c-format
-msgid "Print Previe&w"
-msgstr "&Forhåndsvisning"
+msgid "Print Previe&w..."
+msgstr "&Forhåndsvisning..."
 
 #, c-format
 msgid "&Convert Line Endings to"
@@ -812,13 +811,11 @@ msgstr ""
 msgid "Copy from Right\tAlt+Shift+Left"
 msgstr ""
 
-#, c-format
-msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
-msgstr "Kopier til høyre og g&å videre\tAlt+Ctrl+Right"
+msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
+msgstr "Kopier til høyre og g&å videre\tCtrl+Alt+Right"
 
-#, c-format
-msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "Kopier &til venstre og gå videre\tAlt+Ctrl+Left"
+msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
+msgstr "Kopier &til venstre og gå videre\tCtrl+Alt+Left"
 
 #, c-format
 msgid "Copy &All to Right"
@@ -828,8 +825,7 @@ msgstr "&Kopier alt til høyre"
 msgid "Cop&y All to Left"
 msgstr "K&opier alt til venstre"
 
-#, c-format
-msgid "A&uto Merge\tAlt+Ctrl+M"
+msgid "A&uto Merge\tCtrl+Alt+M"
 msgstr ""
 
 #, c-format
@@ -1750,9 +1746,8 @@ msgstr ""
 msgid "Filefilters"
 msgstr "Filfiltere"
 
-#, c-format
-msgid "Test"
-msgstr "Test"
+msgid "Test..."
+msgstr "Test..."
 
 #, c-format
 msgid "Install..."
@@ -2070,9 +2065,8 @@ msgstr "&Avbryt"
 msgid "Test Filter"
 msgstr "Test filter"
 
-#, c-format
-msgid "Testing filter ..."
-msgstr "Tester filter ..."
+msgid "Testing filter..."
+msgstr "Tester filter..."
 
 #, c-format
 msgid "&Enter text to test:"
@@ -2254,8 +2248,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"
@@ -2837,20 +2830,14 @@ msgstr ""
 "Fortsette likevel?"
 
 #, 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 ""
 "Lagring av fil feilet.\n"
 "%1\n"
 "%2\n"
 "Vil du:\n"
-"\t-bruk et annet filnavn (Klikk Ok)\n"
-"\t-avbryt den aktuelle operasjonen (Klikk Avbryt)?"
+"\t- bruk et annet filnavn (Klikk Ok)\n"
+"\t- avbryt den aktuelle operasjonen (Klikk Avbryt)?"
 
 #, c-format
 msgid ""
@@ -3222,8 +3209,7 @@ msgstr "Høyre koding"
 msgid "Middle Encoding"
 msgstr ""
 
-#, c-format
-msgid "Ignored Diff."
+msgid "Ignored Diff"
 msgstr "Ignorerte forskjeller"
 
 msgctxt "DirView|ColumnHeader"
@@ -3434,16 +3420,13 @@ msgstr "Høyre side attributter."
 msgid "Middle side attributes."
 msgstr ""
 
-#, c-format
-msgid "Left side file EOL type"
-msgstr "Venstre side fil EOL type"
+msgid "Left side file EOL type."
+msgstr "Venstre side fil EOL type."
 
-#, c-format
-msgid "Right side file EOL type"
-msgstr "Høyre side fil EOL type"
+msgid "Right side file EOL type."
+msgstr "Høyre side fil EOL type."
 
-#, c-format
-msgid "Middle side file EOL type"
+msgid "Middle side file EOL type."
 msgstr ""
 
 #, c-format
@@ -3575,12 +3558,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 ""
-"Forskjellige tegnsett funnet i venstre (cp%d) og høyre (cp%d) filer. \n"
+"Forskjellige tegnsett funnet i venstre (cp%d) og høyre (cp%d) filer.\n"
 "Visning av hver fil i sitt tegnsett ser best ut, men sammenslåing/kopiering blir farlig.\n"
 "Vil du behandle begge filer som om de var i standard Windows tegnsett (anbefales)?"