Update translations

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index 330153e..d391fba 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -77,16 +77,13 @@ msgstr "&G برو به ... "
 msgid "Op&en"
 msgstr "&e باز "
 
-#, c-format
-msgid "with &Registered Application"
+msgid "With &Registered Application"
 msgstr "&R با برنامه کاربردي رسمي "
 
-#, c-format
-msgid "with &External Editor\tCtrl+Alt+E"
+msgid "With &External Editor\tCtrl+Alt+E"
 msgstr ""
 
-#, c-format
-msgid "&with..."
+msgid "&With..."
 msgstr "&w با ..."
 
 msgid "S&hell Menu"
@@ -975,8 +972,7 @@ msgstr "&O بازکردن سمت چپي "
 msgid "with &External Editor"
 msgstr "&E با ويرايشگر بيروني "
 
-#, c-format
-msgid "&Parent Folder"
+msgid "Open &Parent Folder..."
 msgstr ""
 
 #, c-format
@@ -1258,9 +1254,8 @@ msgstr " عمومي "
 msgid "Automatically &scroll to first difference"
 msgstr "&s بطور خودکار به نخستين تفاوت منتقل شود "
 
-#, c-format
-msgid "Cl&ose windows with ESC:"
-msgstr "&o   ESC بستن پنجره ها با کليد :"
+msgid "Cl&ose windows with 'Esc':"
+msgstr "&o   'Esc' بستن پنجره ها با کليد :"
 
 #, c-format
 msgid "&Automatically verify paths in Open-dialog"
@@ -1296,10 +1291,7 @@ msgstr "&p بازکردن پنجره محاوره اتمام خودکار "
 msgid "Language:"
 msgstr ""
 
-#, c-format
-msgid ""
-"WinMerge allows hiding some common messageboxes. Press the Reset button to "
-"make all messageboxes visible again."
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
 msgstr ""
 " وينمرج به شما اجازه مي دهد تا بعضي از جعبه پيام معمولي را پنهان نماييد. "
 "کليد بازنشاني / ريست را بفشاريد تا تمام جعبه پيام دوباره آشکار شوند "
@@ -1605,8 +1597,7 @@ msgstr " انتخاب بازکننده بسته "
 msgid "File unpacker:"
 msgstr " باز کننده بسته پرونده : "
 
-#, c-format
-msgid "Display all unpackers, don't check the extension"
+msgid "Display all unpackers, don't check the extension."
 msgstr " تمام بازکننده هاي بسته را نمايش بده، توسعه را بررسي نکن "
 
 #, c-format
@@ -1855,16 +1846,12 @@ msgstr ""
 " موقعي که پرونده هاي غير يوني کد بارگيري مي شوند، انتخاب صفحه کد پيش فرض در "
 "نظر گرفته مي شود : "
 
-#, c-format
-msgid ""
-"Detect codepage info for these files: .html, .rc, .xml \n"
-"need to restart session"
+msgid "Detect codepage info for these files: .html, .rc, .xml\nNeed to restart session."
 msgstr ""
-" تشخيص اطلاعات صفحه کد براي اين پرونده ها : .html, .rc, .xml \n"
+" تشخيص اطلاعات صفحه کد براي اين پرونده ها : .html, .rc, .xml\n"
 " نيازمند جلسه شروع دوباره /  بازآغازي "
 
-#, c-format
-msgid "Detect codepage for text files using mlang.dll\nneed to restart session"
+msgid "Detect codepage for text files using mlang.dll\nNeed to restart session."
 msgstr ""
 
 #, c-format
@@ -2186,8 +2173,7 @@ msgstr "&G پوشه پشتيبان سراسري :  "
 msgid "Backup filename:"
 msgstr " نام پرونده پشتيبان : "
 
-#, c-format
-msgid "&Append .bak -extension"
+msgid "&Append .bak extension"
 msgstr "&A  پيوست کردن توسعه   .bak "
 
 #, c-format
@@ -2211,6 +2197,10 @@ msgid "To right"
 msgstr " به راست "
 
 #, c-format
+msgid "Don't ask this &question again."
+msgstr "&q دوباره اين پرسش را نپرس "
+
+#, c-format
 msgid "Yes"
 msgstr " آري "
 
@@ -2379,12 +2369,10 @@ msgstr ""
 msgid "\nSave (Ctrl+S)"
 msgstr ""
 
-#, c-format
-msgid "Unknown error attempting to open project file"
+msgid "Unknown error attempting to open project file."
 msgstr " مشاهده خطاي نامشخص هنگام مبادرت به بازکردن پرونده پروژه / طرح "
 
-#, c-format
-msgid "Unknown error attempting to save project file"
+msgid "Unknown error attempting to save project file."
 msgstr " مشاهده خطاي نامشخص هنگام مبادرت به ذخيره کردن پرونده پروژه / طرح "
 
 #, c-format
@@ -2502,12 +2490,7 @@ msgstr "&a پرش از همگي "
 msgid "Don't display this &message again."
 msgstr "&m دوباره اين پيام را نمايش نده "
 
-#, c-format
-msgid "Don't ask this &question again."
-msgstr "&q دوباره اين پرسش را نپرس "
-
-#, c-format
-msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
 msgstr ""
 
 msgid "Color Schemes"
@@ -2708,12 +2691,7 @@ msgstr " پرونده صافي پيش از اين وجود دارد. آيا صا
 msgid "Regular expression"
 msgstr " عبارت منظم / قاعده مند "
 
-#, c-format
-msgid ""
-"Filters were updated. Do you want to refresh all open folder compares?\n"
-"\n"
-"If you do not want to refresh all compares now you can select No and refresh "
-"compares later."
+msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select 'No' and refresh compares later."
 msgstr ""
 " صافي ها   به هنگام   شدند. آيا مي خواهيد تا تمام همسنجيهاي پوشه باز، دوباره "
 "انجام شود؟ \n"
@@ -2790,9 +2768,8 @@ msgstr "  مورد %1 از %2"
 msgid "Items: %1"
 msgstr " موارد : %1"
 
-#, c-format
-msgid "Select two existing folders or files to compare"
-msgstr " انتخاب دو پوشه يا پرونده موجود براي مقايسه "
+msgid "Select two existing folders or files to compare."
+msgstr " انتخاب دو پوشه يا پرونده موجود براي مقايسه؟ "
 
 #, c-format
 msgid "Folder Selection"
@@ -2838,8 +2815,7 @@ msgstr ""
 msgid "All paths are invalid!"
 msgstr ""
 
-#, c-format
-msgid "Only enabled for File comparisons"
+msgid "Only enabled for file comparisons"
 msgstr ""
 
 #, c-format
@@ -2892,9 +2868,7 @@ msgid "Save changes to %1?"
 msgstr " آيا تغييرات در %1 ذخيره شود؟"
 
 #, c-format
-msgid ""
-"%1 is marked read-only. Would you like to override the read-only file ? (No "
-"to save as new filename.)"
+msgid "%1 is marked read-only. Would you like to override the read-only file? (No to save as new filename.)"
 msgstr ""
 "پرونده  %1 بصورت فقط خواندني علامت زده شده است. آيا مايل هستيد   پرونده فقط "
 "خواندني   باطل گردد؟ - با نام جديد ذخيره نگردد "
@@ -2916,7 +2890,7 @@ msgstr ""
 " به هر حال کار ادامه يابد؟ "
 
 #, c-format
-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)?"
+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"
@@ -3128,12 +3102,11 @@ msgstr ""
 "\n"
 " را حذف نماييد %1 ?"
 
-#, c-format
-msgid "Are you sure you want to copy:"
-msgstr " آيا مطمئن هستيد که ميخواهيد رونوشت برداري نماييد از : "
+msgid "Are you sure you want to copy?"
+msgstr " آيا مطمئن هستيد که ميخواهيد رونوشت برداري نماييد از؟  "
 
 #, c-format
-msgid "Are you sure you want to copy %d items:"
+msgid "Are you sure you want to copy %d items?"
 msgstr " فقره رونوشت برداري شود؟ %d آيا مطمئن هستيد که مي خواهيد از "
 
 #, c-format
@@ -3153,12 +3126,11 @@ msgstr ""
 " پيدا نشد \n"
 " لطفا مقايسه را تجديد نماييد "
 
-#, c-format
-msgid "Are you sure you want to move:"
-msgstr " آيا مطمئن هستيد که ميخواهيد اين را جابجا نماييد: "
+msgid "Are you sure you want to move?"
+msgstr " آيا مطمئن هستيد که ميخواهيد اين را جابجا نماييد؟"
 
 #, c-format
-msgid "Are you sure you want to move %d items:"
+msgid "Are you sure you want to move %d items?"
 msgstr " مورد جابجا شود؟ %d"
 
 #, c-format
@@ -3609,16 +3581,7 @@ msgid ""
 msgstr ""
 " پرونده هاي موقتي را نمي توان ايجاد نمود. تنظيمات مسير موقت بررسي گردد "
 
-#, c-format
-msgid ""
-"These files use different carriage return types.\n"
-"\n"
-"Do you want to treat all carriage return types as equivalent for this "
-"comparison?\n"
-"\n"
-"Note: If you always want to treat all carriage return types as equivalent, "
-"set the option 'Ignore carriage return differences..' in the Compare tab of "
-"the options dialog (available under Edit/Options)."
+msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences (Windows/Unix/Mac)' in the Compare tab of the options dialog (available under Edit/Options)."
 msgstr ""
 " اين پرونده ها از نوع متفاوتي از علامت بازگشت به سر سطر استفاده مي نمايند \n"
 "\n"
@@ -3706,31 +3669,26 @@ msgid "Replaced %1 string(s)."
 msgstr "  رشته {هاي} جايگزين شده : %1"
 
 #, c-format
-msgid "Cannot find string \"%s\""
+msgid "Cannot find string \"%s\"."
 msgstr " نمي توان رشته روبرو را پيدا کرد :  \"%s\""
 
-#, c-format
-msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
+msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key."
 msgstr ""
 
 #, c-format
 msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2"
 msgstr ""
 
-#, c-format
-msgid "The change of codepage has been merged"
+msgid "The change of codepage has been merged."
 msgstr ""
 
-#, c-format
-msgid "The changes of codepage are conflicting"
+msgid "The changes of codepage are conflicting."
 msgstr ""
 
-#, c-format
-msgid "The change of EOL has been merged"
+msgid "The change of EOL has been merged."
 msgstr ""
 
-#, c-format
-msgid "The changes of EOL are conflicting"
+msgid "The changes of EOL are conflicting."
 msgstr ""
 
 #, c-format
@@ -3780,8 +3738,7 @@ msgstr "نمي تواند در پرونده 1%  بنويسد "
 msgid "The specified output path is not an absolute path: %1"
 msgstr " مسير خروجي مشخص شده يک مسير مطلق نمي باشد : %1"
 
-#, c-format
-msgid "Specify an output file"
+msgid "Specify an output file."
 msgstr " يک پرونده خروجي را مشخص نماييد "
 
 #, c-format
@@ -3957,10 +3914,7 @@ msgstr ""
 msgid "\nAuto Merge (Ctrl+Alt+M)"
 msgstr ""
 
-#, c-format
-msgid ""
-"The adapted unpacker is applied to both files (one file only needs the "
-"extension)"
+msgid "The adapted unpacker is applied to both files (one file only needs the extension)."
 msgstr " بازکننده بسته تطبيق داده شده روي هر دو پرونده ها بکار بسته مي شود "
 
 #, c-format
@@ -3979,8 +3933,7 @@ msgstr " ساير افزايه ها "
 msgid "Private Build: %1"
 msgstr " ساخت شخصي : %1 "
 
-#, c-format
-msgid "Your software is up to date"
+msgid "Your software is up to date."
 msgstr ""
 
 #, c-format
@@ -4190,18 +4143,18 @@ msgid "Page:"
 msgstr ""
 
 #, c-format
-msgid "Pt:(%d,%d) RGBA:(%d,%d,%d,%d) "
+msgid "Pt: (%d, %d)  RGBA: (%d, %d, %d, %d)  "
 msgstr ""
 
 #, c-format
-msgid "Dist:%g "
+msgid "Dist: %g  "
 msgstr ""
 
 #, c-format
-msgid "Dist:%g,%g "
+msgid "Dist: %g, %g  "
 msgstr ""
 
 #, c-format
-msgid "Page:%d/%d Zoom:%d%% %dx%dpx %dbpp"
+msgid "Page: %d/%d  Zoom: %d%%  %dx%dpx  %dbpp"
 msgstr ""
 

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index 67bf85a..9c92a40 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -62,14 +62,14 @@ msgstr "Idź do..."
 msgid "Op&en"
 msgstr "Otwórz"
 
-msgid "with &Registered Application"
-msgstr "w zarejestrowanej aplikacji"
+msgid "With &Registered Application"
+msgstr "W zarejestrowanej aplikacji"
 
-msgid "with &External Editor\tCtrl+Alt+E"
-msgstr "w zewnętrznym edytorze\tCtrl+Alt+E"
+msgid "With &External Editor\tCtrl+Alt+E"
+msgstr "W zewnętrznym edytorze\tCtrl+Alt+E"
 
-msgid "&with..."
-msgstr "w..."
+msgid "&With..."
+msgstr "W..."
 
 msgid "S&hell Menu"
 msgstr "Menu powłoki"
@@ -760,8 +760,8 @@ msgstr "Otwórz lewą"
 msgid "with &External Editor"
 msgstr "w zewnętrznym edytorze"
 
-msgid "&Parent Folder"
-msgstr "Folder nadrzędny"
+msgid "Open &Parent Folder..."
+msgstr ""
 
 msgid "Open Midd&le"
 msgstr "Otwórz środkową"
@@ -981,8 +981,8 @@ msgstr "Ogólne"
 msgid "Automatically &scroll to first difference"
 msgstr "Przewiń automatycznie do pierwszej różnicy"
 
-msgid "Cl&ose windows with ESC:"
-msgstr "Zamknij okna klawiszem ESC:"
+msgid "Cl&ose windows with 'Esc':"
+msgstr "Zamknij okna klawiszem 'Esc':"
 
 msgid "&Automatically verify paths in Open-dialog"
 msgstr "Zweryfikuj automatycznie ścieżki w oknie otwierania plików"
@@ -1008,7 +1008,7 @@ msgstr "Otwórz okno dialogowe automatycznego uzupełniania:"
 msgid "Language:"
 msgstr "Język:"
 
-msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
 msgstr "WinMerge pozwala ukryć niektóre komunikaty. Naciśnij przycisk Resetuj, aby ponownie wyświetlać wszystkie komunikaty."
 
 msgid "Reset"
@@ -1242,8 +1242,8 @@ msgstr "Wybierz program rozpakowujący"
 msgid "File unpacker:"
 msgstr "Plik rozpakowujący:"
 
-msgid "Display all unpackers, don't check the extension"
-msgstr "Pokaż wszystkie programy rozpakowujące, nie sprawdzaj rozszerzenia"
+msgid "Display all unpackers, don't check the extension."
+msgstr "Pokaż wszystkie programy rozpakowujące, nie sprawdzaj rozszerzenia."
 
 msgid "Extensions list:"
 msgstr "Lista rozszerzeń:"
@@ -1432,11 +1432,11 @@ msgstr "Domyślna strona kodowa"
 msgid "Select the default codepage assumed when loading non-Unicode files:"
 msgstr "Wybierz domyślne kodowanie dla otwieranych plików nie będących plikami Unicode:"
 
-msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
-msgstr "Wykryj stronę kodową dla plików: .html, .rc, .xml \nwymagany restart sesji"
+msgid "Detect codepage info for these files: .html, .rc, .xml\nNeed to restart session."
+msgstr "Wykryj stronę kodową dla plików: .html, .rc, .xml \nwymagany restart sesji."
 
-msgid "Detect codepage for text files using mlang.dll\nneed to restart session"
-msgstr "Wykryj stronę kodową dla plików tekstowych wykorzystując mlang.dll\nwymagany restart sesji"
+msgid "Detect codepage for text files using mlang.dll\nNeed to restart session."
+msgstr "Wykryj stronę kodową dla plików tekstowych wykorzystując mlang.dll\nwymagany restart sesji."
 
 msgid "System codepage"
 msgstr "Strona kodowa systemu"
@@ -1684,7 +1684,7 @@ msgstr "Globalny folder dla kopii:"
 msgid "Backup filename:"
 msgstr "Nazwa pliku kopii:"
 
-msgid "&Append .bak -extension"
+msgid "&Append .bak extension"
 msgstr "Dodaj rozszerzenie .bak"
 
 msgid "A&ppend timestamp"
@@ -1702,6 +1702,9 @@ msgstr "Z lewej"
 msgid "To right"
 msgstr "Na prawą"
 
+msgid "Don't ask this &question again."
+msgstr "Nie pytaj ponownie."
+
 msgid "Yes"
 msgstr "Tak"
 
@@ -1839,11 +1842,11 @@ msgstr "\nOtwórz (Ctrl+O)"
 msgid "\nSave (Ctrl+S)"
 msgstr "\nZapisz (Ctrl+S)"
 
-msgid "Unknown error attempting to open project file"
-msgstr "Nieznany błąd podczas próby otwarcia projektu"
+msgid "Unknown error attempting to open project file."
+msgstr "Nieznany błąd podczas próby otwarcia projektu."
 
-msgid "Unknown error attempting to save project file"
-msgstr "Nieznany błąd podczas próby zapisu projektu"
+msgid "Unknown error attempting to save project file."
+msgstr "Nieznany błąd podczas próby zapisu projektu."
 
 msgid "Project file successfully loaded."
 msgstr "Projekt został pomyślnie wczytany."
@@ -1905,10 +1908,7 @@ msgstr "Pomiń wszystko"
 msgid "Don't display this &message again."
 msgstr "Nie wyświetlaj ponownie tego komunikatu."
 
-msgid "Don't ask this &question again."
-msgstr "Nie pytaj ponownie."
-
-msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
 msgstr "Aby ponownie wyświetlić ten komunikat, naciśnij przycisk Resetuj na stronie Ogólne w oknie dialogowym Opcje."
 
 msgid "Color Schemes"
@@ -2034,8 +2034,8 @@ msgstr "Plik filtra już istnieje. Czy nadpisać istniejący plik?"
 msgid "Regular expression"
 msgstr "Wyrażenia regularne"
 
-msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
-msgstr "Filtry zostały zaktualizowane. Czy chcesz odświeżyć wszystkie okna porównania folderów?\n\nJeżeli nie chcesz odświeżać okien porównań teraz, wybierz Nie i odśwież okna później."
+msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select 'No' and refresh compares later."
+msgstr "Filtry zostały zaktualizowane. Czy chcesz odświeżyć wszystkie okna porównania folderów?\n\nJeżeli nie chcesz odświeżać okien porównań teraz, wybierz 'Nie' i odśwież okna później."
 
 msgid "Folder Comparison Results"
 msgstr "Wyniki porównania folderów"
@@ -2096,8 +2096,8 @@ msgstr "Element %1 z %2"
 msgid "Items: %1"
 msgstr "Elementy: %1"
 
-msgid "Select two existing folders or files to compare"
-msgstr "Wybierz dwa istniejące foldery lub pliki do porównania"
+msgid "Select two existing folders or files to compare."
+msgstr "Wybierz dwa istniejące foldery lub pliki do porównania."
 
 msgid "Folder Selection"
 msgstr "Wybierz folder"
@@ -2132,7 +2132,7 @@ msgstr "Środkowa (druga) i prawa (trzecia) ścieżka jest nieprawidłowa!"
 msgid "All paths are invalid!"
 msgstr "Wszystkie ścieżki są nieprawidłowe!"
 
-msgid "Only enabled for File comparisons"
+msgid "Only enabled for file comparisons"
 msgstr "Aktywne tylko dla Porównanie plików"
 
 msgid "Cannot compare file and folder!"
@@ -2168,7 +2168,7 @@ msgid "Save changes to %1?"
 msgstr "Zapisać zmiany w %1?"
 
 #, c-format
-msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
+msgid "%1 is marked read-only. Would you like to override the read-only file? (No to save as new filename.)"
 msgstr "%1 został oznaczony jako tylko do odczytu. Czy chcesz nadpisać istniejący plik?"
 
 msgid "Error backing up file"
@@ -2179,7 +2179,7 @@ msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
 msgstr "Nie można wykonać kopii zapasowej oryginalnego pliku:\n%1\n\nKontynuować mimo wszystko?"
 
 #, c-format
-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)?"
+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 "Zapis pliku nieudany.\n%1\n%2\nCzy chcesz:\n\t- użyć innej nazwy pliku (naciśnij OK)\n\t- przerwać bieżącą operację (naciśnij Anuluj)?"
 
 #, c-format
@@ -2313,23 +2313,23 @@ msgstr "(%1 z %2 objętych plików)"
 msgid "Are you sure you want to delete\n\n%1 ?"
 msgstr "Czy na pewno chcesz usunąć\n\n%1 ?"
 
-msgid "Are you sure you want to copy:"
-msgstr "Czy na pewno chcesz skopiować:"
+msgid "Are you sure you want to copy?"
+msgstr "Czy na pewno chcesz skopiować?"
 
 #, c-format
-msgid "Are you sure you want to copy %d items:"
-msgstr "Czy na pewno chcesz skopiować %d elementów:"
+msgid "Are you sure you want to copy %d items?"
+msgstr "Czy na pewno chcesz skopiować %d elementów?"
 
 #, c-format
 msgid "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare."
 msgstr "Operacja przerwana!\n\nZawartość folderu na dysku została zmieniona. Ścieżka\n%1\nnie została odnaleziona.\n\nProszę odświeżyć porównanie."
 
-msgid "Are you sure you want to move:"
-msgstr "Czy na pewno chcesz przenieść:"
+msgid "Are you sure you want to move?"
+msgstr "Czy na pewno chcesz przenieść?"
 
 #, c-format
-msgid "Are you sure you want to move %d items:"
-msgstr "Czy na pewno chcesz przenieść %d elementów:"
+msgid "Are you sure you want to move %d items?"
+msgstr "Czy na pewno chcesz przenieść %d elementów?"
 
 msgid "Confirm Move"
 msgstr "Potwierdzenie przenoszenia"
@@ -2672,8 +2672,8 @@ msgstr "Wystąpił błąd podczas porównywania plików."
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Nie można utworzyć plików tymczasowych. Sprawdź ustawienie ścieżki tymczasowej."
 
-msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)."
-msgstr "Te pliki używają różnych znaków końca linii.\n\nCzy chcesz traktować wszystkie typy znaków końca linii jako równoważne?\n\nUwaga: Jeśli różne znaki końca linii mają być zawsze traktowane jako równoważne, ustaw w opcjach 'Ignoruj znaki końca linii...' (opcja dostępna w menu Edycja/Opcje w zakładce Porównaj)."
+msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences (Windows/Unix/Mac)' in the Compare tab of the options dialog (available under Edit/Options)."
+msgstr "Te pliki używają różnych znaków końca linii.\n\nCzy chcesz traktować wszystkie typy znaków końca linii jako równoważne?\n\nUwaga: Jeśli różne znaki końca linii mają być zawsze traktowane jako równoważne, ustaw w opcjach 'Ignoruj znaki końca linii (Windows/Unix/Mac)' (opcja dostępna w menu Edycja/Opcje w zakładce Porównaj)."
 
 msgid "The selected folder is invalid."
 msgstr "Wybrany folder jest nieprawidłowy."
@@ -2724,26 +2724,26 @@ msgid "Replaced %1 string(s)."
 msgstr "Zastąpiono %1 sekwencję(i) znaków."
 
 #, c-format
-msgid "Cannot find string \"%s\""
-msgstr "Nie można znaleźć sekwencji znaków \"%s\""
+msgid "Cannot find string \"%s\"."
+msgstr "Nie można znaleźć sekwencji znaków \"%s\"."
 
-msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
+msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key."
 msgstr ""
 
 #, c-format
 msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2"
 msgstr "Liczba automatycznie scalonych zmian: %1\nLiczba nierozwiązanych konfliktów: %2"
 
-msgid "The change of codepage has been merged"
+msgid "The change of codepage has been merged."
 msgstr ""
 
-msgid "The changes of codepage are conflicting"
+msgid "The changes of codepage are conflicting."
 msgstr ""
 
-msgid "The change of EOL has been merged"
+msgid "The change of EOL has been merged."
 msgstr ""
 
-msgid "The changes of EOL are conflicting"
+msgid "The changes of EOL are conflicting."
 msgstr ""
 
 msgid "Location Pane"
@@ -2785,8 +2785,8 @@ msgstr "Nie można zapisać do pliku %1."
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Wybrana ścieżka docelowa nie jest absolutna: %1"
 
-msgid "Specify an output file"
-msgstr "Określ plik wyjściowy"
+msgid "Specify an output file."
+msgstr "Określ plik wyjściowy."
 
 msgid "Cannot create a patch file from binary files."
 msgstr "Nie można utworzyć łatki z plików binarnych."
@@ -2904,8 +2904,8 @@ msgstr "\nWszystko do lewej"
 msgid "\nAuto Merge (Ctrl+Alt+M)"
 msgstr "\nAutomatyczne scalanie (Ctrl+Alt+M)"
 
-msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
-msgstr "Program rozpakowujący zostanie uruchomiony dla obu plików (tylko jeden plik wymaga rozszerzenia)"
+msgid "The adapted unpacker is applied to both files (one file only needs the extension)."
+msgstr "Program rozpakowujący zostanie uruchomiony dla obu plików (tylko jeden plik wymaga rozszerzenia)."
 
 msgid "No prediffer (normal)"
 msgstr "Bez różnicowania wstępnego (normalne)"
@@ -2920,8 +2920,8 @@ msgstr "Inne wtyczki"
 msgid "Private Build: %1"
 msgstr "Kompilacja prywatna: %1"
 
-msgid "Your software is up to date"
-msgstr "Twoje oprogramowanie jest aktualne"
+msgid "Your software is up to date."
+msgstr "Twoje oprogramowanie jest aktualne."
 
 #, c-format
 msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?"
@@ -3109,18 +3109,18 @@ msgid "Page:"
 msgstr ""
 
 #, c-format
-msgid "Pt:(%d,%d) RGBA:(%d,%d,%d,%d) "
+msgid "Pt: (%d, %d)  RGBA: (%d, %d, %d, %d)  "
 msgstr ""
 
 #, c-format
-msgid "Dist:%g "
+msgid "Dist: %g  "
 msgstr ""
 
 #, c-format
-msgid "Dist:%g,%g "
+msgid "Dist: %g, %g  "
 msgstr ""
 
 #, c-format
-msgid "Page:%d/%d Zoom:%d%% %dx%dpx %dbpp"
+msgid "Page: %d/%d  Zoom: %d%%  %dx%dpx  %dbpp"
 msgstr ""
 

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index afa4012..2d8f1b2 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -65,14 +65,14 @@ msgstr "&Ir para..."
 msgid "Op&en"
 msgstr "&Abrir"
 
-msgid "with &Registered Application"
-msgstr "com a Aplicação &Registada"
+msgid "With &Registered Application"
+msgstr "Com a Aplicação &Registada"
 
-msgid "with &External Editor\tCtrl+Alt+E"
-msgstr "com editor externo\tCtrl+Alt+E"
+msgid "With &External Editor\tCtrl+Alt+E"
+msgstr "Com editor externo\tCtrl+Alt+E"
 
-msgid "&with..."
-msgstr "com..."
+msgid "&With..."
+msgstr "Com..."
 
 msgid "S&hell Menu"
 msgstr "Menu da S&hell"
@@ -763,8 +763,8 @@ msgstr "Abrir Esquerda"
 msgid "with &External Editor"
 msgstr "com Editor &Externo"
 
-msgid "&Parent Folder"
-msgstr "Pasta parental"
+msgid "Open &Parent Folder..."
+msgstr ""
 
 msgid "Open Midd&le"
 msgstr "Abrir Meio"
@@ -984,8 +984,8 @@ msgstr "Geral"
 msgid "Automatically &scroll to first difference"
 msgstr "Ir automaticamente para a primeira diferença"
 
-msgid "Cl&ose windows with ESC:"
-msgstr "Fechar janela com ESC:"
+msgid "Cl&ose windows with 'Esc':"
+msgstr "Fechar janela com 'Esc':"
 
 msgid "&Automatically verify paths in Open-dialog"
 msgstr "Verificar automaticamente localização na janela de abertura"
@@ -1013,9 +1013,7 @@ msgstr "Auto-completar Janela de Abertura:"
 msgid "Language:"
 msgstr "Idioma:"
 
-msgid ""
-"WinMerge allows hiding some common messageboxes. Press the Reset button to "
-"make all messageboxes visible again."
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
 msgstr ""
 "WinMerge permite ocultar mensagens predefinidas. Prima o botão Repor para "
 "visualizar novamente todas as mensagens."
@@ -1251,8 +1249,8 @@ msgstr "Selecionar Extrator"
 msgid "File unpacker:"
 msgstr "E&xtrator de Ficheiros:"
 
-msgid "Display all unpackers, don't check the extension"
-msgstr "Mostrar todos os extratores, não verificar extensões"
+msgid "Display all unpackers, don't check the extension."
+msgstr "Mostrar todos os extratores, não verificar extensões."
 
 msgid "Extensions list:"
 msgstr "Lista de extensões:"
@@ -1442,20 +1440,16 @@ msgstr ""
 "Selecionar a página de código predefinida quando carregar ficheiros non-"
 "Unicode:"
 
-msgid ""
-"Detect codepage info for these files: .html, .rc, .xml \n"
-"need to restart session"
+msgid "Detect codepage info for these files: .html, .rc, .xml\nNeed to restart session."
 msgstr ""
 "Detetar informação da página de código para estes ficheiros: .html, .rc, ."
-"xml \n"
-"necessário para reiniciar sessão"
+"xml\n"
+"necessário para reiniciar sessão."
 
-msgid ""
-"Detect codepage for text files using mlang.dll\n"
-"need to restart session"
+msgid "Detect codepage for text files using mlang.dll\nNeed to restart session."
 msgstr ""
 "Detetar página de código para ficheiros de texto que utilizam mlang.dll\n"
-"necessário para reiniciar sessão"
+"necessário para reiniciar sessão."
 
 msgid "System codepage"
 msgstr "Página de código do sistema"
@@ -1703,7 +1697,7 @@ msgstr "Cópia geral de pastas:"
 msgid "Backup filename:"
 msgstr "Nome da cópia do ficheiro:"
 
-msgid "&Append .bak -extension"
+msgid "&Append .bak extension"
 msgstr "&Anexar extenção .bak"
 
 msgid "A&ppend timestamp"
@@ -1721,6 +1715,9 @@ msgstr "Da esquerda"
 msgid "To right"
 msgstr "Para a direita"
 
+msgid "Don't ask this &question again."
+msgstr "Não voltar a perguntar."
+
 msgid "Yes"
 msgstr "Sim"
 
@@ -1876,11 +1873,11 @@ msgstr ""
 "\n"
 "Guardar (Ctrl+S)"
 
-msgid "Unknown error attempting to open project file"
-msgstr "Erro desconhecido ao abrir projeto"
+msgid "Unknown error attempting to open project file."
+msgstr "Erro desconhecido ao abrir projeto."
 
-msgid "Unknown error attempting to save project file"
-msgstr "Erro desconhecido ao guardar projeto"
+msgid "Unknown error attempting to save project file."
+msgstr "Erro desconhecido ao guardar projeto."
 
 msgid "Project file successfully loaded."
 msgstr "Projeto carregado com sucesso."
@@ -1990,12 +1987,7 @@ msgstr "Avançar todos"
 msgid "Don't display this &message again."
 msgstr "Não voltar a exibir esta mensagem."
 
-msgid "Don't ask this &question again."
-msgstr "Não voltar a perguntar."
-
-msgid ""
-"To make this messagebox visible again, press the Reset button on the General "
-"page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
 msgstr ""
 "Para tornar esta caixa de mensagem visível novamente, pressione o botão "
 "Redefinir na página Geral da caixa de diálogo Opções."
@@ -2172,16 +2164,12 @@ msgstr "O filtro de ficheiro já existe. Substítuir filtro existente?"
 msgid "Regular expression"
 msgstr "Expressão regular"
 
-msgid ""
-"Filters were updated. Do you want to refresh all open folder compares?\n"
-"\n"
-"If you do not want to refresh all compares now you can select No and refresh "
-"compares later."
+msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select 'No' and refresh compares later."
 msgstr ""
 "Os filtros foram atualizados. Deseja atualizar as comparações de todas as "
 "pastas abertas?\n"
 "\n"
-"Se não quiser atualizar todas as comparações agora, pode selecionar Não e "
+"Se não quiser atualizar todas as comparações agora, pode selecionar 'Não' e "
 "atualizar a comparação mais tarde."
 
 msgid "Folder Comparison Results"
@@ -2243,8 +2231,8 @@ msgstr "Item %1 de %2"
 msgid "Items: %1"
 msgstr "Item %1"
 
-msgid "Select two existing folders or files to compare"
-msgstr "Selecione duas pastas existentes ou ficheiros para comparar"
+msgid "Select two existing folders or files to compare."
+msgstr "Selecione duas pastas existentes ou ficheiros para comparar."
 
 msgid "Folder Selection"
 msgstr "Seleção de pasta"
@@ -2280,7 +2268,7 @@ msgstr "Pasta Meio (2º) e Direita (3º) não são válidas!"
 msgid "All paths are invalid!"
 msgstr "Todos as pastas de destino são inválidas!"
 
-msgid "Only enabled for File comparisons"
+msgid "Only enabled for file comparisons"
 msgstr "Apenas ativado para comparações de ficheiros"
 
 msgid "Cannot compare file and folder!"
@@ -2340,11 +2328,9 @@ msgid "Save changes to %1?"
 msgstr "Guardar alterações em %1?"
 
 #, c-format
-msgid ""
-"%1 is marked read-only. Would you like to override the read-only file ? (No "
-"to save as new filename.)"
+msgid "%1 is marked read-only. Would you like to override the read-only file? (No to save as new filename.)"
 msgstr ""
-"%1 é apenas de leitura. Deseja substituir o ficheiro apenas de leitura ? "
+"%1 é apenas de leitura. Deseja substituir o ficheiro apenas de leitura? "
 "(Não, para guardar com novo nome.)"
 
 msgid "Error backing up file"
@@ -2363,19 +2349,13 @@ 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- usar um nome diferente para o ficheiro (Prima OK)\n"
 "\t- abortar a acção atual (Prima Cancelar)?"
 
 #, c-format
@@ -2574,12 +2554,12 @@ msgstr ""
 "\n"
 "%1 ?"
 
-msgid "Are you sure you want to copy:"
-msgstr "Tem a certeza que deseja copiar:"
+msgid "Are you sure you want to copy?"
+msgstr "Tem a certeza que deseja copiar?"
 
 #, c-format
-msgid "Are you sure you want to copy %d items:"
-msgstr "Tem a certeza que deseja copiar %d itens:"
+msgid "Are you sure you want to copy %d items?"
+msgstr "Tem a certeza que deseja copiar %d itens?"
 
 #, c-format
 msgid ""
@@ -2598,12 +2578,12 @@ msgstr ""
 "não foi encontrado.\n"
 "\\Por favor atualize para comparar."
 
-msgid "Are you sure you want to move:"
-msgstr "Tem a certeza que deseja mover:"
+msgid "Are you sure you want to move?"
+msgstr "Tem a certeza que deseja mover?"
 
 #, c-format
-msgid "Are you sure you want to move %d items:"
-msgstr "Tem a certeza que deseja mover %d itens:"
+msgid "Are you sure you want to move %d items?"
+msgstr "Tem a certeza que deseja mover %d itens?"
 
 msgid "Confirm Move"
 msgstr "Confirmar"
@@ -2968,22 +2948,14 @@ msgstr ""
 "Não é possível criar ficheiros temporários. Verifique as suas definições de "
 "ficheiros temporários."
 
-msgid ""
-"These files use different carriage return types.\n"
-"\n"
-"Do you want to treat all carriage return types as equivalent for this "
-"comparison?\n"
-"\n"
-"Note: If you always want to treat all carriage return types as equivalent, "
-"set the option 'Ignore carriage return differences..' in the Compare tab of "
-"the options dialog (available under Edit/Options)."
+msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences (Windows/Unix/Mac)' in the Compare tab of the options dialog (available under Edit/Options)."
 msgstr ""
 "Estes ficheiros utilizam diferentes tipos de procedimento.\n"
 "\n"
 "Deseja tratar todos os tipos de procedimentos por igual para comparação?\n"
 "\n"
 "Nota: Se deseja tratar todos os tipos de procedimentos por igual, defina a "
-"opção 'Ignorar diferentes tipos de procedimentos..' no separador de "
+"opção 'Ignorar diferentes tipos de ficheiros (Windows/Unix/Mac)' no separador de "
 "comparação no diálogo opções (disponível em Editar/Definições)."
 
 msgid "The selected folder is invalid."
@@ -3056,15 +3028,13 @@ msgid "Replaced %1 string(s)."
 msgstr "Substituída(s) %1 string(s)."
 
 #, c-format
-msgid "Cannot find string \"%s\""
-msgstr "Não é possível localizar string \"%s\""
+msgid "Cannot find string \"%s\"."
+msgstr "Não é possível localizar string \"%s\"."
 
-msgid ""
-"You are now entering Merge Mode. If you want to turn off Merge Mode, press "
-"F9 key"
+msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key."
 msgstr ""
 "Está a entrar no Modo Combinado. Se pretende desligar o Modo Combinado, "
-"pressione a tecla F9"
+"pressione a tecla F9."
 
 #, c-format
 msgid ""
@@ -3074,17 +3044,17 @@ msgstr ""
 "Número de alterações combinadas automaticamente: %1\n"
 "Número de conflitos não resolvidos: %2"
 
-msgid "The change of codepage has been merged"
-msgstr "A alteração da página de código foi combinada"
+msgid "The change of codepage has been merged."
+msgstr "A alteração da página de código foi combinada."
 
-msgid "The changes of codepage are conflicting"
-msgstr "As alterações da página de código estão em conflito"
+msgid "The changes of codepage are conflicting."
+msgstr "As alterações da página de código estão em conflito."
 
-msgid "The change of EOL has been merged"
-msgstr "A alteração de EOL foi combinada"
+msgid "The change of EOL has been merged."
+msgstr "A alteração de EOL foi combinada."
 
-msgid "The changes of EOL are conflicting"
-msgstr "As alterações de EOL estão em conflito"
+msgid "The changes of EOL are conflicting."
+msgstr "As alterações de EOL estão em conflito."
 
 msgid "Location Pane"
 msgstr "Janela de Localização"
@@ -3125,8 +3095,8 @@ msgstr "Não é possível gravar para o ficheiro %1."
 msgid "The specified output path is not an absolute path: %1"
 msgstr "A localização de destino não é uma localização absoluta: %1"
 
-msgid "Specify an output file"
-msgstr "Especifique o ficheiro de destino"
+msgid "Specify an output file."
+msgstr "Especifique o ficheiro de destino."
 
 msgid "Cannot create a patch file from binary files."
 msgstr "Não é possível criar um ficheiro patch a partir de ficheiros binários."
@@ -3334,12 +3304,10 @@ msgstr ""
 "\n"
 "Combinar automaticamente (Ctrl+Alt+M)"
 
-msgid ""
-"The adapted unpacker is applied to both files (one file only needs the "
-"extension)"
+msgid "The adapted unpacker is applied to both files (one file only needs the extension)."
 msgstr ""
 "O extrator adoptado aplica-se em ambos os ficheiros (apenas um ficheiro "
-"necessita de extensão)"
+"necessita de extensão)."
 
 msgid "No prediffer (normal)"
 msgstr "Não pré-diferenciar (normal)"
@@ -3354,8 +3322,8 @@ msgstr "Outros plugins"
 msgid "Private Build: %1"
 msgstr "Compilação Privada: %1"
 
-msgid "Your software is up to date"
-msgstr "O WinMerge está atualizado com a última versão"
+msgid "Your software is up to date."
+msgstr "O WinMerge está atualizado com a última versão."
 
 #, c-format
 msgid ""
@@ -3553,18 +3521,18 @@ msgid "Page:"
 msgstr "Página:"
 
 #, c-format
-msgid "Pt:(%d,%d) RGBA:(%d,%d,%d,%d) "
-msgstr "Pt:(%d,%d) RGBA:(%d,%d,%d,%d) "
+msgid "Pt: (%d, %d)  RGBA: (%d, %d, %d, %d)  "
+msgstr "Pt: (%d, %d)  RGBA: (%d, %d, %d, %d)  "
 
 #, c-format
-msgid "Dist:%g "
-msgstr "Dist:%g "
+msgid "Dist: %g  "
+msgstr "Dist: %g  "
 
 #, c-format
-msgid "Dist:%g,%g "
-msgstr "Dist:%g,%g "
+msgid "Dist: %g, %g  "
+msgstr "Dist: %g, %g  "
 
 #, c-format
-msgid "Page:%d/%d Zoom:%d%% %dx%dpx %dbpp"
-msgstr "Página:%d/%d Zoom:%d%% %dx%dpx %dbpp"
+msgid "Page: %d/%d  Zoom: %d%%  %dx%dpx  %dbpp"
+msgstr "Página: %d/%d  Zoom: %d%%  %dx%dpx  %dbpp"