Update English.pot #216

Update English.pot & UpdatePoFilesFromPotFile.vbs #221

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index 3e472ed..f7a6334 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -556,12 +556,11 @@ msgstr ""
 msgid "&Print..."
 msgstr "Εκ&τύπωση..."
 
-msgid "Page Set&up"
-msgstr "Διάταξη &Σελίδας"
+msgid "Page Set&up..."
+msgstr "Διάταξη &Σελίδας..."
 
-#, c-format
-msgid "Print Previe&w"
-msgstr "Προε&πισκόπηση Εκτυπώσεως"
+msgid "Print Previe&w..."
+msgstr "Προε&πισκόπηση Εκτυπώσεως..."
 
 #, 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 "Αντιγραφή Δε&ξιά και Μετάβαση σε επομένη\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"
@@ -827,8 +824,7 @@ msgstr "Αντιγραφή όλων &Δεξιά"
 msgid "Cop&y All to Left"
 msgstr "Αντιγραφή όλων &Αριστερά"
 
-#, 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 "Αρχειοφίλτρα"
 
-#, c-format
-msgid "Test"
-msgstr "Δοκιμή"
+msgid "Test..."
+msgstr "Δοκιμή..."
 
 #, c-format
 msgid "Install..."
@@ -2065,8 +2060,7 @@ msgstr "Ά&κυρο"
 msgid "Test Filter"
 msgstr "Δοκιμή Φίλτρου"
 
-#, c-format
-msgid "Testing filter ..."
+msgid "Testing filter..."
 msgstr "Δοκιμή Φίλτρου..."
 
 #, c-format
@@ -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"
@@ -2826,20 +2819,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 ""
@@ -3195,9 +3182,8 @@ msgstr "Κωδικοσελίδα Δεξιού"
 msgid "Middle Encoding"
 msgstr ""
 
-#, c-format
-msgid "Ignored Diff."
-msgstr "Αγνοηθείσα Διαφορά."
+msgid "Ignored Diff"
+msgstr "Αγνοηθείσα Διαφορά"
 
 msgctxt "DirView|ColumnHeader"
 msgid "Binary"
@@ -3407,16 +3393,13 @@ msgstr "Ιδιότητες δεξιάς πλευράς."
 msgid "Middle side attributes."
 msgstr ""
 
-#, c-format
-msgid "Left side file EOL type"
-msgstr "Τύπος χαρακτήρα τερματισμού αριστερής πλευράς"
+msgid "Left side file EOL type."
+msgstr "Τύπος χαρακτήρα τερματισμού αριστερής πλευράς."
 
-#, c-format
-msgid "Right side file EOL type"
-msgstr "Τύπος χαρακτήρα τερματισμού δεξιάς πλευράς"
+msgid "Right side file EOL type."
+msgstr "Τύπος χαρακτήρα τερματισμού δεξιάς πλευράς."
 
-#, c-format
-msgid "Middle side file EOL type"
+msgid "Middle side file EOL type."
 msgstr ""
 
 #, c-format
@@ -3548,12 +3531,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"
 "Επιθυμείτε να θεωρηθεί ότι αμφότερα τα αρχεία χρησιμοποιούν την προκαθορισμένη κωδικοσελίδα του windows (συνιστάται);"
 

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 57d48ac..87c0904 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -557,12 +557,11 @@ msgstr ""
 msgid "&Print..."
 msgstr "Nyomtatás..."
 
-msgid "Page Set&up"
-msgstr "Oldalbeállítás"
+msgid "Page Set&up..."
+msgstr "Oldalbeállítás..."
 
-#, c-format
-msgid "Print Previe&w"
-msgstr "Nyomtatási kép"
+msgid "Print Previe&w..."
+msgstr "Nyomtatási kép..."
 
 #, 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 "Másolás J&obbra és ugrás tovább\tAlt+Ctrl+Right"
+msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
+msgstr "Másolás J&obbra és ugrás tovább\tCtrl+Alt+Right"
 
-#, c-format
-msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "Másolás B&alra és ugrás tovább\tAlt+Ctrl+Left"
+msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
+msgstr "Másolás B&alra és ugrás tovább\tCtrl+Alt+Left"
 
 #, c-format
 msgid "Copy &All to Right"
@@ -828,8 +825,7 @@ msgstr "M&inden Jobbra másolása"
 msgid "Cop&y All to Left"
 msgstr "Mi&nden Balra másolása"
 
-#, c-format
-msgid "A&uto Merge\tAlt+Ctrl+M"
+msgid "A&uto Merge\tCtrl+Alt+M"
 msgstr ""
 
 #, c-format
@@ -1750,8 +1746,7 @@ msgstr ""
 msgid "Filefilters"
 msgstr "FájlSzűrők"
 
-#, c-format
-msgid "Test"
+msgid "Test..."
 msgstr ""
 
 #, c-format
@@ -2066,8 +2061,7 @@ msgstr "&Mégsem"
 msgid "Test Filter"
 msgstr ""
 
-#, c-format
-msgid "Testing filter ..."
+msgid "Testing filter..."
 msgstr ""
 
 #, c-format
@@ -2250,8 +2244,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"
@@ -2770,20 +2763,14 @@ msgstr ""
 "Folytatni akarod?"
 
 #, 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 ""
 "A fájl mentése sikertelen volt.\n"
 "%1\n"
 "%2\n"
 "A lehetőségek:\n"
-"\t-másik fájlnév választása (Ok)\n"
-"\t-a jelenlegi folyamat megszakítása (Mégsem)?"
+"\t- másik fájlnév választása (Ok)\n"
+"\t- a jelenlegi folyamat megszakítása (Mégsem)?"
 
 #, c-format
 msgid ""
@@ -3132,8 +3119,7 @@ msgstr "Jobb oldali kódolás"
 msgid "Middle Encoding"
 msgstr ""
 
-#, c-format
-msgid "Ignored Diff."
+msgid "Ignored Diff"
 msgstr ""
 
 msgctxt "DirView|ColumnHeader"
@@ -3344,16 +3330,13 @@ msgstr "Jobb oldali attribútumok."
 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
@@ -3475,12 +3458,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 ""
-"A bal (cp%d) és jobb (cp%d) oldali fájlok nem ugyanazt a kódolást használják. \n"
+"A bal (cp%d) és jobb (cp%d) oldali fájlok nem ugyanazt a kódolást használják.\n"
 "A különböző kódlapokkal történő kijelzés könnyebben áttekinthető de az olvasztás/törlés kockázatos lehet.\n"
 "Would you like to treat both files as being in the default Windows codepage (recommended)?"
 

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 3d335ea..55db8f6 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -429,11 +429,11 @@ msgstr "Salva &destro con nome..."
 msgid "&Print..."
 msgstr "Stam&pa..."
 
-msgid "Page Set&up"
-msgstr "Impos&ta pagina"
+msgid "Page Set&up..."
+msgstr "Impos&ta pagina..."
 
-msgid "Print Previe&w"
-msgstr "Anteprima &di stampa"
+msgid "Print Previe&w..."
+msgstr "Anteprima &di stampa..."
 
 msgid "&Convert Line Endings to"
 msgstr "&Converti caratteri di fine linea in"
@@ -621,11 +621,11 @@ msgstr "Copia da sinistra\tAlt+Maiusc+Destra"
 msgid "Copy from Right\tAlt+Shift+Left"
 msgstr "Copia da destra\tAlt+Maiusc+Sinistra"
 
-msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
-msgstr "Copia a des&tra e avanza\tAlt+Ctrl+Destra"
+msgid "C&opy to Right and Advance\tCtrl+Alt+Right"
+msgstr "Copia a des&tra e avanza\tCtrl+Alt+Destra"
 
-msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "Copia &a sinistra e avanza\tAlt+Ctrl+Sinistra"
+msgid "Copy &to Left and Advance\tCtrl+Alt+Left"
+msgstr "Copia &a sinistra e avanza\tCtrl+Alt+Sinistra"
 
 msgid "Copy &All to Right"
 msgstr "Cop&ia tutto a destra"
@@ -633,8 +633,8 @@ msgstr "Cop&ia tutto a destra"
 msgid "Cop&y All to Left"
 msgstr "C&opia tutto a sinistra"
 
-msgid "A&uto Merge\tAlt+Ctrl+M"
-msgstr "Unione a&utomatica\tAlt+Ctrl+M"
+msgid "A&uto Merge\tCtrl+Alt+M"
+msgstr "Unione a&utomatica\tCtrl+Alt+M"
 
 msgid "Add &Synchronization Point\tAlt+S"
 msgstr "Aggiungi punto di &sincronizzazione\tAlt+S"
@@ -1353,8 +1353,8 @@ msgstr "Caratteri terminatori &parola:"
 msgid "Filefilters"
 msgstr "Filtri file"
 
-msgid "Test"
-msgstr "Prova"
+msgid "Test..."
+msgstr "Prova..."
 
 msgid "Install..."
 msgstr "Installa..."
@@ -1600,7 +1600,7 @@ msgstr "Annu&lla"
 msgid "Test Filter"
 msgstr "Verifica filtro"
 
-msgid "Testing filter ..."
+msgid "Testing filter..."
 msgstr "Verifica filtro in corso..."
 
 msgid "&Enter text to test:"
@@ -1742,11 +1742,9 @@ msgstr "Limite confronto &veloce (MB):"
 msgid "&Binary compare limit (MB):"
 msgstr "Limite confronto &binario (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 ""
-"&Numeri di thread per il confronto (usare valori negativi per aggiungere al "
+"\n&Numeri di thread per il confronto (usare valori negativi per aggiungere al "
 "numero di core della CPU):"
 
 msgctxt "Options dialog|Categories"
@@ -2278,20 +2276,14 @@ msgstr ""
 "Vuoi continuare comunque?"
 
 #, 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 ""
 "Salvataggio del file fallito.\n"
 "%1\n"
 "%2\n"
 "Vuoi:\n"
-"\t-usare un nome diverso per il file (seleziona 'OK')\n"
-"\t-annullare l'operazione attuale (seleziona 'Annulla')?"
+"\t- usare un nome diverso per il file (seleziona 'OK')\n"
+"\t- annullare l'operazione attuale (seleziona 'Annulla')?"
 
 #, c-format
 msgid ""
@@ -2629,8 +2621,8 @@ msgstr "Codifica di destra"
 msgid "Middle Encoding"
 msgstr "Codifica centrale"
 
-msgid "Ignored Diff."
-msgstr "Diff. ignorate"
+msgid "Ignored Diff"
+msgstr "Diff ignorate"
 
 msgctxt "DirView|ColumnHeader"
 msgid "Binary"
@@ -2795,14 +2787,14 @@ msgstr "Attributi lato destro."
 msgid "Middle side attributes."
 msgstr "Attributi lato centrale."
 
-msgid "Left side file EOL type"
-msgstr "Tipo fine linea lato sinistro"
+msgid "Left side file EOL type."
+msgstr "Tipo fine linea lato sinistro."
 
-msgid "Right side file EOL type"
-msgstr "Tipo fine linea lato destro"
+msgid "Right side file EOL type."
+msgstr "Tipo fine linea lato destro."
 
-msgid "Middle side file EOL type"
-msgstr "Tipo fine linea lato centrale"
+msgid "Middle side file EOL type."
+msgstr "Tipo fine linea lato centrale."
 
 msgid "Left side encoding."
 msgstr "Codifica zona sinistra."
@@ -2927,12 +2919,7 @@ msgid "Do you want to move to the previous page?"
 msgstr "Vuoi passare alla pagina precedente?"
 
 #, 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 ""
 "Il file sinistro (cp%d) e destro (cp%d) non hanno lo stesso codice "
 "pagina.\n"