Update translations

diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index 2c140bb..adfe1b1 100644 (file)
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -73,16 +73,13 @@ msgstr "යන්න"
 msgid "Op&en"
 msgstr "විවෘත කිරීම"
 
-#, c-format
-msgid "with &Registered Application"
+msgid "With &Registered Application"
 msgstr "ලියපදිංචි කළ නි‍යෑලුම සමග"
 
-#, c-format
-msgid "with &External Editor\tCtrl+Alt+E"
+msgid "With &External Editor\tCtrl+Alt+E"
 msgstr ""
 
-#, c-format
-msgid "&with..."
+msgid "&With..."
 msgstr "&සමග"
 
 msgid "S&hell Menu"
@@ -971,8 +968,7 @@ msgstr "වම් පස විවෘත කරන්න"
 msgid "with &External Editor"
 msgstr "බාහිර සම්බන්ධකය සමග"
 
-#, c-format
-msgid "&Parent Folder"
+msgid "Open &Parent Folder..."
 msgstr ""
 
 #, c-format
@@ -1254,9 +1250,8 @@ msgstr "සාමාන්‍ය "
 msgid "Automatically &scroll to first difference"
 msgstr "ස්වයංක්‍රීයව පළමුවන වෙනස්කම සඳහා අනුචලනය"
 
-#, c-format
-msgid "Cl&ose windows with ESC:"
-msgstr "කවුළු වැසීම ESC:"
+msgid "Cl&ose windows with 'Esc':"
+msgstr "කවුළු වැසීම 'Esc':"
 
 #, c-format
 msgid "&Automatically verify paths in Open-dialog"
@@ -1290,9 +1285,8 @@ msgstr "O&pen-dialog Auto-Completion:"
 msgid "Language:"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
-msgstr "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 ""
 
 #, c-format
 msgid "Reset"
@@ -1595,9 +1589,8 @@ msgstr "Select Unpacker"
 msgid "File unpacker:"
 msgstr "File unpacker:"
 
-#, fuzzy, c-format
-msgid "Display all unpackers, don't check the extension"
-msgstr "Display all unpackers, don't check the extension"
+msgid "Display all unpackers, don't check the extension."
+msgstr ""
 
 #, fuzzy, c-format
 msgid "Extensions list:"
@@ -1843,14 +1836,10 @@ msgstr "Default Codepage"
 msgid "Select the default codepage assumed when loading non-Unicode files:"
 msgstr "Select the default codepage assumed when loading non-Unicode files:"
 
-#, c-format
-msgid ""
-"Detect codepage info for these files: .html, .rc, .xml \n"
-"need to restart session"
-msgstr "මෙම ගොනු සඳහා ගුප්ත සංඥා  විස්තර  අණාවරනය කරන්න: .html, .rc, .xml \n"
+msgid "Detect codepage info for these files: .html, .rc, .xml\nNeed to restart session."
+msgstr "මෙම ගොනු සඳහා ගුප්ත සංඥා  විස්තර  අණාවරනය කරන්න: .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
@@ -2172,8 +2161,7 @@ msgstr "ලෝක ව්‍යාප්ත රක්ෂිත පත්‍රි
 msgid "Backup filename:"
 msgstr "රක්ෂිත ලිපි ගොනුවේ නම"
 
-#, c-format
-msgid "&Append .bak -extension"
+msgid "&Append .bak extension"
 msgstr ".bak එකතු කරන ලද්ද එකතු කිරීම"
 
 #, fuzzy, c-format
@@ -2197,6 +2185,10 @@ msgid "To right"
 msgstr "දකුණ දෙසට"
 
 #, c-format
+msgid "Don't ask this &question again."
+msgstr "මෙම ප්‍රශ්නය නැවත නොඅසන්න."
+
+#, c-format
 msgid "Yes"
 msgstr "ඔව්"
 
@@ -2365,12 +2357,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
@@ -2482,12 +2472,7 @@ msgstr "සමස්ථයම නොසලකා හරින්න"
 msgid "Don't display this &message again."
 msgstr "මෙම පණිවිඩය නැවත දර්ශනය නොකරන්න."
 
-#, c-format
-msgid "Don't ask this &question again."
-msgstr "මෙම ප්‍රශ්නය නැවත නොඅසන්න."
-
-#, 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"
@@ -2684,15 +2669,8 @@ msgstr "පෙරහන් ලිපිගොනුව දැනටමත් ප
 msgid "Regular expression"
 msgstr "විදිමත් පෙනීම"
 
-#, fuzzy, 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 ""
-"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."
 
 #, c-format
 msgid "Folder Comparison Results"
@@ -2763,8 +2741,7 @@ msgstr "අයිතමය %1 ගෙන් %2"
 msgid "Items: %1"
 msgstr "අයිතම : %1"
 
-#, c-format
-msgid "Select two existing folders or files to compare"
+msgid "Select two existing folders or files to compare."
 msgstr "සංසන්දනය කිරීම සඳහා පවතින ෆෝල්ඩර හෝ ලිපිගොනු දෙකක් තෝරන්න !"
 
 #, c-format
@@ -2811,8 +2788,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
@@ -2864,9 +2840,9 @@ msgstr "මෙසේ සුරකින්න"
 msgid "Save changes to %1?"
 msgstr "වෙනස් කිරීම් සුරකින්න %1 ?"
 
-#, fuzzy, c-format
-msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
-msgstr "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
+#, c-format
+msgid "%1 is marked read-only. Would you like to override the read-only file? (No to save as new filename.)"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "Error backing up file"
@@ -2885,13 +2861,13 @@ 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"
 "%2\n"
 "ඔබට අවශ්‍ය:\n"
-"\t- වෙනස් නමක් ගොනුවට භාවිතා කිරීමට(Press Ok)\n"
+"\t- වෙනස් නමක් ගොනුවට භාවිතා කිරීමට(Press OK)\n"
 "\t- දැන් ක්‍රියත්මක වන ක්‍රියාව නැවත් වීමට?  (Press Cancel)?"
 
 #, c-format
@@ -3094,13 +3070,12 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#, c-format
-msgid "Are you sure you want to copy:"
-msgstr "Are you sure you want to copy:"
+msgid "Are you sure you want to copy?"
+msgstr ""
 
 #, c-format
-msgid "Are you sure you want to copy %d items:"
-msgstr "Are you sure you want to copy %d items:"
+msgid "Are you sure you want to copy %d items?"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -3120,13 +3095,12 @@ msgstr ""
 "\n"
 "Please refresh the compare."
 
-#, c-format
-msgid "Are you sure you want to move:"
-msgstr "Are you sure you want to move:"
+msgid "Are you sure you want to move?"
+msgstr ""
 
 #, c-format
-msgid "Are you sure you want to move %d items:"
-msgstr "Are you sure you want to move %d items:"
+msgid "Are you sure you want to move %d items?"
+msgstr ""
 
 #, c-format
 msgid "Confirm Move"
@@ -3566,19 +3540,8 @@ msgstr "An error occurred while comparing the files."
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Temporary files could not be created. Check your temporary path settings."
 
-#, 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 ""
-"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)."
 
 #, c-format
 msgid "The selected folder is invalid."
@@ -3654,31 +3617,26 @@ msgid "Replaced %1 string(s)."
 msgstr "Replaced %1 string(s)."
 
 #, c-format
-msgid "Cannot find string \"%s\""
-msgstr "Cannot find string \"%s\""
+msgid "Cannot find string \"%s\"."
+msgstr ""
 
-#, 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
@@ -3727,9 +3685,8 @@ msgstr "Could not write to file %1."
 msgid "The specified output path is not an absolute path: %1"
 msgstr "The specified output path is not an absolute path: %1"
 
-#, c-format
-msgid "Specify an output file"
-msgstr "Specify an output file"
+msgid "Specify an output file."
+msgstr ""
 
 #, c-format
 msgid "Cannot create a patch file from binary files."
@@ -3903,9 +3860,8 @@ 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)"
-msgstr "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
 msgid "No prediffer (normal)"
@@ -3923,8 +3879,7 @@ msgstr "Other plugins"
 msgid "Private Build: %1"
 msgstr "Private Build: %1"
 
-#, c-format
-msgid "Your software is up to date"
+msgid "Your software is up to date."
 msgstr ""
 
 #, c-format
@@ -4134,18 +4089,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/Slovak.po b/Translations/WinMerge/Slovak.po
index 5e3d915..dc81c2e 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -76,16 +76,13 @@ msgstr "&Prejsť na..."
 msgid "Op&en"
 msgstr "&Otvoriť"
 
-#, c-format
-msgid "with &Registered Application"
-msgstr "&registrovanou aplikáciou"
+msgid "With &Registered Application"
+msgstr "&Registrovanou aplikáciou"
 
-#, c-format
-msgid "with &External Editor\tCtrl+Alt+E"
+msgid "With &External Editor\tCtrl+Alt+E"
 msgstr ""
 
-#, c-format
-msgid "&with..."
+msgid "&With..."
 msgstr "Čí&m..."
 
 msgid "S&hell Menu"
@@ -974,8 +971,7 @@ msgstr "&Otvoriť ľavý"
 msgid "with &External Editor"
 msgstr "&externým editorom"
 
-#, c-format
-msgid "&Parent Folder"
+msgid "Open &Parent Folder..."
 msgstr ""
 
 #, c-format
@@ -1257,9 +1253,8 @@ msgstr "Hlavné nastavenia"
 msgid "Automatically &scroll to first difference"
 msgstr "Automatický &skok na prvý rozdiel"
 
-#, c-format
-msgid "Cl&ose windows with ESC:"
-msgstr "Zat&várať okná klávesom ESC:"
+msgid "Cl&ose windows with 'Esc':"
+msgstr "Zat&várať okná klávesom 'Esc':"
 
 #, c-format
 msgid "&Automatically verify paths in Open-dialog"
@@ -1293,8 +1288,7 @@ msgstr "A&utomatické dopĺňanie v dialógu Otvoriť:"
 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 "WinMerge umožňuje zamedziť zobrazovaniu bežných správ. Stlačením tlačidla Reset sa znova správy zobrazia."
 
 #, c-format
@@ -1598,9 +1592,8 @@ msgstr "Vyber rozbaľovací program"
 msgid "File unpacker:"
 msgstr "Rozbaľovací program:"
 
-#, c-format
-msgid "Display all unpackers, don't check the extension"
-msgstr "Zobraziť všetky rozbaľovacie programy, nekontrolovať príponu"
+msgid "Display all unpackers, don't check the extension."
+msgstr "Zobraziť všetky rozbaľovacie programy, nekontrolovať príponu."
 
 #, c-format
 msgid "Extensions list:"
@@ -1846,16 +1839,12 @@ msgstr "Predvolená kódová stránka"
 msgid "Select the default codepage assumed when loading non-Unicode files:"
 msgstr "Zvoľte predvolenú kódovú stránku, ktorá sa použije pri načítaní ne-Unicode súborov:"
 
-#, 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 ""
-"Detekovať kódovú stránku týchto súborov: .html, .rc, .xml \n"
-"vyžaduje reštart relácie"
+"Detekovať kódovú stránku týchto súborov: .html, .rc, .xml\n"
+"vyžaduje reštart relácie."
 
-#, 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
@@ -2177,8 +2166,7 @@ msgstr "&Globálny adresár pre zálohy:"
 msgid "Backup filename:"
 msgstr "Názov záložného súboru:"
 
-#, c-format
-msgid "&Append .bak -extension"
+msgid "&Append .bak extension"
 msgstr "&Pridať rozšírenie .bak"
 
 #, c-format
@@ -2202,6 +2190,10 @@ msgid "To right"
 msgstr "Doprava"
 
 #, c-format
+msgid "Don't ask this &question again."
+msgstr "Už sa túto otázku nepýtať."
+
+#, c-format
 msgid "Yes"
 msgstr "Áno"
 
@@ -2370,13 +2362,11 @@ msgstr ""
 msgid "\nSave (Ctrl+S)"
 msgstr ""
 
-#, c-format
-msgid "Unknown error attempting to open project file"
-msgstr "Neznáma chyba pri pokuse otvoriť súbor projektu"
+msgid "Unknown error attempting to open project file."
+msgstr "Neznáma chyba pri pokuse otvoriť súbor projektu."
 
-#, c-format
-msgid "Unknown error attempting to save project file"
-msgstr "Neznáma chyba pri pokuse uložiť súbor projektu"
+msgid "Unknown error attempting to save project file."
+msgstr "Neznáma chyba pri pokuse uložiť súbor projektu."
 
 #, c-format
 msgid "Project file successfully loaded."
@@ -2487,12 +2477,7 @@ msgstr "Preskočiť vš&etky"
 msgid "Don't display this &message again."
 msgstr "Už túto správu nezobrazovať."
 
-#, c-format
-msgid "Don't ask this &question again."
-msgstr "Už sa túto otázku nepýtať."
-
-#, 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"
@@ -2689,15 +2674,11 @@ msgstr "Filter už existuje. Prepísať existujúci filter?"
 msgid "Regular expression"
 msgstr "Regulárny výraz"
 
-#, 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 ""
 "Filtre boli aktualizované. Chcete obnoviť všetky otvorené porovnania priečinkov?\n"
 "\n"
-"Ak nechcete obnoviť všetky porovnania priečinkov, môžete vybrať Nie a obnoviť porovnania neskôr."
+"Ak nechcete obnoviť všetky porovnania priečinkov, môžete vybrať 'Nie' a obnoviť porovnania neskôr."
 
 #, c-format
 msgid "Folder Comparison Results"
@@ -2768,9 +2749,8 @@ msgstr "Položka %1 of %2"
 msgid "Items: %1"
 msgstr "Položky: %1"
 
-#, c-format
-msgid "Select two existing folders or files to compare"
-msgstr "Vyberte 2 existujúce súbory alebo adresáre na porovnanie"
+msgid "Select two existing folders or files to compare."
+msgstr "Vyberte 2 existujúce súbory alebo adresáre na porovnanie."
 
 #, c-format
 msgid "Folder Selection"
@@ -2816,8 +2796,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
@@ -2870,7 +2849,7 @@ msgid "Save changes to %1?"
 msgstr "Uložiť zmeny do %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 je označený len na čítanie. Chcete aj tak prepísať súbor len na čítanie? (Stlačte Nie ak ho chcete zapísať po novým názvom.)"
 
 #, c-format
@@ -2890,13 +2869,13 @@ msgstr ""
 "Pokračovať napriek tomu?"
 
 #, 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 ""
 "Nepodarilo sa uložiť súbor.\n"
 "%1\n"
 "%2\n"
 "Želáte si:\n"
-"\t- použiť iný názov súbory (Stlačte Ok)\n"
+"\t- použiť iný názov súbory (Stlačte OK)\n"
 "\t- zrušiť prebiehajúcu operáciu (Stlačte Zrušiť)?"
 
 #, c-format
@@ -3099,13 +3078,12 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#, c-format
-msgid "Are you sure you want to copy:"
-msgstr "Naozaj chcete skopírovať:"
+msgid "Are you sure you want to copy?"
+msgstr "Naozaj chcete skopírovať?"
 
 #, c-format
-msgid "Are you sure you want to copy %d items:"
-msgstr "Naozaj chcete skopírovať %d položiek:"
+msgid "Are you sure you want to copy %d items?"
+msgstr "Naozaj chcete skopírovať %d položiek?"
 
 #, c-format
 msgid ""
@@ -3125,13 +3103,12 @@ msgstr ""
 "\n"
 "Prosím, obnovte porovnanie."
 
-#, c-format
-msgid "Are you sure you want to move:"
-msgstr "Ste si istý, že chcete presunúť:"
+msgid "Are you sure you want to move?"
+msgstr "Ste si istý, že chcete presunúť?"
 
 #, c-format
-msgid "Are you sure you want to move %d items:"
-msgstr "Ste si istý, že chcete presunúť %d položiek:"
+msgid "Are you sure you want to move %d items?"
+msgstr "Ste si istý, že chcete presunúť %d položiek?"
 
 #, c-format
 msgid "Confirm Move"
@@ -3571,19 +3548,13 @@ msgstr "Počas porovnávania sa vyskytla chyba."
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Dočasné súobry nebolo možné vytvoriť. Skontrolujte nastavenie odkladacieho adresára."
 
-#, 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 ""
 "Tieto súbory používajú rozličné zakončenia riadkov.\n"
 "\n"
 "Chcete, aby som považoval všetky zakončenia riadkov za ekvivalentné počas tohoto porovnávania?\n"
 "\n"
-"Pozn.: Ak chcete, aby som vždy považoval všetky zakončenia riadkov za ekvivalentné, nastavte voľbu 'Ignorovať rozdiely zakončenia riadkov..' v záložke Porovnávanie dialógu Nastavenia (nájdete v Úpravy/Nastavenia)."
+"Pozn.: Ak chcete, aby som vždy považoval všetky zakončenia riadkov za ekvivalentné, nastavte voľbu 'Ignorovať rozdiely v zakončení riadkov (Windows/Unix/Mac)' v záložke Porovnávanie dialógu Nastavenia (nájdete v Úpravy/Nastavenia)."
 
 #, c-format
 msgid "The selected folder is invalid."
@@ -3659,31 +3630,26 @@ msgid "Replaced %1 string(s)."
 msgstr "Nahradených %1 reťazcov."
 
 #, c-format
-msgid "Cannot find string \"%s\""
-msgstr "Nemožno nájsť reťazec „%s“"
+msgid "Cannot find string \"%s\"."
+msgstr "Nemožno nájsť reťazec „%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
@@ -3732,9 +3698,8 @@ msgstr "Nedalo sa zapisovať do súboru %1."
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Uvedená výstupná cesta nie je absolútna cesta: %1"
 
-#, c-format
-msgid "Specify an output file"
-msgstr "uveďte výstupný súbor"
+msgid "Specify an output file."
+msgstr "uveďte výstupný súbor."
 
 #, c-format
 msgid "Cannot create a patch file from binary files."
@@ -3905,9 +3870,8 @@ 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)"
-msgstr "Rozbaľovací program sa použije na oba súbory (pri jednom súbore stačí prípona)"
+msgid "The adapted unpacker is applied to both files (one file only needs the extension)."
+msgstr "Rozbaľovací program sa použije na oba súbory (pri jednom súbore stačí prípona)."
 
 #, c-format
 msgid "No prediffer (normal)"
@@ -3925,8 +3889,7 @@ msgstr "Iné zásuvné moduly"
 msgid "Private Build: %1"
 msgstr "Súkromné zostavenie: %1"
 
-#, c-format
-msgid "Your software is up to date"
+msgid "Your software is up to date."
 msgstr ""
 
 #, c-format
@@ -4136,18 +4099,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/Slovenian.po b/Translations/WinMerge/Slovenian.po
index a7bc5da..64c31f7 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -77,17 +77,14 @@ msgstr "Pojdi &na..."
 msgid "Op&en"
 msgstr "&Odpri"
 
-#, c-format
-msgid "with &Registered Application"
-msgstr "z re&gistrirano aplikacijo"
+msgid "With &Registered Application"
+msgstr "Z re&gistrirano aplikacijo"
 
-#, c-format
-msgid "with &External Editor\tCtrl+Alt+E"
-msgstr "z zu&nanjim urejevalnikom\tCtrl+Alt+E"
+msgid "With &External Editor\tCtrl+Alt+E"
+msgstr "Z zu&nanjim urejevalnikom\tCtrl+Alt+E"
 
-#, c-format
-msgid "&with..."
-msgstr "&z..."
+msgid "&With..."
+msgstr "&Z..."
 
 msgid "S&hell Menu"
 msgstr "Meni &lupine"
@@ -975,9 +972,8 @@ msgstr "&Odpri levo"
 msgid "with &External Editor"
 msgstr "z &zunanjim urejevalnikom"
 
-#, c-format
-msgid "&Parent Folder"
-msgstr "Nad&rejena mapa"
+msgid "Open &Parent Folder..."
+msgstr ""
 
 #, c-format
 msgid "Open Midd&le"
@@ -1258,9 +1254,8 @@ msgstr "Splošno"
 msgid "Automatically &scroll to first difference"
 msgstr "Samodejno &pojdi na prvo razliko"
 
-#, c-format
-msgid "Cl&ose windows with ESC:"
-msgstr "Zapri okna s tipko &ESC:"
+msgid "Cl&ose windows with 'Esc':"
+msgstr "Zapri okna s tipko '&Esc':"
 
 #, c-format
 msgid "&Automatically verify paths in Open-dialog"
@@ -1294,8 +1289,7 @@ msgstr "Odpri pogovorno okno &Samodejno dokončanje:"
 msgid "Language:"
 msgstr "Jezik:"
 
-#, 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 ""
 "WinMerge omogoča skrivanje nekaterih skupnih sporočilnih oken.\n"
 "Pritisnite 'Ponastavi', da bodo postala vsa sporočilna okna spet vidna."
@@ -1600,9 +1594,8 @@ msgstr "Izberite razpakovalca"
 msgid "File unpacker:"
 msgstr "Razpakovalec datoteke:"
 
-#, c-format
-msgid "Display all unpackers, don't check the extension"
-msgstr "Prikaži vse razpakovalce, ne glede na končnico"
+msgid "Display all unpackers, don't check the extension."
+msgstr "Prikaži vse razpakovalce, ne glede na končnico."
 
 #, c-format
 msgid "Extensions list:"
@@ -1846,18 +1839,12 @@ msgstr "Privzeta kodna stran"
 msgid "Select the default codepage assumed when loading non-Unicode files:"
 msgstr "Izberite privzeto dodeljeno kodno stran pri nalaganju ne-Unicode datotek:"
 
-#, 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 ""
-"Zaznaj kodno stran v teh datotekah: .html, .rc, .xml \n"
+"Zaznaj kodno stran v teh datotekah: .html, .rc, .xml\n"
 "(potreben je ponovni zagon seje)"
 
-#, c-format
-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 ""
 "Zaznavanje kodne strani besedilnih datotek z uporabo mlang.dll\n"
 "zahteva ponovni zagon seje)"
@@ -2180,8 +2167,7 @@ msgstr "&Globalni mapi varnostnih kopij:"
 msgid "Backup filename:"
 msgstr "Ime datoteke varnostne kopije:"
 
-#, c-format
-msgid "&Append .bak -extension"
+msgid "&Append .bak extension"
 msgstr "&Dodaj končnico '.bak'"
 
 #, c-format
@@ -2205,6 +2191,10 @@ msgid "To right"
 msgstr "Na desno"
 
 #, c-format
+msgid "Don't ask this &question again."
+msgstr "Tega ne &sprašuj več."
+
+#, c-format
 msgid "Yes"
 msgstr "Da"
 
@@ -2389,12 +2379,11 @@ msgstr ""
 "\n"
 "Shrani (Ctrl+S)"
 
-msgid "Unknown error attempting to open project file"
-msgstr "Neznana napaka pri poskusu odpiranja datoteke projekta"
+msgid "Unknown error attempting to open project file."
+msgstr "Neznana napaka pri poskusu odpiranja datoteke projekta."
 
-#, c-format
-msgid "Unknown error attempting to save project file"
-msgstr "Neznana napaka pri poskusu shranjevanja projektne datoteke"
+msgid "Unknown error attempting to save project file."
+msgstr "Neznana napaka pri poskusu shranjevanja projektne datoteke."
 
 #, c-format
 msgid "Project file successfully loaded."
@@ -2515,12 +2504,7 @@ msgstr "Preskoči &vse"
 msgid "Don't display this &message again."
 msgstr "Tega sporočila ne kaži več."
 
-#, c-format
-msgid "Don't ask this &question again."
-msgstr "Tega ne &sprašuj več."
-
-#, 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 "Za ponovni prikaz tega sporočila, pritisnite 'Ponastavi' na strani 'Splošno' pogovornega okna 'Možnosti'."
 
 msgid "Color Schemes"
@@ -2717,15 +2701,11 @@ msgstr "Filter datoteka že obstaja. Prepišem obstoječi filter?"
 msgid "Regular expression"
 msgstr "Regularni izraz"
 
-#, 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 ""
 "Filtri so bili posodobljeni. Ali želite osvežiti vse odprte mape za primerjavo?\n"
 "\n"
-"Če jih ne želite osvežiti sedaj, lahko izberete Ne in osvežite primerjave kasneje."
+"Če jih ne želite osvežiti sedaj, lahko izberete 'Ne' in osvežite primerjave kasneje."
 
 #, c-format
 msgid "Folder Comparison Results"
@@ -2796,9 +2776,8 @@ msgstr "Vnos %1 od %2"
 msgid "Items: %1"
 msgstr "Vnosov: %1"
 
-#, c-format
-msgid "Select two existing folders or files to compare"
-msgstr "Za primerjavo izberite dve obstoječi mapi ali datoteki"
+msgid "Select two existing folders or files to compare."
+msgstr "Za primerjavo izberite dve obstoječi mapi ali datoteki."
 
 #, c-format
 msgid "Folder Selection"
@@ -2844,8 +2823,7 @@ msgstr "Srednja (druga) in desna (tretja) pot sta neveljavni!"
 msgid "All paths are invalid!"
 msgstr "Vse poti so neveljavne!"
 
-#, c-format
-msgid "Only enabled for File comparisons"
+msgid "Only enabled for file comparisons"
 msgstr "Omogočeno je le za primerjave datotek"
 
 #, c-format
@@ -2906,7 +2884,7 @@ msgid "Save changes to %1?"
 msgstr "Shrani spremembe v %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 je označena Samo-za- branje. Ali želite preglasiti datoteko Samo-za- branje? ('Ne', za shranjevanje pod novim imenom)"
 
 #, c-format
@@ -2926,13 +2904,7 @@ msgstr ""
 "Vseeno nadaljujem?"
 
 #, 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 ""
 "Ni uspelo shranjevanje.\n"
 "%1\n"
@@ -3141,13 +3113,12 @@ msgstr ""
 "\n"
 "%1 ?"
 
-#, c-format
-msgid "Are you sure you want to copy:"
-msgstr "Ali ste prepričani, da želite kopirati:"
+msgid "Are you sure you want to copy?"
+msgstr "Ali ste prepričani, da želite kopirati?"
 
 #, c-format
-msgid "Are you sure you want to copy %d items:"
-msgstr "Ali ste prepričani, da želite kopirati %d vnosov:"
+msgid "Are you sure you want to copy %d items?"
+msgstr "Ali ste prepričani, da želite kopirati %d vnosov?"
 
 #, c-format
 msgid ""
@@ -3167,13 +3138,12 @@ msgstr ""
 "\n"
 "Osvežite primerjavo."
 
-#, c-format
-msgid "Are you sure you want to move:"
-msgstr "Ali ste prepričani, da želite premakniti:"
+msgid "Are you sure you want to move?"
+msgstr "Ali ste prepričani, da želite premakniti?"
 
 #, c-format
-msgid "Are you sure you want to move %d items:"
-msgstr "Ali ste prepričani, da želite premakniti: %d vnosov:"
+msgid "Are you sure you want to move %d items?"
+msgstr "Ali ste prepričani, da želite premakniti: %d vnosov?"
 
 #, c-format
 msgid "Confirm Move"
@@ -3613,19 +3583,13 @@ msgstr "Prišlo je do napake med primerjanjem datotek."
 msgid "Temporary files could not be created. Check your temporary path settings."
 msgstr "Začasnih datotek ni bilo mogoče ustvariti. Preverite nastavitve začasne poti (PATH)."
 
-#, 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 ""
 "Ti datoteki imata različno vrsto znakov za konec vrstic (EOL).\n"
 "\n"
 "Ali želite obe vrsti obravnavati kot enaki, za trenutno primerjavo?\n"
 "\n"
-"Opomba: Če jih želite vedno obravnavati kot enaki, nastavite možnost 'Prezri različnost vrste znakov za koncev vrstic' na zavihku 'Primerjava' pogovornega okna 'Nastavitve' (dostopen pod Urejanje/Možnosti)."
+"Opomba: Če jih želite vedno obravnavati kot enaki, nastavite možnost 'Prezri različnost vrste znakov za konec vrstice (EOL)' na zavihku 'Primerjava' pogovornega okna 'Nastavitve' (dostopen pod Urejanje/Možnosti)."
 
 #, c-format
 msgid "The selected folder is invalid."
@@ -3705,12 +3669,11 @@ msgid "Replaced %1 string(s)."
 msgstr "Zamenjano %1 nizov."
 
 #, c-format
-msgid "Cannot find string \"%s\""
-msgstr "Ni mogoče najti niza \"%s\""
+msgid "Cannot find string \"%s\"."
+msgstr "Ni mogoče najti niza \"%s\"."
 
-#, c-format
-msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
-msgstr "Zdaj vstopate v Združevalni način. Če želite izklopiti Združevalni način, pritisnite tipko F9"
+msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key."
+msgstr "Zdaj vstopate v Združevalni način. Če želite izklopiti Združevalni način, pritisnite tipko F9."
 
 #, c-format
 msgid ""
@@ -3720,21 +3683,17 @@ msgstr ""
 "Število samodejno združenih sprememb: %1\n"
 "Število nerešenih konfliktov: %2"
 
-#, c-format
-msgid "The change of codepage has been merged"
-msgstr "Sprememba kodne strani je bila združena"
+msgid "The change of codepage has been merged."
+msgstr "Sprememba kodne strani je bila združena."
 
-#, c-format
-msgid "The changes of codepage are conflicting"
-msgstr "Spremembe kodne strani so v sporu"
+msgid "The changes of codepage are conflicting."
+msgstr "Spremembe kodne strani so v sporu."
 
-#, c-format
-msgid "The change of EOL has been merged"
-msgstr "Sprememba konca vrstice (EOL) je bila združena"
+msgid "The change of EOL has been merged."
+msgstr "Sprememba konca vrstice (EOL) je bila združena."
 
-#, c-format
-msgid "The changes of EOL are conflicting"
-msgstr "Spremembe koncev vrstic (EOL) so v sporu"
+msgid "The changes of EOL are conflicting."
+msgstr "Spremembe koncev vrstic (EOL) so v sporu."
 
 #, c-format
 msgid "Location Pane"
@@ -3782,9 +3741,8 @@ msgstr "Ni mogoče pisati v datoteko %1."
 msgid "The specified output path is not an absolute path: %1"
 msgstr "Navedena izhodna pot ni absolutna pot: %1"
 
-#, c-format
-msgid "Specify an output file"
-msgstr "Določite izhodno datoteko"
+msgid "Specify an output file."
+msgstr "Določite izhodno datoteko."
 
 #, c-format
 msgid "Cannot create a patch file from binary files."
@@ -4023,9 +3981,8 @@ msgstr ""
 "\n"
 "Samodejno združi (Ctrl+Alt+M)"
 
-#, c-format
-msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
-msgstr "Prilagojen razpakovalec se uporablja za obe datoteki (samo ena datoteka potrebuje končnico)"
+msgid "The adapted unpacker is applied to both files (one file only needs the extension)."
+msgstr "Prilagojen razpakovalec se uporablja za obe datoteki (samo ena datoteka potrebuje končnico)."
 
 #, c-format
 msgid "No prediffer (normal)"
@@ -4043,9 +4000,8 @@ msgstr "Drugi vtičniki"
 msgid "Private Build: %1"
 msgstr "Zasebna gradnja:%1"
 
-#, c-format
-msgid "Your software is up to date"
-msgstr "Vaša program je posodobljen"
+msgid "Your software is up to date."
+msgstr "Vaša program je posodobljen."
 
 #, c-format
 msgid ""
@@ -4263,18 +4219,18 @@ msgid "Page:"
 msgstr "Stran:"
 
 #, c-format
-msgid "Pt:(%d,%d) RGBA:(%d,%d,%d,%d) "
-msgstr "Tč:(%d,%d) RGBA:(%d,%d,%d,%d) "
+msgid "Pt: (%d, %d)  RGBA: (%d, %d, %d, %d)  "
+msgstr "Tč: (%d, %d)  RGBA: (%d, %d, %d, %d)  "
 
 #, c-format
-msgid "Dist:%g "
-msgstr "Razdalja:%g "
+msgid "Dist: %g  "
+msgstr "Razdalja: %g  "
 
 #, c-format
-msgid "Dist:%g,%g "
-msgstr "Razdalja:%g,%g "
+msgid "Dist: %g, %g  "
+msgstr "Razdalja: %g, %g  "
 
 #, c-format
-msgid "Page:%d/%d Zoom:%d%% %dx%dpx %dbpp"
-msgstr "Stran:%d/%d Povečava:%d%% %dx%dpx %dbpp"
+msgid "Page: %d/%d  Zoom: %d%%  %dx%dpx  %dbpp"
+msgstr "Stran: %d/%d  Povečava: %d%%  %dx%dpx  %dbpp"