From e98834131ea835c6e9f0b22661f66c596783466b Mon Sep 17 00:00:00 2001 From: TDE Weblate Date: Mon, 14 Jan 2019 00:26:13 +0000 Subject: [PATCH] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: applications/kdiff3 Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/ --- po/ar.po | 67 ++----------------------- po/az.po | 72 +++----------------------- po/bg.po | 81 ++++++------------------------ po/br.po | 81 ++++++------------------------ po/ca.po | 64 +----------------------- po/cs.po | 81 ++++++------------------------ po/cy.po | 81 ++++++------------------------ po/da.po | 81 ++++++------------------------ po/de.po | 81 ++++++------------------------ po/el.po | 81 ++++++------------------------ po/en_GB.po | 81 ++++++------------------------ po/es.po | 81 ++++++------------------------ po/et.po | 81 ++++++------------------------ po/fr.po | 81 ++++++------------------------ po/ga.po | 81 ++++++------------------------ po/gl.po | 67 ++----------------------- po/hi.po | 81 ++++++------------------------ po/hu.po | 81 ++++++------------------------ po/is.po | 64 +----------------------- po/it.po | 81 ++++++------------------------ po/ja.po | 81 ++++++------------------------ po/ka.po | 81 ++++++------------------------ po/lt.po | 136 +++++++++++++++----------------------------------- po/nb.po | 81 ++++++------------------------ po/nl.po | 81 ++++++------------------------ po/pl.po | 81 ++++++------------------------ po/pt.po | 81 ++++++------------------------ po/pt_BR.po | 81 ++++++------------------------ po/ro.po | 64 +----------------------- po/ru.po | 81 ++++++------------------------ po/rw.po | 81 ++++++------------------------ po/sk.po | 64 +----------------------- po/sr.po | 81 ++++++------------------------ po/sr@Latn.po | 81 ++++++------------------------ po/sv.po | 81 ++++++------------------------ po/ta.po | 81 ++++++------------------------ po/tg.po | 72 +++----------------------- po/tr.po | 81 ++++++------------------------ po/uk.po | 81 ++++++------------------------ po/zh_CN.po | 81 ++++++------------------------ 40 files changed, 564 insertions(+), 2617 deletions(-) diff --git a/po/ar.po b/po/ar.po index 350491f..0f489d3 100644 --- a/po/ar.po +++ b/po/ar.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2006-12-03 19:06+0100\n" "Last-Translator: محمد سعد Mohamed SAAD \n" "Language-Team: Arabic \n" @@ -142,11 +142,6 @@ msgid "" "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "إعادة المسح" @@ -248,11 +243,6 @@ msgstr "" msgid "C&ontinue" msgstr "&تابع" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "جاري الإجراء " @@ -341,13 +331,6 @@ msgstr "خطأ في البرنامج" msgid "An error occurred while copying.\n" msgstr "حصل خطأ عند النسخ.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "خطأ." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "" @@ -564,10 +547,6 @@ msgstr "آخر تغيير" msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2712 -msgid "File" -msgstr "" - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "غير متوفر" @@ -815,10 +794,6 @@ msgstr "" msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1086,10 +1061,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "" @@ -1098,10 +1069,6 @@ msgstr "" msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "" @@ -1348,14 +1315,6 @@ msgstr "" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:455 -msgid "Configure" -msgstr "" - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "" @@ -2236,10 +2195,6 @@ msgstr "" msgid "Configure..." msgstr "" -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2312,14 +2267,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2342,11 +2289,6 @@ msgstr "" msgid "Configure KDiff3" msgstr "" -#: kdiff3_shell.rc:4 -#, no-c-format -msgid "&File" -msgstr "" - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2382,7 +2324,6 @@ msgstr "" msgid "&Window" msgstr "" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "خطأ." diff --git a/po/az.po b/po/az.po index 3daa4cd..b5bad78 100644 --- a/po/az.po +++ b/po/az.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2004-03-15 21:45+0200\n" "Last-Translator: Mətin Əmirov \n" "Language-Team: Azerbaijani \n" @@ -139,11 +139,6 @@ msgid "" "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "" @@ -245,11 +240,6 @@ msgstr "" msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "" @@ -338,13 +328,6 @@ msgstr "" msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Xəta." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "" @@ -561,10 +544,6 @@ msgstr "" msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2712 -msgid "File" -msgstr "" - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "" @@ -812,10 +791,6 @@ msgstr "" msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1083,10 +1058,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "" @@ -1095,10 +1066,6 @@ msgstr "" msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "" @@ -1345,15 +1312,6 @@ msgstr "" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Quraşdır..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "" @@ -2235,10 +2193,6 @@ msgstr "" msgid "Configure..." msgstr "Quraşdır..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2311,14 +2265,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2341,11 +2287,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "" -#: kdiff3_shell.rc:4 -#, no-c-format -msgid "&File" -msgstr "" - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2381,7 +2322,10 @@ msgstr "" msgid "&Window" msgstr "&Pəncərə" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Xəta." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Quraşdır..." diff --git a/po/bg.po b/po/bg.po index 1f7403a..a2277fa 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2006-11-16 23:19+0200\n" "Last-Translator: Zlatko Popov \n" "Language-Team: Bulgarian \n" @@ -155,11 +155,6 @@ msgstr "" "В момента извършвате сливане на директория. Сигурни ли сте, че искате да " "прекъснете сливането и да сканирате отново директорията?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Ново сканиране" @@ -264,11 +259,6 @@ msgstr "Промяна на всички операции по сливане" msgid "C&ontinue" msgstr "&Продължение" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Обработка " @@ -363,13 +353,6 @@ msgstr "Програмна грешка" msgid "An error occurred while copying.\n" msgstr "Възникна грешка по време на копирането.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Грешка." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Грешка при сливане" @@ -619,11 +602,6 @@ msgstr "Последна промяна" msgid "Link-Destination" msgstr "Местоназначение на препратката" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Файл..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "не е наличен" @@ -881,10 +859,6 @@ msgstr "Грешка при отваряне на файл" msgid "Opens documents for comparison..." msgstr "Отваря документ за сравняване..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1161,10 +1135,6 @@ msgstr "" "В момента извършвате сливане на директории. Сигурни ли сте, че искате да го " "прекъснете?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Запис на файл..." @@ -1173,10 +1143,6 @@ msgstr "Запис на файл..." msgid "Saving file with a new filename..." msgstr "Запис на файл с ново име..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "Отпечатване..." @@ -1446,15 +1412,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Променете това ако не-ASCII символите не се изобразяват правилно." -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Конфигуриране..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Изходен шрифт за редактора и разделителя" @@ -2467,10 +2424,6 @@ msgstr "Резултат (по избор):" msgid "Configure..." msgstr "Конфигуриране..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Търсене на текст:" @@ -2547,14 +2500,6 @@ msgstr "" msgid "Sort key result:" msgstr "Резултат от сортирането на ключове:" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "Съвпадението е успешно." @@ -2577,11 +2522,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "Конфигуриране на KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Файл..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2617,10 +2557,21 @@ msgstr "&Сливане" msgid "&Window" msgstr "&Прозорец" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Грешка." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Файл..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Конфигуриране..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Файл..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Файлове А и Б са двоично еднакви.\n" diff --git a/po/br.po b/po/br.po index c23db8e..8d755ce 100644 --- a/po/br.po +++ b/po/br.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeextragear-1/kdiff3.po\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n" "Last-Translator: Thierry Vignaud \n" "Language-Team: br \n" @@ -135,11 +135,6 @@ msgid "" "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "" @@ -241,11 +236,6 @@ msgstr "" msgid "C&ontinue" msgstr "&Kenderc'hel" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "O treterez " @@ -334,13 +324,6 @@ msgstr "Fazi gant ar meziant" msgid "An error occurred while copying.\n" msgstr "Degouezhet ez eus ar fazi en ur eilañ.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Fazi." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Fazi en ur dastum" @@ -557,11 +540,6 @@ msgstr "Kemm diwezhañ" msgid "Link-Destination" msgstr "Liamm dehaezadur" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Restr ..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "n'eo ket da gaout" @@ -809,10 +787,6 @@ msgstr "Fazi en ur zigeriñ ar restr" msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1080,10 +1054,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Emaon oc'h enrollañ ar restr ..." @@ -1092,10 +1062,6 @@ msgstr "Emaon oc'h enrollañ ar restr ..." msgid "Saving file with a new filename..." msgstr "Oc'h enrollañ ar restr gant un anv restr nevez ..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "Emaon o voulañ ..." @@ -1342,15 +1308,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Kefluniañ ..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "" @@ -2234,10 +2191,6 @@ msgstr "" msgid "Configure..." msgstr "Kefluniañ ..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Skrid klasket :" @@ -2310,14 +2263,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2340,11 +2285,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "Kefluniañ KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Restr ..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2380,10 +2320,21 @@ msgstr "&Dastum" msgid "&Window" msgstr "&Prenestr" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Fazi." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Restr ..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Kefluniañ ..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Restr ..." #~ msgid "Swap" #~ msgstr "Disloañ" diff --git a/po/ca.po b/po/ca.po index 467dedb..4ab83f1 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -133,11 +133,6 @@ msgid "" "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "" @@ -239,11 +234,6 @@ msgstr "" msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "" @@ -332,12 +322,6 @@ msgstr "" msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -msgid "Error" -msgstr "" - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "" @@ -554,10 +538,6 @@ msgstr "" msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2712 -msgid "File" -msgstr "" - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "" @@ -805,10 +785,6 @@ msgstr "" msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1076,10 +1052,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "" @@ -1088,10 +1060,6 @@ msgstr "" msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "" @@ -1338,14 +1306,6 @@ msgstr "" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:455 -msgid "Configure" -msgstr "" - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "" @@ -2225,10 +2185,6 @@ msgstr "" msgid "Configure..." msgstr "" -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2301,14 +2257,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2331,11 +2279,6 @@ msgstr "" msgid "Configure KDiff3" msgstr "" -#: kdiff3_shell.rc:4 -#, no-c-format -msgid "&File" -msgstr "" - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2370,8 +2313,3 @@ msgstr "" #, no-c-format msgid "&Window" msgstr "" - -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" diff --git a/po/cs.po b/po/cs.po index 8222833..056f513 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2007-01-25 19:58+0100\n" "Last-Translator: Klára Cihlářová \n" "Language-Team: Czech \n" @@ -142,11 +142,6 @@ msgid "" "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Znovu prohledat" @@ -250,11 +245,6 @@ msgstr "" msgid "C&ontinue" msgstr "P&okračovat" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Zpracovávání " @@ -348,13 +338,6 @@ msgstr "Chyba programu" msgid "An error occurred while copying.\n" msgstr "Během kopírování se stala chyba.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Chyba." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Chyba slučování" @@ -571,11 +554,6 @@ msgstr "" msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Soubor..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "nedostupný" @@ -823,10 +801,6 @@ msgstr "Chyba otvírání souboru" msgid "Opens documents for comparison..." msgstr "Otevře dokumenty pro porovnání..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Uloží výsledek spojení. Musí být vyřešeny všechny konflikty!" @@ -1094,10 +1068,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Ukládám soubor..." @@ -1106,10 +1076,6 @@ msgstr "Ukládám soubor..." msgid "Saving file with a new filename..." msgstr "Ukládám soubor pod jiným názvem..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "Tisknu..." @@ -1356,15 +1322,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Nastavit..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "" @@ -2245,10 +2202,6 @@ msgstr "" msgid "Configure..." msgstr "Nastavit..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2321,14 +2274,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2351,11 +2296,6 @@ msgstr "" msgid "Configure KDiff3" msgstr "" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Soubor..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2391,7 +2331,18 @@ msgstr "" msgid "&Window" msgstr "O&kno" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Chyba." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Soubor..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Nastavit..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Soubor..." diff --git a/po/cy.po b/po/cy.po index 7ba3584..47e7c8f 100644 --- a/po/cy.po +++ b/po/cy.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: ../cy/messages//kdeextragear-1/kdiff3.po\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n" "Last-Translator: Thierry Vignaud \n" "Language-Team: cy \n" @@ -134,11 +134,6 @@ msgid "" "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Ailsyllu" @@ -240,11 +235,6 @@ msgstr "" msgid "C&ontinue" msgstr "&Mynd ymlaen" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "" @@ -333,13 +323,6 @@ msgstr "" msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Gwall." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "" @@ -556,11 +539,6 @@ msgstr "" msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Ffeil..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "dim ar gael" @@ -809,10 +787,6 @@ msgstr "Gwall agor ffeil" msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1080,10 +1054,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Yn cadw ffeil..." @@ -1092,10 +1062,6 @@ msgstr "Yn cadw ffeil..." msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "Argraffu..." @@ -1342,15 +1308,6 @@ msgstr "Lladin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Ffurfweddu..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "" @@ -2236,10 +2193,6 @@ msgstr "" msgid "Configure..." msgstr "Ffurfweddu..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 #, fuzzy msgid "Search text:" @@ -2313,14 +2266,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2343,11 +2288,6 @@ msgstr "" msgid "Configure KDiff3" msgstr "" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Ffeil..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2383,10 +2323,21 @@ msgstr "&Cyfuno" msgid "&Window" msgstr "&Ffenestr" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Gwall." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Ffeil..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Ffurfweddu..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Ffeil..." #, fuzzy #~ msgid "Manually match lines" diff --git a/po/da.po b/po/da.po index a79ac12..f6dbbf8 100644 --- a/po/da.po +++ b/po/da.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2006-11-16 08:18-0500\n" "Last-Translator: Erik Kjær Pedersen \n" "Language-Team: Danish \n" @@ -154,11 +154,6 @@ msgstr "" "Du er ved at udføre en mappeindfletning. Er du sikker på at du ønsker at " "afbryde indfletningen og skanne mappen igen?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Genskan" @@ -263,11 +258,6 @@ msgstr "Ændrer alle indfletningsoperationer" msgid "C&ontinue" msgstr "&Fortsæt" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Behandler" @@ -361,13 +351,6 @@ msgstr "Programfejl" msgid "An error occurred while copying.\n" msgstr "Der opstod en fejl mens der kopieredes.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Fejl." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Indfletningsfejl" @@ -605,11 +588,6 @@ msgstr "Sidste ændring" msgid "Link-Destination" msgstr "Link-destination" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Fil..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "ikke tilgængelig" @@ -866,10 +844,6 @@ msgstr "Fejl ved åbning af fil" msgid "Opens documents for comparison..." msgstr "Åbner dokumenter til sammenligning..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "gemmer indfletningsresultatet. Alle konflikter skal løses!" @@ -1143,10 +1117,6 @@ msgstr "" "Du er ved at udføre en mappeindfletning. Er du sikker på du ønskler at " "afbryde?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Gemmer fil..." @@ -1155,10 +1125,6 @@ msgstr "Gemmer fil..." msgid "Saving file with a new filename..." msgstr "Gemmer fil med nyt filnavn..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "Udskriver..." @@ -1425,15 +1391,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Ændr dette hvis ikke-ASCII tegn ikke vises rigtigt." -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Indstil..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Editor & Diff uddata-skrifttype" @@ -2440,10 +2397,6 @@ msgstr "Uddata (frivillig):" msgid "Configure..." msgstr "Indstil..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Søgetekst:" @@ -2523,14 +2476,6 @@ msgstr "" msgid "Sort key result:" msgstr "Sorteringsnøgleresultat:" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "Matchning lykkedes." @@ -2553,11 +2498,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "Indstil KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Fil..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2593,10 +2533,21 @@ msgstr "Ind&flet" msgid "&Window" msgstr "&Vindue" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Fejl." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Fil..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Indstil..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Fil..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Filerne A og B er binært ens.\n" diff --git a/po/de.po b/po/de.po index e5b31ed..2a90088 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2006-07-09 10:25+0200\n" "Last-Translator: Thomas Reitelbach \n" "Language-Team: German \n" @@ -162,11 +162,6 @@ msgstr "" "Sie sind dabei, Verzeichnisse zusammenzuführen. Sind Sie sicher, dass Sie " "diese Operation abbrechen und das Verzeichnis erneut einlesen wollen?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Neu einlesen" @@ -271,11 +266,6 @@ msgstr "Änderung aller Zusammenführungsaktionen" msgid "C&ontinue" msgstr "&Fortsetzen" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Fortschritt " @@ -370,13 +360,6 @@ msgstr "Programm Fehler" msgid "An error occurred while copying.\n" msgstr "Ein Fehler ist während des Kopierens aufgetreten.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Fehler." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Zusammenführungsfehler" @@ -624,11 +607,6 @@ msgstr "Letzte Änderung" msgid "Link-Destination" msgstr "Verknüpfungsziel" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Datei ..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "nicht vorhanden" @@ -883,10 +861,6 @@ msgstr "Fehler beim Dateiöffnen" msgid "Opens documents for comparison..." msgstr "Dateien für Vergleich öffnen ..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1161,10 +1135,6 @@ msgstr "" "Sie führen eine Verzeichniszusammenführung durch. Sind sie sicher, dass sie " "diese beenden möchten?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Datei wird gespeichert ..." @@ -1173,10 +1143,6 @@ msgstr "Datei wird gespeichert ..." msgid "Saving file with a new filename..." msgstr "Datei wird unter neuem Namen gespeichert ..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "Drucken ..." @@ -1450,15 +1416,6 @@ msgstr "" "Falls die speziellen Zeichen Ihrer Sprache nicht korrekt dargestellt werden, " "können diesen Wert ändern. (Vielleicht hilfts.)" -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Einrichten ..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Schrift für Editor & Vergleichsfenster" @@ -2489,10 +2446,6 @@ msgstr "Ziel (optional):" msgid "Configure..." msgstr "Einrichten ..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Suchtext:" @@ -2569,14 +2522,6 @@ msgstr "" msgid "Sort key result:" msgstr "Sortierschlüsselergebnis:" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "Übereinstimmung erfolgreich." @@ -2601,11 +2546,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "KDiff3 einrichten" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Datei ..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2641,10 +2581,21 @@ msgstr "&Zusammenführen" msgid "&Window" msgstr "&Fenster" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Fehler." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Datei ..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Einrichten ..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Datei ..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Die Dateien A und B sind binär identisch.\n" diff --git a/po/el.po b/po/el.po index f66c340..4062f67 100644 --- a/po/el.po +++ b/po/el.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2007-03-15 15:23+0200\n" "Last-Translator: Spiros Georgaras \n" "Language-Team: Greek \n" @@ -153,11 +153,6 @@ msgstr "" "Αυτή τη στιγμή κάνετε μια συγχώνευση καταλόγου. Είστε σίγουροι ότι " "επιθυμείτε την εγκατάλειψη της συγχώνευσης και την επανασάρωση του καταλόγου;" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Επανασάρωση" @@ -262,11 +257,6 @@ msgstr "Αλλαγή όλων των λειτουργιών συγχώνευση msgid "C&ontinue" msgstr "Συνέ&χεια" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Επεξεργασία " @@ -361,13 +351,6 @@ msgstr "Σφάλμα προγράμματος" msgid "An error occurred while copying.\n" msgstr "Ένα σφάλμα παρουσιάστηκε κατά την αντιγραφή.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Σφάλμα." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Σφάλμα συγχώνευσης" @@ -620,11 +603,6 @@ msgstr "Τελευταία τροποποίηση" msgid "Link-Destination" msgstr "Δεσμός-προορισμός" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Αρχείο..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "μη διαθέσιμο" @@ -881,10 +859,6 @@ msgstr "Σφάλμα ανοίγματος αρχείου" msgid "Opens documents for comparison..." msgstr "Ανοίγει έγγραφα για σύγκριση..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1161,10 +1135,6 @@ msgstr "" "Αυτή τη στιγμή εκτελείται μια συγχώνευση καταλόγου. Είστε σίγουροι ότι " "επιθυμείτε να την εγκαταλείψετε;" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Αποθήκευση αρχείου..." @@ -1173,10 +1143,6 @@ msgstr "Αποθήκευση αρχείου..." msgid "Saving file with a new filename..." msgstr "Αποθήκευση αρχείου με ένα νέο όνομα..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "Εκτύπωση..." @@ -1446,15 +1412,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Τροποποιήστε αυτό αν οι μη ASCII χαρακτήρες δεν εμφανίζονται σωστά." -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Ρύθμιση..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Γραμματοσειρά επεξεργαστή & εξόδου διαφορών" @@ -2477,10 +2434,6 @@ msgstr "Έξοδος (προαιρετική):" msgid "Configure..." msgstr "Ρύθμιση..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Αναζήτηση κειμένου:" @@ -2563,14 +2516,6 @@ msgstr "" msgid "Sort key result:" msgstr "Αποτέλεσμα κλειδιού ταξινόμησης:" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "Επιτυχία ταιριάσματος." @@ -2595,11 +2540,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "Ρύθμιση του KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Αρχείο..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2635,10 +2575,21 @@ msgstr "&Συγχώνευση" msgid "&Window" msgstr "&Παράθυρο" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Σφάλμα." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Αρχείο..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Ρύθμιση..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Αρχείο..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Τα αρχεία Α και Β είναι δυαδικά ίσα.\n" diff --git a/po/en_GB.po b/po/en_GB.po index 6254ee9..a743fe9 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2005-02-02 11:52+0000\n" "Last-Translator: Andrew Coles \n" "Language-Team: British English \n" @@ -155,11 +155,6 @@ msgstr "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Rescan" @@ -264,11 +259,6 @@ msgstr "Changing All Merge Operations" msgid "C&ontinue" msgstr "C&ontinue" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Processing " @@ -362,13 +352,6 @@ msgstr "Program Error" msgid "An error occurred while copying.\n" msgstr "An error occurred while copying.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Error." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Merge Error" @@ -604,11 +587,6 @@ msgstr "Last Modification" msgid "Link-Destination" msgstr "Link-Destination" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "File..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "not available" @@ -870,10 +848,6 @@ msgstr "File Open Error" msgid "Opens documents for comparison..." msgstr "Opens documents for comparison..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Saves the merge result. All conflicts must be solved!" @@ -1146,10 +1120,6 @@ msgid "" msgstr "" "You are currently doing a directory merge. Are you sure, you want to abort?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Saving file..." @@ -1158,10 +1128,6 @@ msgstr "Saving file..." msgid "Saving file with a new filename..." msgstr "Saving file with a new filename..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 #, fuzzy msgid "Printing..." @@ -1430,15 +1396,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Change this if non-ASCII characters are not displayed correctly." -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Configure..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Editor & Diff Output Font" @@ -2407,10 +2364,6 @@ msgstr "Output (optional):" msgid "Configure..." msgstr "Configure..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Search text:" @@ -2483,14 +2436,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2514,11 +2459,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "Configure KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "File..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2554,10 +2494,21 @@ msgstr "&Merge" msgid "&Window" msgstr "&Window" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Error." + +#, fuzzy +#~ msgid "File" +#~ msgstr "File..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Configure..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "File..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Files A and B are binary equal.\n" diff --git a/po/es.po b/po/es.po index 90ebdc2..d34a7e3 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2006-11-06 22:21+0100\n" "Last-Translator: santi \n" "Language-Team: Español \n" @@ -157,11 +157,6 @@ msgstr "" "Actualmente está haciendo una fusión de directorio. ¿Está seguro de que " "desea abandonar la fusión y volver a leer el directorio?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Volver a buscar" @@ -266,11 +261,6 @@ msgstr "Cambiando todas las operaciones de fusión" msgid "C&ontinue" msgstr "C&ontinuar" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Procesando" @@ -364,13 +354,6 @@ msgstr "Error de programa" msgid "An error occurred while copying.\n" msgstr "Ocurrió un error mientras se copiaba.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Error." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Error de fusión" @@ -614,11 +597,6 @@ msgstr "Última modificación" msgid "Link-Destination" msgstr "Destino del enlace" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Archivo..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "no disponible" @@ -880,10 +858,6 @@ msgstr "Error de apertura de archivo" msgid "Opens documents for comparison..." msgstr "Abre documentos para comparación..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1160,10 +1134,6 @@ msgstr "" "Actualmente está haciendo una fusión de directorio. ¿Está seguro de que " "desea abandonar?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Guardando archivo..." @@ -1172,10 +1142,6 @@ msgstr "Guardando archivo..." msgid "Saving file with a new filename..." msgstr "Guardando archivo con un nuevo nombre..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "Imprimiendo..." @@ -1448,15 +1414,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Cambier esto si ningún carácter ASCII se muestra correctamente." -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Configurar..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Fuente para el editor y salida diff" @@ -2484,10 +2441,6 @@ msgstr "Salida (opcional):" msgid "Configure..." msgstr "Configurar..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Buscar texto:" @@ -2571,14 +2524,6 @@ msgstr "" msgid "Sort key result:" msgstr "Resultado de la clave de ordenación:" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "Coincidencia correcta." @@ -2602,11 +2547,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "Configurar KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Archivo..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2642,10 +2582,21 @@ msgstr "&Fusionar" msgid "&Window" msgstr "&Ventana" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Error." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Archivo..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Configurar..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Archivo..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Los archivos A y B son binariamente iguales.\n" diff --git a/po/et.po b/po/et.po index 4100731..b2bb38a 100644 --- a/po/et.po +++ b/po/et.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2006-12-07 00:29+0300\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" @@ -152,11 +152,6 @@ msgstr "" "Sul on parajasti käsil kataloogi ühendamine. Kas tõesti ühendamine " "katkestada ja kataloog uuesti läbi uurida?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Uuri uuesti läbi" @@ -260,11 +255,6 @@ msgstr "Kõigi ühendamisoperatsioonide muutmine" msgid "C&ontinue" msgstr "&Jätka" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Töödeldakse " @@ -358,13 +348,6 @@ msgstr "Rakenduse viga" msgid "An error occurred while copying.\n" msgstr "Kopeerimisel tekkis viga.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Viga." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Ühendamise viga" @@ -604,11 +587,6 @@ msgstr "Viimase muutmise aeg" msgid "Link-Destination" msgstr "Viit-sihtkoht" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Fail..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "pole kättesaadav" @@ -866,10 +844,6 @@ msgstr "Viga faili avamisel" msgid "Opens documents for comparison..." msgstr "Avab dokumendid võrdlemiseks..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1143,10 +1117,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Sul on parajasti käsil kataloogide ühendamine. Kas tõesti katkestada?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Faili salvestamine..." @@ -1155,10 +1125,6 @@ msgstr "Faili salvestamine..." msgid "Saving file with a new filename..." msgstr "Faili salvestamine uue nimega..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "Trükkimine..." @@ -1425,15 +1391,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Muuda, kui mitte-ASCII sümboleid ei näidata korrektselt." -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Seadista..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Redaktori ja erinevuse väljundi font" @@ -2437,10 +2394,6 @@ msgstr "Väljund (lisavõimalus):" msgid "Configure..." msgstr "Seadista..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Otsitav tekst:" @@ -2517,14 +2470,6 @@ msgstr "" msgid "Sort key result:" msgstr "Sorteerimisvõtme tulemus:" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "Leiti sobivus." @@ -2547,11 +2492,6 @@ msgstr "KDiff&3" msgid "Configure KDiff3" msgstr "KDiff3 seadistamine" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Fail..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2587,10 +2527,21 @@ msgstr "Ü&hendamine" msgid "&Window" msgstr "Ake&n" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Viga." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Fail..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Seadista..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Fail..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Failid A ja B on binaarselt võrdsed.\n" diff --git a/po/fr.po b/po/fr.po index 6fa3e78..59163ff 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2005-02-03 21:34+0100\n" "Last-Translator: Simon Depiets <2df@tuxfamily.org>\n" "Language-Team: Français \n" @@ -155,11 +155,6 @@ msgstr "" "Vous procédez à une fusion. Confirmez-vous l'abandon de la fusion et le " "rafraîchissement du dossier ?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Rafraîchissement" @@ -264,11 +259,6 @@ msgstr "Changement de toutes les opérations de fusion" msgid "C&ontinue" msgstr "C&ontinuer" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "En cours " @@ -362,13 +352,6 @@ msgstr "Erreur du programme" msgid "An error occurred while copying.\n" msgstr "Une erreur est survenue lors de la copie.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Erreur." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Erreur de fusion" @@ -617,11 +600,6 @@ msgstr "Dernière modification" msgid "Link-Destination" msgstr "Destination du lien" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Fichier..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "non disponible" @@ -888,10 +866,6 @@ msgstr "Erreur d'ouverture d'un Fichier" msgid "Opens documents for comparison..." msgstr "Ouvre les documents pour comparaison..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1168,10 +1142,6 @@ msgstr "" "Vous faites actuellement une fusion de dossiers. Voulez-vous vraiment " "annuler ?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Enregistrement du fichier..." @@ -1180,10 +1150,6 @@ msgstr "Enregistrement du fichier..." msgid "Saving file with a new filename..." msgstr "Enregistrement du fichier avec un nouveau nom..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 #, fuzzy msgid "Printing..." @@ -1461,15 +1427,6 @@ msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" "Changez cela si les caractères non-ASCII ne sont pas affichés correctement." -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Configurer..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Police de l'éditeur et du résultat de Diff" @@ -2461,10 +2418,6 @@ msgstr "Fichier de résultat (optionnel) :" msgid "Configure..." msgstr "Configurer..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Chercher la chaîne :" @@ -2537,14 +2490,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2568,11 +2513,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "Configurer KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Fichier..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2608,10 +2548,21 @@ msgstr "&Fusion" msgid "&Window" msgstr "&Fenêtre" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Erreur." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Fichier..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Configurer..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Fichier..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Les fichiers A et B sont égaux binairement.\n" diff --git a/po/ga.po b/po/ga.po index 48dadb3..34ea95f 100644 --- a/po/ga.po +++ b/po/ga.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeextragear-1/kdiff3.po\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2004-12-03 14:52-0500\n" "Last-Translator: Kevin Patrick Scannell \n" "Language-Team: ga \n" @@ -133,11 +133,6 @@ msgid "" "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Athscan" @@ -239,11 +234,6 @@ msgstr "" msgid "C&ontinue" msgstr "&Lean ar aghaidh" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Ag próiseáil " @@ -332,13 +322,6 @@ msgstr "Earráid Chláir" msgid "An error occurred while copying.\n" msgstr "Tharla earráid le linn cóipeála.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Earráid." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "" @@ -555,11 +538,6 @@ msgstr "Athrú Is Déanaí" msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Comhad..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "níl ar fáil" @@ -807,10 +785,6 @@ msgstr "Earráid agus Comhad á Oscailt" msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1078,10 +1052,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Comhad á shábháil..." @@ -1090,10 +1060,6 @@ msgstr "Comhad á shábháil..." msgid "Saving file with a new filename..." msgstr "Comhad á shábháil le hainm comhaid nua..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "Á Phriontáil..." @@ -1340,15 +1306,6 @@ msgstr "Laidin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Cumraigh..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "" @@ -2229,10 +2186,6 @@ msgstr "Aschur (roghnach):" msgid "Configure..." msgstr "Cumraigh..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2305,14 +2258,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "D'éirigh le meaitseáil." @@ -2335,11 +2280,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "Cumraigh KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Comhad..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2375,10 +2315,21 @@ msgstr "Cu&maisc" msgid "&Window" msgstr "&Fuinneog" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Earráid." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Comhad..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Cumraigh..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Comhad..." #~ msgid "Preserve carriage return" #~ msgstr "Caomhnaigh aisfhilleadh carráiste" diff --git a/po/gl.po b/po/gl.po index 725d86a..af81809 100644 --- a/po/gl.po +++ b/po/gl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2006-06-03 21:54+0200\n" "Last-Translator: mvillarino \n" "Language-Team: Galician \n" @@ -137,11 +137,6 @@ msgid "" "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Analisar de Novo" @@ -243,11 +238,6 @@ msgstr "" msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "" @@ -336,12 +326,6 @@ msgstr "" msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -msgid "Error" -msgstr "" - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "" @@ -558,10 +542,6 @@ msgstr "" msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2712 -msgid "File" -msgstr "" - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "non disponíbel" @@ -809,10 +789,6 @@ msgstr "" msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1080,10 +1056,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "" @@ -1092,10 +1064,6 @@ msgstr "" msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "A imprimir..." @@ -1342,15 +1310,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Configurar..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "" @@ -2231,10 +2190,6 @@ msgstr "" msgid "Configure..." msgstr "Configurar..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2307,14 +2262,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2337,11 +2284,6 @@ msgstr "" msgid "Configure KDiff3" msgstr "" -#: kdiff3_shell.rc:4 -#, no-c-format -msgid "&File" -msgstr "" - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2377,7 +2319,6 @@ msgstr "" msgid "&Window" msgstr "&Fiestra" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Configurar..." diff --git a/po/hi.po b/po/hi.po index dad06c4..4ce293d 100644 --- a/po/hi.po +++ b/po/hi.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2005-01-22 16:10+0530\n" "Last-Translator: Ravishankar Shrivastava \n" "Language-Team: indlinux-hindi \n" @@ -138,11 +138,6 @@ msgid "" "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "री-स्कैन" @@ -244,11 +239,6 @@ msgstr "सभी सम्मिलित करने के ऑपरेश msgid "C&ontinue" msgstr "जारी रखें (&o)" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "प्रोसेसिंग" @@ -337,13 +327,6 @@ msgstr "प्रोग्राम त्रुटि" msgid "An error occurred while copying.\n" msgstr "नक़ल करने के दौरान एक त्रुटि हुई.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "त्रुटि." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "सम्मिलित करने में त्रुटि" @@ -561,11 +544,6 @@ msgstr "अंतिम परिवर्धन" msgid "Link-Destination" msgstr "लिंक-गंतव्य" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "फ़ाइल..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "उपलब्ध नहीं" @@ -823,10 +801,6 @@ msgstr "फ़ाइल खोलने में त्रुटि" msgid "Opens documents for comparison..." msgstr "दस्तावेज़ों को तुलना के लिए खोलता है..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1096,10 +1070,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "फ़ाइल सहेजा जा रहा है..." @@ -1108,10 +1078,6 @@ msgstr "फ़ाइल सहेजा जा रहा है..." msgid "Saving file with a new filename..." msgstr "फ़ाइल नए फ़ाइलनाम के साथ सहेजा जा रहा है..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 #, fuzzy msgid "Printing..." @@ -1373,15 +1339,6 @@ msgstr "" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "कॉन्फ़िगर...." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "संपादक तथा डिफ़ आउटपुट फ़ॉन्ट" @@ -2277,10 +2234,6 @@ msgstr "आउटपुट (वैकल्पिक):" msgid "Configure..." msgstr "कॉन्फ़िगर...." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "पाठ ढूंढें:" @@ -2353,14 +2306,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2384,11 +2329,6 @@ msgstr "के-डिफ3 (&K)" msgid "Configure KDiff3" msgstr "के-डिफ3 को कॉन्फ़िगर करें" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "फ़ाइल..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2424,10 +2364,21 @@ msgstr "सम्मिलित करें (&M)" msgid "&Window" msgstr "विंडो (&W)" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "त्रुटि." + +#, fuzzy +#~ msgid "File" +#~ msgstr "फ़ाइल..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "कॉन्फ़िगर...." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "फ़ाइल..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "फ़ाइलें अ तथा ब बाइनरी समान हैं.\n" diff --git a/po/hu.po b/po/hu.po index d1aa821..98dcda4 100644 --- a/po/hu.po +++ b/po/hu.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KDE 3.2\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2004-01-09 11:11+0100\n" "Last-Translator: Tamas Szanto \n" "Language-Team: Hungarian \n" @@ -143,11 +143,6 @@ msgstr "" "Egy könyvtárösszeolvasztás még nem fejeződött be. Biztosan félbe szeretné " "szakítani a műveletet és újra be szeretné olvasni a könyvtár tartalmát?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Újraolvasás" @@ -253,11 +248,6 @@ msgstr "Az összes összeolvasztási művelet megváltoztatása" msgid "C&ontinue" msgstr "F&olytatás" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Feldolgozás " @@ -352,13 +342,6 @@ msgstr "Programhiba" msgid "An error occurred while copying.\n" msgstr "Hiba történt másolás közben.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Hiba." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Összeolvasztási hiba" @@ -608,11 +591,6 @@ msgstr "Utolsó módosítás" msgid "Link-Destination" msgstr "Link-Cél" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Fájl..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "nem áll rendelkezésre" @@ -883,10 +861,6 @@ msgstr "Fájlmegnyitási hiba" msgid "Opens documents for comparison..." msgstr "Dokumentumok megnyitása összehasonlításhoz..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1167,10 +1141,6 @@ msgstr "" "Éppen folyamatban van egy könyvtárösszeolvasztás. Biztosan félbe szeretné " "szakítani a műveletet?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "A fájl mentése..." @@ -1179,10 +1149,6 @@ msgstr "A fájl mentése..." msgid "Saving file with a new filename..." msgstr "A fájl elmentése más néven..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 #, fuzzy msgid "Printing..." @@ -1466,15 +1432,6 @@ msgstr "" "Akkor kell esetleg bejelölni, ha a nem ASCII karakterek helytelenül jelennek " "meg." -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Beállítás..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "A szerkesztő és a diff-kimenet betűtípusa" @@ -2449,10 +2406,6 @@ msgstr "Kimenet (opcionális):" msgid "Configure..." msgstr "Beállítás..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 #, fuzzy msgid "Search text:" @@ -2526,14 +2479,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2557,11 +2502,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "A KDiff3 beállításai" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Fájl..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2597,10 +2537,21 @@ msgstr "Össze&olvasztás" msgid "&Window" msgstr "&Ablak" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Hiba." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Fájl..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Beállítás..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Fájl..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "A és B fájl binárisan megegyezik.\n" diff --git a/po/is.po b/po/is.po index 467dedb..4ab83f1 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -133,11 +133,6 @@ msgid "" "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "" @@ -239,11 +234,6 @@ msgstr "" msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "" @@ -332,12 +322,6 @@ msgstr "" msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -msgid "Error" -msgstr "" - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "" @@ -554,10 +538,6 @@ msgstr "" msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2712 -msgid "File" -msgstr "" - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "" @@ -805,10 +785,6 @@ msgstr "" msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1076,10 +1052,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "" @@ -1088,10 +1060,6 @@ msgstr "" msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "" @@ -1338,14 +1306,6 @@ msgstr "" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:455 -msgid "Configure" -msgstr "" - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "" @@ -2225,10 +2185,6 @@ msgstr "" msgid "Configure..." msgstr "" -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2301,14 +2257,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2331,11 +2279,6 @@ msgstr "" msgid "Configure KDiff3" msgstr "" -#: kdiff3_shell.rc:4 -#, no-c-format -msgid "&File" -msgstr "" - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2370,8 +2313,3 @@ msgstr "" #, no-c-format msgid "&Window" msgstr "" - -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" diff --git a/po/it.po b/po/it.po index e3933d4..a1fade3 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2006-12-08 16:52+0100\n" "Last-Translator: Marcello Anni \n" "Language-Team: italiano \n" @@ -155,11 +155,6 @@ msgstr "" "Stai fondendo delle cartelle. Sei sicuro? Vuoi interrompere la fusione e " "riesaminare la cartella?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Riesamina" @@ -264,11 +259,6 @@ msgstr "Modifica tutte le operazioni di fusione" msgid "C&ontinue" msgstr "C&ontinua" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Sto elaborando" @@ -362,13 +352,6 @@ msgstr "Errore nel programma" msgid "An error occurred while copying.\n" msgstr "Si è verificato un errore durante la copia.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Errore." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Errore nella fusione" @@ -609,11 +592,6 @@ msgstr "Ultima modifica" msgid "Link-Destination" msgstr "Collegamento di destinazione" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "File..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "non disponibile" @@ -869,10 +847,6 @@ msgstr "Errore nell'aprire file" msgid "Opens documents for comparison..." msgstr "Apre documenti per confronto..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1148,10 +1122,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "È in corso la fusione di cartelle. Sei sicuro di voler interrompere?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Salvataggio file..." @@ -1160,10 +1130,6 @@ msgstr "Salvataggio file..." msgid "Saving file with a new filename..." msgstr "Salvataggio file con nuovo nome..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "Stampa..." @@ -1432,15 +1398,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Cambialo se i caratteri non-ascii non vengono mostrati correttamente." -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Configura..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Set di caratteri per l'editor e per l'output di diff" @@ -2458,10 +2415,6 @@ msgstr "Output (Opzionale):" msgid "Configure..." msgstr "Configura..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Testo da cercare:" @@ -2538,14 +2491,6 @@ msgstr "" msgid "Sort key result:" msgstr "Ordina il risultato per chiave:" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "Confronto con successo." @@ -2568,11 +2513,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "Configura KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "File..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2608,10 +2548,21 @@ msgstr "F&usione" msgid "&Window" msgstr "Fine&stra" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Errore." + +#, fuzzy +#~ msgid "File" +#~ msgstr "File..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Configura..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "File..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "I file A e B sono uguali a livello binario.\n" diff --git a/po/ja.po b/po/ja.po index 508c79c..9b8ed92 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2006-04-14 21:25+0900\n" "Last-Translator: Yukiko Bando \n" "Language-Team: Japanese \n" @@ -142,11 +142,6 @@ msgstr "" "今ディレクトリマージ中です. 本当にマージを中止し、ディレクトリを再スキャンし" "ますか?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "再スキャン" @@ -251,11 +246,6 @@ msgstr "すべてのマージ操作を更新中" msgid "C&ontinue" msgstr "続行(&O)" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "処理中" @@ -349,13 +339,6 @@ msgstr "プログラムエラー" msgid "An error occurred while copying.\n" msgstr "コピー中にエラー発生\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "エラー" - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "マージエラー" @@ -586,11 +569,6 @@ msgstr "最終更新" msgid "Link-Destination" msgstr "リンク先" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "ファイル..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "利用不可" @@ -843,10 +821,6 @@ msgstr "ファイルを開く際にエラー" msgid "Opens documents for comparison..." msgstr "比較のために文書を開いています..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "マージ結果を保存. すべての衝突を回避しなければなりません!" @@ -1115,10 +1089,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "ディレクトリマージ実行中です. 本当に中止しますか?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "ファイルを保存中..." @@ -1127,10 +1097,6 @@ msgstr "ファイルを保存中..." msgid "Saving file with a new filename..." msgstr "名前を付けてファイルを保存中..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "印刷中..." @@ -1397,15 +1363,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "非 ASCII 文字が適切に表示されなければ、これを変更してください。" -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "設定..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "エディタ/Diff 出力フォント" @@ -2364,10 +2321,6 @@ msgstr "出力 (オプション):" msgid "Configure..." msgstr "設定..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "検索テキスト:" @@ -2440,14 +2393,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2471,11 +2416,6 @@ msgstr "KDiff3(&K)" msgid "Configure KDiff3" msgstr "KDiff3 を設定" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "ファイル..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2511,10 +2451,21 @@ msgstr "マージ(&M)" msgid "&Window" msgstr "ウィンドウ(&W)" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "エラー" + +#, fuzzy +#~ msgid "File" +#~ msgstr "ファイル..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "設定..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "ファイル..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "ファイル A と B は同じバイナリです\n" diff --git a/po/ka.po b/po/ka.po index 8462bf5..7f52484 100644 --- a/po/ka.po +++ b/po/ka.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2006-03-28 01:44+0400\n" "Last-Translator: Giasher \n" "Language-Team: \n" @@ -153,11 +153,6 @@ msgstr "" "თქვენ ახლა დირექტორიების შერწყმას ახორციელებთ.დარწმუნებული ხართ რომ გსურთ " "შერწყმის შეწყვეტა და დირექტორიის თავიდან სკანირება?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "თავიდან სკანირება" @@ -262,11 +257,6 @@ msgstr "ყველა შერწყმის ოპერაციები msgid "C&ontinue" msgstr "&გაგრძელება" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "მიმდინარეობა " @@ -360,13 +350,6 @@ msgstr "პროგრამის შეცდომა" msgid "An error occurred while copying.\n" msgstr "ასლის გაკეთებისას შეცდომა მოხდა.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "შეცდომა." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "შერწმის შეცდომა" @@ -605,11 +588,6 @@ msgstr "უკანასკნელად ჩასწორებული msgid "Link-Destination" msgstr "ბმულის დანიშნულება" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "ფაილი..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "ხელმიუწვდომელია" @@ -875,10 +853,6 @@ msgstr "ფაილის გახსნის შეცდომა" msgid "Opens documents for comparison..." msgstr "ხსნის დოკუმენტებს შესადარებლად..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "ინახავს შერწყმის შედეგებს. ყველა კონფლიქტი უნდა გადაიჭრას!" @@ -1148,10 +1122,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "თქვენ ახლა დირექტორიათა შერწყმას აკეთებთ. ნამდვილად გსურთ შეწყვეტა?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "ფაილის შენახვა..." @@ -1160,10 +1130,6 @@ msgstr "ფაილის შენახვა..." msgid "Saving file with a new filename..." msgstr "ფაილის ახალი სახელით შენახვა..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 #, fuzzy msgid "Printing..." @@ -1434,15 +1400,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "შეცვალე თუ არა ASCII სიმბოლოები არ აისახება მართებულად." -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "კონფიგურაცია..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "რედაქტორი და Diff გამონატანის შრიფტი" @@ -2403,10 +2360,6 @@ msgstr "გამონატანი (არასავალდებულ msgid "Configure..." msgstr "კონფიგურაცია..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "ტექსტის ძიება:" @@ -2479,14 +2432,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2510,11 +2455,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "KDiff3 კონფიგურაცია" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "ფაილი..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2550,10 +2490,21 @@ msgstr "შ&ერწყმა" msgid "&Window" msgstr "&ფანჯარა" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "შეცდომა." + +#, fuzzy +#~ msgid "File" +#~ msgstr "ფაილი..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "კონფიგურაცია..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "ფაილი..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "A და B ბინარულად ტოლია.\n" diff --git a/po/lt.po b/po/lt.po index 920b4a7..e470dd3 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: ziogelis 77\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2005-02-23 01:27+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -296,11 +296,6 @@ msgid "" "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "" @@ -433,11 +428,6 @@ msgstr "" msgid "C&ontinue" msgstr "&Tęsti" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "" @@ -526,13 +516,6 @@ msgstr "" msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Klaida." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "" @@ -749,10 +732,6 @@ msgstr "" msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2712 -msgid "File" -msgstr "" - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "" @@ -1001,10 +980,6 @@ msgstr "" msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1285,10 +1260,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 #, fuzzy msgid "Saving file..." @@ -1319,10 +1290,6 @@ msgstr "" "#-#-#-#-# umbrello.po (umbrello) #-#-#-#-#\n" "Išsaugojama byla nauju vardu..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 #, fuzzy msgid "Printing..." @@ -1586,47 +1553,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "" -"#-#-#-#-# kxkb.po (kxkb) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kcmfonts.po (kcmfonts) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# tdelibs.po (tdelibs) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# katepart.po (katepart) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# quanta.po (quanta) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kxsldbg.po (kxsldbg) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kplato.po (kplato) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# k3b.po (k3b) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# libkdehighscores.po (libkdehighscores) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# twin4.po (twin4) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# libtdegames.po (libtdegames) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kcmkamera.po (kcmkamera) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kpilot.po (kpilot) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# uachangerplugin.po (uachangerplugin) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# katemake.po (katemake) #-#-#-#-#\n" -"Konfigūruoti...\n" -"#-#-#-#-# kcmwifi.po (kcmwifi) #-#-#-#-#\n" -"Derinti..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "" @@ -2548,10 +2474,6 @@ msgstr "" "#-#-#-#-# kcmwifi.po (kcmwifi) #-#-#-#-#\n" "Derinti..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2635,14 +2557,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2665,11 +2579,6 @@ msgstr "" msgid "Configure KDiff3" msgstr "" -#: kdiff3_shell.rc:4 -#, no-c-format -msgid "&File" -msgstr "" - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2705,7 +2614,42 @@ msgstr "" msgid "&Window" msgstr "&Langas" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Klaida." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "" +#~ "#-#-#-#-# kxkb.po (kxkb) #-#-#-#-#\n" +#~ "Konfigūruoti...\n" +#~ "#-#-#-#-# kcmfonts.po (kcmfonts) #-#-#-#-#\n" +#~ "Konfigūruoti...\n" +#~ "#-#-#-#-# tdelibs.po (tdelibs) #-#-#-#-#\n" +#~ "Konfigūruoti...\n" +#~ "#-#-#-#-# katepart.po (katepart) #-#-#-#-#\n" +#~ "Konfigūruoti...\n" +#~ "#-#-#-#-# quanta.po (quanta) #-#-#-#-#\n" +#~ "Konfigūruoti...\n" +#~ "#-#-#-#-# kxsldbg.po (kxsldbg) #-#-#-#-#\n" +#~ "Konfigūruoti...\n" +#~ "#-#-#-#-# kplato.po (kplato) #-#-#-#-#\n" +#~ "Konfigūruoti...\n" +#~ "#-#-#-#-# k3b.po (k3b) #-#-#-#-#\n" +#~ "Konfigūruoti...\n" +#~ "#-#-#-#-# libkdehighscores.po (libkdehighscores) #-#-#-#-#\n" +#~ "Konfigūruoti...\n" +#~ "#-#-#-#-# twin4.po (twin4) #-#-#-#-#\n" +#~ "Konfigūruoti...\n" +#~ "#-#-#-#-# libtdegames.po (libtdegames) #-#-#-#-#\n" +#~ "Konfigūruoti...\n" +#~ "#-#-#-#-# kcmkamera.po (kcmkamera) #-#-#-#-#\n" +#~ "Konfigūruoti...\n" +#~ "#-#-#-#-# kpilot.po (kpilot) #-#-#-#-#\n" +#~ "Konfigūruoti...\n" +#~ "#-#-#-#-# uachangerplugin.po (uachangerplugin) #-#-#-#-#\n" +#~ "Konfigūruoti...\n" +#~ "#-#-#-#-# katemake.po (katemake) #-#-#-#-#\n" +#~ "Konfigūruoti...\n" +#~ "#-#-#-#-# kcmwifi.po (kcmwifi) #-#-#-#-#\n" +#~ "Derinti..." diff --git a/po/nb.po b/po/nb.po index b71b132..ef5056e 100644 --- a/po/nb.po +++ b/po/nb.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2006-06-10 22:03+0200\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" @@ -153,11 +153,6 @@ msgstr "" "Nå utfører du en mappefletting. Er du sikker på at du vil avbryte flettingen " "og lese gjennom mappa på nytt?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Les på nytt" @@ -261,11 +256,6 @@ msgstr "Endre alle flette-handlinger" msgid "C&ontinue" msgstr "F&ortsett" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Arbeider " @@ -359,13 +349,6 @@ msgstr "Programfeil" msgid "An error occurred while copying.\n" msgstr "Det oppsto en feil under kopiering.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Feil." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Flettefeil" @@ -599,11 +582,6 @@ msgstr "Siste endring" msgid "Link-Destination" msgstr "Lenkemål" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Fil ..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "ikke tilgjengelig" @@ -856,10 +834,6 @@ msgstr "Feil ved åpning av fil" msgid "Opens documents for comparison..." msgstr "Åpner dokumentere for sammenlikning ..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Lagrer fletteresultatet. Alle konflikter må løses!" @@ -1128,10 +1102,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Du holder på med en mappefletting. Er du sikker på at du vil avbryte?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Lagrer fil ..." @@ -1140,10 +1110,6 @@ msgstr "Lagrer fil ..." msgid "Saving file with a new filename..." msgstr "Lagrer fil med nytt filnavn ..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "Skriver ut ..." @@ -1408,15 +1374,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Endre dette hvis tegn som ikke er i ASCII ikke blir vist riktig." -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Sett opp ..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Skrift for redigering og utdata" @@ -2409,10 +2366,6 @@ msgstr "Utdata (valgfri):" msgid "Configure..." msgstr "Sett opp ..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Søketekst:" @@ -2491,14 +2444,6 @@ msgstr "" msgid "Sort key result:" msgstr "Resulterende sorteringsnøkler:" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "Tilslag." @@ -2521,11 +2466,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "Sett opp KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Fil ..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2561,10 +2501,21 @@ msgstr "&Flett" msgid "&Window" msgstr "&Vindu" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Feil." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Fil ..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Sett opp ..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Fil ..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Filer A og B er binært like.\n" diff --git a/po/nl.po b/po/nl.po index 1f5ad83..188070e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2006-11-27 00:05+0100\n" "Last-Translator: Rinse de Vries \n" "Language-Team: Dutch \n" @@ -162,11 +162,6 @@ msgstr "" "werkelijk, of wilt u het samenvoegen afbreken en de directory opnieuw " "inlezen?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Opnieuw inlezen" @@ -271,11 +266,6 @@ msgstr "Verandering van alle samenvoegingen" msgid "C&ontinue" msgstr "D&oorgaan" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Voortgang" @@ -370,13 +360,6 @@ msgstr "Programmafout" msgid "An error occurred while copying.\n" msgstr "Er deed zich een fout voor tijdens het kopiëren.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Fout." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Fout bij samenvoegen" @@ -625,11 +608,6 @@ msgstr "Laatste wijziging" msgid "Link-Destination" msgstr "Koppelingsbestemming" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Bestand..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "niet beschikbaar" @@ -890,10 +868,6 @@ msgstr "Fout bij bestanden openen" msgid "Opens documents for comparison..." msgstr "Opent documenten voor vergelijking..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1167,10 +1141,6 @@ msgstr "" "U bent momenteel bezig met het samenvoegen van directorypen. Wilt u " "werkelijk afbreken?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Bestand wordt opgeslagen..." @@ -1179,10 +1149,6 @@ msgstr "Bestand wordt opgeslagen..." msgid "Saving file with a new filename..." msgstr "Bestand wordt opgeslagen met een nieuwe naam..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "Afdrukken..." @@ -1454,15 +1420,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Verander dit indien niet-ascii tekens niet juist weergegeven worden." -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Instellen..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Lettertype voor editor & vergelijkingsvenster" @@ -2488,10 +2445,6 @@ msgstr "Uitvoer (optioneel):" msgid "Configure..." msgstr "Instellen..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Zoektekst:" @@ -2573,14 +2526,6 @@ msgstr "" msgid "Sort key result:" msgstr "Resulterende sorteersleutel:" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "Overeenkomst succesvol" @@ -2605,11 +2550,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "KDiff3 instellen" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Bestand..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2645,10 +2585,21 @@ msgstr "Sa&menvoegen" msgid "&Window" msgstr "&Venster" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Fout." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Bestand..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Instellen..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Bestand..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Bestanden A en B zijn binair gelijk.\n" diff --git a/po/pl.po b/po/pl.po index 6ffb71f..d92a3d2 100644 --- a/po/pl.po +++ b/po/pl.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2005-12-30 14:10+0100\n" "Last-Translator: Robert Gomulka \n" "Language-Team: polish \n" @@ -165,11 +165,6 @@ msgstr "" "Obecnie wykonywane jest łączenie katalogów. Jesteś pewny że chcesz przerwać " "tą operację i ponownie przeskanować katalog?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Ponowne skanowanie" @@ -274,11 +269,6 @@ msgstr "Zmiana wszystkich operacji łączenia" msgid "C&ontinue" msgstr "K&ontynuuj" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "W trakcie " @@ -372,13 +362,6 @@ msgstr "Błąd programu" msgid "An error occurred while copying.\n" msgstr "Wystąpił błąd w trakcie kopiowania.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Błąd." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Błąd połączenia" @@ -617,11 +600,6 @@ msgstr "Ostatnia modyfikacja" msgid "Link-Destination" msgstr "Dowiązanie do pliku" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Plik..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "niedostępne" @@ -883,10 +861,6 @@ msgstr "Błąd otwarcia pliku" msgid "Opens documents for comparison..." msgstr "Otwieranie dokumentów do porównania..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1163,10 +1137,6 @@ msgid "" msgstr "" "Obecnie wykonujesz połączenie katalogów. Jesteś pewny że chcesz przerwać?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Zapisywanie pliku..." @@ -1175,10 +1145,6 @@ msgstr "Zapisywanie pliku..." msgid "Saving file with a new filename..." msgstr "Zapisywanie pliku pod nową nazwą..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 #, fuzzy msgid "Printing..." @@ -1454,15 +1420,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Zmień to jeśli znaki non-ascii są wyświetlane niepoprawnie." -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Konfiguracja..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Czcionka edytora i wyjścia różnic" @@ -2434,10 +2391,6 @@ msgstr "Wynik (opcjonalnie):" msgid "Configure..." msgstr "Konfiguracja..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Szukaj tekstu:" @@ -2510,14 +2463,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2541,11 +2486,6 @@ msgstr "K&Diff3" msgid "Configure KDiff3" msgstr "Konfiguracja KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Plik..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2581,10 +2521,21 @@ msgstr "&Połączenie" msgid "&Window" msgstr "&Okno" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Błąd." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Plik..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Konfiguracja..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Plik..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Pliki A i B są binarnie identyczne.\n" diff --git a/po/pt.po b/po/pt.po index 78608bb..7fd773b 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2006-11-05 14:35+0000\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -150,11 +150,6 @@ msgstr "" "Você está neste momento a fazer uma junção de pastas. Tem a certeza que " "deseja interromper a junção e analisar a pasta de novo?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Pesquisar de Novo" @@ -259,11 +254,6 @@ msgstr "A Mudar Todas as Operações de Junção" msgid "C&ontinue" msgstr "C&ontinuar" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "A processar " @@ -357,13 +347,6 @@ msgstr "Erro no Programa" msgid "An error occurred while copying.\n" msgstr "Ocorreu um erro ao copiar.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Erro." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Erro na Junção" @@ -602,11 +585,6 @@ msgstr "Última Modificação" msgid "Link-Destination" msgstr "Ligação-Destino" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Ficheiro..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "não disponível" @@ -867,10 +845,6 @@ msgstr "Erro de Acesso ao Ficheiro" msgid "Opens documents for comparison..." msgstr "Abre os documentos para os comparar..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1147,10 +1121,6 @@ msgstr "" "Você está a fazer uma junção de pastas de momento. Tem a certeza que quer " "interromper?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "A gravar o ficheiro..." @@ -1159,10 +1129,6 @@ msgstr "A gravar o ficheiro..." msgid "Saving file with a new filename..." msgstr "A gravar o ficheiro com um novo nome..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "A imprimir..." @@ -1434,15 +1400,6 @@ msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" "Altere isto se os caracteres não-ASCII não são mostrados correctamente." -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Configurar..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Tipo de Letra do Resultado do Diff e do Editor" @@ -2461,10 +2418,6 @@ msgstr "Resultado (opcional):" msgid "Configure..." msgstr "Configurar..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Texto da procura:" @@ -2544,14 +2497,6 @@ msgstr "" msgid "Sort key result:" msgstr "Resultado da chave de ordenação:" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "Sucesso da correspondência." @@ -2575,11 +2520,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "Configurar o KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Ficheiro..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2615,10 +2555,21 @@ msgstr "Reu&nir" msgid "&Window" msgstr "&Janela" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Erro." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Ficheiro..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Configurar..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Ficheiro..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Os ficheiros A e B são iguais a nível binário.\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 21f753d..919f619 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2007-01-30 20:41-0200\n" "Last-Translator: Diniz Bortolotto \n" "Language-Team: Brazilian Portuguese \n" @@ -169,11 +169,6 @@ msgstr "" "Você está neste momento fazendo uma mesclagem de diretórios. Tem certeza que " "deseja interromper a mesclagem e analisar o diretório de novo?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Pesquisar de Novo" @@ -278,11 +273,6 @@ msgstr "Mudando Todas as Operações de Mesclagem" msgid "C&ontinue" msgstr "C&ontinuar" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Processando " @@ -376,13 +366,6 @@ msgstr "Erro no Programa" msgid "An error occurred while copying.\n" msgstr "Ocorreu um erro ao copiar.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Erro." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Erro na Mesclagem" @@ -623,11 +606,6 @@ msgstr "Última modificação" msgid "Link-Destination" msgstr "Ligação-Destino" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Arquivo..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "não disponível" @@ -888,10 +866,6 @@ msgstr "Erro na abertura do arquivo" msgid "Opens documents for comparison..." msgstr "Abre documentos para comparação..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1168,10 +1142,6 @@ msgstr "" "Você está fazendo uma mesclagem de diretórios. Tem certeza de que deseja " "cancelar?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Salvando arquivo...." @@ -1180,10 +1150,6 @@ msgstr "Salvando arquivo...." msgid "Saving file with a new filename..." msgstr "Salvando arquivo com um novo nome..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "Imprimindo..." @@ -1455,15 +1421,6 @@ msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" "Mude isto se caracteres diferentes de ASCII não forem exibidos corretamente." -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Configurar..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Fonte de Saída do Editor & Diff " @@ -2481,10 +2438,6 @@ msgstr "Saída (opcional):" msgid "Configure..." msgstr "Configurar..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Texto da procura:" @@ -2565,14 +2518,6 @@ msgstr "" msgid "Sort key result:" msgstr "Resultado da chave de ordenação:" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "Sucesso da correspondência." @@ -2596,11 +2541,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "Configurar KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Arquivo..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2636,10 +2576,21 @@ msgstr "&Mesclar" msgid "&Window" msgstr "&Janela" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Erro." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Arquivo..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Configurar..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Arquivo..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Arquivos A e B são iguais em nível binário.\n" diff --git a/po/ro.po b/po/ro.po index d428908..4468902 100644 --- a/po/ro.po +++ b/po/ro.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: @PACKAGE\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2003-11-08 18:45+0200\n" "Last-Translator: Claudiu Costin \n" "Language-Team: Romanian \n" @@ -138,11 +138,6 @@ msgid "" "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "" @@ -244,11 +239,6 @@ msgstr "" msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "" @@ -337,12 +327,6 @@ msgstr "" msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -msgid "Error" -msgstr "" - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "" @@ -559,10 +543,6 @@ msgstr "" msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2712 -msgid "File" -msgstr "" - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "" @@ -810,10 +790,6 @@ msgstr "" msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1081,10 +1057,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "" @@ -1093,10 +1065,6 @@ msgstr "" msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "" @@ -1343,14 +1311,6 @@ msgstr "" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:455 -msgid "Configure" -msgstr "" - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "" @@ -2230,10 +2190,6 @@ msgstr "" msgid "Configure..." msgstr "" -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2306,14 +2262,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2336,11 +2284,6 @@ msgstr "" msgid "Configure KDiff3" msgstr "" -#: kdiff3_shell.rc:4 -#, no-c-format -msgid "&File" -msgstr "" - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2375,8 +2318,3 @@ msgstr "" #, no-c-format msgid "&Window" msgstr "" - -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" diff --git a/po/ru.po b/po/ru.po index b7bd76c..ff80c49 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2005-02-01 10:56+0200\n" "Last-Translator: Nick Shaforostoff \n" "Language-Team: \n" @@ -141,11 +141,6 @@ msgstr "" "Сейчас программа работает в режиме объединения каталогов. Вы действительно " "хотите отменить все изменения и обновить содержание каталогов?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Обновить" @@ -247,11 +242,6 @@ msgstr "Изменение всех объединений" msgid "C&ontinue" msgstr "&Продолжить" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Обработка " @@ -343,13 +333,6 @@ msgstr "Ошибка программы" msgid "An error occurred while copying.\n" msgstr "Ошибка копирования.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Ошибка." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Ошибка объединения" @@ -579,11 +562,6 @@ msgstr "Последнее изменение" msgid "Link-Destination" msgstr "Объект ссылки" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Файл..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "не доступно" @@ -840,10 +818,6 @@ msgstr "Ошибка открытия файлов" msgid "Opens documents for comparison..." msgstr "Открыть файлы для сравнения..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Сохранить результат объединения. Все конфликты должны быть разрешены!" @@ -1114,10 +1088,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Остановить объединение каталогов?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Сохранение файла..." @@ -1126,10 +1096,6 @@ msgstr "Сохранение файла..." msgid "Saving file with a new filename..." msgstr "Сохранение файла с новым именем..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 #, fuzzy msgid "Printing..." @@ -1395,15 +1361,6 @@ msgstr "" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Настроить..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Шрифт редактора и вывода различий" @@ -2307,10 +2264,6 @@ msgstr "Вывод (необязательно):" msgid "Configure..." msgstr "Настроить..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Найти:" @@ -2383,14 +2336,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2414,11 +2359,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "Настроить KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Файл..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2454,10 +2394,21 @@ msgstr "&Объединение" msgid "&Window" msgstr "&Окно" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Ошибка." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Файл..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Настроить..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Файл..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Файлы A и B бинарно одинаковы.\n" diff --git a/po/rw.po b/po/rw.po index 18a54db..467af21 100644 --- a/po/rw.po +++ b/po/rw.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3 3.4\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2005-05-25 18:07-0600\n" "Last-Translator: Steve Murphy \n" "Language-Team: Kinyarwanda \n" @@ -181,11 +181,6 @@ msgid "" "the merge and rescan the directory?" msgstr "A Ububiko Gukomatanya . , Kuri Kureka i Gukomatanya na i Ububiko ? " -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 #, fuzzy msgid "Rescan" @@ -311,11 +306,6 @@ msgstr "Ibikorerwa Ishusho" msgid "C&ontinue" msgstr "Komeza" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 #, fuzzy msgid "Processing " @@ -426,13 +416,6 @@ msgstr "Ikosa " msgid "An error occurred while copying.\n" msgstr "Ikosa Gukoporora . \n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Ikosa." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 #, fuzzy msgid "Merge Error" @@ -701,11 +684,6 @@ msgstr "Iherutse guhindurwa" msgid "Link-Destination" msgstr "Ishyika" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Idosiye..." - #: directorymergewindow.cpp:2729 #, fuzzy msgid "not available" @@ -991,10 +969,6 @@ msgstr "Ikosa gufungura idosiye" msgid "Opens documents for comparison..." msgstr "Inyandiko ya: ... " -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 #, fuzzy msgid "Saves the merge result. All conflicts must be solved!" @@ -1321,10 +1295,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "A Ububiko Gukomatanya . , Kuri Kureka ? " -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 #, fuzzy msgid "Saving file..." @@ -1335,10 +1305,6 @@ msgstr "Idosiye ... " msgid "Saving file with a new filename..." msgstr "Idosiye Na: A Gishya Izina ry'idosiye: ... " -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 #, fuzzy msgid "Printing..." @@ -1644,15 +1610,6 @@ msgstr "Ikilatini-1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "iyi NIBA - Inyuguti OYA . " -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Kugena imiterere..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "" @@ -2728,10 +2685,6 @@ msgstr "( Bitari ngombwa ) : " msgid "Configure..." msgstr "Kugena imiterere..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 #, fuzzy msgid "Search text:" @@ -2809,14 +2762,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2840,11 +2785,6 @@ msgstr "" msgid "Configure KDiff3" msgstr "Kuboneza Gucapa na KDE" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Idosiye..." - #: kdiff3_shell.rc:7 #, fuzzy, no-c-format msgid "&Directory" @@ -2880,10 +2820,21 @@ msgstr "Gukomatanya" msgid "&Window" msgstr "Idirishya" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Ikosa." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Idosiye..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Kugena imiterere..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Idosiye..." #, fuzzy #~ msgid "Files A and B are binary equal.\n" diff --git a/po/sk.po b/po/sk.po index e61d83e..4888fcc 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2006-09-15 18:02+0200\n" "Last-Translator: Richard Fric \n" "Language-Team: Slovak \n" @@ -138,11 +138,6 @@ msgid "" "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "" @@ -244,11 +239,6 @@ msgstr "" msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "" @@ -337,12 +327,6 @@ msgstr "" msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -msgid "Error" -msgstr "" - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "" @@ -559,10 +543,6 @@ msgstr "" msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2712 -msgid "File" -msgstr "" - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "" @@ -810,10 +790,6 @@ msgstr "" msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1081,10 +1057,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "" @@ -1093,10 +1065,6 @@ msgstr "" msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "" @@ -1343,14 +1311,6 @@ msgstr "" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:455 -msgid "Configure" -msgstr "" - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "" @@ -2230,10 +2190,6 @@ msgstr "" msgid "Configure..." msgstr "" -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2306,14 +2262,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2336,11 +2284,6 @@ msgstr "" msgid "Configure KDiff3" msgstr "" -#: kdiff3_shell.rc:4 -#, no-c-format -msgid "&File" -msgstr "" - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2375,8 +2318,3 @@ msgstr "" #, no-c-format msgid "&Window" msgstr "" - -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" diff --git a/po/sr.po b/po/sr.po index b296b79..428afde 100644 --- a/po/sr.po +++ b/po/sr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2005-02-26 19:41+0100\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian\n" @@ -154,11 +154,6 @@ msgstr "" "Тренутно стапате директоријуме. Желите ли заиста да прекинете стапање и " "поново скенирате директоријум?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Поново скенирај" @@ -263,11 +258,6 @@ msgstr "Мењам све операције стапања" msgid "C&ontinue" msgstr "&Настави" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Обрађујем " @@ -359,13 +349,6 @@ msgstr "Програмска грешка" msgid "An error occurred while copying.\n" msgstr "Дошло је до грешке у току копирања.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Грешка." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Грешка стапања" @@ -609,11 +592,6 @@ msgstr "Последња измена" msgid "Link-Destination" msgstr "Веза-одредиште" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Фајл..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "није доступно" @@ -877,10 +855,6 @@ msgstr "Грешка при отварању фајла" msgid "Opens documents for comparison..." msgstr "Отвара документе за поређење..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Снима резултат стапања. Сви сукоби морају бити разрешени!" @@ -1154,10 +1128,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Тренутно стапате директоријуме. Желите ли заиста да прекинете?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Снимам фајл..." @@ -1166,10 +1136,6 @@ msgstr "Снимам фајл..." msgid "Saving file with a new filename..." msgstr "Снимам фајл под новим именом..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 #, fuzzy msgid "Printing..." @@ -1437,15 +1403,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Измените ово аке се знакови који нису ASCII не приказују исправно." -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Подеси..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Фонт уређивача и раз. излаза" @@ -2415,10 +2372,6 @@ msgstr "Излаз (опционо):" msgid "Configure..." msgstr "Подеси..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Текст за претрагу:" @@ -2491,14 +2444,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2522,11 +2467,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "Подеси KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Фајл..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2562,10 +2502,21 @@ msgstr "&Стопи" msgid "&Window" msgstr "П&розор" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Грешка." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Фајл..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Подеси..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Фајл..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Фајлови А и Б су бинарно једнаки.\n" diff --git a/po/sr@Latn.po b/po/sr@Latn.po index 7bf2e54..de4e32e 100644 --- a/po/sr@Latn.po +++ b/po/sr@Latn.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2005-02-26 19:41+0100\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian\n" @@ -154,11 +154,6 @@ msgstr "" "Trenutno stapate direktorijume. Želite li zaista da prekinete stapanje i " "ponovo skenirate direktorijum?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Ponovo skeniraj" @@ -263,11 +258,6 @@ msgstr "Menjam sve operacije stapanja" msgid "C&ontinue" msgstr "&Nastavi" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Obrađujem " @@ -359,13 +349,6 @@ msgstr "Programska greška" msgid "An error occurred while copying.\n" msgstr "Došlo je do greške u toku kopiranja.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Greška." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Greška stapanja" @@ -610,11 +593,6 @@ msgstr "Poslednja izmena" msgid "Link-Destination" msgstr "Veza-odredište" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Fajl..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "nije dostupno" @@ -879,10 +857,6 @@ msgstr "Greška pri otvaranju fajla" msgid "Opens documents for comparison..." msgstr "Otvara dokumente za poređenje..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Snima rezultat stapanja. Svi sukobi moraju biti razrešeni!" @@ -1156,10 +1130,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Trenutno stapate direktorijume. Želite li zaista da prekinete?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Snimam fajl..." @@ -1168,10 +1138,6 @@ msgstr "Snimam fajl..." msgid "Saving file with a new filename..." msgstr "Snimam fajl pod novim imenom..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 #, fuzzy msgid "Printing..." @@ -1439,15 +1405,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Izmenite ovo ake se znakovi koji nisu ASCII ne prikazuju ispravno." -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Podesi..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Font uređivača i raz. izlaza" @@ -2417,10 +2374,6 @@ msgstr "Izlaz (opciono):" msgid "Configure..." msgstr "Podesi..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Tekst za pretragu:" @@ -2493,14 +2446,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2524,11 +2469,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "Podesi KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Fajl..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2564,10 +2504,21 @@ msgstr "&Stopi" msgid "&Window" msgstr "P&rozor" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Greška." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Fajl..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Podesi..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Fajl..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Fajlovi A i B su binarno jednaki.\n" diff --git a/po/sv.po b/po/sv.po index 1f01cab..d15f34b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2006-11-05 16:50+0100\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" @@ -153,11 +153,6 @@ msgstr "" "Du håller för närvarande på med att sammanfoga kataloger. Är du säker på att " "du vill avbryta den och avsöka katalogen igen?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Avsök igen" @@ -262,11 +257,6 @@ msgstr "Ändra alla sammanfogningsåtgärder" msgid "C&ontinue" msgstr "F&ortsätt" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Behandlar " @@ -360,13 +350,6 @@ msgstr "Programfel" msgid "An error occurred while copying.\n" msgstr "Ett fel uppstod vid kopiering.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Fel." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Sammanfogningsfel" @@ -607,11 +590,6 @@ msgstr "Senast ändrad" msgid "Link-Destination" msgstr "Länkmål" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Fil..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "Ej tillgänglig" @@ -868,10 +846,6 @@ msgstr "Fel vid öppna fil" msgid "Opens documents for comparison..." msgstr "Öppnar dokument för jämförelse..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Sparar sammanfogningsresultat. Alla konflikter måste vara lösta." @@ -1145,10 +1119,6 @@ msgstr "" "Du håller för närvarande på med en katalogsammanfogning. Är du säker på att " "du vill avbryta?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Sparar fil..." @@ -1157,10 +1127,6 @@ msgstr "Sparar fil..." msgid "Saving file with a new filename..." msgstr "Sparar fil med ett nytt namn..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 msgid "Printing..." msgstr "Skriver ut..." @@ -1428,15 +1394,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Ändra det här om tecken som inte är ASCII inte visas riktigt." -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Anpassa..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Teckensnitt för editor och jämförelser" @@ -2440,10 +2397,6 @@ msgstr "Utmatning (valfri):" msgid "Configure..." msgstr "Anpassa..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Söktext:" @@ -2522,14 +2475,6 @@ msgstr "" msgid "Sort key result:" msgstr "Sorteringsnyckelresultat:" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "Matchning lyckades." @@ -2552,11 +2497,6 @@ msgstr "&Kdiff3" msgid "Configure KDiff3" msgstr "Anpassa Kdiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Fil..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2592,10 +2532,21 @@ msgstr "Sa&mmanfoga" msgid "&Window" msgstr "Fö&nster" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Fel." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Fil..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Anpassa..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Fil..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "Filerna A och B är binärt lika.\n" diff --git a/po/ta.po b/po/ta.po index c9fa8de..63b2a64 100644 --- a/po/ta.po +++ b/po/ta.po @@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2004-08-24 04:28+0530\n" "Last-Translator: I. Felix \n" "Language-Team: \n" @@ -172,11 +172,6 @@ msgstr "" "நீங்கள் தற்பொழுது ஒன்றாக சேர்க்கப்பட்ட அடைவை பயன்படுத்திக் கொண்டிருக்கிறீர்கள். நீங்கள் நிச்சயமாக " "ஒன்று சேர்ப்பதை நிறுத்திவிட்டு அடைவை மறுவருடலை விரும்புகிறீர்களா?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "மறுவருடல்" @@ -281,11 +276,6 @@ msgstr "அனைத்து ஒன்றுசேர் இயக்கங் msgid "C&ontinue" msgstr "தொடர்தல்" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "செயலாக்குதல்" @@ -379,13 +369,6 @@ msgstr "நிரல் பிழை" msgid "An error occurred while copying.\n" msgstr "நகலெடுக்கும்போது பிழை ஏற்பட்டுள்ளது.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "பிழை." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "ஒன்றுசேர் பிழை" @@ -622,11 +605,6 @@ msgstr "கடைசி திருத்தம்" msgid "Link-Destination" msgstr "இணை-சேருமிடம்" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "கோப்பு" - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "கிடைக்கவில்லை" @@ -891,10 +869,6 @@ msgstr "கோப்பு திறப்பில் பிழை" msgid "Opens documents for comparison..." msgstr "ஒப்பிடுதலுக்கு ஆவணங்களைத் திறக்க..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "ஒன்றுசேர் முடிவை சேகரி. அனைத்து குழப்பங்களும் தீர வேண்டும்." @@ -1170,10 +1144,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "நீங்கள் தற்போது அடைவுகளை சேர்த்துக் கொண்டிருக்கிறீர்கள். நிறுத்த விரும்புகிறீர்களா?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "கோப்பு சேகரித்தல்..." @@ -1182,10 +1152,6 @@ msgstr "கோப்பு சேகரித்தல்..." msgid "Saving file with a new filename..." msgstr "புதிய கோப்புப்பெயருடன் கோப்பினை சேகரித்தல்..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 #, fuzzy msgid "Printing..." @@ -1448,15 +1414,6 @@ msgstr "" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "இல்லா-ஆஸ்கி-எழுத்துக்கள் சரியாக வெளிகாட்டவில்லை என்றால் இதை மாற்றுக" -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "அமை" - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "திருத்துபவரும் வித்தியாசமான வெளியீட்டு எழுத்துக்களும்" @@ -2414,10 +2371,6 @@ msgstr "வெளீயிடு (விருப்பங்கள்)" msgid "Configure..." msgstr "அமை" -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 #, fuzzy msgid "Search text:" @@ -2491,14 +2444,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2522,11 +2467,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "அமை KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "கோப்பு" - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2562,10 +2502,21 @@ msgstr "ஒன்றாகச்சேர்" msgid "&Window" msgstr "சாளரங்கள்" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "பிழை." + +#, fuzzy +#~ msgid "File" +#~ msgstr "கோப்பு" + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "அமை" + +#, fuzzy +#~ msgid "&File" +#~ msgstr "கோப்பு" #~ msgid "Files A and B are binary equal.\n" #~ msgstr "கோப்புகள் A மற்றும் B இருநிலை சமம் உடையன.\n" diff --git a/po/tg.po b/po/tg.po index 7461631..c83be38 100644 --- a/po/tg.po +++ b/po/tg.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2005-09-17 13:29+0500\n" "Last-Translator: Victor Ibragimov \n" "Language-Team: Tajik\n" @@ -163,11 +163,6 @@ msgstr "" "ҳақиқат мехоҳед, ки ҳамаи тағйиротҳоро нест кунед ва таркиби каталогро ан " "нав кунед?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Дигар кардан" @@ -273,11 +268,6 @@ msgstr "Тағйироти ҳамаи якҷошавиҳо" msgid "C&ontinue" msgstr "&Давом додан" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Коркард " @@ -368,13 +358,6 @@ msgstr "Хатогии барнома" msgid "An error occurred while copying.\n" msgstr "Хатогии нусхакунӣ.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Хатогӣ." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Хатогии якҷояшавӣ" @@ -609,10 +592,6 @@ msgstr "Тағйироти охирон" msgid "Link-Destination" msgstr "Бадарғаи-объект" -#: directorymergewindow.cpp:2712 -msgid "File" -msgstr "" - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "дастрас нест" @@ -878,10 +857,6 @@ msgstr "Хатогӣ дар кушодани файл" msgid "Opens documents for comparison..." msgstr "Мекушояд документҳоро барои муқоиса..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1158,10 +1133,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Якҷояшавии каталогро нигоҳ дорем.Оё,шумо дилпур мехоҳед, баровардан?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Нигоҳ доштани файл..." @@ -1170,10 +1141,6 @@ msgstr "Нигоҳ доштани файл..." msgid "Saving file with a new filename..." msgstr "Бо номи нав нигоҳ доштани файл..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 #, fuzzy msgid "Printing..." @@ -1433,15 +1400,6 @@ msgstr "" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Танзимоти KDiff3..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "" @@ -2344,10 +2302,6 @@ msgstr "" msgid "Configure..." msgstr "Танзимоти KDiff3..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 #, fuzzy msgid "Search text:" @@ -2421,14 +2375,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2452,11 +2398,6 @@ msgstr "KDiff3Part" msgid "Configure KDiff3" msgstr "Танзимоти KDiff3..." -#: kdiff3_shell.rc:4 -#, no-c-format -msgid "&File" -msgstr "" - #: kdiff3_shell.rc:7 #, fuzzy, no-c-format msgid "&Directory" @@ -2492,10 +2433,13 @@ msgstr "Пайваст кардан" msgid "&Window" msgstr "Нишон диҳед Тирезаи С-ро" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Хатогӣ." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Танзимоти KDiff3..." #, fuzzy #~ msgid "Diff and Merge" diff --git a/po/tr.po b/po/tr.po index 2873dfd..a13e3ce 100644 --- a/po/tr.po +++ b/po/tr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2005-07-12 10:50+0300\n" "Last-Translator: Alper Sen \n" "Language-Team: Türkçe \n" @@ -159,11 +159,6 @@ msgstr "" "Şu anda bir dizin birleştirmesi yapıyorsunuz. Birleştirmeden çıkmak ve " "dizini yeniden taramak istediğinizden emin misiniz?" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Yeniden Tara" @@ -267,11 +262,6 @@ msgstr "Tüm Birleştirme İşlemleri Değiştiriliyor" msgid "C&ontinue" msgstr "D&evam Et" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "İşleniyor" @@ -366,13 +356,6 @@ msgstr "Uygulama Hatası" msgid "An error occurred while copying.\n" msgstr "Koplayanırken hata oluştu.\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Hata." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Birleştirme Hatası" @@ -609,11 +592,6 @@ msgstr "Son Değiştirme" msgid "Link-Destination" msgstr "Bağ-Hedefi" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Dosya..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "mümkün değil" @@ -872,10 +850,6 @@ msgstr "Dosya Açma Hatası" msgid "Opens documents for comparison..." msgstr "Karşılaştırmak için belge açar..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Birleştirme sonuçlarını kaydeder. Tüm çakışmalar çözülmelidir!" @@ -1158,10 +1132,6 @@ msgstr "" "Şu anda bir dizin birleştirmesi gerçekleştiriyorsunuz. Çıkmak istediğinizden " "emin misiniz?" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "Dosya kaydediliyor..." @@ -1170,10 +1140,6 @@ msgstr "Dosya kaydediliyor..." msgid "Saving file with a new filename..." msgstr "Dosya yeni bir isimle kaydediliyor..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 #, fuzzy msgid "Printing..." @@ -1437,15 +1403,6 @@ msgstr "" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Yapılandır..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Düzenleyici ve Karşılaştırıcı Çıktısı Yazıtipi" @@ -2360,10 +2317,6 @@ msgstr "Çıktı (İsteğe Bağlı):" msgid "Configure..." msgstr "Yapılandır..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 #, fuzzy msgid "Search text:" @@ -2437,14 +2390,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2468,11 +2413,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "KDiff3 Uygulamasını Yapılandır" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Dosya..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2508,10 +2448,21 @@ msgstr "&Birleştir" msgid "&Window" msgstr "&Pencere" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Hata." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Dosya..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Yapılandır..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Dosya..." #~ msgid "Files A and C have equal text. \n" #~ msgstr "A ve C dosyaları aynı metne sahip. \n" diff --git a/po/uk.po b/po/uk.po index 94caa5a..65df4cd 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2006-06-14 23:20-0700\n" "Last-Translator: Ivan Petrouchtchak \n" "Language-Team: Ukrainian \n" @@ -142,11 +142,6 @@ msgstr "" "Ви дійсно хочете цілковито відновити Pilot з резервної копії (%1)? Ця дія приведе до повного стирання даних на Pilot." -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Пересканувати" @@ -258,11 +253,6 @@ msgstr "" msgid "C&ontinue" msgstr "Пр&одовжити" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 #, fuzzy msgid "Processing " @@ -367,13 +357,6 @@ msgid "An error occurred while copying.\n" msgstr "" "

Помилка під час спроби видалення сертифіката:

%1

" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "Помилка." - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 #, fuzzy msgid "Merge Error" @@ -631,11 +614,6 @@ msgstr "Час останньої модифікації" msgid "Link-Destination" msgstr "Сховати місце призначення &посилання" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "Файл..." - #: directorymergewindow.cpp:2729 #, fuzzy msgid "not available" @@ -909,10 +887,6 @@ msgstr "Помилка відкриття файла" msgid "Opens documents for comparison..." msgstr "Кількість речень, слів та літер в документі" -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" @@ -1214,10 +1188,6 @@ msgstr "" "Ви в даний час приймаєте участь у грі. Ви дійсно хочете закрити Atlantik? " "Якщо ви вийдете з гри, ви програли." -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 #, fuzzy msgid "Saving file..." @@ -1228,10 +1198,6 @@ msgstr "Збереження файла..." msgid "Saving file with a new filename..." msgstr "Зберігаю файл з новим ім'ям..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 #, fuzzy msgid "Printing..." @@ -1503,15 +1469,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "Налаштувати..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "" @@ -2454,10 +2411,6 @@ msgstr "Коментар (не обов'язковий):" msgid "Configure..." msgstr "Налаштувати..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Знайти текст:" @@ -2533,14 +2486,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2564,11 +2509,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "Налаштувати KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "Файл..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2604,10 +2544,21 @@ msgstr "&Об'єднати" msgid "&Window" msgstr "&Вікно" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "Помилка." + +#, fuzzy +#~ msgid "File" +#~ msgstr "Файл..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "Налаштувати..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "Файл..." #, fuzzy #~ msgid "Preserve carriage return" diff --git a/po/zh_CN.po b/po/zh_CN.po index 68e135c..ab39ef4 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2018-12-27 20:04+0100\n" +"POT-Creation-Date: 2019-01-13 19:08+0100\n" "PO-Revision-Date: 2005-02-07 10:03+0800\n" "Last-Translator: Mai Hao Hui \n" "Language-Team: zh_CN \n" @@ -151,11 +151,6 @@ msgid "" "the merge and rescan the directory?" msgstr "您当前正在合并目录。您确定要放弃合并，重新扫描目录吗？" -#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 -#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 -msgid "Warning" -msgstr "" - #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "重新扫描" @@ -259,11 +254,6 @@ msgstr "更改全部合并操作" msgid "C&ontinue" msgstr "继续(&o)" -#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 -#: smalldialogs.cpp:169 smalldialogs.cpp:381 -msgid "&Cancel" -msgstr "" - #: directorymergewindow.cpp:1236 msgid "Processing " msgstr "处理 " @@ -357,13 +347,6 @@ msgstr "程序错误" msgid "An error occurred while copying.\n" msgstr "复制时发生错误。\n" -#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 -#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 -#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 -#, fuzzy -msgid "Error" -msgstr "错误。" - #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "合并错误" @@ -588,11 +571,6 @@ msgstr "上次修改" msgid "Link-Destination" msgstr "链接目标" -#: directorymergewindow.cpp:2712 -#, fuzzy -msgid "File" -msgstr "文件..." - #: directorymergewindow.cpp:2729 msgid "not available" msgstr "不可用" @@ -850,10 +828,6 @@ msgstr "文件打开出错" msgid "Opens documents for comparison..." msgstr "打开文档比较..." -#: kdiff3.cpp:436 -msgid "Reload" -msgstr "" - #: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "保存合并结果。必须解决全部冲突！" @@ -1123,10 +1097,6 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "您当前正在合并目录。您确认要放弃吗？" -#: kdiff3.cpp:622 -msgid "Quit" -msgstr "" - #: kdiff3.cpp:644 msgid "Saving file..." msgstr "正在保存文件..." @@ -1135,10 +1105,6 @@ msgstr "正在保存文件..." msgid "Saving file with a new filename..." msgstr "正在用新文件名保存文件..." -#: kdiff3.cpp:663 -msgid "Save As..." -msgstr "" - #: kdiff3.cpp:751 #, fuzzy msgid "Printing..." @@ -1404,15 +1370,6 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "如果非 ASCII 字符不能正确显示，请更改此选项。" -#: optiondialog.cpp:455 -#, fuzzy -msgid "Configure" -msgstr "配置..." - -#: optiondialog.cpp:510 -msgid "Font" -msgstr "" - #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "编辑器和 Diff 输出字体" @@ -2373,10 +2330,6 @@ msgstr "输出(可选)：" msgid "Configure..." msgstr "配置..." -#: smalldialogs.cpp:164 -msgid "&OK" -msgstr "" - #: smalldialogs.cpp:347 msgid "Search text:" msgstr "搜索文本：" @@ -2449,14 +2402,6 @@ msgstr "" msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:493 -msgid "OK" -msgstr "" - -#: smalldialogs.cpp:497 -msgid "Cancel" -msgstr "" - #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2480,11 +2425,6 @@ msgstr "&KDiff3" msgid "Configure KDiff3" msgstr "配置 KDiff3" -#: kdiff3_shell.rc:4 -#, fuzzy, no-c-format -msgid "&File" -msgstr "文件..." - #: kdiff3_shell.rc:7 #, no-c-format msgid "&Directory" @@ -2520,10 +2460,21 @@ msgstr "合并(&M)" msgid "&Window" msgstr "窗口(&W)" -#: kdiff3_shell.rc:106 -#, no-c-format -msgid "Main Toolbar" -msgstr "" +#, fuzzy +#~ msgid "Error" +#~ msgstr "错误。" + +#, fuzzy +#~ msgid "File" +#~ msgstr "文件..." + +#, fuzzy +#~ msgid "Configure" +#~ msgstr "配置..." + +#, fuzzy +#~ msgid "&File" +#~ msgstr "文件..." #~ msgid "Files A and B are binary equal.\n" #~ msgstr "文件 A 和 B 二进制数据相同。\n"