From 7d3ea131395612ab2584ad56df638ad78b555140 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sat, 23 Nov 2019 06:45:16 +0900 Subject: [PATCH] Update English.pot #216 Update English.pot & UpdatePoFilesFromPotFile.vbs #221 --- Translations/WinMerge/Slovak.po | 70 +++++++++++++--------------------- Translations/WinMerge/Slovenian.po | 68 ++++++++++++--------------------- Translations/WinMerge/Spanish.po | 66 ++++++++++++-------------------- Translations/WinMerge/Swedish.po | 77 ++++++++++++++------------------------ Translations/WinMerge/Turkish.po | 76 ++++++++++++++----------------------- Translations/WinMerge/Ukrainian.po | 68 ++++++++++++--------------------- 6 files changed, 153 insertions(+), 272 deletions(-) diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po index 1dc91f9fc..f80f8b28d 100644 --- a/Translations/WinMerge/Slovak.po +++ b/Translations/WinMerge/Slovak.po @@ -557,12 +557,11 @@ msgstr "" msgid "&Print..." msgstr "&Tlačiť..." -msgid "Page Set&up" -msgstr "Nastavenie s&tránky" +msgid "Page Set&up..." +msgstr "Nastavenie s&tránky..." -#, c-format -msgid "Print Previe&w" -msgstr "Náhľad p&red tlačou" +msgid "Print Previe&w..." +msgstr "Náhľad p&red tlačou..." #, 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 "Kopírovať vpravo a ísť ďalej\tAlt+Ctrl+Right" +msgid "C&opy to Right and Advance\tCtrl+Alt+Right" +msgstr "Kopírovať vpravo a ísť ďalej\tCtrl+Alt+Right" -#, c-format -msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" -msgstr "Kopírovať vľavo a ísť ďalej\tAlt+Ctrl+Left" +msgid "Copy &to Left and Advance\tCtrl+Alt+Left" +msgstr "Kopírovať vľavo a ísť ďalej\tCtrl+Alt+Left" #, c-format msgid "Copy &All to Right" @@ -828,8 +825,7 @@ msgstr "Kopírovať všetko vpravo" msgid "Cop&y All to Left" msgstr "Kopírovať všetko vľavo" -#, c-format -msgid "A&uto Merge\tAlt+Ctrl+M" +msgid "A&uto Merge\tCtrl+Alt+M" msgstr "" #, c-format @@ -1750,9 +1746,8 @@ msgstr "Zalam&ovať slová:" msgid "Filefilters" msgstr "Filtre súborov" -#, c-format -msgid "Test" -msgstr "Testovať" +msgid "Test..." +msgstr "Testovať..." #, c-format msgid "Install..." @@ -2070,9 +2065,8 @@ msgstr "&Zrušiť" msgid "Test Filter" msgstr "Test filtra" -#, c-format -msgid "Testing filter ..." -msgstr "Testujem filter ..." +msgid "Testing filter..." +msgstr "Testujem filter..." #, c-format msgid "&Enter text to test:" @@ -2254,8 +2248,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" @@ -2837,20 +2830,14 @@ msgstr "" "Pokračovať napriek tomu?" #, 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 "" "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-zrušiť prebiehajúcu operáciu (Stlačte Zrušiť)?" +"\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 msgid "" @@ -3222,8 +3209,7 @@ msgstr "Kódovanie vpravo" msgid "Middle Encoding" msgstr "" -#, c-format -msgid "Ignored Diff." +msgid "Ignored Diff" msgstr "Ignorovaný rozdiel" msgctxt "DirView|ColumnHeader" @@ -3434,16 +3420,13 @@ msgstr "Atribúty na pravej strane." msgid "Middle side attributes." msgstr "" -#, c-format -msgid "Left side file EOL type" -msgstr "Typ zakončenia riadka súboru na ľavej strane" +msgid "Left side file EOL type." +msgstr "Typ zakončenia riadka súboru na ľavej strane." -#, c-format -msgid "Right side file EOL type" -msgstr "Typ zakončenia riadka súboru na pravej strane" +msgid "Right side file EOL type." +msgstr "Typ zakončenia riadka súboru na pravej strane." -#, c-format -msgid "Middle side file EOL type" +msgid "Middle side file EOL type." msgstr "" #, c-format @@ -3575,12 +3558,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 "" -"Rozličné kódové stránky v ľavol (cp%d) a pravom (cp%d) súbore. \n" +"Rozličné kódové stránky v ľavol (cp%d) a pravom (cp%d) súbore.\n" "Zobrazenie každého súboru v jeho kódovej stránke lepšie zobrazuje, ale zlučovanie/kopírovanie bude nebezpečné.\n" "Chcete precovať s oboma stránkami akoby boli v predvolenej kódovej stránke Windows (odporúča sa)?" diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po index 2f51a55ed..48b314f33 100644 --- a/Translations/WinMerge/Slovenian.po +++ b/Translations/WinMerge/Slovenian.po @@ -558,12 +558,11 @@ msgstr "" msgid "&Print..." msgstr "&Natisni ..." -msgid "Page Set&up" -msgstr "Nastavitev &strani" +msgid "Page Set&up..." +msgstr "Nastavitev &strani..." -#, c-format -msgid "Print Previe&w" -msgstr "&Predogled tiskanja" +msgid "Print Previe&w..." +msgstr "&Predogled tiskanja..." #, 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 "Kopiraj de&sno in nadaljuj\tAlt+Ctrl+desno" +msgid "C&opy to Right and Advance\tCtrl+Alt+Right" +msgstr "Kopiraj de&sno in nadaljuj\tCtrlAlt++desno" -#, c-format -msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" -msgstr "Kopiraj le&vo in nadaljuj\tAlt+Ctrl+levo" +msgid "Copy &to Left and Advance\tCtrl+Alt+Left" +msgstr "Kopiraj le&vo in nadaljuj\tCtrl+Alt+levo" #, c-format msgid "Copy &All to Right" @@ -829,8 +826,7 @@ msgstr "Kopiraj vse v des&no" msgid "Cop&y All to Left" msgstr "Kopiraj vse v &lev&o" -#, c-format -msgid "A&uto Merge\tAlt+Ctrl+M" +msgid "A&uto Merge\tCtrl+Alt+M" msgstr "" #, c-format @@ -1753,9 +1749,8 @@ msgstr "&Znak za konec besede" msgid "Filefilters" msgstr "Datotečni filtri" -#, c-format -msgid "Test" -msgstr "Test" +msgid "Test..." +msgstr "Test..." #, c-format msgid "Install..." @@ -2073,9 +2068,8 @@ msgstr "&Prekliči" msgid "Test Filter" msgstr "Testni filter" -#, c-format -msgid "Testing filter ..." -msgstr "Testiranje filtra ..." +msgid "Testing filter..." +msgstr "Testiranje filtra..." #, c-format msgid "&Enter text to test:" @@ -2257,8 +2251,7 @@ msgstr "Omejitev za &hitro primerjavo (MB):" msgid "&Binary compare limit (MB):" msgstr "" -#, c-format -msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):" +msgid "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):" msgstr "" msgctxt "Options dialog|Categories" @@ -2841,13 +2834,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 "" "Shranjevanje datoteke ni uspelo.\n" "%1\n" @@ -3226,9 +3213,8 @@ msgstr "Kodiranje desno" msgid "Middle Encoding" msgstr "" -#, c-format -msgid "Ignored Diff." -msgstr "Zanemarjene razlike." +msgid "Ignored Diff" +msgstr "Zanemarjene razlike" msgctxt "DirView|ColumnHeader" msgid "Binary" @@ -3438,16 +3424,13 @@ msgstr "Atributi desne strani." msgid "Middle side attributes." msgstr "" -#, c-format -msgid "Left side file EOL type" -msgstr "Tip znakov za konec vrstice (EOL) na levi datoteki" +msgid "Left side file EOL type." +msgstr "Tip znakov za konec vrstice (EOL) na levi datoteki." -#, c-format -msgid "Right side file EOL type" -msgstr "Tip znakov za konec vrstice (EOL) na desni datoteki" +msgid "Right side file EOL type." +msgstr "Tip znakov za konec vrstice (EOL) na desni datoteki." -#, c-format -msgid "Middle side file EOL type" +msgid "Middle side file EOL type." msgstr "" #, c-format @@ -3579,12 +3562,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 "" -"Leva (cp%d) in desna (cp%d) datoteka sta v različnih kodnih tabelah. \n" +"Leva (cp%d) in desna (cp%d) datoteka sta v različnih kodnih tabelah.\n" "Prikaz posamezne datoteke v svoji kodni tabeli bo omogočilo boljši prikaz, a združevanje/kopiranje bo nevarno.\n" "Ali želite obravnavati obe datoteki kot da sta v isti privzeti windows kodni tabeli (priporočljivo)?" diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po index da9924b9b..34c660775 100644 --- a/Translations/WinMerge/Spanish.po +++ b/Translations/WinMerge/Spanish.po @@ -559,12 +559,11 @@ msgstr "" msgid "&Print..." msgstr "&Imprimir..." -msgid "Page Set&up" -msgstr "Configurar &página" +msgid "Page Set&up..." +msgstr "Configurar &página..." -#, c-format -msgid "Print Previe&w" -msgstr "&Vista preliminar" +msgid "Print Previe&w..." +msgstr "&Vista preliminar..." #, c-format msgid "&Convert Line Endings to" @@ -814,13 +813,11 @@ msgstr "" msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#, c-format -msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" -msgstr "Copiar al lado D&erecho y avanzar\tAlt+Ctrl+Right" +msgid "C&opy to Right and Advance\tCtrl+Alt+Right" +msgstr "Copiar al lado D&erecho y avanzar\tCtrl+Alt+Right" -#, c-format -msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" -msgstr "Copiar al lado I&zquierdo y avanzar\tAlt+Ctrl+Left" +msgid "Copy &to Left and Advance\tCtrl+Alt+Left" +msgstr "Copiar al lado I&zquierdo y avanzar\tCtrl+Alt+Left" #, c-format msgid "Copy &All to Right" @@ -830,8 +827,7 @@ msgstr "Copiar todas al lado De&recho" msgid "Cop&y All to Left" msgstr "Copiar todas al lado Iz&quierdo" -#, c-format -msgid "A&uto Merge\tAlt+Ctrl+M" +msgid "A&uto Merge\tCtrl+Alt+M" msgstr "" #, c-format @@ -1752,9 +1748,8 @@ msgstr "" msgid "Filefilters" msgstr "Filtros de archivo" -#, c-format -msgid "Test" -msgstr "Probar" +msgid "Test..." +msgstr "Probar..." #, c-format msgid "Install..." @@ -2072,9 +2067,8 @@ msgstr "&Cancelar" msgid "Test Filter" msgstr "Prueba de filtro" -#, c-format -msgid "Testing filter ..." -msgstr "Probando filtro ..." +msgid "Testing filter..." +msgstr "Probando filtro..." #, c-format msgid "&Enter text to test:" @@ -2256,8 +2250,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" @@ -2839,20 +2832,14 @@ msgstr "" "¿Continuar de todas formas?" #, 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 "" "Error al guardar archivo.\n" "%1\n" "%2\n" "Desea:\n" -"\t-usar un nombre diferente (Aceptar)\n" -"\t-cancelar la operación (Cancelar)" +"\t- usar un nombre diferente (Aceptar)\n" +"\t- cancelar la operación (Cancelar)" #, c-format msgid "" @@ -3224,8 +3211,7 @@ msgstr "Codificación dcha." msgid "Middle Encoding" msgstr "" -#, c-format -msgid "Ignored Diff." +msgid "Ignored Diff" msgstr "Difs. ignoradas" msgctxt "DirView|ColumnHeader" @@ -3436,16 +3422,13 @@ msgstr "Attributos del archivo del lado derecho." msgid "Middle side attributes." msgstr "" -#, c-format -msgid "Left side file EOL type" +msgid "Left side file EOL type." msgstr "Tipo de EOL del archivo del lado izquierdo." -#, c-format -msgid "Right side file EOL type" +msgid "Right side file EOL type." msgstr "Tipo de EOL del archivo del lado derecho." -#, c-format -msgid "Middle side file EOL type" +msgid "Middle side file EOL type." msgstr "" #, c-format @@ -3577,12 +3560,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 "" -"Las páginas de códigos son diferentes en el archivo de la izquierda (cp%d) y el de la derecha (cp%d). \n" +"Las páginas de códigos son diferentes en el archivo de la izquierda (cp%d) y el de la derecha (cp%d).\n" "Mostrar cada archivo en su página de códigos dará una mejor visualización, pero combinar/copiar sería peligroso.\n" "¿Le gustaría tratar ambos archivos con la página de códigos predeterminada de windows (recomendado)?" diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po index c68ad7b3f..fedea7a31 100644 --- a/Translations/WinMerge/Swedish.po +++ b/Translations/WinMerge/Swedish.po @@ -558,12 +558,11 @@ msgstr "Spara Höger som ..." msgid "&Print..." msgstr "Skriv ut ..." -msgid "Page Set&up" -msgstr "UtskriftsFormat" +msgid "Page Set&up..." +msgstr "UtskriftsFormat..." -#, c-format -msgid "Print Previe&w" -msgstr "Förhandsgranska Utskrift" +msgid "Print Previe&w..." +msgstr "Förhandsgranska Utskrift..." #, c-format msgid "&Convert Line Endings to" @@ -813,13 +812,11 @@ msgstr "Kopiera från Vänster\tAlt+Shift+Right" msgid "Copy from Right\tAlt+Shift+Left" msgstr "Kopiera från Höger\tAlt+Shift+Left" -#, c-format -msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" -msgstr "Kopiera till Höger och Fortskrid\tAlt+Ctrl+Höger" +msgid "C&opy to Right and Advance\tCtrl+Alt+Right" +msgstr "Kopiera till Höger och Fortskrid\tCtrl+Alt+Höger" -#, c-format -msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" -msgstr "Kopiera till Vänster och Fortskrid\tAlt+Ctrl+Vänster" +msgid "Copy &to Left and Advance\tCtrl+Alt+Left" +msgstr "Kopiera till Vänster och Fortskrid\tCtrl+Alt+Vänster" #, c-format msgid "Copy &All to Right" @@ -829,9 +826,8 @@ msgstr "Kopiera Allt till Höger" msgid "Cop&y All to Left" msgstr "Kopiera Allt till Vänster" -#, c-format -msgid "A&uto Merge\tAlt+Ctrl+M" -msgstr "Auto SammanFog\tAlt+Ctrl+M" +msgid "A&uto Merge\tCtrl+Alt+M" +msgstr "" #, c-format msgid "Add &Synchronization Point\tAlt+S" @@ -1750,9 +1746,8 @@ msgstr "Ordbrytningstecken:" msgid "Filefilters" msgstr "Filfilter" -#, c-format -msgid "Test" -msgstr "Testa" +msgid "Test..." +msgstr "Testa..." #, c-format msgid "Install..." @@ -2073,9 +2068,8 @@ msgstr "Avbryt" msgid "Test Filter" msgstr "Testa Filter" -#, c-format -msgid "Testing filter ..." -msgstr "Testar filter ..." +msgid "Testing filter..." +msgstr "Testar filter..." #, c-format msgid "&Enter text to test:" @@ -2257,8 +2251,8 @@ msgstr "Högsta SnabbJämförelseStorlek (MB):" msgid "&Binary compare limit (MB):" msgstr "Högsta Binär JämförelseStorlek (MB):" -msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):" -msgstr "Antal JämförelseTrådar (ett negativt värde antyder tillägg av antal tillgängliga CPU-kärnor):" +msgid "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):" +msgstr "\nAntal JämförelseTrådar (ett negativt värde antyder tillägg av antal tillgängliga CPU-kärnor):" msgctxt "Options dialog|Categories" msgid "Binary" @@ -2857,20 +2851,14 @@ msgstr "" "Vill Ni fortsätta i alla fall?" #, 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 "" "Det gick inte att spara filen.\n" "%1\n" "%2\n" "Vill Ni:\n" -"\t-använda ett annat filnamn (Tryck OK)\n" -"\t-avbryta sparande av fil (Tryck Avbryt)?" +"\t- använda ett annat filnamn (Tryck OK)\n" +"\t- avbryta sparande av fil (Tryck Avbryt)?" #, c-format msgid "" @@ -3241,9 +3229,8 @@ msgstr "Höger Kodning" msgid "Middle Encoding" msgstr "Mitter Kodning" -#, c-format -msgid "Ignored Diff." -msgstr "Åsidosatta Skillnader." +msgid "Ignored Diff" +msgstr "Åsidosatta Skillnader" msgctxt "DirView|ColumnHeader" msgid "Binary" @@ -3453,17 +3440,14 @@ msgstr "Höger sidas egenskaper." msgid "Middle side attributes." msgstr "Mitters egenskaper." -#, c-format -msgid "Left side file EOL type" -msgstr "Vänster sidas Filradslutstyp" +msgid "Left side file EOL type." +msgstr "Vänster sidas Filradslutstyp." -#, c-format -msgid "Right side file EOL type" -msgstr "Höger sidas Filradslutstyp" +msgid "Right side file EOL type." +msgstr "Höger sidas Filradslutstyp." -#, c-format -msgid "Middle side file EOL type" -msgstr "Mitters Filradslutstyp" +msgid "Middle side file EOL type." +msgstr "Mitters Filradslutstyp." #, c-format msgid "Left side encoding." @@ -3593,12 +3577,9 @@ msgid "Do you want to move to the previous page?" msgstr "Vill Ni växla till föregående sida?" #, c-format -msgid "" -"Different codepages found in left (cp%d) and right (cp%d) files. \n" -"Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" -"Would you like to treat both files as being in the default Windows codepage (recommended)?" +msgid "Different codepages found in left (cp%d) and right (cp%d) files.\nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default Windows codepage (recommended)?" msgstr "" -"Vänster (cp%d) och Höger (cp%d) fil har olika TextKodning. \n" +"Vänster (cp%d) och Höger (cp%d) fil har olika TextKodning.\n" "Att visa filerna i deras egna Kodning ger en bättre visning men sammanfogning/kopiering blir farligt.\n" "Vill Ni att båda filer betraktas som att de är i Windows förvalda Kodning (anrådes)?" diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po index 141f86713..f464b63e3 100644 --- a/Translations/WinMerge/Turkish.po +++ b/Translations/WinMerge/Turkish.po @@ -558,12 +558,11 @@ msgstr "Sağı Fa&rklı Kaydet..." msgid "&Print..." msgstr "&Yazdır..." -msgid "Page Set&up" -msgstr "&Sayfa Ayarları" +msgid "Page Set&up..." +msgstr "&Sayfa Ayarları..." -#, c-format -msgid "Print Previe&w" -msgstr "&Baskı Önizleme" +msgid "Print Previe&w..." +msgstr "&Baskı Önizleme..." #, c-format msgid "&Convert Line Endings to" @@ -813,13 +812,11 @@ msgstr "Sol&dan Kopyala\tAlt+Shift+Sağ" msgid "Copy from Right\tAlt+Shift+Left" msgstr "Sağdan &Kopyala\tAlt+Shift+Sol" -#, c-format -msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" -msgstr "Sağa Kopyala &ve İlerle\tAlt+Ctrl+Sağ" +msgid "C&opy to Right and Advance\tCtrl+Alt+Right" +msgstr "Sağa Kopyala &ve İlerle\tCtrl+Alt+Sağ" -#, c-format -msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" -msgstr "Sola Kopyala ve İle&rle\tAlt+Ctrl+Sol" +msgid "Copy &to Left and Advance\tCtrl+Alt+Left" +msgstr "Sola Kopyala ve İle&rle\tCtrl+Alt+Sol" #, c-format msgid "Copy &All to Right" @@ -829,9 +826,8 @@ msgstr "Tü&münü Sağa Kopyala" msgid "Cop&y All to Left" msgstr "&Tümünü Sola Kopyala" -#, c-format -msgid "A&uto Merge\tAlt+Ctrl+M" -msgstr "Otomatik &Birleştir\tAlt+Ctrl+M" +msgid "A&uto Merge\tCtrl+Alt+M" +msgstr "" #, c-format msgid "Add &Synchronization Point\tAlt+S" @@ -1753,9 +1749,8 @@ msgstr "&Sözcük Kesme Karakterleri:" msgid "Filefilters" msgstr "Dosya Süzgeçleri" -#, c-format -msgid "Test" -msgstr "Sına" +msgid "Test..." +msgstr "Sına..." #, c-format msgid "Install..." @@ -2073,8 +2068,7 @@ msgstr "İ&ptal" msgid "Test Filter" msgstr "Süzgeci Sına" -#, c-format -msgid "Testing filter ..." +msgid "Testing filter..." msgstr "Süzgeç sınanıyor..." #, c-format @@ -2257,9 +2251,8 @@ msgstr "&Hızlı Karşılaştırma Sınırı (MB):" msgid "&Binary compare limit (MB):" msgstr "" -#, c-format -msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):" -msgstr "Karşılaştırma İşlemlerinin Sayısı (eksi değerler kullanılabilecek başka işlemci çekirdeklerine eklenir):" +msgid "\n&Number of compare threads (a negative value implies addition of the number of available CPU cores):" +msgstr "\nKarşılaştırma İşlemlerinin Sayısı (eksi değerler kullanılabilecek başka işlemci çekirdeklerine eklenir):" msgctxt "Options dialog|Categories" msgid "Binary" @@ -2827,18 +2820,13 @@ msgstr "Özgün dosya yedeklenemedi:\n" "Gene de devam edilsin mi?" #, 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 "Dosya kaydedilemedi.\n" "%1\n" "%2\n" "Ne yapmak istersiniz:\n" -"\t-Farklı bir ad kullanılsın (Tamam Üzerine Tıklayın)\n" -"\t-Bu işlem iptal edilsin (İptal Üzerine Tıklayın)" +"\t- Farklı bir ad kullanılsın (Tamam Üzerine Tıklayın)\n" +"\t- Bu işlem iptal edilsin (İptal Üzerine Tıklayın)" #, c-format msgid "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3192,9 +3180,8 @@ msgstr "Sağ Dosya Kodlaması" msgid "Middle Encoding" msgstr "Orta Dosya Kodlaması" -#, c-format -msgid "Ignored Diff." -msgstr "Yok Sayılan Farklılıklar." +msgid "Ignored Diff" +msgstr "" msgctxt "DirView|ColumnHeader" msgid "Binary" @@ -3404,17 +3391,14 @@ msgstr "Sağdaki dosyanın öznitelikleri." msgid "Middle side attributes." msgstr "Ortadaki dosyanın öznitelikleri." -#, c-format -msgid "Left side file EOL type" -msgstr "Soldaki dosyanın satır sonu türü" +msgid "Left side file EOL type." +msgstr "" -#, c-format -msgid "Right side file EOL type" -msgstr "Sağdaki dosyanın satır sonu türü" +msgid "Right side file EOL type." +msgstr "" -#, c-format -msgid "Middle side file EOL type" -msgstr "Ortadaki dosyanın satır sonu türü" +msgid "Middle side file EOL type." +msgstr "" #, c-format msgid "Left side encoding." @@ -3539,12 +3523,8 @@ msgid "Do you want to move to the previous page?" msgstr "Önceki sayfaya geçmek ister misiniz?" #, 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)?" -msgstr "Sol panodaki (cp%d) ve sağ panodaki (cp%d) dosyaların kod sayfaları farklı. \n" -"Dosyalar kendi kod sayfalarında daha iyi bir görüntülenir ancak birleştirme/kopyalama işlemleri tehlikeli olur.\n" -"Dosyaların varsayılan Windows kod sayfasını kullanıyormuş gibi işlenmesini ister misiniz (önerilir)?" +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 "" #, c-format msgid "Information lost due to encoding errors: both files" diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po index de01ebe61..bbd2126fd 100644 --- a/Translations/WinMerge/Ukrainian.po +++ b/Translations/WinMerge/Ukrainian.po @@ -558,12 +558,11 @@ msgstr "" msgid "&Print..." msgstr "&Друк..." -msgid "Page Set&up" +msgid "Page Set&up..." msgstr "Пара&метри сторінки..." -#, c-format -msgid "Print Previe&w" -msgstr "&Попередній перегляд" +msgid "Print Previe&w..." +msgstr "&Попередній перегляд..." #, 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 "Скопіювати на праву панель і перейти до наступної\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" @@ -829,8 +826,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 @@ -1751,9 +1747,8 @@ msgstr "Символи, якимми розбиваються слова" msgid "Filefilters" msgstr "Фільтри файлів" -#, c-format -msgid "Test" -msgstr "Випробувати" +msgid "Test..." +msgstr "Випробувати..." #, c-format msgid "Install..." @@ -2071,9 +2066,8 @@ msgstr "&Скасувати" msgid "Test Filter" msgstr "Випробування фільтра" -#, c-format -msgid "Testing filter ..." -msgstr "Випробувати фільтр ..." +msgid "Testing filter..." +msgstr "Випробувати фільтр..." #, c-format msgid "&Enter text to test:" @@ -2255,8 +2249,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" @@ -2838,20 +2831,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-використати інше ім'я файлу (Натисніть OК)\n" -"\t-скасувати поточну операцію (Натисніть Скасувати)?" +"\t- використати інше ім'я файлу (Натисніть OК)\n" +"\t- скасувати поточну операцію (Натисніть Скасувати)?" #, c-format msgid "" @@ -3221,8 +3208,7 @@ msgstr "Кодування файлу праворуч" msgid "Middle Encoding" msgstr "" -#, c-format -msgid "Ignored Diff." +msgid "Ignored Diff" msgstr "Знех. відмінності" msgctxt "DirView|ColumnHeader" @@ -3433,16 +3419,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 @@ -3574,12 +3557,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" "Показати обидва файли в системному кодуванні (рекомендується)?" -- 2.11.0