Update English.pot #216

Update English.pot & UpdatePoFilesFromPotFile.vbs #221

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 5633366..ecbce21 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -557,11 +557,10 @@ msgstr ""
 msgid "&Print..."
 msgstr "&Tisk..."
 
-msgid "Page Set&up"
-msgstr "V&zhled stránky"
+msgid "Page Set&up..."
+msgstr "V&zhled stránky..."
 
-#, c-format
-msgid "Print Previe&w"
+msgid "Print Previe&w..."
 msgstr "Ná&hled..."
 
 #, c-format
@@ -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 "Kopírovat dopr&ava a na další\tAlt+Ctrl+Right"
+msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
+msgstr "Kopírovat dopr&ava a na další\tCtrl+Alt+Right"
 
-#, c-format
-msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "Kopírovat dol&eva a na další\tAlt+Ctrl+Left"
+msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
+msgstr "Kopírovat dol&eva a na další\tCtrl+Alt+Left"
 
 #, c-format
 msgid "Copy &All to Right"
@@ -828,8 +825,7 @@ msgstr "&Kopírovat vše doprava"
 msgid "Cop&y All to Left"
 msgstr "K&opírovat vše doleva"
 
-#, c-format
-msgid "A&uto Merge\tAlt+Ctrl+M"
+msgid "A&uto Merge\tCtrl+Alt+M"
 msgstr ""
 
 #, c-format
@@ -1752,9 +1748,8 @@ msgstr "Zn&aky oddělující slova:"
 msgid "Filefilters"
 msgstr "Filtrování souborů"
 
-#, c-format
-msgid "Test"
-msgstr "Z&kouška"
+msgid "Test..."
+msgstr "Z&kouška..."
 
 #, c-format
 msgid "Install..."
@@ -2068,9 +2063,8 @@ msgstr "Storno"
 msgid "Test Filter"
 msgstr "Zkouška filtru"
 
-#, c-format
-msgid "Testing filter ..."
-msgstr "Zkouška filtru ..."
+msgid "Testing filter..."
+msgstr "Zkouška filtru..."
 
 #, c-format
 msgid "&Enter text to test:"
@@ -2252,8 +2246,7 @@ msgstr "&Omezení pro rychlé porovnání (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):"
+msgid "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
 msgstr ""
 
 msgctxt "Options dialog|Categories"
@@ -2793,13 +2786,7 @@ msgstr ""
 "Chcete pokračovat?"
 
 #, 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 ""
 "Ukládání souboru selhalo.\n"
 "%1\n"
@@ -3162,8 +3149,7 @@ msgstr "Kódování vpravo"
 msgid "Middle Encoding"
 msgstr ""
 
-#, c-format
-msgid "Ignored Diff."
+msgid "Ignored Diff"
 msgstr "Ignor. rozdílů"
 
 msgctxt "DirView|ColumnHeader"
@@ -3374,16 +3360,13 @@ msgstr "Atributy souboru na pravé straně"
 msgid "Middle side attributes."
 msgstr ""
 
-#, c-format
-msgid "Left side file EOL type"
-msgstr "Typ konce řádků v souboru na levé straně"
+msgid "Left side file EOL type."
+msgstr "Typ konce řádků v souboru na levé straně."
 
-#, c-format
-msgid "Right side file EOL type"
-msgstr "Typ konce řádků v souboru na pravé straně"
+msgid "Right side file EOL type."
+msgstr "Typ konce řádků v souboru na pravé straně."
 
-#, c-format
-msgid "Middle side file EOL type"
+msgid "Middle side file EOL type."
 msgstr ""
 
 #, c-format
@@ -3505,10 +3488,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 ""
 "V souborech vlevo (cp%d) a vpravo (cp%d) bylo nalezeno rozdílné kódování.\n"
 "Zobrazení každého souboru v jeho znakové stránce poskytne lepší náhled, ale slučování nebo kopírování bude nebezpečné.\n"

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index a201f93..5442ff2 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -558,12 +558,11 @@ msgstr ""
 msgid "&Print..."
 msgstr "&Udskriv..."
 
-msgid "Page Set&up"
-msgstr "Side op&sætning"
+msgid "Page Set&up..."
+msgstr "Side op&sætning..."
 
-#, c-format
-msgid "Print Previe&w"
-msgstr "Vis udskrif&t"
+msgid "Print Previe&w..."
+msgstr "Vis udskrif&t..."
 
 #, c-format
 msgid "&Convert Line Endings to"
@@ -813,13 +812,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ø&jre og gå til næste\tAlt+Ctrl+Right"
+msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
+msgstr "Kopier til hø&jre og gå til næste\tCtrl+Alt+Right"
 
-#, c-format
-msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "Kopier til v&enstre og gå til næste\tAlt+Ctrl+Left"
+msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
+msgstr "Kopier til v&enstre og gå til næste\tCtrl+Alt+Left"
 
 #, c-format
 msgid "Copy &All to Right"
@@ -829,8 +826,7 @@ msgstr "Kopier alt &til højre"
 msgid "Cop&y All to Left"
 msgstr "Kopier alt til venst&re"
 
-#, c-format
-msgid "A&uto Merge\tAlt+Ctrl+M"
+msgid "A&uto Merge\tCtrl+Alt+M"
 msgstr ""
 
 #, c-format
@@ -1755,9 +1751,8 @@ msgstr ""
 msgid "Filefilters"
 msgstr "Filfiltre"
 
-#, c-format
-msgid "Test"
-msgstr "Test"
+msgid "Test..."
+msgstr "Test..."
 
 #, c-format
 msgid "Install..."
@@ -2077,8 +2072,7 @@ msgstr "&Annuller"
 msgid "Test Filter"
 msgstr "Test Filter"
 
-#, c-format
-msgid "Testing filter ..."
+msgid "Testing filter..."
 msgstr "Tester filter..."
 
 #, c-format
@@ -2261,8 +2255,7 @@ msgstr "&Grænse for hurtig sammenligning (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):"
+msgid "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
 msgstr ""
 
 msgctxt "Options dialog|Categories"
@@ -2860,20 +2853,14 @@ msgstr ""
 "Fortsæt alligevel?"
 
 #, 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 ""
 "Gem fil fejlede.\n"
 "%1\n"
 "%2\n"
 "Vil du:\n"
-"\t-bruge et andet filenavn (Tryk Ok)\n"
-"\t-afbryd aktuel operation (Tryk Annuller)?"
+"\t- bruge et andet filenavn (Tryk Ok)\n"
+"\t- afbryd aktuel operation (Tryk Annuller)?"
 
 #, c-format
 msgid ""
@@ -3248,8 +3235,7 @@ msgstr "Højre encoding"
 msgid "Middle Encoding"
 msgstr ""
 
-#, c-format
-msgid "Ignored Diff."
+msgid "Ignored Diff"
 msgstr "Ignoreret forskel"
 
 msgctxt "DirView|ColumnHeader"
@@ -3460,16 +3446,13 @@ msgstr "Højre side attributter."
 msgid "Middle side attributes."
 msgstr ""
 
-#, c-format
-msgid "Left side file EOL type"
-msgstr "Venstre sidefil EOL type"
+msgid "Left side file EOL type."
+msgstr "Venstre sidefil EOL type."
 
-#, c-format
-msgid "Right side file EOL type"
-msgstr "Højre sidefil EOL type"
+msgid "Right side file EOL type."
+msgstr "Højre sidefil EOL type."
 
-#, c-format
-msgid "Middle side file EOL type"
+msgid "Middle side file EOL type."
 msgstr ""
 
 #, c-format
@@ -3616,14 +3599,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 ""
-"Venstre fil (cp%d) og højre fil (cp%d) har ikke den samme codepage. \n"
+"Venstre fil (cp%d) og højre fil (cp%d) har ikke den samme codepage.\n"
 "Visning af hver fil i sin egen codepage vil give et bedre visuelt resultat "
 "men fletning/kopiering vil være farligt.\n"
 "Vil du behandle begge filer som værende i standard Windows codepage "