Update English.pot #216

Update English.pot & UpdatePoFilesFromPotFile.vbs #221

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index e1f9947..15e8a66 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -558,12 +558,11 @@ msgstr ""
 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"
@@ -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 "&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"
@@ -829,8 +826,7 @@ msgstr "&A رونوشت برداري همه به راست "
 msgid "Cop&y All to Left"
 msgstr "&y رونوشت برداري همه به چپ "
 
-#, c-format
-msgid "A&uto Merge\tAlt+Ctrl+M"
+msgid "A&uto Merge\tCtrl+Alt+M"
 msgstr ""
 
 #, c-format
@@ -1757,9 +1753,8 @@ msgstr ""
 msgid "Filefilters"
 msgstr " پرونده صافيها "
 
-#, c-format
-msgid "Test"
-msgstr " آزمايش "
+msgid "Test..."
+msgstr " آزمايش ..."
 
 #, c-format
 msgid "Install..."
@@ -2079,9 +2074,8 @@ msgstr "&C لغو "
 msgid "Test Filter"
 msgstr " آزمايش صافي "
 
-#, c-format
-msgid "Testing filter ..."
-msgstr " آزمايش صافي ... "
+msgid "Testing filter..."
+msgstr " آزمايش صافي... "
 
 #, c-format
 msgid "&Enter text to test:"
@@ -2263,8 +2257,7 @@ msgstr "&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):"
+msgid "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
 msgstr ""
 
 msgctxt "Options dialog|Categories"
@@ -2863,13 +2856,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"
@@ -3250,8 +3237,7 @@ msgstr " کدبندي راست "
 msgid "Middle Encoding"
 msgstr ""
 
-#, c-format
-msgid "Ignored Diff."
+msgid "Ignored Diff"
 msgstr " تفاوت چشم پوشي شده "
 
 msgctxt "DirView|ColumnHeader"
@@ -3462,16 +3448,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
@@ -3620,14 +3603,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/Polish.po b/Translations/WinMerge/Polish.po
index 4223231..1635d41 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -1,4 +1,4 @@
-# This file is part from WinMerge <https://winmerge.org/>
+# This file is part from WinMerge <https://winmerge.org/>
 # Released under the "GNU General Public License"
 #
 # Translators:
@@ -429,11 +429,11 @@ msgstr "Zapisz prawą jako..."
 msgid "&Print..."
 msgstr "Drukuj..."
 
-msgid "Page Set&up"
-msgstr "Ustawienia strony"
+msgid "Page Set&up..."
+msgstr "Ustawienia strony..."
 
-msgid "Print Previe&w"
-msgstr "Podgląd wydruku"
+msgid "Print Previe&w..."
+msgstr "Podgląd wydruku..."
 
 msgid "&Convert Line Endings to"
 msgstr "Konwertuj końce linii do"
@@ -621,11 +621,11 @@ msgstr "Kopiuj z lewej\tAlt+Shift+Right"
 msgid "Copy from Right\tAlt+Shift+Left"
 msgstr "Kopiuj z prawej\tAlt+Shift+Left"
 
-msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
-msgstr "Kopiuj do prawej i przejdź dalej\tAlt+Ctrl+Right"
+msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
+msgstr "Kopiuj do prawej i przejdź dalej\tCtrl+Alt+Right"
 
-msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "Kopiuj do lewej i przejdź dalej\tAlt+Ctrl+Left"
+msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
+msgstr "Kopiuj do lewej i przejdź dalej\tCtrl+Alt+Left"
 
 msgid "Copy &All to Right"
 msgstr "Kopiuj wszystko do prawej"
@@ -633,8 +633,8 @@ msgstr "Kopiuj wszystko do prawej"
 msgid "Cop&y All to Left"
 msgstr "Kopiuj wszystko do lewej"
 
-msgid "A&uto Merge\tAlt+Ctrl+M"
-msgstr "Automatyczne scalanie\tAlt+Ctrl+M"
+msgid "A&uto Merge\tCtrl+Alt+M"
+msgstr ""
 
 msgid "Add &Synchronization Point\tAlt+S"
 msgstr "Dodaj punkt synchronizacji\tAlt+S"
@@ -1728,7 +1728,7 @@ msgstr "Limit szybkiego porównania (MB):"
 msgid "&Binary compare limit (MB):"
 msgstr "Limit porównywania binarnego (MB):"
 
-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 "Liczba porównywanych wątków (wartość ujemna oznacza dodanie liczby dostępnych rdzeni procesora):"
 
 msgctxt "Options dialog|Categories"
@@ -2370,8 +2370,8 @@ msgstr "Prawe kodowanie"
 msgid "Middle Encoding"
 msgstr "Środkowe kodowanie"
 
-msgid "Ignored Diff."
-msgstr "Ignorowane różn."
+msgid "Ignored Diff"
+msgstr "Ignorowane różn"
 
 msgctxt "DirView|ColumnHeader"
 msgid "Binary"
@@ -2536,14 +2536,14 @@ msgstr "Atrybuty prawej strony."
 msgid "Middle side attributes."
 msgstr "Atrybuty środkowej strony."
 
-msgid "Left side file EOL type"
-msgstr "Typ znaków końca linii z lewej strony"
+msgid "Left side file EOL type."
+msgstr "Typ znaków końca linii z lewej strony."
 
-msgid "Right side file EOL type"
-msgstr "Typ znaków końca linii z prawej strony"
+msgid "Right side file EOL type."
+msgstr "Typ znaków końca linii z prawej strony."
 
-msgid "Middle side file EOL type"
-msgstr "Typ znaków końca linii po środku"
+msgid "Middle side file EOL type."
+msgstr "Typ znaków końca linii po środku."
 
 msgid "Left side encoding."
 msgstr "Kodowanie lewej strony."
@@ -2922,3 +2922,4 @@ msgstr "Nie udało się utworzyć folderu."
 
 msgid "You can specify the following parameters to the path:\n$file: Path name of the current file\n$linenum: Line number of the current cursor position"
 msgstr "Możesz podać następujące parametry ścieżki:\n$file: Nazwa ścieżki do bieżącego pliku\n$linenum: Numer linii dla aktualnej pozycji kursora"
+

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index 32f06e9..4ff6d28 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -559,12 +559,11 @@ msgstr "Guardar &Direita Como..."
 msgid "&Print..."
 msgstr "&Imprimir..."
 
-msgid "Page Set&up"
-msgstr "Con&figurações da Página"
+msgid "Page Set&up..."
+msgstr "Con&figurações da Página..."
 
-#, c-format
-msgid "Print Previe&w"
-msgstr "Pré-&visualizar"
+msgid "Print Previe&w..."
+msgstr "Pré-&visualizar..."
 
 #, c-format
 msgid "&Convert Line Endings to"
@@ -814,13 +813,11 @@ msgstr "Copiar da Esquerda\tAlt+Shift+Right"
 msgid "Copy from Right\tAlt+Shift+Left"
 msgstr "Copiar da Direita\tAlt+Shift+Left"
 
-#, c-format
-msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
-msgstr "C&opiar para a Direita e Avançar\tAlt+Ctrl+Right"
+msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
+msgstr "C&opiar para a Direita e Avançar\tCtrl+Alt+Right"
 
-#, c-format
-msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "Copiar &para a Esquerda e Avançar\tAlt+Ctrl+Left"
+msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
+msgstr "Copiar &para a Esquerda e Avançar\tCtrl+Alt+Left"
 
 #, c-format
 msgid "Copy &All to Right"
@@ -830,9 +827,8 @@ msgstr "Copiar Tudo para a Direita"
 msgid "Cop&y All to Left"
 msgstr "C&opiar Tudo para a Esquerda"
 
-#, c-format
-msgid "A&uto Merge\tAlt+Ctrl+M"
-msgstr "Combinar A&utomaticamente\tAlt+Ctrl+M"
+msgid "A&uto Merge\tCtrl+Alt+M"
+msgstr ""
 
 #, c-format
 msgid "Add &Synchronization Point\tAlt+S"
@@ -1752,9 +1748,8 @@ msgstr "Caracteres da palavra:"
 msgid "Filefilters"
 msgstr "Filtros de ficheiro"
 
-#, c-format
-msgid "Test"
-msgstr "Testar"
+msgid "Test..."
+msgstr "Testar..."
 
 #, c-format
 msgid "Install..."
@@ -2076,9 +2071,8 @@ msgstr "Cancelar"
 msgid "Test Filter"
 msgstr "Testar filtro"
 
-#, c-format
-msgid "Testing filter ..."
-msgstr "A testar filtro ..."
+msgid "Testing filter..."
+msgstr "A testar filtro..."
 
 #, c-format
 msgid "&Enter text to test:"
@@ -2260,9 +2254,8 @@ msgstr "&Limite da comparação rápida (MB):"
 msgid "&Binary compare limit (MB):"
 msgstr "&Limite da comparação binária (MB):"
 
-#, c-format
-msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
-msgstr "&Número de tópicos de comparação (um valor negativo implica a adição do número de núcleos de CPU disponíveis)"
+msgid "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
+msgstr "\n&Número de tópicos de comparação (um valor negativo implica a adição do número de núcleos de CPU disponíveis)"
 
 msgctxt "Options dialog|Categories"
 msgid "Binary"
@@ -2865,20 +2858,14 @@ msgstr ""
 "Continuar na mesma?"
 
 #, 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 ""
 "Erro ao guardar ficheiro.\n"
 "%1\n"
 "%2\n"
 "Deseja:\n"
-"\t-usar um nome diferente para o ficheiro (Prima Ok)\n"
-"\t-abortar a acção atual (Prima Cancelar)?"
+"\t- usar um nome diferente para o ficheiro (Prima Ok)\n"
+"\t- abortar a acção atual (Prima Cancelar)?"
 
 #, c-format
 msgid ""
@@ -3249,9 +3236,8 @@ msgstr "Codificação Dtª"
 msgid "Middle Encoding"
 msgstr "Codificação Meio"
 
-#, c-format
-msgid "Ignored Diff."
-msgstr "Diferença ignorada."
+msgid "Ignored Diff"
+msgstr "Diferença ignorada"
 
 msgctxt "DirView|ColumnHeader"
 msgid "Binary"
@@ -3461,17 +3447,14 @@ msgstr "Atributos do lado direito."
 msgid "Middle side attributes."
 msgstr "Atributos do meio."
 
-#, c-format
-msgid "Left side file EOL type"
-msgstr "Tipo de ficheiro EOL do lado esquerdo"
+msgid "Left side file EOL type."
+msgstr "Tipo de ficheiro EOL do lado esquerdo."
 
-#, c-format
-msgid "Right side file EOL type"
-msgstr "Tipo de ficheiro EOL do lado direito"
+msgid "Right side file EOL type."
+msgstr "Tipo de ficheiro EOL do lado direito."
 
-#, c-format
-msgid "Middle side file EOL type"
-msgstr "Tipo de ficheiro EOL do meio"
+msgid "Middle side file EOL type."
+msgstr "Tipo de ficheiro EOL do meio."
 
 #, c-format
 msgid "Left side encoding."
@@ -3602,12 +3585,9 @@ msgid "Do you want to move to the previous page?"
 msgstr "Deseja retroceder para a página anterior?"
 
 #, 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 ""
-"Encontradas páginas de código diferentes nos ficheiros da esquerda (cp%d) e direita (cp%d). \n"
+"Encontradas páginas de código diferentes nos ficheiros da esquerda (cp%d) e direita (cp%d).\n"
 "Apresentar cada ficheiro na sua página de código terá melhor visualização, mas combinar/copiar poderá ser arriscado.\\Deseja tratar os dois ficheiros como tendo as páginas de código predefinidas para as janelas?"
 
 #, c-format