From 864c4269a4dda66e93611d597c98e5a5b3c7bc20 Mon Sep 17 00:00:00 2001 From: TDE Weblate Date: Thu, 27 Dec 2018 19:21:46 +0000 Subject: 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/ (cherry picked from commit 7637a92a1da3eec5e3f9f55ca614dd98aac8e7f9) --- po/ar.po | 1152 ++++++++++++++++++++++++++----------------------- po/az.po | 1137 +++++++++++++++++++++++++----------------------- po/bg.po | 1287 ++++++++++++++++++++++++++++++------------------------- po/br.po | 1147 ++++++++++++++++++++++++++----------------------- po/ca.po | 1135 +++++++++++++++++++++++++----------------------- po/cs.po | 1151 ++++++++++++++++++++++++++----------------------- po/cy.po | 1140 ++++++++++++++++++++++++++----------------------- po/da.po | 1263 +++++++++++++++++++++++++++++------------------------- po/de.po | 1301 +++++++++++++++++++++++++++++-------------------------- po/el.po | 1305 ++++++++++++++++++++++++++++++-------------------------- po/en_GB.po | 1259 +++++++++++++++++++++++++++++------------------------- po/es.po | 1327 +++++++++++++++++++++++++++++++-------------------------- po/et.po | 1249 ++++++++++++++++++++++++++++------------------------- po/fr.po | 1295 +++++++++++++++++++++++++++++-------------------------- po/ga.po | 1145 ++++++++++++++++++++++++++----------------------- po/gl.po | 1136 +++++++++++++++++++++++++----------------------- po/hi.po | 1221 +++++++++++++++++++++++++++------------------------- po/hu.po | 1274 +++++++++++++++++++++++++++++------------------------- po/is.po | 1135 +++++++++++++++++++++++++----------------------- po/it.po | 1250 ++++++++++++++++++++++++++++------------------------- po/ja.po | 1241 +++++++++++++++++++++++++++++------------------------ po/ka.po | 1228 +++++++++++++++++++++++++++------------------------- po/lt.po | 1169 +++++++++++++++++++++++++++----------------------- po/nb.po | 1242 ++++++++++++++++++++++++++++------------------------- po/nl.po | 1302 +++++++++++++++++++++++++++++-------------------------- po/pl.po | 1275 +++++++++++++++++++++++++++++------------------------- po/pt.po | 1310 ++++++++++++++++++++++++++++++-------------------------- po/pt_BR.po | 1312 ++++++++++++++++++++++++++++++-------------------------- po/ro.po | 1135 +++++++++++++++++++++++++----------------------- po/ru.po | 1206 +++++++++++++++++++++++++++------------------------ po/rw.po | 1231 +++++++++++++++++++++++++++------------------------- po/sk.po | 1135 +++++++++++++++++++++++++----------------------- po/sr.po | 1269 +++++++++++++++++++++++++++++------------------------- po/sr@Latn.po | 1264 +++++++++++++++++++++++++++++------------------------- po/sv.po | 1283 ++++++++++++++++++++++++++++++------------------------- po/ta.po | 1323 +++++++++++++++++++++++++++++--------------------------- po/tg.po | 1186 +++++++++++++++++++++++++++------------------------ po/tr.po | 1209 ++++++++++++++++++++++++++++------------------------ po/uk.po | 1187 +++++++++++++++++++++++++++------------------------ po/zh_CN.po | 1222 ++++++++++++++++++++++++++++------------------------ 40 files changed, 26331 insertions(+), 22707 deletions(-) (limited to 'po') diff --git a/po/ar.po b/po/ar.po index 356f593..350491f 100644 --- a/po/ar.po +++ b/po/ar.po @@ -4,36 +4,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2006-12-03 19:06+0100\n" "Last-Translator: محمد سعد Mohamed SAAD \n" "Language-Team: Arabic \n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Mohamed SAAD محمد سعد" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "metehyi@free.fr" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "فشل كتابة بيانات الحافظة إلى الملف المؤقت." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "من الحافظة" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -47,7 +48,7 @@ msgstr "" "\n" "سيتم تعطيل الإجراء التمهيدي الآن." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -56,21 +57,21 @@ msgid "" "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "خطأ داخلي فادح" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "السطر الأعلى" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "النهاية" @@ -86,240 +87,244 @@ msgstr "" msgid "Size. " msgstr "القياس: " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "التاريخ و القياس: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "فشل إنشاء نسخة مؤقتة من %1." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "فشل فتح %1." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "جاري مقارنة الملف..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "خطأ عند القراءة من %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "الإسم" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "العملية" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "الحالة" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "أبيض" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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 "إعادة المسح" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "فشل فتح المجلّدات:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"الدليل A \"%1\" غير موجود أو هو ليس دليل.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "الدليل A \"%1\" غير موجود أو هو ليس دليل.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"الدليل B \"%1\" غير موجود أو هو ليس دليل.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "الدليل B \"%1\" غير موجود أو هو ليس دليل.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"الدليل C \"%1\" غير موجود أو هو ليس دليل.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "الدليل C \"%1\" غير موجود أو هو ليس دليل.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "خطأ فتح الدليل" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "تحذير بشأن الضوابط" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "جاري مسح المجلّدات...." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "قراءة الدليل A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "قراءة الدليل B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "قراءة الدليل C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "إفحص الأذون للمجلّدات الفرعية." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "جاهز." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "حالة مقارنة المجلّدات" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "عدد المجلّدات الفرعية:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "عدد الملفات المتساوية:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "عدد الملفات المختلفة:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&تابع" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "جاري الإجراء " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "واجب العمل." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "أنسخ A إلى B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "أنسخ B إلى A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "أمحي A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "أمحي B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "أمحي A و B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "أمحي ( إذا كان موجود )" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "هذه العملية ليست ممكنة حالياً." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "العملية غير ممكنة" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -328,42 +333,47 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "خطأ في البرنامج" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"حصل خطأ عند النسخ.\n" +#: directorymergewindow.cpp:1965 +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:1900 directorymergewindow.cpp:2306 +#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "خطأ." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "إنتهيت." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "غير محفوظ." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -375,732 +385,748 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "إفعله" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "تابع بلبند الأخير" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "جاري..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"حصل خطأ. إضغط موافق لترى المعلومات المفصلة.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "حصل خطأ. إضغط موافق لترى المعلومات المفصلة.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "نسخ( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "إعادة تسمية( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "خطأ: فشلت إعادة التسمية." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "خطأ عند إنشاء الدليل." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "الهدف" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "الدليل" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "النوع" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "الحجم" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "آخر تغيير" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +msgid "File" +msgstr "" + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "غير متوفر" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "الهدف: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "نفّذ العملية للبند الحالي" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "قارن الملفات المختارة" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "عملية إختيار تلقائية لكل البنود" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "لا عملية لكل البنود" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "أعرض الملفات المتشابهة" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "أعرض الملفات المختلفة" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "أعرض الملفات فقط في أ" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "أعرض الملفات فقط في ب" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "أعرض الملفات فقط في س" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "لا تفعل أي شيئ" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "أ" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "ب" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "س" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "أمحي أ و ب" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " msgstr "" -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "جاري طلب حالة الملف: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "جاري قراءة الملف: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "جاري كتابة الملف: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "إعادة تسمية الملف: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "نسخ الملف: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "" -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "" -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "يخرج من التطبيق" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "" -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "" -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "" -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "" -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "" -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "" @@ -1115,8 +1141,8 @@ msgstr "" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" #: main.cpp:35 @@ -1193,19 +1219,18 @@ msgstr "" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" @@ -1215,115 +1240,95 @@ msgid "" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "" -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " msgstr "" -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " msgstr "" -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1343,6 +1348,14 @@ 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 "" @@ -1462,8 +1475,7 @@ msgid "Auto indentation" msgstr "" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" #: optiondialog.cpp:701 @@ -1494,112 +1506,106 @@ msgstr "" msgid "Diff Settings" msgstr "" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" +#: optiondialog.cpp:750 +msgid "Treat as white space." msgstr "" -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" - -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1607,58 +1613,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1668,121 +1675,142 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "عدد المجلّدات الفرعية:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "" -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1790,187 +1818,203 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -1978,7 +2022,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -1988,19 +2052,19 @@ msgid "" "Do you want to continue or do you want to select another font." msgstr "" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2009,8 +2073,7 @@ msgid "PreprocessorCmd: " msgstr "" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" #: pdiff.cpp:264 @@ -2072,14 +2135,8 @@ msgstr "" msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" #: pdiff.cpp:530 @@ -2089,108 +2146,54 @@ msgid "" "Continue at your own risk." msgstr "" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "" -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "" -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "" -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "" @@ -2233,6 +2236,10 @@ msgstr "" msgid "Configure..." msgstr "" +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2305,6 +2312,14 @@ 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 "" @@ -2316,3 +2331,58 @@ msgstr "" #: smalldialogs.cpp:559 msgid "Opening and closing parentheses don't match in regular expression." msgstr "" + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "" + +#: kdiff3_part.rc:13 +#, no-c-format +msgid "Configure KDiff3" +msgstr "" + +#: kdiff3_shell.rc:4 +#, no-c-format +msgid "&File" +msgstr "" + +#: kdiff3_shell.rc:7 +#, no-c-format +msgid "&Directory" +msgstr "" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" diff --git a/po/az.po b/po/az.po index 801db4e..3daa4cd 100644 --- a/po/az.po +++ b/po/az.po @@ -5,36 +5,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2004-03-15 21:45+0200\n" "Last-Translator: Mətin Əmirov \n" "Language-Team: Azerbaijani \n" +"Language: az\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.0.2\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Mətin Əmirov" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "metin@karegen.com" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -43,7 +44,7 @@ msgid "" "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -52,21 +53,21 @@ msgid "" "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Son" @@ -82,238 +83,245 @@ msgstr "" msgid "Size. " msgstr "" -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "" -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "" -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 #, fuzzy msgid "Comparing file..." msgstr "Quraşdır..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Ad" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Əməliyyat" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Vəziyyət" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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 "" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Hazırdır." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -322,41 +330,47 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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 "" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Xəta." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Qurtardı." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -368,731 +382,748 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Növ" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Böyüklük" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +msgid "File" +msgstr "" + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " msgstr "" -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Yaddaş çatışmır" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "" -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "" -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Qatarı tap" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "" -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "" -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "" -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "" -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "" -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "" @@ -1107,8 +1138,8 @@ msgstr "" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" #: main.cpp:35 @@ -1185,19 +1216,18 @@ msgstr "" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" @@ -1207,115 +1237,95 @@ msgid "" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "" -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " msgstr "" -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " msgstr "" -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1335,6 +1345,15 @@ 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 "" @@ -1454,8 +1473,7 @@ msgid "Auto indentation" msgstr "" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" #: optiondialog.cpp:701 @@ -1487,112 +1505,106 @@ msgstr "&KDiff3" msgid "Diff Settings" msgstr "" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" +#: optiondialog.cpp:750 +msgid "Treat as white space." msgstr "" -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" - -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1600,58 +1612,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1661,121 +1674,141 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +msgid "Max number of history entries:" +msgstr "" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "" -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1783,188 +1816,204 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "Əməliyyat" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -1972,7 +2021,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -1982,19 +2051,19 @@ msgid "" "Do you want to continue or do you want to select another font." msgstr "" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2003,8 +2072,7 @@ msgid "PreprocessorCmd: " msgstr "" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" #: pdiff.cpp:264 @@ -2066,14 +2134,8 @@ msgstr "Linediff: A <-> C" msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" #: pdiff.cpp:530 @@ -2083,108 +2145,54 @@ msgid "" "Continue at your own risk." msgstr "" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Ləğv Et" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "" -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Fayl açma xətası" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "" -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "" -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Cərgə" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, fuzzy, no-c-format -msgid "D&iffview" -msgstr "&KDiff3" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Pəncərə" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "" @@ -2227,6 +2235,10 @@ msgstr "" msgid "Configure..." msgstr "Quraşdır..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2299,6 +2311,14 @@ 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 "" @@ -2310,3 +2330,58 @@ msgstr "" #: smalldialogs.cpp:559 msgid "Opening and closing parentheses don't match in regular expression." msgstr "" + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +msgid "Configure KDiff3" +msgstr "" + +#: kdiff3_shell.rc:4 +#, no-c-format +msgid "&File" +msgstr "" + +#: kdiff3_shell.rc:7 +#, no-c-format +msgid "&Directory" +msgstr "&Cərgə" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "" + +#: kdiff3_shell.rc:61 +#, fuzzy, no-c-format +msgid "D&iffview" +msgstr "&KDiff3" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Pəncərə" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" diff --git a/po/bg.po b/po/bg.po index 47134e8..1f7403a 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,37 +4,38 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2006-11-16 23:19+0200\n" "Last-Translator: Zlatko Popov \n" "Language-Team: Bulgarian \n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Красимира Минчева" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "krasimira_m@yahoo.com" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "" "Записът на данните от системния буфер във временния файл беше неуспешен." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "От системния буфер" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -42,13 +43,14 @@ msgid "" "\n" "The preprocessing command will be disabled now." msgstr "" -"Възможно е предварителната обработка да е неуспешна. Проверете тази команда:\n" +"Възможно е предварителната обработка да е неуспешна. Проверете тази " +"команда:\n" "\n" " %1\n" "\n" "Командата за предварителна обработка ще бъде неактивна." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -61,9 +63,10 @@ msgstr "" "\n" " %1\n" "\n" -"Командата за предварителна обработка за сравняване на редове ще бъде неактивна." +"Командата за предварителна обработка за сравняване на редове ще бъде " +"неактивна." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -71,15 +74,15 @@ msgstr "" "Грешка от загуба на данни:\n" "Ако продължава, моля, свържете се с автора.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Сериозна вътрешна грешка" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "Най-горна линия" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Край" @@ -95,245 +98,249 @@ msgstr "Препратка: " msgid "Size. " msgstr "Размер. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Дата и размер: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Създаването на временно копие на %1 беше неуспешно." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Отварянето на %1 беше неуспешно." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Сравняване на файл..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Грешка по време на четене от %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Име" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Действие" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Статус" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Нерешен" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Решен" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Запълнено" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Празно" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" "В момента извършвате сливане на директория. Сигурни ли сте, че искате да " "прекъснете сливането и да сканирате отново директорията?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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 "Ново сканиране" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Продължение на сливането" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Отварянето на директориите беше неуспешно:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Директория А \"%1\" не съществува или не е директория.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Директория А \"%1\" не съществува или не е директория.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Директория Б \"%1\" не съществува или не е директория.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Директория Б \"%1\" не съществува или не е директория.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Директория В \"%1\" не съществува или не е директория.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Директория В \"%1\" не съществува или не е директория.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Грешка при отваряне на директория" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -"Когато се сливат три директории, целевата директория не трябва да бъде същата " -"като А или Б.\n" +"Когато се сливат три директории, целевата директория не трябва да бъде " +"същата като А или Б.\n" "Проверете отново преди да продължите." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Предупреждение за параметър" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Сканиране на директориите..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Четене на директория А" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Четене на директория Б" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Четене на директория В" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Някои от поддиректориите са нечетими" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Проверете правата на поддиректориите." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "В готовност." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Статус на сравняването на директории" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Бройка на поддиректориите:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Бройка на еднаквите файлове:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Бройка на различните файлове:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Бройка на ръчните сливания:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Това засяга всички операции по сливане." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Промяна на всички операции по сливане" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Продължение" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Обработка " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Задача." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Копиране на А в Б" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Копиране на Б в А" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Изтриване на А" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Изтриване на Б" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Изтриване на А и Б" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Сливане с А" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Сливане с Б" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Сливане с А и Б" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Изтриване (ако съществува)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Сливане" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Сливане (ръчно)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Грешка: Конфликт в типовете на файлове" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Грешка: Датите са еднакви, но файловете не са." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Това действие в момента не е възможно." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Действието не е възможно" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -348,42 +355,47 @@ msgstr "" "Ако знаете как да го направите отново, моля, свържете се с автора на " "програмата." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Програмна грешка" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Възникна грешка по време на копирането.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Възникна грешка по време на копирането.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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 "Грешка при сливане" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Грешка." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Изпълнено." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Не е записан." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Непозната операция за сливане. (Това не трябва да се случва никога!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Непозната операция за сливане." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -399,541 +411,552 @@ msgstr "" "Изберете \"Изпълнение\" ако сте прочел инструкциите и знаете какво правите.\n" "Изберете \"Симулация\" и ще разберете какво би се случило.\n" "\n" -"Имайте предвид, че тази програма е все още бета версия и изобщо НЯМА ГАРАНЦИЯ! " -"Правете резервни копия на важната информация!" +"Имайте предвид, че тази програма е все още бета версия и изобщо НЯМА " +"ГАРАНЦИЯ! Правете резервни копия на важната информация!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Стартиране на сливането" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Изпълнение" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Симулация" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -"Осветеният елемент има различни типове в различните директории. Изберете какво " -"да се направи." +"Осветеният елемент има различни типове в различните директории. Изберете " +"какво да се направи." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" "Датите на последна промяна на файловете са еднакви, но файловете не са. " "Изберете какво да се направи." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" "В момента действието е невъзможно, тъй като тече процес на сливане на " "директории." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Възникнала е грешка в последната стъпка.\n" "Искате ли да продължите с елемента, който е причинил тази грешка или ще го " "прескочите?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Продължаване на сливането след грешката" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Продължаване с последния елемент" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Прескачане на елемент" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Прескочен." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "Изпълнява се..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Операцията по сливане завърши." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Сливането завърши" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Симулацията на сливане завърши: Проверете дали сте съгласни с предложените " "действия." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" "Възникнала е грешка. Натиснете \"ОК\", за да видите подробна информация.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Грешка: По време на изтриването на %1: Създаването на резервно копие беше " "неуспешно." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "рекурсивно изтриване на директория( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "изтриване( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Грешка: операцията по изтриване беше неуспешна при опит за четене на " "директорията." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Грешка: операцията по изтриване на директория( %1 ) беше неуспешна." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Грешка: операцията по изтриване беше неуспешна." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ръчно сливане( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -" Забележка: След ръчно сливане, потребителят трябва да натисне клавиш F7, " -"за да продължи." +" Забележка: След ръчно сливане, потребителят трябва да натисне клавиш " +"F7, за да продължи." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Грешка: копирането на ( %1 -> %2 ) беше неуспешно. Изтриването на " "съществуващото местоназначение е неуспешно." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "копиране на препратка( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Грешка: копирането на препратка беше неуспешно: Отдалечени препратки не се " "поддържат." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Грешка: копирането на препратка беше неуспешно." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "копиране( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Грешка по време на преименуване( %1 -> %2 ): Изтриването на съществуващото " "местоназначение беше неуспешно." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "преименуване( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Грешка: Преименуването беше неуспешно." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -"Грешка по време на създаване на директория %1. Не може да се изтрие съществуващ " -"файл." +"Грешка по време на създаване на директория %1. Не може да се изтрие " +"съществуващ файл." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "създаване на директория( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Грешка по време на създаване на директория." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Местоназначение" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Директория" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Тип" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Размер" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Атрибути" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Последна промяна" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Местоназначение на препратката" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Файл..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "не е наличен" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "А (местоназначение): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "А (база): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "Б (местоназначение): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "В (местоназначение): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Местоназначение: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "Запис състоянието при сливане като..." -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Стартиране/Продължение на сливането на директория" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Стартиране на операцията за текущия елемент" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Сравняване на маркираните файлове" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Сливане на текущия файл" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Скриване на всички поддиректории" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Показване на всички поддиректории" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Изберете А за всички елементи" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Изберете Б за всички елементи" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Изберете В за всички елементи" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Автоматично избиране на операция за всички елементи" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Без операция за всички елементи" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "Показване на идентични файлове" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "Показване на различните файлове" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "Показване на файлове само в A" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "Показване на файлове само в B" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "Показване на файлове само в C" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "Сравняване на маркираните файлове" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "Сливане на маркираните файлове" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Да не се прави нищо" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "А" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "Б" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "В" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Изтриване на А и Б" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Сливане в А и Б" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -"В процеса на създаване на ново резервно копие, изтриването на по-старото беше " -"неуспешно.\n" +"В процеса на създаване на ново резервно копие, изтриването на по-старото " +"беше неуспешно.\n" "Име на файл: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " msgstr "" -"В процеса на създаване на ново резервно копие, преименуването беше неуспешно.\n" +"В процеса на създаване на ново резервно копие, преименуването беше " +"неуспешно.\n" "Имена на файлове: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Вземане статуса на файл: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Чете на файл: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Запис на файл: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Няма памет" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Създаване на директория: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Премахване на директория: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Премахване на файл: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Създаване на връзка към символи: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Преименуване на файл: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Копиране на файл: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -"Грешка по време на копиране: Отварянето на файл за четене беше неуспешно. Име " -"на файл: %1" +"Грешка по време на копиране: Отварянето на файл за четене беше неуспешно. " +"Име на файл: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -"Грешка по време на копиране: Отварянето на файл за запис беше неуспешно. Име на " -"файл: %1" +"Грешка по време на копиране: Отварянето на файл за запис беше неуспешно. Име " +"на файл: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "Грешка по време на копиране: Четенето беше неуспешно. Име на файл: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Грешка по време на копиране: Записът беше неуспешен. Име на файл: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Четене на директория: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Списък на директория: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "Текуща конфигурация:" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "Грешка на опция за конфигурация:" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Използвана е настройка --auto, но не е указан изходен файл." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Игнорирана е настройка --auto за сравняване на директории." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Записът беше неуспешен." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Отварянето на тези файлове беше неуспешно:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Грешка при отваряне на файл" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Отваря документ за сравняване..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Запис на резултатът от сливането. Всички конфликти трябва да са решени!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Запис на текущият документ като..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "Отпечатване на разликите" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Излиза от програмата" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Изрязва маркираната част и я слага в системния буфер" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Копира маркираната част в системния буфер" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Вмъква съдържанието на системния буфер на посоченото място" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "Маркиране на всичко в текущия прозорец" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Търсене на низ" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Повторно търсене на низа" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Включва/Изключва лентата с инструменти" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Включва/Изключва лентата за състоянието" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Конфигуриране на KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Отиване на текущата операция" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Отиване на първата операция" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Отиване на последната операция" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Прескача разликата в интервалите, когато настройката \"Показване на " "интервалите\" е изключена.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -941,236 +964,244 @@ msgstr "" "(Прескача разликата в интервалите, дори когато настройката \"Показване на " "интервалите\" е изключена.)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Отиване на предишната операция" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Отиване на следващата операция" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Отиване на предишния конфликт" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Отиване на следващия конфликт" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Отиване на предишния неразрешен конфликт" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Отиване на следващия неразрешен конфликт" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Маркирайте ред(ове) от А" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Маркирайте ред(ове) от Б" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Маркирайте ред(ове) от В" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Автоматично прехвърляне към следващия нерешен конфликт, след избиране на " "източник" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Показване на символите за интервал и табулация за разлика" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Показване на интервалите" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Показване на номерата на редовете" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Избиране на А навсякъде" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Избиране на Б навсякъде" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Избиране на В навсякъде" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Избиране на А за всички нерешени конфликти" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Избиране на Б за всички нерешени конфликти" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Избиране на В за всички нерешени конфликти" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Избиране на А за всички нерешени конфликти, свързани с интервали" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Избиране на Б за всички нерешени конфликти, свързани с интервали" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Избиране на В за всички нерешени конфликти, свързани с интервали" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Автоматично разрешаване на простите конфликти" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Задаване на действията за конфликти" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "Изпълнение на автосливане на регулярни изрази" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "Автоматично разрешаване на конфликтите в историята" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "Разделяне на разликата при маркираното" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "Сливане на маркираните файлове" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Показване на прозорец А" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Показване на прозорец Б" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Показване на прозорец В" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Фокусиране на следващия прозорец" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Нормален изглед" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "Изглед на А срещу Б" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "Изглед на А срещу В" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "Изглед на Б срещу В" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Пренасяне на думите за различните прозорци" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "Добавяне на ръчно подравняване на разликите" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "Изчистване на на ръчно подравняване на разликите" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Фокусиране върху предишния прозорец" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Превключване към разделена подредба" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Разделен изглед на директория и текст" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Превключване между изглед на директория и текст" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Резултатът от сливането не е записан." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Запис и изход" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Изход без запис" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Записът на резултата от сливането беше неуспешен." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "В момента извършвате сливане на директории. Сигурни ли сте, че искате да го " "прекъснете?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Запис на файл..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Запис на файл с ново име..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "Отпечатване..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "Отпечатването е прекъснато." -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Маркираното" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "Отпечатването приключи." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Излизане..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Превключване на лентата с инструменти..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Превключване на лентата за състоянието..." @@ -1185,12 +1216,12 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Част от програмата не може да бъде намерена!\n" -"Това обикновено се случва поради проблеми с инсталацията. за повече информация, " -"моля, прочетете README-файла в инсталационния пакет." +"Това обикновено се случва поради проблеми с инсталацията. за повече " +"информация, моля, прочетете README-файла в инсталационния пакет." #: main.cpp:35 msgid "Tool for Comparison and Merge of Files and Directories" @@ -1215,8 +1246,8 @@ msgstr "Отново изходен файл. (За съвместимост с #: main.cpp:46 msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -"Без ГПИ ако всички конфликти могат да бъдат разрешени автоматично. (Нуждае се " -"от -о файл)" +"Без ГПИ ако всички конфликти могат да бъдат разрешени автоматично. (Нуждае " +"се от -о файл)" #: main.cpp:47 msgid "Don't solve conflicts automatically. (For compatibility...)" @@ -1272,20 +1303,20 @@ msgstr "да се отвори файл 3" msgid "Ignored. (User defined.)" msgstr "Игнорирано (дефинирано от потребителя.)" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -"+ Много благодарности за тези, които се обадиха за грешките и имаха нови идеи!" +"+ Много благодарности за тези, които се обадиха за грешките и имаха нови " +"идеи!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Брой оставащи нерешени конфликти: %1 (от които %2 са интервали)" @@ -1297,55 +1328,30 @@ msgstr "" "Изходът е променен.\n" "Ако продължите промените ще бъдат загубени." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Всички входни файлове са двоично еднакви." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Входните файлове съдържат еднакъв текст." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Файлове А и Б са двоично еднакви.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Файлове А и Б съдържат еднакъв текст. \n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Файлове %1 и %2 са двоично еднакви.\n" -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Файлове А и В са двоично еднакви.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Файлове А и В съдържат еднакъв текст. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Файлове А и Б съдържат еднакъв текст. \n" -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Файлове Б и В са двоично еднакви.\n" - -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Файлове Б и В съдържат еднакъв текст. \n" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Общ брой конфликти: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1353,7 +1359,7 @@ msgstr "" "\n" "Брой автоматично решени конфликти: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1361,23 +1367,23 @@ msgstr "" "\n" "Брой нерешени конфликти: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Конфликти" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "<Няма входен ред>" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "<Сливане на конфликт (Само интервали)>" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "<Сливане на конфликт>" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1385,11 +1391,11 @@ msgstr "" "Все още не всички конфликти са решени.\n" "Файлът не е записан.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Оставащи конфликти" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1399,28 +1405,28 @@ msgstr "" "\n" "Създаването на резервно копие беше неуспешно. Файлът не е записан." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Грешка при запис на файл" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Грешка по време на запис." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Резултат" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Променен]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "Кодова таблица" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "Кодек от" @@ -1440,6 +1446,15 @@ 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 "Изходен шрифт за редактора и разделителя" @@ -1565,10 +1580,8 @@ msgid "Auto indentation" msgstr "Автоматичен отстъп" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"Включено: Отстъпа на предишния ред се използва за всеки нов.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "Включено: Отстъпа на предишния ред се използва за всеки нов.\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1602,65 +1615,58 @@ msgstr "Разлика" msgid "Diff Settings" msgstr "Настройки за разлика" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Запазване на връщането на нов ред" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Показване на символ за нов ред \"\\r\" ако съществуват.\n" -"Помага за сравняването на файлове, които са променени под различни операционни " -"системи." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Третиране на С/С++ коментарите като интервали." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Игнориране на числата" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "Игнориране на числата по време на фазата за съвпадение. (Подобно на " "игнорирането на интервалите.)\n" "Може да помогне да се сравнят файлове с числова информация." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Игнориране коментарите на С/С++" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Третиране на С/С++ коментарите като интервали." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Игнориране на големи и малки букви" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -"Третиране на разликата в регистъра като промяна в интервалите. (\"a\"<=>\"A\")" +"Третиране на разликата в регистъра като промяна в интервалите. (\"a\"<=>\"A" +"\")" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Команда за предварителна обработка:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -"Дефинирана от потребителя предварителна обработка. (Погледнете документацията " -"за подробности.)" +"Дефинирана от потребителя предварителна обработка. (Погледнете " +"документацията за подробности.)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Команда за предварителна обработка на съвпадение на редове:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1668,11 +1674,11 @@ msgstr "" "Тази предварителна обработка се използва само при съвпадения на редове.\n" "(Вижте документацията за допълнителна информация.)" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Опитайте по-усърдно (по-бавно)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1680,53 +1686,53 @@ msgstr "" "Включва настройка --minimal за външното разделяне.\n" "Анализирането на големи файлове ще е много по-бавно." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "Настройки за сливане" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Забавяне на автоматичното придвижване (милисекунди):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" "Когато сте в режим на автоматично придвижване, резултатът на маркираното се " "показва \n" -"за определен период от време преди да се премине на следващ конфликт. Обхват: " -"0-2000 мсек" - -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "Настройки за сливане" +"за определен период от време преди да се премине на следващ конфликт. " +"Обхват: 0-2000 мсек" -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Интервал по подразбиране при сливане на 2 файла:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Ръчен избор" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -"Позволяване на сливащия алгоритъм автоматично да избира вход за промени от типа " -"интервали." +"Позволяване на сливащия алгоритъм автоматично да избира вход за промени от " +"типа интервали." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Интервал по подразбиране при сливане на 3 файла:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "Автоматично сливане на регулярни изрази" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "Автосливане на регулярни изрази:" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1738,11 +1744,11 @@ msgstr "" "Когато някой ред с конфликт съвпадне с регулярния израз,\n" "тогава \"- if available - C\", иначе ще бъде избран B." -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "Изпълнение на автосливане на регулярни изрази при начало на сливането" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" @@ -1750,15 +1756,15 @@ msgstr "" "Изпълнение на сливане за автосливане на регулярни изрази\n" "веднага след започване на сливане.\n" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "Сливане историята на версиите" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "Регулярен израз за начало на история:" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" @@ -1768,17 +1774,18 @@ msgstr "" "Обикновено това съдържа ключова дума \"$Log$\".\n" "Стойност по подразбиране: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "Регулярен израз за начало на историята:" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" "Сливането на историята се състои от няколко реда.\n" @@ -1787,19 +1794,19 @@ msgstr "" "Ако е празно, тогава KDiff3 ще счита, че празните редове разделят записите.\n" "За повече подробности вижте документацията." -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "Сортиране сливането на историята" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "Сортиране на историята за версията с клавиш." -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "Ред за сортиране на ключове за история:" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1816,23 +1823,32 @@ msgstr "" "Ако е празно, тогава няма да има сортиране.\n" "За повече информация вижте документацията." -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "Сливане на историята за версията при стартиране" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "Автосливане на историята за версията при стартиране." -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Бройка на поддиректориите:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "Тестване на регулярни изрази" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "Неподходяща команда за сливане:" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" @@ -1842,23 +1858,35 @@ msgstr "" "при условие ,че не са открити други промени.\n" "Извикани с параметри: има на файл 1има на файл 2 име на файл 3" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Сливане на директории" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Рекурсивни директории" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Дали да се анализират или да не се анализират поддиректориите." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Шаблон(и) за файл:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1868,11 +1896,11 @@ msgstr "" "Wildcards: \"*\" and \"?\"\n" "Могат да се определят няколко шаблона чрез използване на разделителя: \";\"" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Анти шаблон(и) за файл:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1882,11 +1910,11 @@ msgstr "" "Wildcards: \"*\" and \"?\"\n" "Могат да се определят няколко шаблона чрез използване на разделителя: \";\"" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Анти шаблон(и) за директория:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1896,35 +1924,36 @@ msgstr "" "Wildcards: \"*\" and \"?\"\n" "Могат да се определят няколко шаблона чрез използване на разделителя: \";\"" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Използване на .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" "Разширява антишаблона до нещо, което ще бъде игнорирано от CVS.\n" -"Чрез локалното \".cvsignore\"-files това може да бъде настроено за директория." +"Чрез локалното \".cvsignore\"-files това може да бъде настроено за " +"директория." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Откриване на скрити файлове и директории" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Открива файлове и директории със скрит атрибут." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Открива файлове и директории, започващи с \".\"." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Проследяване на файловите препратки" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1932,11 +1961,11 @@ msgstr "" "Включено: Сравнява файла, към който сочи препратката.\n" "Изключено: Сравнява препратките." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Проследяване на препратките към директория" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1944,11 +1973,11 @@ msgstr "" "Включено: Сравнява директорията, към която сочи препратката.\n" "Изключено: Сравнява препратките." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "Сравняване на имена, чувствително към регистър" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1960,49 +1989,72 @@ msgstr "" "включете тази опция, ако регистъра трябва да съвпада. (По подразбиране за " "Windows е изключено, иначе - включено.)" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Режим \"сравняване на файлове\"" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Двоично сравнение" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Двоично сравнение за всеки файл. (По подразбиране)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Пълен анализ" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -"Прави пълен анализ и показва статистическа информация в допълнителни колони.\n" +"Прави пълен анализ и показва статистическа информация в допълнителни " +"колони.\n" "(По-бавно от двоичното сравнение, много по-бавно за двоични файлове.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Доверяване на датата на промяна (опасно)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Приема се, че файловете са еднакви, ако датата на промяна и големината са " +"еднакви.\n" +"Може да се използва за големи директории или бавни мрежи." + +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" "Useful for big directories or slow networks." msgstr "" "Приема се, че файловете са еднакви, ако датата на промяна и големината са " "еднакви.\n" "Може да се използва за големи директории или бавни мрежи." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Доверяване на големината (опасно)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -2012,11 +2064,11 @@ msgstr "" "Може да се използва за големи директории или бавни мрежи, когато датата се " "променя по време на сваляне." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Синхронизиране на директории" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -2024,13 +2076,14 @@ msgid "" msgstr "" "Предлага да запише файловете и в двете директории така, че\n" "и двете директории след това да са едни и същи.\n" -"Работи само, когато се сравняват две директории без определено местонахождение." +"Работи само, когато се сравняват две директории без определено " +"местонахождение." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Разликите в интервалите да се приемат за еднакви" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -2038,11 +2091,11 @@ msgstr "" "Файловете да се считат за еднакви, ако се различават само по интервалите.\n" "Това работи само ако е избран пълен анализ." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Копиране на по-новите, вместо сливане (не е безопасно)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2052,11 +2105,11 @@ msgstr "" "(Използвайте го само ако знаете какво правите!)\n" "Ефективно е само ако се сравняват две директории." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Резервни копия на файлове (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2064,15 +2117,15 @@ msgstr "" "Когато файл ще се записва върху стар файл, тогава старият файл\n" "ще бъде преименуван с разширение \".orig\" или ще бъде изтрит." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Регионални настройки" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Език (нужно е рестартиране)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2080,11 +2133,11 @@ msgstr "" "Изберете език за ГПИ-низовете или \"Автоматично\".\n" "За да се смени езика, излезте от KDiff3 и я рестартирайте." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Използване на еднаква кодова таблица за всичко:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." @@ -2093,21 +2146,21 @@ msgstr "" "първата.\n" "Изключете са необходими различни индивидуални настройки." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Забележка: Локалната кодова таблица е " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "Файлова кодова таблица за А:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" "Ако е включена тази отметка, тогава кодирането Уникод (UTF-16 или UTF-8) ще " "бъде намерено.\n" @@ -2116,27 +2169,27 @@ msgstr "" "(Намирането на Уникод зависи от първите байтове във файла - byte order mark " "\"BOM\".)" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "Автонамиране на Уникод" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "Файлова кодова таблица за Б:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "Файлова кодова таблица за В:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Кодова таблица на файла за резултата от сливането и записване:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "Автоматично маркиране" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " @@ -2147,15 +2200,15 @@ msgstr "" "Когато има нещо неясно, ще се появи прозорец , от където може да избере " "кодиране." -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Кодова таблица на файл за файлове за предварителна обработка:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Езици тип \"отдясно на ляво\"" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2163,19 +2216,19 @@ msgstr "" "Някои езици се четат отдясно наляво.\n" "Тази настройка ще промени съответно редактора и визуализатора." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "Интеграция" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "Настройки на интеграцията" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "Опции за команден ред, които да бъдат игнорирани:" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2187,7 +2240,27 @@ msgstr "" "Могат да бъдат посочени няколко стойности, разделени с \";\" \n" "Това ще елиминира грешката \"Неизвестна грешка\"." -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2203,19 +2276,19 @@ msgstr "" "\n" "Искате ли да продължите или ще изберете друг шрифт?" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Несъвместими шрифтове" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Продължете на собствена отговорност" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Изберете друг шрифт" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "Това ще възстанови всички настройки. Не само тези в текущата тема." @@ -2224,10 +2297,8 @@ msgid "PreprocessorCmd: " msgstr "PreprocessorCmd: " #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"Следните настройки, които избрахте може да променят информация:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "Следните настройки, които избрахте може да променят информация:\n" #: pdiff.cpp:264 msgid "" @@ -2291,17 +2362,9 @@ msgstr "Разлика на ред: A <-> B" msgid "All input files contain the same text, but are not binary equal." msgstr "Входните файлове съдържат еднакъв текст, но не са двоично еднакви." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Файлове %1 и %2 са двоично еднакви.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"Файлове %1 и %2 са с еднакъв текст, но не са двоично еднакви. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Файлове %1 и %2 са с еднакъв текст, но не са двоично еднакви. \n" #: pdiff.cpp:530 msgid "" @@ -2314,108 +2377,54 @@ msgstr "" "информация.\n" "Продължавате на собствена отговорност." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Прекъсване" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Отваряне на файлове..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Грешка при отваряне на файл" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Изрязване на маркираното..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Копиране на маркираното в системния буфер..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Вмъкване съдържанието на системния буфер..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Запис и продължение" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Продължение без запис" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Търсенето завърши." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Търсенето завърши" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "Нищо не е избрано в прозореца за разлики." -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "Грешка при ръчно добавяне на охват за разликите" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Конфигуриране на KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Директория" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Операция по сливане на текущия елемент" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Операция по синхронизация на текущия елемент" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Движение" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "Изглед на раз&делител" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Сливане" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Прозорец" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "А (базов):" @@ -2458,6 +2467,10 @@ msgstr "Резултат (по избор):" msgid "Configure..." msgstr "Конфигуриране..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Търсене на текст:" @@ -2534,6 +2547,14 @@ 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 "Съвпадението е успешно." @@ -2545,3 +2566,85 @@ msgstr "Съвпадението беше неуспешен." #: smalldialogs.cpp:559 msgid "Opening and closing parentheses don't match in regular expression." msgstr "Отварянето и затварянето на дървото не съвпада с регулярния израз." + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Директория" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Операция по сливане на текущия елемент" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Операция по синхронизация на текущия елемент" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Движение" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "Изглед на раз&делител" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Сливане" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Прозорец" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Файлове А и Б са двоично еднакви.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Файлове А и В са двоично еднакви.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Файлове А и В съдържат еднакъв текст. \n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Файлове Б и В са двоично еднакви.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Файлове Б и В съдържат еднакъв текст. \n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Запазване на връщането на нов ред" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Показване на символ за нов ред \"\\r\" ако съществуват.\n" +#~ "Помага за сравняването на файлове, които са променени под различни " +#~ "операционни системи." diff --git a/po/br.po b/po/br.po index 8590370..c23db8e 100644 --- a/po/br.po +++ b/po/br.po @@ -3,35 +3,36 @@ msgid "" msgstr "" "Project-Id-Version: kdeextragear-1/kdiff3.po\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n" "Last-Translator: Thierry Vignaud \n" "Language-Team: br \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Thierry Vignaud, Jañ-Mai Drapier" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "tvignaud@mandriva.com, jdrapier@club-internet.fr" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Eus ar golver" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -40,7 +41,7 @@ msgid "" "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -49,21 +50,21 @@ msgid "" "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Fazi diabarzh grevus" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Dibenn" @@ -79,237 +80,244 @@ msgstr "Liamm : " msgid "Size. " msgstr "Ment. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Deiziad ha ment : " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "" -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Sac'het eo digeiñ ar restr %1." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Fazi en ur less eus %1." -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Anv" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Ober" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Stad" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Gwenn" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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 "" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Sac'het eo digeriñ ar renkelloù :" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Fazi en ur zigeriñ ar renkell" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Emaon o tielfennañ ar renkelloù ..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Emaon o lenn ar renkell A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Emaon o lenn ar renkell B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Emaon o lenn ar renkell C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Prest." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Niver a is-renkelloù :" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Kenderc'hel" -#: directorymergewindow.cpp:1169 +#: 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 " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Traoù d'ober." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Eilañ A da B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Eilañ B da A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Lemel A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Lemel B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Lemel A & B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Dastum" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -318,42 +326,47 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Fazi gant ar meziant" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Degouezhet ez eus ar fazi en ur eilañ.\n" +#: directorymergewindow.cpp:1965 +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:1900 directorymergewindow.cpp:2306 +#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Fazi en ur dastum" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Fazi." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Graet." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "N'eo ket enrollet." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -365,732 +378,749 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Tremen an dra" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Tremenet." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "Ober a ran ..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Degouezhet ez eus ar fazi. Gwaskit OK da welet an titouroù munut.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Degouezhet ez eus ar fazi. Gwaskit OK da welet an titouroù munut.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "dilemel( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Fazi : sac'het eo lemel." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "eilañ( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "adenvel( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Fazi en ur c'hrouiñ ur renkell." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Dehaez." -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Renkell" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Seurt" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Ment" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Kemm diwezhañ" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Liamm dehaezadur" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Restr ..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "n'eo ket da gaout" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Dehaez. : " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "Diskouez restroù a zo e A hepken" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "Diskouez restroù a zo e B hepken" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "Diskouez restroù a zo e C hepken" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Ober netra" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "G" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Lemel A && B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " msgstr "" -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Emaon o lenn ar restr : %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Emaon o skrivañ ar restr : %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Memor ebet" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Oc'h oberiañ ar renkell : %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Emaon o tilemel ar renkell : %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Emaon o tilemel ar restr : %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Emaon oc'h adenvel ar restr : %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Emaon oc'h eilañ ar restr : %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Emaon o lenn ar renkell :" -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "Fazi er dibarzh kefluniañ :" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Fazi en ur enrollañ." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Fazi en ur zigeriñ ar restr" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Enrollañ a ra an teul red e ..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Kuitaat a ra ar meziant" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Eilañ a ra an dachenn dibabet er golver" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Diskouez/Kuzhat ar varrenn &ostilhoù" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Kuzhat/Diskouez ar varenn stad" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Kefluniañ KDiff3 ..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Diskouez niverennoù linenn" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Diskouez ar prenestr A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Diskouez ar prenestr B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Diskouez ar prenestr C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Fokuz ouzh ar brenestr a-heul" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Fokuz ouzh ar brenestr diaraok" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Enrollañ && kuitaat" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Kuitaat hep enrollañ" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Emaon oc'h enrollañ ar restr ..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Oc'h enrollañ ar restr gant un anv restr nevez ..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "Emaon o voulañ ..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "Nullet eo ar voulañ." -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Diuzadenn" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "Echu eo moulañ." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Emaon o kuitaat ..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Emaon o kuzhat/diskouez ar varenn ostilh ..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Diskouez/Kuzhat ar varenn stad ..." @@ -1105,8 +1135,8 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" #: main.cpp:35 @@ -1183,19 +1213,18 @@ msgstr "restr3 da zigeriñ" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" @@ -1205,115 +1234,95 @@ msgid "" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "" -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " msgstr "" -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " msgstr "" -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Fazi en ur skrivañ." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Ezkas" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Kemmet]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1333,6 +1342,15 @@ 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 "" @@ -1452,8 +1470,7 @@ msgid "Auto indentation" msgstr "Emgeflosk" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" #: optiondialog.cpp:701 @@ -1486,113 +1503,107 @@ msgstr "KDiff3" msgid "Diff Settings" msgstr "Kefluniadur rann-vro" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." +#: optiondialog.cpp:750 +msgid "Treat as white space." msgstr "" -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Kefluniadur rann-vro" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Kefluniadur rann-vro" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Choazh diwar zorn" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1600,58 +1611,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1661,121 +1673,142 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Niver a is-renkelloù :" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Sil(où) restr :" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Implijit .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "" -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Heuliañ liammoù ar retroù" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Heuliañ liammoù ar renkelloù" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1783,187 +1816,203 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +msgid "Trust the size and modification date (unsafe)" +msgstr "" + +#: optiondialog.cpp:1092 +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" + +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" msgstr "" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1097 msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Kefluniadur rann-vro" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "Dibab ent emgefreek" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -1971,7 +2020,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -1981,19 +2050,19 @@ msgid "" "Do you want to continue or do you want to select another font." msgstr "" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Dibab un nodrezh all" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2002,8 +2071,7 @@ msgid "PreprocessorCmd: " msgstr "" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" #: pdiff.cpp:264 @@ -2065,14 +2133,8 @@ msgstr "" msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" #: pdiff.cpp:530 @@ -2082,108 +2144,54 @@ msgid "" "Continue at your own risk." msgstr "" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Paouez" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Emaon o tigeriñ ar restroù ..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Fazi en ur zigeriñ ar restr" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "O troc'hañ an dibab ..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Oc'h eilañ an dibab d'ar golver ..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Enrollañ && Kenderc'hel" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Echu eo ar glask." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Kefluniañ KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Renkell" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Dastum" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Prenestr" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "" @@ -2226,6 +2234,10 @@ msgstr "" msgid "Configure..." msgstr "Kefluniañ ..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Skrid klasket :" @@ -2298,6 +2310,14 @@ 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 "" @@ -2310,6 +2330,61 @@ msgstr "" msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Renkell" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Dastum" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Prenestr" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + #~ msgid "Swap" #~ msgstr "Disloañ" diff --git a/po/ca.po b/po/ca.po index 03a165c..467dedb 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,35 +1,36 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: ENCODING\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -38,7 +39,7 @@ msgid "" "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -47,21 +48,21 @@ msgid "" "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "" @@ -77,237 +78,244 @@ msgstr "" msgid "Size. " msgstr "" -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "" -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "" -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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 "" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "" -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -316,41 +324,46 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" +#: directorymergewindow.cpp:1965 +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:1900 directorymergewindow.cpp:2306 +#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "" -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "" -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -362,731 +375,748 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +msgid "File" +msgstr "" + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " msgstr "" -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "" -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "" -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "" -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "" -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "" -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "" -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "" -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "" @@ -1101,8 +1131,8 @@ msgstr "" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" #: main.cpp:35 @@ -1179,19 +1209,18 @@ msgstr "" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" @@ -1201,115 +1230,95 @@ msgid "" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "" -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " msgstr "" -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " msgstr "" -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1329,6 +1338,14 @@ 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 "" @@ -1448,8 +1465,7 @@ msgid "Auto indentation" msgstr "" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" #: optiondialog.cpp:701 @@ -1480,112 +1496,106 @@ msgstr "" msgid "Diff Settings" msgstr "" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." +#: optiondialog.cpp:750 +msgid "Treat as white space." msgstr "" -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1593,58 +1603,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1654,121 +1665,141 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +msgid "Max number of history entries:" +msgstr "" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "" -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1776,187 +1807,203 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -1964,7 +2011,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -1974,19 +2041,19 @@ msgid "" "Do you want to continue or do you want to select another font." msgstr "" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -1995,8 +2062,7 @@ msgid "PreprocessorCmd: " msgstr "" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" #: pdiff.cpp:264 @@ -2058,14 +2124,8 @@ msgstr "" msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" #: pdiff.cpp:530 @@ -2075,108 +2135,54 @@ msgid "" "Continue at your own risk." msgstr "" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "" -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "" -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "" -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "" @@ -2219,6 +2225,10 @@ msgstr "" msgid "Configure..." msgstr "" +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2291,6 +2301,14 @@ 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 "" @@ -2302,3 +2320,58 @@ msgstr "" #: smalldialogs.cpp:559 msgid "Opening and closing parentheses don't match in regular expression." msgstr "" + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "" + +#: kdiff3_part.rc:13 +#, no-c-format +msgid "Configure KDiff3" +msgstr "" + +#: kdiff3_shell.rc:4 +#, no-c-format +msgid "&File" +msgstr "" + +#: kdiff3_shell.rc:7 +#, no-c-format +msgid "&Directory" +msgstr "" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "" + +#: kdiff3_shell.rc:95 +#, 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 444f9b2..8222833 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,37 +6,38 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2007-01-25 19:58+0100\n" "Last-Translator: Klára Cihlářová \n" "Language-Team: Czech \n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Klára Cihlářová,Jakub Friedl" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "koty@seznam.cz,jfriedl@suse.cz" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Zápis dat schránky do dočasného souboru selhal." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Ze schránky" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -45,7 +46,7 @@ msgid "" "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -54,7 +55,7 @@ msgid "" "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -62,15 +63,15 @@ msgstr "" "Chyba, ztracená data:\n" "Pokud lze chybu reprodukovat, kontaktujte autora.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Závažná interní chyba" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Konec" @@ -86,242 +87,246 @@ msgstr "Odkaz: " msgid "Size. " msgstr "Velikost" -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Datum a velikost: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Vytváření dočasné kopie %1 selhalo." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Otevření %1 selhalo." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Porovnání souborů..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Chyba čtení z %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Jméno" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Operace" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Stav" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Nevyřešeno" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Vyřešeno" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Nebílý" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Bílá" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Pokračovat se slučováním" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Otvírání adresářů selhalo:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Adresář A \"%1\" neexistuje nebo není adresářem.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Adresář A \"%1\" neexistuje nebo není adresářem.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Adresář B \"%1\" neexistuje nebo není adresářem.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Adresář B \"%1\" neexistuje nebo není adresářem.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Adresář C \"%1\" neexistuje nebo není adresářem.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Adresář C \"%1\" neexistuje nebo není adresářem.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Chyba otvírání adresáře" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "Cílový adresář nesmí být při slučování tří adresářů shodný s A nebo B.\n" "Před pokračováním proveďte kontrolu." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Prohledávání adresářů..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Čtení adresáře A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Čtení adresáře B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Čtení adresáře C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Některé podadresáře byly nečitelné v" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Zkontrolujte oprávnění podadresářů." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Připraven." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Stav porovnání adresářů" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Počet podadresářů:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Počet shodných souborů:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Počet rozdílných souborů:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Počet ručních sloučení:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Toto ovlivňuje všechna slučování." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "P&okračovat" -#: directorymergewindow.cpp:1169 +#: 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í " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Udělat." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Zkopírovat A do B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Zkopírovat B do A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Smazat A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Smazat B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Smazat A a B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Sloučit do A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Sloučit do B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Sloučit do A a B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Smazat (pokud existuje)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Sloučit" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Sloučit (ručně)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Chyba: Konflikt typů souborů" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Chyba: Data jsou shodná ale soubory nikoliv." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Tato operace není nyní možná." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Operace není možná" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -335,42 +340,47 @@ msgstr "" "\n" "Pokud tuto situaci umíte reprodukovat, kontaktujte prosím autora programu." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Chyba programu" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Během kopírování se stala chyba.\n" +#: directorymergewindow.cpp:1965 +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:1900 directorymergewindow.cpp:2306 +#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Chyba slučování" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Chyba." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Hotovo." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Neuloženo." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Neznámá slučovací operace. (Toto se nesmí nikdy stát!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Neznámá slučovací operace." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -382,731 +392,749 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Pokračovat se slučováním po chybě" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Přeskočit položku" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Přeskočeno." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Slučování dokončeno" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Typ" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Velikost" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Soubor..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "nedostupný" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "Zobrazit rozdílné soubory" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Nedělat nic" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " msgstr "" -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Nedostatek paměti" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "" -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "" -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Chyba otvírání souboru" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Otevře dokumenty pro porovnání..." -#: kdiff3.cpp:423 +#: 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!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Uloží aktuální dokument jako..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Ukončí aplikaci" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Vyjme současný výběr a umístí jej do schránky" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Zkopíruje vybranou sekci do schránky" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Vloží současný obsah schránky na aktuální pozici" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Hledání řetězce" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Další hledání řetězce" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Povolí/zakáže nástrojovou lištu" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Povolí/zakáže stavovou lištu" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Nastavit: KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Ukládám soubor..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Ukládám soubor pod jiným názvem..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "Tisknu..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "Tisk zrušen." -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Výběr" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "Tisk dokončen." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Ukončuji..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Přepínání panelu nástrojů..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Přepnout stavovou lištu..." @@ -1121,8 +1149,8 @@ msgstr "" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" #: main.cpp:35 @@ -1199,19 +1227,18 @@ msgstr "" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" @@ -1221,115 +1248,95 @@ msgid "" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "" -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " msgstr "" -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " msgstr "" -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Konfilkty" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Výstup" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1349,6 +1356,15 @@ 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 "" @@ -1468,8 +1484,7 @@ msgid "Auto indentation" msgstr "" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" #: optiondialog.cpp:701 @@ -1500,112 +1515,106 @@ msgstr "Diff" msgid "Diff Settings" msgstr "Nastavení Diff" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." +#: optiondialog.cpp:750 +msgid "Treat as white space." msgstr "" -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Ignorovat velikost písmen" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1613,58 +1622,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1674,121 +1684,142 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Počet podadresářů:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "" -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1796,187 +1827,203 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "Automatický výběr" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "Integrace" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -1984,7 +2031,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -1994,19 +2061,19 @@ msgid "" "Do you want to continue or do you want to select another font." msgstr "" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2015,8 +2082,7 @@ msgid "PreprocessorCmd: " msgstr "" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" #: pdiff.cpp:264 @@ -2078,14 +2144,8 @@ msgstr "" msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" #: pdiff.cpp:530 @@ -2095,108 +2155,54 @@ msgid "" "Continue at your own risk." msgstr "" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Přerušit" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "" -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Vyjímám výběr..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Kopíruji výběr do schránky..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Vkládám obsah schránky..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "O&kno" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "" @@ -2239,6 +2245,10 @@ msgstr "" msgid "Configure..." msgstr "Nastavit..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2311,6 +2321,14 @@ 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 "" @@ -2322,3 +2340,58 @@ msgstr "" #: smalldialogs.cpp:559 msgid "Opening and closing parentheses don't match in regular expression." msgstr "" + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "O&kno" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" diff --git a/po/cy.po b/po/cy.po index 0941504..7ba3584 100644 --- a/po/cy.po +++ b/po/cy.po @@ -1,35 +1,36 @@ msgid "" msgstr "" "Project-Id-Version: ../cy/messages//kdeextragear-1/kdiff3.po\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n" "Last-Translator: Thierry Vignaud \n" "Language-Team: cy \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "KD wrth KGyfieithu" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "kyfieithu@dotmon.com" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -38,7 +39,7 @@ msgid "" "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -47,21 +48,21 @@ msgid "" "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Diwedd" @@ -77,238 +78,245 @@ msgstr "Cyswllt : " msgid "Size. " msgstr "" -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "" -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "" -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 #, fuzzy msgid "Comparing file..." msgstr "Yn cadw ffeil..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Enw" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Gweithrediad" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Cyflwr" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Gwyn" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Parod." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Mynd ymlaen" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Cyfuno" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -317,41 +325,47 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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 "" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Gwall." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Wedi'i wneud." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -363,732 +377,750 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Math" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Maint" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Ffeil..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "dim ar gael" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " msgstr "" -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Allan o Gof." -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "" -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "Gwall agor ffeil" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "" -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Gwall agor ffeil" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Terfynu'r cymhwysiad" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Torri'r adran dewisiedig a'i roi ar y gludfwrdd" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Copïo'r adran dewisiedig i'r gludfwrdd" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Gludo cynnwys y gludfwrdd i'r fan wirioneddol" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Galluogi/analluogi'r bar offer" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Galluogi/analluogi'r bar cyflwr" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Gorffen heb gadw" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Yn cadw ffeil..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "Argraffu..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Dewisiad" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "" -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Terfynu..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Dangos/cuddio'r bar offer..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Dangos/cuddio'r bar cyflwr..." @@ -1103,8 +1135,8 @@ msgstr "" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" #: main.cpp:35 @@ -1181,19 +1213,18 @@ msgstr "" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" @@ -1203,115 +1234,95 @@ msgid "" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "" -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " msgstr "" -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " msgstr "" -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Gwrthdrawiadau" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Allbwn" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1331,6 +1342,15 @@ 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 "" @@ -1451,8 +1471,7 @@ msgid "Auto indentation" msgstr "" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" #: optiondialog.cpp:701 @@ -1484,113 +1503,107 @@ msgstr "" msgid "Diff Settings" msgstr "Gosodiadau Rhanbarthol" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" +#: optiondialog.cpp:750 +msgid "Treat as white space." msgstr "" -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" - -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Gosodiadau Rhanbarthol" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Gosodiadau Rhanbarthol" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Dewis gyda llaw" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1598,58 +1611,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1659,121 +1673,141 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +msgid "Max number of history entries:" +msgstr "" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "" -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1781,190 +1815,206 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Gosodiadau Rhanbarthol" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "dim detholiad" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "Gweithrediad" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration Settings" msgstr "Gosodiadau Rhanbarthol" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -1972,7 +2022,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -1982,19 +2052,19 @@ msgid "" "Do you want to continue or do you want to select another font." msgstr "" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2003,8 +2073,7 @@ msgid "PreprocessorCmd: " msgstr "" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" #: pdiff.cpp:264 @@ -2066,14 +2135,8 @@ msgstr "" msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" #: pdiff.cpp:530 @@ -2083,108 +2146,54 @@ msgid "" "Continue at your own risk." msgstr "" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Erthylu" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "" -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Gwall agor ffeil" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Yn torri'r dewisiad..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Yn copïo'r dewisiad i'r clipfwrdd..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Yn mewnosod cynnwys y clipfwrdd..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Cyfeiriadur" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Cyfuno" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Ffenestr" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "" @@ -2227,6 +2236,10 @@ msgstr "" msgid "Configure..." msgstr "Ffurfweddu..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 #, fuzzy msgid "Search text:" @@ -2300,6 +2313,14 @@ 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 "" @@ -2312,6 +2333,61 @@ msgstr "" msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Cyfeiriadur" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Cyfuno" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Ffenestr" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + #, fuzzy #~ msgid "Manually match lines" #~ msgstr "Dewis gyda llaw" diff --git a/po/da.po b/po/da.po index 4422bcc..a79ac12 100644 --- a/po/da.po +++ b/po/da.po @@ -5,37 +5,38 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2006-11-16 08:18-0500\n" "Last-Translator: Erik Kjær Pedersen \n" "Language-Team: Danish \n" +"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: \n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Erik Kjær Pedersen" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "erik@binghamton.edu" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Skrivning af klippebordsdata til midlertidig fil mislykkedes." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Fra klippebord" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -49,7 +50,7 @@ msgstr "" "\n" "Forbehandlingskommandoen vil blive deaktiveret nu." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -57,13 +58,14 @@ msgid "" "\n" "The line-matching-preprocessing command will be disabled now." msgstr "" -"Forbehandlingen af linje-matchning mislykkedes muligvis. Tjek denne kommando:\n" +"Forbehandlingen af linje-matchning mislykkedes muligvis. Tjek denne " +"kommando:\n" "\n" " %1\n" "\n" "Forbehandlingskommandoen til linje-matchning vil blibe deaktiveret nu." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -71,15 +73,15 @@ msgstr "" "Fejl med datatab:\n" "Hvis dette kan gentages so kontakt venligst forfatteren.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Alvorlig intern fejl" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "Toplinje" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Slut" @@ -95,244 +97,249 @@ msgstr "Link: " msgid "Size. " msgstr "Størrelse. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Dato & Størrelse: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Oprettelse af midlertidig kopi af %1 mislykkedes." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Åbning af %1 mislykkedes." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Sammenligner fil..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Fejl ved læsning fra %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Navn" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Operation" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Uløst" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Løst" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Ikke-hvid" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Hvid" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" 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:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Fortsæt med indfletning" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Det mislykkedes at åbne mapper:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Mappen A \"%1\" eksisterer ikke eller er ikke en mappe.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Mappen A \"%1\" eksisterer ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Mappen B \"%1\" eksisterer ikke eller er ikke en mappe.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Mappen B \"%1\" eksisterer ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Mappen C \"%1\" eksisterer ikke eller er ikke en mappe.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Mappen C \"%1\" eksisterer ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Fejl ved åbning af mappe" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -"Målmappen kan ikke være den samme som A eller B når tre mapper flettes sammen.\n" +"Målmappen kan ikke være den samme som A eller B når tre mapper flettes " +"sammen.\n" "Tjek igen før du fortsætter." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Parameteradvarsel" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Skanner mapper..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Læser mappen A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Læser mappen B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Læser mappen C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Nogle undermapper kunne ikke læses i" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Tjek tilladelser for undermapperne." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Klar." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Status for mappesammenligning" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Antal undermapper:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Antal ens filer:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Antal forskellige filer:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Antal manuelle indfletninger:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Dette påvirker alle indfletningsoperationer." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Ændrer alle indfletningsoperationer" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Fortsæt" -#: directorymergewindow.cpp:1169 +#: 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" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "At gøre." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Kopiér A til B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Kopiér B til A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Slet A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Slet B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Slet A & B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Indflet til A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Indflet til B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Indflet til A & B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Slet (hvis det eksisterer)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Indflet" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Indflet (manuelt)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Fejl: Filtyper i konflikt" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Fejl: Datoer er ens men filer er ikke." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Denne operation er ikke mulig for øjeblikket." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Operation ikke mulig" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -346,42 +353,47 @@ msgstr "" "\n" "Hvis du ved hvordan dette kan reproduceres, så kontakt programmets forfatter." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Programfejl" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Der opstod en fejl mens der kopieredes.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Der opstod en fejl mens der kopieredes.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Fejl." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Færdig." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Ikke gemt." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Ukendt indfletningsoperation. (Dette skulle ikke kunne ske!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Ukendt indfletningsoperation." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -397,337 +409,341 @@ msgstr "" "Vælg \"Gør det\" hvis du har læst instruktionerne og ved hvad du gør.\n" "Valg af \"Simulér det\" vil fortælle dig hvad der ville ske.\n" "\n" -"Vær klar over at dette program stadig har beta-status og der er INGEN GARANTI " -"overhovedet! Lav sikkerhedskopier af dine vitale data!" +"Vær klar over at dette program stadig har beta-status og der er INGEN " +"GARANTI overhovedet! Lav sikkerhedskopier af dine vitale data!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Starter indfletning" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Gør det" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Simulér det" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" "Det frem,hævede punkt har forskellig type i de forskellige mapper. Vælg hvad " "der skal gøres." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" "Ændringsdatoerne for filerne er ens, men filerne er ikke ens. Vælg hvad der " "skal gøres." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" "Denne operation er ikke mulig lige nu da mappe-indfletningen kører for " "øjeblikket." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Der opstod en fejl i det sidste skridt.\n" "Ønsker du at fortsætte punktet der forårsagede fejlen eller ønsker du at " "springe over dette punkt?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Fortsæt med indfletning efter en fejl" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Fortsæt med det sidste punkt" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Spring over punkt" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Sprunget over." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "I fremgang..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Indfletningsoperation færdig." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Indfletning færdig" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Simuleret indfletning færdig: Tjek om du er enig i de foreslåede operationer." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Der opstod en fejl. Tryk på o.k. for at se detaljeret information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Der opstod en fejl. Tryk på o.k. for at se detaljeret information.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Fejl: Under sletning af %1: Det mislykkedes at lave sikkerhedskopi." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "slet mappe rekursivt( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "slet( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Fejl: 'slet mappe'-operation mislykkedes under forsøget på at læse mappen." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Fejl: rmdir( %1 ) operation mislykkedes." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Fejl: slet-operation mislykkedes." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "manuel indfletning( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -" Bemærk: Efter en manuel indfletning skal brugeren fortsætte ved at trykke " -"på F7." +" Bemærk: Efter en manuel indfletning skal brugeren fortsætte ved at " +"trykke på F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Fejl: copy( %1 -> %2 ) mislykkedes. Sletning af eksisterende mål mislykkedes." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Fejl: copyLink mislykkedes: Eksterne link er endnu ikke understøttede." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Fejl: copyLink mislykkedes." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "copy( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Fejl under rename( %1 -> %2 ): Kan ikke slette eksisterende mål." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Fejl: Omdøbning mislykkedes." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Fejl ved makeDir af %1. Kan ikke slette eksisterende fil." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Fejl ved oprettelse af mappe." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Mål" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Mappe" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Størrelse" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Sidste ændring" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Link-destination" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Fil..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "ikke tilgængelig" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (Basis): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Dest: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "Gem tilstand for mappesammenfletning som..." -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Start/Fortsæt mappeindfletning" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Kør operation for dette punkt" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Sammenlign udvalgt fil" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Indflet udvalgt fil" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Fold alle undermapper sammen" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Fold alle undermapper ud" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Vælg A for alle punkter" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Vælg B for alle punkter" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Vælg C for alle punkter" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Auto-vælg operation for alle punkter" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Ingen operation for alle punkter" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "Vis identiske filer" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "Vis forskellige filer" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "Vis kun filer i A" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "Vis kun filer i B" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "Vis kun filer i C" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "Sammenlign eksplicit markerede filer" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "Sammenflet eksplicit markerede filer" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Gør intet" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Slet A && B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Indflet til A && B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -"Det mislykkedes at slette en ældre sikkerhedskopi under sikkerhedskopieringen.\n" +"Det mislykkedes at slette en ældre sikkerhedskopi under " +"sikkerhedskopieringen.\n" "Filnavn: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -735,423 +751,439 @@ msgstr "" "Det mislykkedes at ændre navnet under sikkerhedskopieringen\n" "Filnavne:" -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Henter filstatus: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Læser fil: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Skriver fil: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Ude af hukommelse" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Opretter mappe: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Fjerner mappe: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Fjerner fil: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Laver symbolsk link: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Omdøber fil: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Kopierer fil: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" "Fejl under kopieringsoperationen: Åbning af fil til læsning mislykkedes. " "Filnavn: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" "Fejl under kopieringsoperationen: Åbning af fil til skrivning mislykkedes. " "Filnavn: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "Fejl under kopieringsoperationen: Læsning mislykkedes. Filnavn: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Fejl under kopieringsoperationen: Skrivning mislykkedes. Filnavn: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Læser mappe:" -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Giver en liste af mappe: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "Nuværende indstilling:" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "Fejl i indstillingstilvalg:" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Tilvalg --auto brugt, men ingen uddatafil angivet." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Tilvalg --auto ignoreret for mappesammenligning." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Det mislykkedes at gemme." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Det mislykkedes at åbne disse filer:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Fejl ved åbning af fil" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Åbner dokumenter til sammenligning..." -#: kdiff3.cpp:423 +#: 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!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Gemmer dette dokument som..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "Udskriv forskellene" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Afslutter programmet" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Udklipper det markerede udvalg og lægger det på klippebordet" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Kopierer det valgte udsnit til klippebordet" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Indsætter klippebordets indhold på den aktuelle position" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "Markér alting i nuværende vindue" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Søg efter en streng" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Søg efter strengen igen" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Slå værktøjslinjen til/fra" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Slår statuslinjen til/fra" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Indstil KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Gå til den aktuelle delta" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Gå til første delta" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Gå til sidste delta" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -"(Springer over forskelle i blanke tegn når \"Vis blanke tegn\" er deaktiveret.)" +"(Springer over forskelle i blanke tegn når \"Vis blanke tegn\" er " +"deaktiveret.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -"(Springer ikke over forskelle i blanke tegn også selvom \"Vis blanke tegn\" er " -"deaktiveret.)" +"(Springer ikke over forskelle i blanke tegn også selvom \"Vis blanke tegn\" " +"er deaktiveret.)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Gå til forrige delta" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Gå til næste delta" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Gå til forrige konflikt" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Gå til næste konflikt" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Gå til forrige uløste konflikt" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Gå til næste uløste konflikt" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Vælg linjer fra A" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Vælg linjer fra B" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Vælg linjer fra C" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Gå til næste uløste konflikt automatisk efter kildevalg" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Vis mellemrums && tabulator-tegn for forskelle" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Vis blanke tegn" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Vis linjenumre" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Vælg A overalt" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Vælg B overalt" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Vælg C overalt" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Vælg A for alle uløste konflikter" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Vælg B for alle uløste konflikter" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Vælg C for alle uløste konflikter" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Vælg A for alle uløste konflikter med blanke tegn" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Vælg B for alle uløste konflikter med blanke tegn" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Vælg C for alle uløste konflikter med blanke tegn" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Løs simple konflikter automatisk" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Sæt deltaer til konflikter" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "Kør automatisk sammenfletning med regulært udtryk" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "Løs historikkonflikter automatisk" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "Opdel sammenligning ved markering" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "Føj markerede sammenligninger sammen" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Vis vindue A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Vis vindue B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Vis vindue V" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Fokus på næste vindue" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Normalt overblik" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "A vs. B overblik" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "A vs. C overblik" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "B vs. C overblik" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Tekstombrydning i diff-vinduer" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "Tilføj manuel justering af sammenligning" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "Ryd alle manuelle justeringer af sammenligning" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Fokus på forrige vindue" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Slå opdelt orientering til og fra" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Mappe && tekst opdelt skærmvisning" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Skift mellem Mappe && tekstvisning" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Indfletningsresultatet er ikke blevet gemt." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Gem && afslut" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Afslut uden at gemme" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Det mislykkedes at gemme indfletningsresultatet." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -"Du er ved at udføre en mappeindfletning. Er du sikker på du ønskler at afbryde?" +"Du er ved at udføre en mappeindfletning. Er du sikker på du ønskler at " +"afbryde?" + +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Gemmer fil..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Gemmer fil med nyt filnavn..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "Udskriver..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "Udskrift afbrudt." -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Markering" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "Udskrift færdig." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Går ud..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Slår værktøjslinje til/fra" -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Slå statuslinje til/fra..." @@ -1166,8 +1198,8 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Kunne ikke finde vores part!\n" "Dette sker sædvanligvis på grund af et installationsproblem. Læs venligst " @@ -1224,8 +1256,8 @@ msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -"Sæt en indstilling ud af kraft. Brug en gang for hver indstilling, f.eks. --cs " -"\"AutoAdvance=1\"" +"Sæt en indstilling ud af kraft. Brug en gang for hver indstilling, f.eks. --" +"cs \"AutoAdvance=1\"" #: main.cpp:54 msgid "Show list of config settings and current values." @@ -1251,19 +1283,18 @@ msgstr "fil3 der skal åbnes" msgid "Ignored. (User defined.)" msgstr "Ignoreres. (brugerdefineret)" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "+ Mange tak til dem der rapporterede fejl og bidrog med ideer." -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Antal tilbageværende uløste konflikter: %1 (af hvilke %2 er blanke tegn)" @@ -1276,55 +1307,30 @@ msgstr "" "Uddata er blevet ændret.\n" "Hvis du fortsætter vil dine ændringer gå tabt." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Alle inddata-filer er binært ens." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Alle inddata-filer indeholder den samme tekst." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Filerne A og B er binært ens.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Filerne A og B har samme tekst.\n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Filerne A og C er binært ens.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Filerne A og C har samme tekst.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Filerne %1 og %2 er binært ens.\n" -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Filerne B og C er binært ens.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Filerne A og B har samme tekst.\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Filerne B og C har samme tekst.\n" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Totalt antal konflikter: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1332,7 +1338,7 @@ msgstr "" "\n" "Antal automatisk løste konflikter: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1340,23 +1346,23 @@ msgstr "" "\n" "Antal uløste konflikter: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Konflikter" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1364,11 +1370,11 @@ msgstr "" "Ikke alle konflikter er løst endnu.\n" "Filen er ikke gemt.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Konflikter tilovers" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1378,28 +1384,28 @@ msgstr "" "\n" "Mislykkedes at oprette sikkerhedskopi. Filen blev ikke gemt." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Fejl ved at gemme fil" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Fejl ved skrivning." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Uddata" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Ændret]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "Filtegnsæt for at gemme" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "Koder fra" @@ -1419,6 +1425,15 @@ 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" @@ -1542,10 +1557,8 @@ msgid "Auto indentation" msgstr "Auto-indrykning" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"Til: Indrykningen for den tidligere linje bruges for en ny linje.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "Til: Indrykningen for den tidligere linje bruges for en ny linje.\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1579,64 +1592,56 @@ msgstr "Diff" msgid "Diff Settings" msgstr "Opsætning af diff" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Bevar vognretur" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Vis vognretur-tegn '\\r' hvis de eksisterer.\n" -"Hjælper med at sammenligne filer der blev ændrede under forskellige " -"operativsystemer." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Behandl C/C++ kommentarer ligesom blanke tegn." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Ignorér numre" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -"Ignorér nummer-tegn i den fase hvor du matcher linjer. (Ligner Ignorér blanke " -"tegn.)\n" +"Ignorér nummer-tegn i den fase hvor du matcher linjer. (Ligner Ignorér " +"blanke tegn.)\n" "Kan muligvis hjælpe med at sammenligne numeriske data." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Ignorér C/C++ kommentarer" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Behandl C/C++ kommentarer ligesom blanke tegn." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Ignorér versaltype" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Behandl forskel mellem store og små bogstaver som ændringer i blanke tegn. " "('a'<=>'A')" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Præprocessor kommando:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "Brugerdefineret præ-proces. (Se dokumentationen for detaljer.)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Linje-matchende præprocessor kommando:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1644,11 +1649,11 @@ msgstr "" "Denne præ-processor bruges kun når du matcher linjer.\n" "(Se dokumentationen for detaljer.)" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Prøv hårdt (langsommere)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1656,11 +1661,15 @@ msgstr "" "Aktiverer --minimal tilvalget for den eksterne diff.\n" "Analysen af store filer vil være meget langsommere." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "Opsætning af sammenflet" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Auto fremad-tøven (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" @@ -1669,39 +1678,35 @@ msgstr "" "i det angiven tidsrum tid, før der springes frem til den næste konflikt. " "Område: 0-2000 ms" -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "Opsætning af sammenflet" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Standard for 2-fils indfletning af blanke tegn:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Manuelt valg" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -"Tillad indfletningsalgoritmen automatisk at vælge et input for ændringer kun af " -"blanke tegn." +"Tillad indfletningsalgoritmen automatisk at vælge et input for ændringer kun " +"af blanke tegn." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Standard for 3-fils indfletning:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "Automatisk sammenfletning med regulært udtryk" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "Regulært udtryk for automatisk sammenfletning:" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1712,12 +1717,12 @@ msgstr "" "Når en linje med en konflikt matcher det regulære udtryk vælges -C \n" "om tilgængeligt, ellers vælges B." -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" "Kør automatisk sammenfletning med regulært udtryk når sammenfletning starter" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" @@ -1725,15 +1730,15 @@ msgstr "" "Kør automatisk sammenfletning med regulært\n" "udtryk med det samme når en sammenfletning starter.\n" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "Sammenfletning ifølge versionskontrolhistorik" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "Regulært udtryk for historikkens begyndelse:" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" @@ -1743,17 +1748,18 @@ msgstr "" "Som oftest indeholder linjen nøgleordet \"$Log$\".\n" "Standardværdi: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "Regulært udtryk for historikindgangens begyndelse:" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" "En versionskontrol historikindgang består af flere linjer.\n" @@ -1764,19 +1770,19 @@ msgstr "" "historikposterne ad.\n" "Se dokumentationen for detaljer." -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "Sortering af historiksammenfletning" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "Sortér versionskontrolhistorikken med en nøgle." -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "Sorteringsnøglernes rækkefølge fra historikpostens begyndelse:" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1794,26 +1800,35 @@ msgstr "" "Hvis det efterlades tomt, gøres ingen sortering.\n" "Se dokumentationen for detaljer." -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" "Sammenfletning ifølge versionskontrolhistorik når sammenfletning starter" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -"Kør automatisk sammenfletning ifølge versionskontrolhistorik når sammenfletning " -"starter." +"Kør automatisk sammenfletning ifølge versionskontrolhistorik når " +"sammenfletning starter." + +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Antal undermapper:" -#: optiondialog.cpp:947 +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "Test dine regulære udtryk" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "Ikke relevant sammenfletningskommando:" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" @@ -1823,23 +1838,35 @@ msgstr "" "når ingen andre relevante ændringer blev detekteret.\n" "Kaldes med parametrene: filnavn1 filnavn2 filnavn3" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Mappeindfletning" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Rekursive mapper" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Om undermapper skal analyseres eller ej." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Filmønstre:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1849,11 +1876,11 @@ msgstr "" "Jokertegn: '*' og '?'\n" "Flere mønstre kan angives ved brug af adskillertegnet: ';'" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Fil-anti-mønstre:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1863,11 +1890,11 @@ msgstr "" "Jokertegn: '*' og '?'\n" "Flere mønstre kan angives ved brug af adskillertegnet: ';'" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Mappe-anti-mønstre:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1877,11 +1904,11 @@ msgstr "" "Jokertegn: '*' og '?'\n" "Flere mønstre kan angives ved brug af adskillertegnet: ';'" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Brug .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1889,23 +1916,23 @@ msgstr "" "Udvider anti-mønstret til hvadsomhelst der ville blive ignoreret af CVS.\n" "Via lokale \".cvsignore\"-filer kan dette være specifikt for en enkel mappe." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Find skjulte filer og mapper" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Finder filer og mapper med en skjulte attribut." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Finder filer og mapper der begynder med '.'." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Følger fil-link" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1913,11 +1940,11 @@ msgstr "" "Til: Sammenlign med filen som linket peger på.\n" "Fra: Sammenlign link." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Følg mappe-link" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1925,11 +1952,11 @@ msgstr "" "Til: Sammenlign med mappen som linket peger på.\n" "Fra: Sammenlign link." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "Versalfølsom filnavnesammenligning" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1937,26 +1964,26 @@ msgid "" "off, otherwise on.)" msgstr "" "Mappesammenligning sammenligner filer eller mapper når deres navne matcher.\n" -"Angiv dette tilvalg hvis navnenes versaltilstand skal matche. (Standardværdien " -"for Windows er fra, ellers til.)" +"Angiv dette tilvalg hvis navnenes versaltilstand skal matche. " +"(Standardværdien for Windows er fra, ellers til.)" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Filsammenligningstilstand" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Binær sammenligning" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Binær sammenligning af hver fil. (Standard)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Fuld analyse" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1964,24 +1991,45 @@ msgstr "" "Udfør en fuld analyse og vis statistisk information i ekstra søjler.\n" "(Langsommere end en binær sammenligning, meget langsommere for binære filer.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Stol på ændringsdato (usikker)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" "Antag at filer er ens hvis ændringsdatoen og fillængden er ens.\n" "Nyttigt for store mapper eller langsomme netværk." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Antag at filer er ens hvis ændringsdatoen og fillængden er ens.\n" +"Nyttigt for store mapper eller langsomme netværk." + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Stol på størrelsen (usikker)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -1991,11 +2039,11 @@ msgstr "" "Nyttigt for store mapper eller langsomme netværk, når datoen er ændret efter " "filer er hentet." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Synkronisér mapper" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -2005,11 +2053,11 @@ msgstr "" "begge mapper er ens bagefter.\n" "Virker kun når to mapper sammenlignes uden at angive nogen destination." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Forskelle i blanke tegn anses for ens" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -2017,11 +2065,11 @@ msgstr "" "Hvis filer kun adskiller sig med blanke tegn, anses dem for ens.\n" "Dette er kun aktiveret når fuldstændig analyse vælges." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Kopiér nyere i stedet for at indflette (usikker)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2031,11 +2079,11 @@ msgstr "" "(Brug kun dette hvis du ved hvad du foretager dig!)\n" "Kun effektivt når to mapper sammenlignes." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Sikkerhedskopieringsfiler (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2043,15 +2091,15 @@ msgstr "" "Når en fil ville blive gemt over en gammel fil, så vil den gamle\n" "fil blive omdøbt med en '.orig'-endelse i stedet for at blive slettet." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Regional opsætning" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Sprog (genstart krævet)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2059,11 +2107,11 @@ msgstr "" "Vælg sproget for GUI-strengene eller \"Auto\".\n" "For at en ændring af sprog skal ske, afslut og start KDiff3 igen." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Brug samme tegnsæt til alt:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." @@ -2071,21 +2119,21 @@ msgstr "" "At aktivere dette lader dig ændre alle tegnsæt ved at kun ændre den første.\n" "Deaktivér det hvis forskellige individuelle indstillinger behøves." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Bemærk: Lokalt tegnsæt er " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "Filtegnsæt for A:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" "Hvis aktiveret detekteres Unicode-kodning (UTF-16 eller UTF-8).\n" "Hvis filens kodning ikke kan detekteres, bruges den valgte kodning som " @@ -2093,27 +2141,27 @@ msgstr "" "(Detektering af Unicode afhænger af den første byte i en fil - " "byterækkefølgemarkøren \"BOM\".)" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "Detektér Unicode automatisk" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "Filtegnsæt for B:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "Filtegnsæt for C:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Filtegnsæt for sammenflettede uddata og når der gemmes:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "Automatisk markering" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " @@ -2123,15 +2171,15 @@ msgstr "" "I tvetydige tilfælde bedes brugeren om at vælge kodning at gemme med via en " "dialog." -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Filtegnsæt for forbehandlingsfiler:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Sprog som læses fra højre til venstre" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2139,19 +2187,19 @@ msgstr "" "Nogle sprog læses fra højre til venstre.\n" "Indstillingen ændrer visningen og editoren på tilsvarende måde." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "Integrering" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "Integreringsindstillinger" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "Kommandolinjeflag at ignorere:" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2163,7 +2211,27 @@ msgstr "" "Flere værdier kan angives hvis de adskilles af ';'\n" "Dette undertrykker fejlmeddelelsen \"Ukendt flag\"." -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2179,19 +2247,19 @@ msgstr "" "\n" "Ønsker du at fortsætte eller at vælge en anden skrifttype." -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Inkompatibel skrifttype" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Fortsæt på eget ansvar." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Vælg en anden skrifttype" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "Dette nulstiller alle tilvalg. Ikke kun dem der angår dette emne." @@ -2200,10 +2268,8 @@ msgid "PreprocessorCmd: " msgstr "Præprocessor kommando:" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"Følgende tilvalg du valgte vil muligvis ændre data:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "Følgende tilvalg du valgte vil muligvis ændre data:\n" #: pdiff.cpp:264 msgid "" @@ -2267,19 +2333,12 @@ msgstr "Linjeforskel: A <-> C" #: pdiff.cpp:513 msgid "All input files contain the same text, but are not binary equal." msgstr "" -"Alle inddata-filer indeholder den samme tekst, men er ikke binært ækvivalente." - -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Filerne %1 og %2 er binært ens.\n" +"Alle inddata-filer indeholder den samme tekst, men er ikke binært " +"ækvivalente." #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"Filerne %1 og %2 har samme tekst men er ikke binært ens.\n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Filerne %1 og %2 har samme tekst men er ikke binært ens.\n" #: pdiff.cpp:530 msgid "" @@ -2291,108 +2350,54 @@ msgstr "" "Bemærk at KDiff3-indfletningen ikke er beregnet til binære data.\n" "Fortsæt på eget ansvar." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Afbryd" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Åbner filer..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Fejl ved åbning af fil" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Klipper valgene ud..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Kopierer valgene til klippebord..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Indsætter klippebordets indhold..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Gem && Fortsæt" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Fortsæt uden at gemme" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Søgning færdig." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Søgning færdig" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "Ingenting er markeret i inddatavindue med sammenligning." -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "Fejl ved tilføjelse manuelt sammenligningsområde" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Indstil KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Mappe" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Indfletningsoperation for dette punkt" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Synkroniseringsoperation for dette punkt" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Bevægelse" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "D&iff-visning" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "Ind&flet" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Vindue" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (Basis):" @@ -2435,6 +2440,10 @@ msgstr "Uddata (frivillig):" msgid "Configure..." msgstr "Indstil..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Søgetekst:" @@ -2514,6 +2523,14 @@ 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." @@ -2526,6 +2543,88 @@ msgstr "Matchning mislykkedes." msgid "Opening and closing parentheses don't match in regular expression." msgstr "Indledende og afsluttende parenteser matcher ikke i regulært udtryk." +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Mappe" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Indfletningsoperation for dette punkt" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Synkroniseringsoperation for dette punkt" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Bevægelse" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "D&iff-visning" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "Ind&flet" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Vindue" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Filerne A og B er binært ens.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Filerne A og C er binært ens.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Filerne A og C har samme tekst.\n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Filerne B og C er binært ens.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Filerne B og C har samme tekst.\n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Bevar vognretur" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Vis vognretur-tegn '\\r' hvis de eksisterer.\n" +#~ "Hjælper med at sammenligne filer der blev ændrede under forskellige " +#~ "operativsystemer." + #~ msgid "Diff and Merge" #~ msgstr "Sammenlign og sammenflet" diff --git a/po/de.po b/po/de.po index a3ff81a..e5b31ed 100644 --- a/po/de.po +++ b/po/de.po @@ -10,37 +10,38 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2006-07-09 10:25+0200\n" "Last-Translator: Thomas Reitelbach \n" "Language-Team: German \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Joachim Eibl" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "joachim.eibl@gmx.de" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Speichern der Zwischenablage in temporärer Datei ist fehlgeschlagen." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Aus Zwischenablage" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -55,7 +56,7 @@ msgstr "" "\n" "Diese Vorverarbeitung wird nun deaktiviert." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -71,7 +72,7 @@ msgstr "" "\n" "Der Vorverarbeitungsbefehl für Zeilenabgleich wird nun deaktiviert." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -80,15 +81,15 @@ msgstr "" "Falls das Problem reproduzierbar ist, nehmen Sie bitte Kontakt mit dem Autor " "auf.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Schwerwiegender interner Fehler" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "Oberste Zeile" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Ende" @@ -104,245 +105,249 @@ msgstr "Verknüpfung: " msgid "Size. " msgstr "Größe: " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Datum & Größe: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Erstellung einer temporären Kopie von %1 ist fehlgeschlagen." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Öffnen von %1 ist fehlgeschlagen." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Datei wird verglichen ..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Fehler beim Lesen von %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Name" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Aktion" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Ungelöst" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Gelöst" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Nicht weiß" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Weiß" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -"Sie sind dabei, Verzeichnisse zusammenzuführen. Sind Sie sicher, dass Sie diese " -"Operation abbrechen und das Verzeichnis erneut einlesen wollen?" +"Sie sind dabei, Verzeichnisse zusammenzuführen. Sind Sie sicher, dass Sie " +"diese Operation abbrechen und das Verzeichnis erneut einlesen wollen?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Zusammenführung fortsetzen" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Öffnen der Verzeichnisse fehlgeschlagen:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Verzeichnis A \"%1\" existiert nicht oder ist kein Verzeichnis.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Verzeichnis A \"%1\" existiert nicht oder ist kein Verzeichnis.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Verzeichnis B \"%1\" existiert nicht oder ist kein Verzeichnis.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Verzeichnis B \"%1\" existiert nicht oder ist kein Verzeichnis.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Verzeichnis C \"%1\" existiert nicht oder ist kein Verzeichnis.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Verzeichnis C \"%1\" existiert nicht oder ist kein Verzeichnis.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Fehler beim Öffnen des Verzeichnisses" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -"Wenn drei Verzeichnisse zusammengeführt werden, darf das Zielverzeichnis nicht " -"mit A oder B identisch sein.\n" +"Wenn drei Verzeichnisse zusammengeführt werden, darf das Zielverzeichnis " +"nicht mit A oder B identisch sein.\n" "Bitte überprüfen Sie dies." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Parameter-Warnung" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Verzeichnisse einlesen ..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Einlesen von Verzeichnis A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Einlesen von Verzeichnis B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Einlesen von Verzeichnis C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Einige Unterverzeichnisse nicht lesbar in" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Überprüfen Sie bitte die Zugriffsrechte für die Unterverzeichnisse." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Bereit" -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Status des Verzeichnisvergleichs" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Anzahl der Unterverzeichnisse:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Anzahl der identischen Dateien:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Anzahl der unterschiedlichen Dateien:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Anzahl der manuellen Zusammenführungen:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Dies beeinflußt alle Zusammenführungsaktionen." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Änderung aller Zusammenführungsaktionen" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Fortsetzen" -#: directorymergewindow.cpp:1169 +#: 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 " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Unerledigt." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Kopiere A nach B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Kopiere B nach A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Lösche A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Lösche B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Lösche A & B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Zusammenführen nach A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Zusammenführen nach B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Zusammenführen nach A & B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Lösche (falls vorhanden)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Zusammenführen" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Zusammenführen (manuell)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Fehler: Konflikt der Dateitypen" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Fehler: Gleiches Datum, aber unterschiedliche Dateien." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Diese Aktion ist momentan nicht zulässig." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Unzulässige Aktion" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -357,42 +362,47 @@ msgstr "" "Wenn Sie dies reproduzieren können, informieren Sie bitte den Autor dieses " "Programms." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Programm Fehler" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Ein Fehler ist während des Kopierens aufgetreten.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Ein Fehler ist während des Kopierens aufgetreten.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Fehler." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Erledigt." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Nicht gespeichert." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Unbekannte Zusammenführaktion. (Sollte nie passieren!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Unbekannte Zusammenführaktion." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -409,337 +419,341 @@ msgstr "" "erwartet.\n" "Wählen Sie \"Simulieren\" um zu sehen, was passieren würde.\n" "\n" -"Sie sollten aber wissen, dass dieses Programm noch Beta-Status hat und es KEINE " -"GARANTIE gibt! Erstellen Sie Sicherungkopien Ihrer wichtigen Daten!" +"Sie sollten aber wissen, dass dieses Programm noch Beta-Status hat und es " +"KEINE GARANTIE gibt! Erstellen Sie Sicherungkopien Ihrer wichtigen Daten!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Start der Zusammenführung" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Start" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Simulieren" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" "Das markierte Element hat einen unterschiedlichen Typ in den verschiedenen " "Verzeichnissen. Wählen Sie eine Aktion." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -"Für die markierte Datei ist zwar das Datum der letzen Änderung gleich, aber die " -"Dateien unterscheiden sich. Wählen Sie die Zusammenführaktion." +"Für die markierte Datei ist zwar das Datum der letzen Änderung gleich, aber " +"die Dateien unterscheiden sich. Wählen Sie die Zusammenführaktion." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" "Diese Aktion ist momentan nicht möglich, weil zur Zeit Verzeichnisse " "zusammengeführt werden." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Beim letzten Element ist ein Fehler aufgetreten.\n" "Wollen Sie mit diesem Element fortfahren, oder wollen Sie dieses Element " "überspringen?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Fortsetzung der Zusammenführung nach einem Fehler" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Mit letztem Element fortsetzen" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Element überspringen" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Übersprungen." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "In Bearbeitung ..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Die Zusammenführung ist fertig." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Zusammenführung abgeschlossen." -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Die simulierte Zusammenführung ist abgeschlossen. Überprüfen Sie, ob Sie mit " "den vorgeschlagenen Aktionen einverstanden sind." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Ein Fehler ist aufgetreten. Wählen Sie OK um Details zu sehen.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Ein Fehler ist aufgetreten. Wählen Sie OK um Details zu sehen.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -"Fehler: Beim Löschen von %1: Die Erstellung einer Sicherungskopie schlug fehl." +"Fehler: Beim Löschen von %1: Die Erstellung einer Sicherungskopie schlug " +"fehl." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "Lösche Verzeichnis rekursiv( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "Lösche( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Fehler: Löschen des Verzeichnisses schlug fehl, da es nicht gelesen werden " "konnte." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Fehler: Verzeichnis löschen( %1 ) Operation fehlgeschlagen." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Fehler: Löschoperation fehlgeschlagen." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "Manuelles Zusammenführen( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " Hinweis: Nach manuellem Zusammenführen mit F7 fortsetzen." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Fehler: Kopie( %1 -> %2 ) fehlgeschlagen. Das existierende Ziel konnte nicht " "gelöscht werden." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "Verknüpfung kopieren( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Fehler: Verknüpfung kopieren: Nichtlokale Verknüpfungen werden nicht " "unterstützt." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Fehler: Verknüpfung kopieren fehlgeschlagen." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "kopiere( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -"Fehler beim Umbenennen( %1 -> %2 ): Das existierende Ziel konnte nicht gelöscht " -"werden." +"Fehler beim Umbenennen( %1 -> %2 ): Das existierende Ziel konnte nicht " +"gelöscht werden." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "Umbenennen( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Fehler: Umbenennen fehlgeschlagen." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Fehler beim Erstellen des Verzeichnisses %1. Kann existierendes Objekt nicht " "löschen." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "erstelleVerzeichnis( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Fehler beim Erstellen eines Verzeichnis." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Ziel" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Verzeichnis" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Typ" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Größe" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Letzte Änderung" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Verknüpfungsziel" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Datei ..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "nicht vorhanden" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (Ziel): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (Basis): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (Ziel): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (Ziel): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Ziel: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "Verzeichniszusammenführungsstatus speichern unter ..." -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Verzeichniszusammenführung starten/fortsetzen" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Aktion des aktuellen Elements ausführen" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Vergleiche gewählte Datei" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Aktuelle Datei zusammenführen" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Alle Unterverzeichnisse einklappen" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Alle Unterverzeichnisse ausklappen" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Für alle Elemente A wählen" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Für alle Elemente B wählen" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Für alle Elemente C wählen" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Aktion für alle Elemente automatisch wählen" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Keine Aktion für alle Elemente" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "Zeige identische Dateien" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "Zeige unterschiedliche Dateien" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "Zeige Dateien nur in A" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "Zeige Dateien nur in B" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "Zeige Dateien nur in C" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "Vergleiche explizit ausgewählte Dateien" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "Führe explizit ausgewählte Dateien zusammen" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Nichts tun" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Lösche A && B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Zusammenführen nach A && B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " @@ -748,7 +762,7 @@ msgstr "" "vorhandene Sicherungskopie nicht gelöscht werden.\n" "Datei: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -757,188 +771,194 @@ msgstr "" "fehlgeschlagen:\n" "Dateinamen: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Hole Datei Status: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Einlesen von Datei: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Schreibe Datei: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Nicht genügend Speicher" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Erstelle Verzeichnis: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Lösche Verzeichnis: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Lösche Datei: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Erstelle Verknüpfung: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Datei umbenennen: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Datei kopieren: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "Fehler beim Kopieren: Datei konnte nicht zum Lesen geöffnet werden: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" "Fehler beim Kopieren: Datei konnte nicht zum Schreiben geöffnet werden: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "Fehler beim Kopieren: Lesen fehlgeschlagen: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Fehler beim Kopieren: Schreiben fehlgeschlagen: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Verzeichnis wird eingelesen:" -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Einlesen von Verzeichnis: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "Aktuelle Einstellungen:" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "Fehler in der Einstellungsoption" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Option --auto verwendet, aber keine Ausgabedatei angegeben." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Option --auto wird beim Vergleich von Verzeichnissen ignoriert." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Speichern fehlgeschlagen." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Öffnen dieser Dateien schlug fehl:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Fehler beim Dateiöffnen" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Dateien für Vergleich öffnen ..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Sichern des Zusammenführergebnisses. Alle Konflikte müssen gelöst sein." -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Speichert das aktuelle Dokument als ..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "Unterschiede drucken" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Beendet das Programm" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Schneidet die Auswahl aus und kopiert sie in die Zwischenablage" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Kopiert den ausgewählten Bereich in die Zwischenablage" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Fügt den Inhalt der Zwischenablage an der aktuellen Position ein" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "Alles auswählen in aktuellem Fenster" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Suche nach Text ..." -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Weitersuchen" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Blendet die Werkzeugleiste ein/aus" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Blendet die Statusleiste ein/aus" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "KDiff3 einrichten ..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Springe zu aktuellem Unterschied" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Springe zum ersten Unterschied" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Springe zum letzten Unterschied" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Unterschiede in weißen Zeichen werden übersprungen, wenn \"Zeige weiße " "Zeichen\" ausgeschaltet ist.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -946,234 +966,242 @@ msgstr "" "(Unterschiede in weißen Zeichen werden nicht übersprungen, auch wenn \"Zeige " "weiße Zeichen\" ausgeschaltet ist.)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Springe zu vorigem Unterschied" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Springe zu nächstem Unterschied" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Springe zu vorigem Konflikt" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Springe zu nächstem Konflikt" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Springe zu vorigem ungelösten Konflikt" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Springe zu nächstem ungelöstem Konflikt" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Wähle Zeile(n) von A" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Wähle Zeile(n) von B" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Wähle Zeile(n) von C" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Automatisch zu nächstem ungelösten Konflikt weiterspringen" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Zeige Leerzeichen und Tabulator Zeichen in Unterschieden" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Zeige \"weiße\" Zeichen" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Zeige Zeilennummern" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Wähle A überall" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Wähle B überall" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Wähle C überall" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Wähle A für alle ungelösten Konflikte" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Wähle B für alle ungelösten Konflikte" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Wähle C für alle ungelösten Konflikte" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Wähle A für alle ungelösten \"weißen\" Konflikte" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Wähle B für alle ungelösten \"weißen\" Konflikte" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Wähle C für alle ungelösten \"weißen\" Konflikte" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Automatisch einfache Konflikte lösen" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Alle Unterschiede zu Konflikten machen" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "Regulärer-Ausdruck-Zusammenführung starten" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "Automatisch History-Konflikte auflösen" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "Trenne Unterschied bei der Auswahlsmarkierung" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "Verbinde markierte Unterschiede" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Zeige Fenster A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Zeige Fenster B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Zeige Fenster C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Setze Fokus zum nächsten Fenster" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Normale Übersicht" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "A vs. B Übersicht" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "A vs. C Übersicht" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "B vs. C Übersicht" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Zeilenumbruch für Vergleichsanzeige" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "Manuelle Ausrichtung hinzufügen" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "Alle manuellen Ausrichtungen entfernen" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Setze Fokus zum vorigen Fenster" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Ausrichtung der Fensterteilung wechseln" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Verzeichnis && Textfenster teilen sich Hauptfenster" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Wechsel zwischen Verzeichnis && Text Fenster" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Das Zusammenführungsergebnis wurde nicht gespeichert." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Speichern && Beenden" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Beenden ohne zu speichern" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Speichern des Zusammenführungsergebnisses schlug fehl." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Sie führen eine Verzeichniszusammenführung durch. Sind sie sicher, dass sie " "diese beenden möchten?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Datei wird gespeichert ..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Datei wird unter neuem Namen gespeichert ..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "Drucken ..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "Drucken abgebrochen." -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Auswahl" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "Drucken beendet." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Wird beendet ..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Werkzeugleiste (de)aktivieren ..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Statusleiste an/aus ..." @@ -1188,12 +1216,12 @@ msgstr "KDiff3-Komponente" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Konnte die KDiff3-Komponente nicht finden!\n" -"Das ist normalerweise ein Installationsproblem. Bitte lesen Sie die " -"README-Datei, die den Quelltexten beiliegt." +"Das ist normalerweise ein Installationsproblem. Bitte lesen Sie die README-" +"Datei, die den Quelltexten beiliegt." #: main.cpp:35 msgid "Tool for Comparison and Merge of Files and Directories" @@ -1219,8 +1247,8 @@ msgstr "Ergebnisdatei. (Für Kompatibilität mit anderen Werkzeugen.)" #: main.cpp:46 msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -"Kein Fenster anzeigen, wenn alle Konflikte automatisch lösbar sind. (Benötigt " -"-o)" +"Kein Fenster anzeigen, wenn alle Konflikte automatisch lösbar sind. " +"(Benötigt -o)" #: main.cpp:47 msgid "Don't solve conflicts automatically. (For compatibility...)" @@ -1275,20 +1303,19 @@ msgstr "Dritte Datei" msgid "Ignored. (User defined.)" msgstr "Ignoriert. (Benutzerdefiniert.)" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" "+ Vielen Dank an alle, die Fehler gemeldet und Ideen beigesteuert haben!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Anzahl der verbleibenden ungelösten Konflikte: %1 (wobei %2 davon weiße " @@ -1302,55 +1329,30 @@ msgstr "" "Das Ergebnis wurde verändert.\n" "Wenn sie fortsetzen gehen die Änderungen verloren." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Alle Quelldateien sind binär identisch." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Alle Quelldateien enthalten den gleichen Text." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Die Dateien A und B sind binär identisch.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Die Dateien A und B enthalten den gleichen Text. \n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Die Dateien A und C sind binär identisch.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Die Dateien A und C enthalten den gleichen Text. \n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Die Dateien B und C sind binär identisch.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Die Dateien %1 und %2 sind binär identisch.\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Die Dateien B und C enthalten den gleichen Text. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Die Dateien A und B enthalten den gleichen Text. \n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Gesamte Anzahl der Konflikte: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1358,7 +1360,7 @@ msgstr "" "\n" "Anzahl der automatisch gelösten Konflikte: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1366,23 +1368,23 @@ msgstr "" "\n" "Anzahl der ungelösten Konflikte: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Konflikte" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1390,11 +1392,11 @@ msgstr "" "Noch sind nicht alle Konflikt gelöst.\n" "Die Datei wurde nicht gespeichert.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Es sind noch ungelöste Konflikte übrig" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1404,29 +1406,29 @@ msgstr "" "\n" "Die Sicherungskopie anzulegen schlug fehl. Die Datei wurde nicht gespeichert." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Fehler beim Speichern der Datei" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Fehler beim Schreiben." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Ausgabe" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Geändert]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 #, fuzzy msgid "Encoding for saving" msgstr "Dateikodierung für C:" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1448,6 +1450,15 @@ 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" @@ -1530,8 +1541,8 @@ msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -"Diese Farbe zu ändern, wird erst beim Start des nächsten Verzeichnisvergleichs " -"wirksam." +"Diese Farbe zu ändern, wird erst beim Start des nächsten " +"Verzeichnisvergleichs wirksam." #: optiondialog.cpp:644 msgid "Oldest file color:" @@ -1562,8 +1573,8 @@ msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A Tab-character will be inserted." msgstr "" -"Falls aktiv wird bei Betätigen des Tabulaturs die passende Anzahl Leerzeichen " -"eingefügt. Sonst wird ein Tabulatorzeichen eingefügt." +"Falls aktiv wird bei Betätigen des Tabulaturs die passende Anzahl " +"Leerzeichen eingefügt. Sonst wird ein Tabulatorzeichen eingefügt." #: optiondialog.cpp:689 msgid "Tab size:" @@ -1574,8 +1585,7 @@ msgid "Auto indentation" msgstr "Automatisch einrücken" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" "Wenn aktiv, dann wird die Einrückung der vorigen Zeile bei neuen Zeilen " "übernommen.\n" @@ -1589,7 +1599,8 @@ msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "" -"Falls aktiv wird die Auswahl automatisch sofort in die Zwischenablage kopiert.\n" +"Falls aktiv wird die Auswahl automatisch sofort in die Zwischenablage " +"kopiert.\n" "Sonst muss man explizit kopieren, z.B. mit Ctrl-C." #: optiondialog.cpp:709 @@ -1614,64 +1625,56 @@ msgstr "KDiff3" msgid "Diff Settings" msgstr "Vergleichs- und Zusammenführungs-Einstellungen" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Wagenrücklaufzeichen anzeigen" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Zeige das Wagenrücklaufzeichen '\\r' falls vorhanden.\n" -"Hilft beim Vergleich von Dateien, die unter verschiedenen Betriebssystemen " -"geändert wurden." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Behandle C/C++ Kommentare wie \"weiße\" Zeichen." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Zahlen ignorieren" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "Zahlen werden während des Vergleichs wie \"weiße\" Zeichen behandelt.\n" "Könnte helfen, wenn Dateien viele Zahlen enthalten." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Ignoriere C/C++ Kommentare" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Behandle C/C++ Kommentare wie \"weiße\" Zeichen." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Unterschiede bei Groß- und Kleinschreibung ignorieren" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Unterschiede bei Groß- und Kleinschreibung wie weiße Unterschiede behandeln. " "('a'<=>'A')" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Vorverarbeitungsbefehl:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Benutzerdefinierbare Vorverarbeitung: (Siehe Beschreibung für Details.)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Vorverarbeitungsbefehl nur für Zeilenabgleich:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1679,66 +1682,66 @@ msgstr "" "Dieser Vorverarbeitungsbefehl wirkt nur in der Phase des Zeilenabgleichs.\n" "(Für Details siehe die Dokumentation.)" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Aufwendig suchen (langsamer)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -"Der Vergleichsalgorithmus versucht aufwendig nach kleinem Satz von Änderungen " -"zu suchen. \n" +"Der Vergleichsalgorithmus versucht aufwendig nach kleinem Satz von " +"Änderungen zu suchen. \n" "Für sehr große Dateien kann der Vergleich viel langsamer sein." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Vergleichs- und Zusammenführungs-Einstellungen" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Automatisch-Weiterspringen-Verzögerung (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -"Wenn automatisches Weiterspringen aktiviert ist, wird das Ergebnis der letzten " -"Auswahl\n" +"Wenn automatisches Weiterspringen aktiviert ist, wird das Ergebnis der " +"letzten Auswahl\n" "für diese Dauer angezeigt, bevor weitergesprungen wird. (0-2000 ms)" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Vergleichs- und Zusammenführungs-Einstellungen" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "\"Weiße\" Zeichen Autoauswahl bei 2 Dateien:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Manuelle Auswahl" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" "Bei Datei-Zusammenführungen wird automatisch diese Vorauswahl für " "ausschliesslich \"weiße\" Konflikte gewählt." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "\"Weiße\" Zeichen Autoauswahl bei 3 Dateien:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "Regulärer Ausdrück für automatische Zusammenführung" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "Regulärer Ausdrück für automatische Zusammenführung:" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1750,13 +1753,13 @@ msgstr "" "Wenn eine Konfliktzeile auf diesen regulären Ausdruck passt, wird\n" "- sofern verfügbar - C, ansonsten B ausgewählt." -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" "Zusammenführung für Regulären Ausdruck beim Start einer Zusammenführung " "durchführen" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" @@ -1764,15 +1767,15 @@ msgstr "" "Führe die Zusammenführung für Reguläre Ausdrücke sofort\n" "beim Start einer Zusammenführung durch.\n" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "Versionsverwaltungs History-Zusammenführung" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "Regulärer Ausdruck für History-Start:" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" @@ -1782,39 +1785,41 @@ msgstr "" "Normalerweise enthält diese Zeile das \"$Log$\"-Schlüsselwort.\n" "Voreinstellung: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "Regulärer Ausdruck für History-Eintrag-Startzeile:" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" "Ein Versionsverwaltungs-History Eintrag besteht aus mehreren Zeilen.\n" "Geben Sie einen regulären Ausdruck an, um die erste Zeile (ohne die\n" "voranstehenden Kommentarzeichen) zu erkennen.\n" "Verwenden Sie runde Klammern um Sortierschlüssel zu gruppieren.\n" -"Wenn leergelassen, nimmt KDiff3 an, dass die History-Einträge durch Leerzeilen\n" +"Wenn leergelassen, nimmt KDiff3 an, dass die History-Einträge durch " +"Leerzeilen\n" "getrennt sind. (Siehe Dokumentation für Details.)" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "Sortierte History-Zusammenführung" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "Schlüsselbasierte Sortierung der Versionsverwaltungs-Historyeinträge" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "Historyeintragsstart Sortierschlüsselreihenfolge:" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1825,58 +1830,81 @@ msgid "" msgstr "" "Jede runde Klammer im regulären Ausdruck des History-Start-Eintrags\n" "gruppiert einen Schlüssel der für Sortierung benützt werden kann.\n" -"Geben Sie eine liste der Schlüssel an (nummeriert in der Auftrittsreihenfolge,\n" +"Geben Sie eine liste der Schlüssel an (nummeriert in der " +"Auftrittsreihenfolge,\n" "mit 1 beginnend), wobei Komma ',' als Trennzeichen benützt wird. (z.B.: " "\"4,5,6,1,2,3,7\").\n" "Wenn der Eintrag leer ist, wird keine Sortierung durchgeführt.\n" "(Siehe Dokumentation für Details)." -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" "Versionsverwaltungs-History beim Start einer Zusammenführung zusammenführen" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" "Starte Versionsverwaltungs-History-Zusammenführung beim Start einer " "Zusammenführung" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Anzahl der Unterverzeichnisse:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "Testen Sie Ihre regulären Ausdrücke" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "Befehl bei irrelevanter Zusammenführung:" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -"Wenn spezifiziert wird dieser Befehl nach einer automatischen Zusammenführung \n" +"Wenn spezifiziert wird dieser Befehl nach einer automatischen " +"Zusammenführung \n" "ausgeführt, wenn keine relevanten Änderungen detektiert wurden.\n" "Aufruf erfolgt mit den Parametern: Dateiname1 Dateiname2 Dateiname3" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Verzeichnis-Zusammenführung" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Rekursive Verzeichnisse" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Falls aktiv werden auch Unterverzeichnisse eingelesen." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Datei Muster:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1884,13 +1912,14 @@ msgid "" msgstr "" "Muster der zu analysierenden Dateien. \n" "Jokerzeichen: '*' und '?'\n" -"Mehrer Muster können angegeben werden, indem das Trennzeichen ';' benützt wird." +"Mehrer Muster können angegeben werden, indem das Trennzeichen ';' benützt " +"wird." -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Datei Anti-Muster:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1898,13 +1927,14 @@ msgid "" msgstr "" "Muster der auszuschließenden Dateien. \n" "Jokerzeichen: '*' und '?'\n" -"Mehrer Muster können angegeben werden, indem das Trennzeichen ';' benützt wird." +"Mehrer Muster können angegeben werden, indem das Trennzeichen ';' benützt " +"wird." -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Verzeichnis Anti-Muster:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1912,13 +1942,14 @@ msgid "" msgstr "" "Muster der auszuschließenden Verzeichnisse. \n" "Jokerzeichen: '*' und '?'\n" -"Mehrer Muster können angegeben werden, indem das Trennzeichen ';' benützt wird." +"Mehrer Muster können angegeben werden, indem das Trennzeichen ';' benützt " +"wird." -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr ".cvsignore benützen" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1926,35 +1957,36 @@ msgstr "" "Erweitert die Anti-Muster um alles, das auch CVS ignorieren würde.\n" "Mit Hilfe der lokalen \".cvsignore\"-Dateien ist dies Verzeichnis-spezifisch." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Finde versteckte Dateien und Verzeichnisse" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Findet versteckte Dateien und Verzeichnisse." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Findet versteckte Dateien und Verzeichnisse, die mit '.' beginnen." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Folge Datei-Verknüpfungen" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -"Falls aktiv werden die Dateien auf die die Verknüpfung verweist, verglichen.\n" +"Falls aktiv werden die Dateien auf die die Verknüpfung verweist, " +"verglichen.\n" "Sonst nur die Verknüpfungen selbst." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Folge Verzeichnis-Verküpfungen" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1963,66 +1995,88 @@ msgstr "" "verglichen.\n" "Sonst nur die Verknüpfungen." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "Groß-/kleinschreibung bei Dateinamen" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" "Set this option if the case of the names must match. (Default for Windows is " "off, otherwise on.)" msgstr "" -"Der Verzeichnisvergleich vergleicht Dateien und Verzeichnisse wenn deren Namen " -"gleich sind.\n" +"Der Verzeichnisvergleich vergleicht Dateien und Verzeichnisse wenn deren " +"Namen gleich sind.\n" "Aktivieren Sie diese Einstellung, wenn es auch auf Groß-/Kleinschreibung im " "Dateinamen ankommt. (Voreinstellung für Windows ist aus, sonst ein.)" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Dateivergleichsmethode" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Binärvergleich" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Binärvergleich aller Dateien (Voreinstellung)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Vollständige Analyse" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -"Vollständige Analyse durchführen und Statistik-Information in eigenen Spalten " -"anzeigen.\n" +"Vollständige Analyse durchführen und Statistik-Information in eigenen " +"Spalten anzeigen.\n" "(Langsamer als Binärvergleich, viel langsamer bei Binärdateien.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Vertraue dem Änderungsdatum (unsicher)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" "Annahme, dass Dateien identisch sind, wenn das Änderungsdatum und die Größe " "übereinstimmen.\n" "Hilfreich bei großen Verzeichnissen oder langsamen Verbindungen." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Annahme, dass Dateien identisch sind, wenn das Änderungsdatum und die Größe " +"übereinstimmen.\n" +"Hilfreich bei großen Verzeichnissen oder langsamen Verbindungen." + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Vertraue der Größe (unsicher)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -2032,11 +2086,11 @@ msgstr "" "Hilfreich bei großen Verzeichnissen oder langsamen Verbindungen, wenn das " "Veränderungsdatum beim Kopieren modifiziert wird." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Verzeichnisse synchronisieren" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -2047,11 +2101,11 @@ msgstr "" "Funktioniert nur, wenn zwei Verzeichnisse verglichen werden, und kein Ziel " "angegeben wird." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Dateien mit \"Weißen\" Unterschieden als gleich markieren" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -2060,11 +2114,11 @@ msgstr "" "gleiche Dateien behandelt werden.\n" " Dies ist nur wählbar, wenn vollständige Analyse ausgewählt ist." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Neuere Datei statt Zusammenführung auswählen (unsicher)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2076,11 +2130,11 @@ msgstr "" "Falls inaktiv wird eine Zusammenführung vorgeschlagen.\n" "Nur beim Vergleich zweier Verzeichnisse wirksam." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Sicherungskopie erstellen (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2088,15 +2142,15 @@ msgstr "" "Wenn eine Datei über eine existierende Datei gespeichert würde, wird die \n" "bestehende Datei mit der Erweiterung '.orig' umbenannt und nicht gelöscht." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Regionale Einstellungen" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Sprache (Neustart erforderlich)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2104,73 +2158,73 @@ msgstr "" "Sprache für das Benutzerinterface wählen oder \"Auto\".\n" "Diese Änderung wird erst nach Beendigung und Neustart von KDiff3 wirksam." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Die gleiche Kodierung für alles benützen:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -"Durch Aktivierung dieser Option können alle Kodierungen durch Setzen der ersten " -"eingestellt werden. Dies auszuschalten erlaubt unterschiedliche individuelle " -"Einstellungen." +"Durch Aktivierung dieser Option können alle Kodierungen durch Setzen der " +"ersten eingestellt werden. Dies auszuschalten erlaubt unterschiedliche " +"individuelle Einstellungen." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Hinweis: Die lokale Kodierung ist " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "Dateikodierung für A:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "Dateikodierung für B:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "Dateikodierung für C:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Dateikodierung für Zusammenführung und Speichern:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "Auswahl automatisch kopieren" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Dateikodierung für Präprozessor Dateien:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Rechts-Nach-Links Sprache" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2178,19 +2232,19 @@ msgstr "" "Einige Sprachen werden von rechts nach links gelesen.\n" "Diese Einstellung ändert die Anzeige und den Editor entsprechend." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "Integration" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "Einstellungen für Integration" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "Ignorierbare Kommandozeilenoptionen:" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2202,7 +2256,27 @@ msgstr "" "Mehrere Werte können mit Trennzeichen ';' angegeben werden.\n" "Dies wird die Fehlermeldung \"Unbekannte Option\" beim Start unterdrücken." -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2216,21 +2290,22 @@ msgstr "" "Weil dieses Programm nicht mit solchen Schriften umgehen kann,\n" "werden beim Editieren wahrscheinlich Probleme auftreten. \n" "\n" -"Wollen Sie mit dieser Schrift fortfahren oder doch eine andere Schrift wählen?" +"Wollen Sie mit dieser Schrift fortfahren oder doch eine andere Schrift " +"wählen?" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Inkompatible Schriftart" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Weiter auf eigenes Risiko" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Andere Schrift wählen" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" "Dies führt zum zurücksetzen aller Einstellungen, nicht nur des aktuellen " @@ -2241,10 +2316,8 @@ msgid "PreprocessorCmd: " msgstr "Vorverarbeitungsbefehl: " #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"Die folgende(n) aktive(n) Einstellung(en) könnten Daten verändern.\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "Die folgende(n) aktive(n) Einstellung(en) könnten Daten verändern.\n" #: pdiff.cpp:264 msgid "" @@ -2307,17 +2380,11 @@ msgstr "Zeilenvergleich: A <-> C" #: pdiff.cpp:513 msgid "All input files contain the same text, but are not binary equal." msgstr "" -"Alle Quelldateien enthalten den gleichen Text, sind aber nicht binär identisch." - -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Die Dateien %1 und %2 sind binär identisch.\n" +"Alle Quelldateien enthalten den gleichen Text, sind aber nicht binär " +"identisch." #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Die Dateien %1 und %2 haben den gleichen Text, sind aber nicht binär " "identisch.\n" @@ -2332,108 +2399,54 @@ msgstr "" "Beachten Sie, dass KDiff3 nicht für den Binärdatenvergleich konzipiert ist.\n" "Machen Sie auf eigenes Risiko weiter." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Abbrechen" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Dateien öffnen ..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Fehler beim Öffnen der Datei" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Auswahl wird ausgeschnitten ..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Auswahl wird in Zwischenablage kopiert ..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Inhalt der Zwischenablage wird eingefügt ..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Speichern && Fortsetzen" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Fortsetzen ohne zu Speichern" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Suche abgeschlossen." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Suche abgeschlossen" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "In keinem der Unterschiedsfenster ist eine Auswahl markiert." -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "Fehler beim Hinzufügen einer manuellen Ausrichtung." -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "KDiff3 einrichten" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "V&erzeichnis" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Zusammenführaktion für aktuelles Element" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Synchronisationsaktion für aktuelles Element" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Navigation" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "Vergleichsansicht" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Zusammenführen" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Fenster" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (Basis):" @@ -2476,6 +2489,10 @@ msgstr "Ziel (optional):" msgid "Configure..." msgstr "Einrichten ..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Suchtext:" @@ -2552,6 +2569,14 @@ 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." @@ -2566,5 +2591,87 @@ msgstr "" "Öffnende und schließende runde Klammern in regulärem Ausdruck passen nicht " "zusammen." +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "V&erzeichnis" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Zusammenführaktion für aktuelles Element" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Synchronisationsaktion für aktuelles Element" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Navigation" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "Vergleichsansicht" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Zusammenführen" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Fenster" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Die Dateien A und B sind binär identisch.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Die Dateien A und C sind binär identisch.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Die Dateien A und C enthalten den gleichen Text. \n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Die Dateien B und C sind binär identisch.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Die Dateien B und C enthalten den gleichen Text. \n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Wagenrücklaufzeichen anzeigen" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Zeige das Wagenrücklaufzeichen '\\r' falls vorhanden.\n" +#~ "Hilft beim Vergleich von Dateien, die unter verschiedenen " +#~ "Betriebssystemen geändert wurden." + #~ msgid "Diff and Merge" #~ msgstr "Vergleich und Zusammenführung" diff --git a/po/el.po b/po/el.po index 0b086a6..f66c340 100644 --- a/po/el.po +++ b/po/el.po @@ -5,36 +5,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2007-03-15 15:23+0200\n" "Last-Translator: Spiros Georgaras \n" "Language-Team: Greek \n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Σπύρος Γεωργαράς,Τούσης Μανώλης" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "sngeorgaras@otenet.gr,manolis@koppermind.homelinux.org" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Η εγγραφή δεδομένων στο προσωρινό αρχείο απέτυχε." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Από το πρόχειρο" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -48,7 +49,7 @@ msgstr "" "\n" "Η εντολή προεπεξεργασίας θα απενεργοποιηθεί τώρα." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -63,7 +64,7 @@ msgstr "" "\n" "Η δυνατότητα προεπεξεργασίας αντιστοίχησης γραμμών θα απενεργοποιηθεί τώρα." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -71,15 +72,15 @@ msgstr "" "Σφάλμα απώλειας δεδομένων:\n" "Αν αναπαράγεται το σφάλμα, παρακαλώ επικοινωνήστε με το συγγραφέα.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Σοβαρό εσωτερικό σφάλμα" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "Πάνω γραμμή" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Τέλος" @@ -95,245 +96,249 @@ msgstr "Δεσμός: " msgid "Size. " msgstr "Μέγεθος. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Ημερομηνία & μέγεθος: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Η δημιουργία του προσωρινού αντιγράφου για το %1 απέτυχε." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Το άνοιγμα του %1 απέτυχε." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Σύγκριση αρχείου..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Σφάλμα ανάγνωσης από το %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Όνομα" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Λειτουργία" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Κατάσταση" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Μη λυμένο" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Λυμένο" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Μη κενό" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Κενό" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -"Αυτή τη στιγμή κάνετε μια συγχώνευση καταλόγου. Είστε σίγουροι ότι επιθυμείτε " -"την εγκατάλειψη της συγχώνευσης και την επανασάρωση του καταλόγου;" +"Αυτή τη στιγμή κάνετε μια συγχώνευση καταλόγου. Είστε σίγουροι ότι " +"επιθυμείτε την εγκατάλειψη της συγχώνευσης και την επανασάρωση του καταλόγου;" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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 "Επανασάρωση" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Συνέχεια συγχώνευσης" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Το άνοιγμα των καταλόγων απέτυχε:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Ο κατάλογος Α \"%1\" δεν υπάρχει ή δεν είναι κατάλογος.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Ο κατάλογος Α \"%1\" δεν υπάρχει ή δεν είναι κατάλογος.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Ο κατάλογος Β \"%1\" δεν υπάρχει ή δεν είναι κατάλογος.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Ο κατάλογος Β \"%1\" δεν υπάρχει ή δεν είναι κατάλογος.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Ο κατάλογος Γ \"%1\" δεν υπάρχει ή δεν είναι κατάλογος.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Ο κατάλογος Γ \"%1\" δεν υπάρχει ή δεν είναι κατάλογος.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Σφάλμα ανοίγματος Καταλόγου" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "Ο κατάλογος προορισμού δεν πρέπει να είναι ίδιος με τους Α ή Β όταν " "συγχωνεύονται τρεις κατάλογοι.\n" "Κάντε έναν έλεγχο ξανά πριν συνεχίσετε." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Προειδοποίηση παραμέτρου" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Σάρωση καταλόγων..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Ανάγνωση καταλόγου Α" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Ανάγνωση καταλόγου Β" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Ανάγνωση καταλόγου Γ" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Μερικοί υποκατάλογοι δεν είναι αναγνώσιμοι στο" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Ελέγξτε τις άδειες χρήσης των υποκαταλόγων." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Έτοιμο." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Κατάσταση σύγκρισης καταλόγου" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Αριθμός υποκαταλόγων:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Αριθμός ίδιων αρχείων:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Αριθμός διαφορετικών αρχείων:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Αριθμός χειροκίνητων συγχωνεύσεων:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Αυτό επηρεάζει όλες τις συγχωνεύσεις." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Αλλαγή όλων των λειτουργιών συγχώνευσης" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "Συνέ&χεια" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Επεξεργασία " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Προς υλοποίηση." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Αντιγραφή του Α στο Β" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Αντιγραφή του Β στο Α" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Διαγραφή του Α" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Διαγραφή του Β" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Διαγραφή των Α & Β" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Συγχώνευση στο Α" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Συγχώνευση στο Β" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Συγχώνευση στα Α & Β" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Διαγραφή (αν υπάρχει)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Συγχώνευση" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Συγχώνευση (χειροκίνητη)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Σφάλμα: Σύγκρουση τύπου αρχείων" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Σφάλμα: Οι ημερομηνίες είναι ίδιες αλλά τα αρχεία όχι." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Αυτή η λειτουργία δεν είναι δυνατή αυτή τη στιγμή." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Μη δυνατή λειτουργία" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -348,42 +353,47 @@ msgstr "" "Αν μπορείτε να το αναπαράγετε, παρακαλώ επικοινωνήστε με το συγγραφέα του " "προγράμματος." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Σφάλμα προγράμματος" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Ένα σφάλμα παρουσιάστηκε κατά την αντιγραφή.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Ένα σφάλμα παρουσιάστηκε κατά την αντιγραφή.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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 "Σφάλμα συγχώνευσης" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Σφάλμα." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Έγινε." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Δεν αποθηκεύτηκε." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Άγνωστη λειτουργία συγχώνευσης. (Δε θα έπρεπε να συμβεί ποτέ!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Άγνωστη λειτουργία συγχώνευσης." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -396,344 +406,350 @@ msgid "" msgstr "" "Η συγχώνευση είναι έτοιμη να ξεκινήσει.\n" "\n" -"Επιλέξτε το \"Εκτέλεση\" αν διαβάσατε αρκετές οδηγίες και γνωρίζετε τι κάνετε.\n" +"Επιλέξτε το \"Εκτέλεση\" αν διαβάσατε αρκετές οδηγίες και γνωρίζετε τι " +"κάνετε.\n" "Επιλέγοντας την \"Εξομοίωση\" θα γίνει αναφορά του τι θα συμβεί.\n" "\n" "Σημειώστε ότι το αυτό το πρόγραμμα βρίσκεται ακόμη σε κατάσταση beta και δεν " "υπάρχει ΕΓΓΥΗΣΗ ούτως ή άλλως! Κάντε αντίγραφα ασφαλείας για τα σημαντικά " "δεδομένα σας!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Εκκίνηση συγχώνευσης" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Εκτέλεση" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Εξομοίωση" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" "Το τονισμένο αντικείμενο έχει διαφορετικό τύπο σε διαφορετικούς καταλόγους. " "Επιλέξτε τι θέλετε να κάνετε." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -"Οι ημερομηνίες τροποποίησης των αρχείων είναι ίδιες αλλά τα αρχεία δεν είναι. " -"Επιλέξτε τι θέλετε να κάνετε." +"Οι ημερομηνίες τροποποίησης των αρχείων είναι ίδιες αλλά τα αρχεία δεν " +"είναι. Επιλέξτε τι θέλετε να κάνετε." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -"Αυτή η λειτουργία δεν είναι αυτή τη στιγμή δυνατή γιατί η συγχώνευση καταλόγου " -"εκτελείται αυτήν τη στιγμή." +"Αυτή η λειτουργία δεν είναι αυτή τη στιγμή δυνατή γιατί η συγχώνευση " +"καταλόγου εκτελείται αυτήν τη στιγμή." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Υπήρξε ένα σφάλμα στο τελευταίο βήμα.\n" -"Επιθυμείτε τη συνέχεια με το αντικείμενο που προκάλεσε το σφάλμα ή επιθυμείτε " -"την παράλειψή του;" +"Επιθυμείτε τη συνέχεια με το αντικείμενο που προκάλεσε το σφάλμα ή " +"επιθυμείτε την παράλειψή του;" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Συνέχεια συγχώνευσης μετά από ένα σφάλμα" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Συνέχεια με το τελευταίο αντικείμενο" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Παράλειψη αντικειμένου" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Παραλείφθηκε." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "Σε πρόοδο..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Η λειτουργία συγχώνευσης ολοκληρώθηκε." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Η συγχώνευση ολοκληρώθηκε" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Η εξομοίωση συγχώνευσης ολοκληρώθηκε: Ελέγξτε αν συμφωνείτε με τις " "προτεινόμενες ενέργειες." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" "Παρουσιάστηκε ένα σφάλμα. Πατήστε το Εντάξει για να δείτε λεπτομερείς " "πληροφορίες.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -"Σφάλμα: Κατά τη διαγραφή του %1: Η δημιουργία του αντιγράφου ασφαλείας απέτυχε." +"Σφάλμα: Κατά τη διαγραφή του %1: Η δημιουργία του αντιγράφου ασφαλείας " +"απέτυχε." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "αναδρομική διαγραφή καταλόγου( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "διαγραφή ( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Σφάλμα: η διαγραφή καταλόγου απέτυχε κατά την προσπάθεια ανάγνωσης του " "καταλόγου." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Σφάλμα: η λειτουργία rmdir( %1 ) απέτυχε." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Σφάλμα: η διαγραφή απέτυχε." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "χειροκίνητη συγχώνευση( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Σημείωση: Μετά από μία χειροκίνητη συγχώνευση ο χρήστης θα πρέπει να " "συνεχίσει πατώντας F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -"Σφάλμα: η αντιγραφή ( %1 -> %2 ) απέτυχε. Η διαγραφή του υπάρχοντος προορισμού " -"απέτυχε." +"Σφάλμα: η αντιγραφή ( %1 -> %2 ) απέτυχε. Η διαγραφή του υπάρχοντος " +"προορισμού απέτυχε." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "Αντιγραφή δεσμού( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -"Σφάλμα: η αντιγραφή δεσμού απέτυχε: Οι απομακρυσμένοι δεσμοί δεν υποστηρίζονται " -"ακόμα." +"Σφάλμα: η αντιγραφή δεσμού απέτυχε: Οι απομακρυσμένοι δεσμοί δεν " +"υποστηρίζονται ακόμα." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Σφάλμα: η αντιγραφή δεσμού απέτυχε." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "αντιγραφή ( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Σφάλμα κατά την μετονομασία( %1 -> %2 ): Αδυναμία διαγραφής του υπάρχοντος " "προορισμού." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "μετονομασία ( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Σφάλμα: Η μετονομασία απέτυχε." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Σφάλμα κατά τη δημιουργία του καταλόγου %1. Αδύνατη η διαγραφή υπάρχοντος " "αρχείου." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "Δημιουργία καταλόγου( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Σφάλμα κατά τη δημιουργία του καταλόγου." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Προορ." -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Κατ" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Τύπος" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Μέγεθος" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Ιδιοτ" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Τελευταία τροποποίηση" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Δεσμός-προορισμός" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Αρχείο..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "μη διαθέσιμο" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (Προορ): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (Βάση): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (Προορ): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "Γ (Προορ): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Προορ: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "Αποθήκευση κατάστασης συγχώνευσης καταλόγου ως..." -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Έναρξη/συνέχεια συγχώνευσης καταλόγου" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Εκτέλεση της λειτουργίας για το τρέχον αντικείμενο" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Σύγκριση του επιλεγμένου αρχείου" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Συγχώνευση του επιλεγμένου αρχείου" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Αναδίπλωση όλων των υποκαταλόγων" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Ανάπτυξη όλων των υποκαταλόγων" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Επιλογή του Α για όλα τα αντικείμενα" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Επιλογή του Β για όλα τα αντικείμενα" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Επιλογή του Γ για Όλα τα αντικείμενα" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Λειτουργία αυτόματης επιλογής για όλα τα αντικείμενα" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Καμία λειτουργία για όλα τα αντικείμενα" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "Εμφάνιση ταυτόσημων αρχείων" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "Εμφάνιση διαφορετικών αρχείων" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "Εμφάνιση αρχείων μόνο στο Α" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "Εμφάνιση αρχείων μόνο στο Β" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "Εμφάνιση αρχείων μόνο στο Γ" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "Σύγκριση άμεσα επιλεγμένων αρχείων" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "Συγχώνευση άμεσα επιλεγμένων αρχείων" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Να μη γίνει τίποτα" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "Α" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "Β" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "Γ" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Διαγραφή των A && B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Συγχώνευση σε A && B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " @@ -742,7 +758,7 @@ msgstr "" "αντιγράφου ασφαλείας. \n" "Όνομα αρχείου: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -750,192 +766,198 @@ msgstr "" "Αποτυχία μετονομασίας, κατά τη δημιουργία αντιγράφου ασφαλείας. \n" "Ονόματα αρχείων: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Ανάκτηση κατάστασης αρχείου: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Ανάγνωση αρχείου: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Εγγραφή αρχείου: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Τέλος μνήμης" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Δημιουργία καταλόγου: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Αφαίρεση καταλόγου: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Αφαίρεση αρχείου: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Δημιουργία συμβολικού δεσμού: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Μετονομασία αρχείου: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Αντιγραφή αρχείου: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -"Σφάλμα κατά την αντιγραφή: Το άνοιγμα του αρχείου για ανάγνωση απέτυχε. Όνομα " -"αρχείου: %1" +"Σφάλμα κατά την αντιγραφή: Το άνοιγμα του αρχείου για ανάγνωση απέτυχε. " +"Όνομα αρχείου: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" "Σφάλμα κατά την αντιγραφή: Το άνοιγμα του αρχείου για εγγραφή απέτυχε. Όνομα " "αρχείου: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "Σφάλμα κατά την αντιγραφή: Η ανάγνωση απέτυχε. Όνομα αρχείου: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Σφάλμα κατά την αντιγραφή: Η εγγραφή απέτυχε. Όνομα αρχείου: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Ανάγνωση καταλόγου: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Εμφάνιση καταλόγου: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "Τρέχουσα ρύθμιση:" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "Σφάλμα ρύθμισης επιλογής:" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Χρησιμοποιήθηκε η επιλογή --auto, αλλά δεν καθορίστηκε αρχείο εξόδου." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Η επιλογή --auto αγνοήθηκε για τη σύγκριση καταλόγων." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Η αποθήκευση απέτυχε." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Το άνοιγμα αυτών των αρχείων απέτυχε:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Σφάλμα ανοίγματος αρχείου" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Ανοίγει έγγραφα για σύγκριση..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Αποθηκεύει το αποτέλεσμα της συγχώνευσης. Όλες οι συγκρούσεις θα πρέπει να " "έχουν επιλυθεί!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Αποθηκεύει το τρέχον έγγραφο ως..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "Εκτύπωση των διαφορών" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Κλείνει την εφαρμογή" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Αποκοπή του επιλεγμένου τμήματος και τοποθέτηση στο πρόχειρο" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Αντιγραφή του επιλεγμένου τμήματος στο πρόχειρο" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Επικόλληση των περιεχομένων του πρόχειρου στην τρέχουσα θέση" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "Επιλογή όλων στο τρέχον παράθυρο" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Αναζήτηση για μια συμβολοσειρά" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Αναζήτηση ξανά για μια συμβολοσειρά" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Ενεργοποίηση/απενεργοποίηση της γραμμής εργαλείων" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Ενεργοποιεί/απενεργοποιεί τη γραμμή κατάστασης" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Ρύθμιση του KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Μετάβαση στην τρέχουσα διαφορά" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Μετάβαση στη πρώτη διαφορά" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Μετάβαση στην τελευταία διαφορά" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Παράλειψη των διαφορών στα κενά όταν είναι απενεργοποιημένη η \"Εμφάνιση " "κενών\")" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -943,235 +965,243 @@ msgstr "" "(Μη παράλειψη των διαφορών στα κενά ακόμη και αν είναι απενεργοποιημένη η " "\"Εμφάνιση κενών\")" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Μετάβαση στη προηγούμενη διαφορά" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Μετάβαση στην επόμενη διαφορά" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Μετάβαση στην προηγούμενη σύγκρουση" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Μετάβαση στην επόμενη σύγκρουση" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Μετάβαση στην προηγούμενη μη λυμένη σύγκρουση" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Μετάβαση στην επόμενη μη λυμένη σύγκρουση" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Επιλογή γραμμής(ών) από το Α" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Επιλογή γραμμής(ών) από το Β" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Επιλογή γραμμής(ών) από το Γ" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Αυτόματη μετάβαση στην επόμενη μη λυμένη σύγκρουση μετά την επιλογή πηγής" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Εμφάνιση κενών && χαρακτήρων οριοθέτησης για διαφορές" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Εμφάνιση κενών" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Εμφάνιση αριθμών γραμμής" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Επιλογή παντού του Α" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Επιλογή παντού του Β" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Επιλογή παντού το Γ" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Επιλογή του Α για όλες τις μη λυμένες διαφορές" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Επιλογή του Β για όλες τις μη λυμένες διαφορές" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Επιλογή του Γ για όλες τις μη λυμένες διαφορές" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Επιλογή του Α για όλες τις μη λυμένες διαφορές κενών" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Επιλογή του Β για όλες τις μη λυμένες διαφορές κενών" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Επιλογή του Γ για όλες τις μη λυμένες διαφορές κενών" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Αυτόματη επίλυση απλών συγκρούσεων" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Ορισμός διαφορών στις συγκρούσεις" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "Εκτέλεση κανονικής έκφρασης αυτόματης συγχώνευσης" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "Αυτόματη επίλυση συγκρούσεων ιστορικού" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "Διαίρεση διαφορών στην επιλογή" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "Ένωση των επιλεγμένων διαφορών" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Εμφάνιση του παραθύρου Α" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Εμφάνιση του παραθύρου Β" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Εμφάνιση του παραθύρου Γ" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Εστίαση στο επόμενο παράθυρο" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Κανονική επισκόπηση" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "Επισκόπηση Α με το Β" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "Επισκόπηση Α με το Γ" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "Επισκόπηση Β με το Γ" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Αναδίπλωση λέξεων στα παράθυρα διαφοράς" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "Προσθήκη χειροκίνητης στοίχισης διαφορών" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "Καθαρισμός όλων των χειροκίνητων στοιχίσεων διαφορών" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Εστίαση στο προηγούμενο παράθυρο" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Εναλλαγή προσανατολισμού διαίρεσης" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Διαίρεση προβολής καταλόγου && κειμένου" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Εναλλαγή μεταξύ προβολής καταλόγου && κειμένου" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Το αποτέλεσμα της συγχώνευσης δεν έχει αποθηκευτεί." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Αποθήκευση && έξοδος" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Έξοδος χωρίς αποθήκευση" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Αποτυχία αποθήκευσης του αποτελέσματος συγχώνευσης." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Αυτή τη στιγμή εκτελείται μια συγχώνευση καταλόγου. Είστε σίγουροι ότι " "επιθυμείτε να την εγκαταλείψετε;" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Αποθήκευση αρχείου..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Αποθήκευση αρχείου με ένα νέο όνομα..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "Εκτύπωση..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "Η εκτύπωση εγκαταλείφθηκε." -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Επιλογή" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "Η εκτύπωση ολοκληρώθηκε." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Έξοδος..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Εναλλαγή γραμμής εργαλείων..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Εναλλαγή της γραμμής κατάστασης..." @@ -1186,8 +1216,8 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Αδυναμία εύρεσης του τμήματος μας!\n" "Αυτό συνήθως συμβαίνει εξαιτίας ενός προβλήματος εγκατάστασης. Παρακαλώ " @@ -1216,8 +1246,8 @@ msgstr "Αρχείο εξόδου, και πάλι. (Για συμβατότητ #: main.cpp:46 msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -"Χωρίς γραφικό περιβάλλον αν όλες οι συγκρούσεις μπορούν να επιλυθούν αυτόματα. " -"(Απαιτεί το -o file)" +"Χωρίς γραφικό περιβάλλον αν όλες οι συγκρούσεις μπορούν να επιλυθούν " +"αυτόματα. (Απαιτεί το -o file)" #: main.cpp:47 msgid "Don't solve conflicts automatically. (For compatibility...)" @@ -1272,24 +1302,23 @@ msgstr "αρχείο3 για άνοιγμα" msgid "Ignored. (User defined.)" msgstr "Αγνόηση. (καθορισμός από χρήστη.)" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" "+ Πολλές ευχαριστίες σε όσους ανέφεραν σφάλματα και συνεισέφεραν ιδέες!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -"Αριθμός εναπομείναντων μη λυμένων συγκρούσεων: %1 ( %2 από τις οποίες αφορούν " -"κενά)" +"Αριθμός εναπομείναντων μη λυμένων συγκρούσεων: %1 ( %2 από τις οποίες " +"αφορούν κενά)" #: mergeresultwindow.cpp:285 msgid "" @@ -1299,55 +1328,30 @@ msgstr "" "Η έξοδος έχει τροποποιηθεί.\n" "Αν συνεχίσετε οι αλλαγές σας θα χαθούν." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Όλα τα αρχεία εισόδου είναι δυαδικά ίσα." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Όλα τα αρχεία εισόδου περιέχουν το ίδιο κείμενο." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Τα αρχεία Α και Β είναι δυαδικά ίσα.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Τα αρχεία Α και Β περιέχουν το ίδιο κείμενο. \n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Τα αρχεία %1 και %2 είναι δυαδικά ίσα.\n" -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Τα αρχεία Α και Γ είναι δυαδικά ίσα.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Τα αρχεία Α και Β περιέχουν το ίδιο κείμενο. \n" -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Τα αρχεία Α και Γ περιέχουν το ίδιο κείμενο. \n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Τα αρχεία Β και Γ είναι δυαδικά ίσα.\n" - -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Τα αρχεία Β και Γ περιέχουν το ίδιο κείμενο. \n" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Συνολικός αριθμός συγκρούσεων: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1355,7 +1359,7 @@ msgstr "" "\n" "Αριθμός αυτόματα λυμένων συγκρούσεων: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1363,23 +1367,23 @@ msgstr "" "\n" "Αριθμός μη λυμένων συγκρούσεων: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Συγκρούσεις" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "<Χωρίς γραμμή πηγής>" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "<Σύγκρουση συγχώνευσης (μόνο κενών)>" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "<Σύγκρουση συγχώνευσης>" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1387,11 +1391,11 @@ msgstr "" "Δεν έχουν επιλυθεί ακόμη όλες οι συγκρούσεις.\n" "Το αρχείο δεν αποθηκεύτηκε.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Συγκρούσεις που απομένουν" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1401,28 +1405,28 @@ msgstr "" "\n" "Η δημιουργία αντιγράφου ασφαλείας απέτυχε. Το αρχείο δεν αποθηκεύτηκε." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Σφάλμα εγγραφής αρχείου" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Σφάλμα κατά την εγγραφή." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Έξοδος" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Τροποποιημένο]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "Κωδικοποίηση για την αποθήκευση" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "Κωδικοποιητής από" @@ -1442,6 +1446,15 @@ 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 "Γραμματοσειρά επεξεργαστή & εξόδου διαφορών" @@ -1456,8 +1469,8 @@ msgid "" "If the font doesn't support italic characters, then this does nothing." msgstr "" "Επιλέγει την πλάγια έκδοση της γραμματοσειράς για τις διαφορές.\n" -"Αν η γραμματοσειρά δεν υποστηρίζει τους πλάγιους χαρακτήρες, τότε αυτό δεν έχει " -"αποτέλεσμα." +"Αν η γραμματοσειρά δεν υποστηρίζει τους πλάγιους χαρακτήρες, τότε αυτό δεν " +"έχει αποτέλεσμα." #: optiondialog.cpp:542 msgid "Color" @@ -1568,11 +1581,10 @@ msgid "Auto indentation" msgstr "Αυτόματη χρήση εσοχών" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -"Ενεργοποιημένο: Η εσοχή της προηγούμενης γραμμής θα χρησιμοποιηθεί για μια νέα " -"γραμμή.\n" +"Ενεργοποιημένο: Η εσοχή της προηγούμενης γραμμής θα χρησιμοποιηθεί για μια " +"νέα γραμμή.\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1595,7 +1607,8 @@ msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -"Καθορίζει τον τύπο τέλους γραμμής όταν αποθηκεύεται ένα επεξεργασμένο αρχείο.\n" +"Καθορίζει τον τύπο τέλους γραμμής όταν αποθηκεύεται ένα επεξεργασμένο " +"αρχείο.\n" "DOS/Windows: CR+LF; UNIX: LF; με τα CR=0D, LF=0A" #: optiondialog.cpp:732 @@ -1606,63 +1619,56 @@ msgstr "Diff" msgid "Diff Settings" msgstr "Ρυθμίσεις του Diff" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Διατήρηση επαναφοράς κεφαλής" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Εμφανίζει τους χαρακτήρες επαναφοράς κεφαλής '\\r' αν υπάρχουν.\n" -"Βοηθάει στη σύγκριση αρχείων που τροποποιήθηκαν σε διαφορετικά λειτουργικά " -"συστήματα." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Θεώρηση των σχολίων C/C++ σαν κενά." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Παράβλεψη αριθμών" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "Παράβλεψη αριθμών κατά τη φάση ταιριάσματος γραμμών. (Αντίστοιχο με την " "παράβλεψη κενών).\n" "Μπορεί να φανεί χρήσιμο κατά τη σύγκριση αρχείων με αριθμητικά δεδομένα." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Παράβλεψη σχολίων C/C++" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Θεώρηση των σχολίων C/C++ σαν κενά." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Αγνόηση διάκρισης πεζών/κεφαλαίων" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Χειρισμός των διαφορών σε πεζά/κεφαλαία ως αλλαγές κενών. ('α'<=>'Α')" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Εντολή προεπεξεργαστή:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -"Προεπεξεργασία ορισμένη από το χρήστη. (Δείτε τα εγχειρίδια για λεπτομέρειες)." +"Προεπεξεργασία ορισμένη από το χρήστη. (Δείτε τα εγχειρίδια για " +"λεπτομέρειες)." -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Εντολή προεπεξεργαστή για ταίριασμα γραμμών:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1670,11 +1676,11 @@ msgstr "" "Ο προεπεξεργαστής χρησιμοποιείται μόνο κατά το ταίριασμα γραμμών.\n" "(Δείτε τα εγχειρίδια για λεπτομέρειες)." -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Εις βάθος ανάλυση (πιο αργό)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1682,71 +1688,71 @@ msgstr "" "Ενεργοποιεί την επιλογή --minimal για το εξωτερικό diff.\n" "Η ανάλυση μεγάλων αρχείων θα είναι αισθητά πιο αργή." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "Ρυθμίσεις συγχώνευσης" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Καθυστέρηση αυτόματης μετάβασης (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -"Όταν βρίσκεστε στη λειτουργία αυτόματης μετάβασης εμφανίζεται το αποτέλεσμα της " -"τρέχουσας επιλογής\n" -"για τον καθορισμένο χρόνο, πριν την μεταπήδηση στην επόμενη σύγκρουση. Εύρος: " -"0-2000 ms" +"Όταν βρίσκεστε στη λειτουργία αυτόματης μετάβασης εμφανίζεται το αποτέλεσμα " +"της τρέχουσας επιλογής\n" +"για τον καθορισμένο χρόνο, πριν την μεταπήδηση στην επόμενη σύγκρουση. " +"Εύρος: 0-2000 ms" -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "Ρυθμίσεις συγχώνευσης" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Προκαθορισμός κενών διαφορών συγχώνευσης 2 αρχείων:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Χειροκίνητη επιλογή" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" "Επιτρέπει στον αλγόριθμο συγχώνευσης την αυτόματη επιλογή μιας εισόδου για " "διαφορές μόνο κενών." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Προκαθορισμός κενών διαφορών συγχώνευσης 3 αρχείων:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "Κανονική έκφραση αυτόματης συγχώνευσης" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "Κανονική έκφραση αυτόματης συγχώνευσης:" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" "When a line with a conflict matches the regular expression then\n" "- if available - C, otherwise B will be chosen." msgstr "" -"Κανονική έκφραση για γραμμές όπου το KDiff3 θα πρέπει να επιλέξει αυτόματα μία " -"πηγή.\n" -"Αν μία γραμμή με σύγκρουση ταιριάζει στην κανονική έκφραση τότε θα επιλεχθεί το " -"Γ, αν\n" +"Κανονική έκφραση για γραμμές όπου το KDiff3 θα πρέπει να επιλέξει αυτόματα " +"μία πηγή.\n" +"Αν μία γραμμή με σύγκρουση ταιριάζει στην κανονική έκφραση τότε θα επιλεχθεί " +"το Γ, αν\n" "είναι διαθέσιμο, ενώ σε άλλη περίπτωση το Β." -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" "Εκτέλεση κανονικής έκφρασης αυτόματης συγχώνευσης στην αρχή της συγχώνευσης" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" @@ -1754,15 +1760,15 @@ msgstr "" "Εκτέλεση της συγχώνευσης για κανονικές εκφράσεις αυτόματης συγχώνευσης\n" "αμέσως μετά την έναρξη της συγχώνευσης.\n" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "Συγχώνευση ιστορικού ελέγχου έκδοσης" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "Κανονική έκφραση έναρξης ιστορικού:" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" @@ -1772,41 +1778,42 @@ msgstr "" "Συνήθως αυτή η γραμμή περιέχει τη λέξη κλειδί \"$Log$\".\n" "Η προκαθορισμένη τιμή είναι: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "Κανονική έκφραση για την έναρξη της καταχώρησης ιστορικού:" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" "Μία καταχώρηση ιστορικού συγχώνευσης αποτελείται από πολλές γραμμές.\n" -"Καθορίστε την κανονική έκφραση για τον εντοπισμό της πρώτης γραμμής (χωρίς το " -"σχόλιο που προηγείται).\n" -"Χρησιμοποιείστε παρενθέσεις για την ομαδοποίηση των κλειδιών που επιθυμείτε για " -"την ταξινόμηση.\n" +"Καθορίστε την κανονική έκφραση για τον εντοπισμό της πρώτης γραμμής (χωρίς " +"το σχόλιο που προηγείται).\n" +"Χρησιμοποιείστε παρενθέσεις για την ομαδοποίηση των κλειδιών που επιθυμείτε " +"για την ταξινόμηση.\n" "Αν ορισθεί σαν κενή, τότε το KDiff3 θεωρεί ότι οι καταχωρήσεις ιστορικού " "διαχωρίζονται με κενές γραμμές.\n" "Δείτε την τεκμηρίωση για λεπτομέρειες." -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "Ταξινόμηση ιστορικού συγχώνευσης" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "Ταξινόμηση ιστορικού ελέγχου εκδόσεων κατά ένα κλειδί." -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "Σειρά ταξινόμησης ιστορικού ελέγχου εκδόσεων:" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1823,24 +1830,33 @@ msgstr "" "Αν ορισθεί κενό, τότε δε θα γίνει ταξινόμηση.\n" "Δείτε την τεκμηρίωση για λεπτομέρειες." -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "Συγχώνευση ιστορικού ελέγχου έκδοσης κατά την έναρξη συγχώνευσης" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" "Εκτέλεση συγχώνευσης ιστορικού ελέγχου έκδοσης κατά την έναρξη συγχώνευσης." -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Αριθμός υποκαταλόγων:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "Δοκιμή των κανονικών εκφράσεών σας" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "Εντολή συγχώνευσης με σχετικού:" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" @@ -1850,23 +1866,35 @@ msgstr "" "όταν δεν εντοπιστούν άλλες σχετικές τροποποιήσεις.\n" "Καλείται με παραμέτρους τα: όνομααρχείου1 όνομααρχείου2 όνομααρχείου3" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Συγχώνευση καταλόγου" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Αναδρομικά στους καταλόγους" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Αν θα αναλυθούν οι υποκατάλογοι ή όχι." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Μοτίβα αρχείου:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1876,11 +1904,11 @@ msgstr "" "Σύμβολα υποκατάστασης: '*' και '?'\n" "Μπορούν να οριστούν πολλαπλά μοτίβα χρησιμοποιώντας το διαχωριστικό: ';'" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Αντίστροφα μοτίβα αρχείου:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1890,11 +1918,11 @@ msgstr "" "Σύμβολα υποκατάστασης: '*' και '?'\n" "Μπορούν να οριστούν πολλαπλά μοτίβα χρησιμοποιώντας το διαχωριστικό: ';'" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Αντίστροφα μοτίβα καταλόγου:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1904,11 +1932,11 @@ msgstr "" "Σύμβολα υποκατάστασης: '*' και '?'\n" "Μπορούν να οριστούν πολλαπλά μοτίβα χρησιμοποιώντας το διαχωριστικό: ';'" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Χρήση .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1917,23 +1945,23 @@ msgstr "" "Μέσω των τοπικών αρχείων \".cvsignore\" μπορεί αυτό να είναι συγκεκριμένου " "καταλόγου." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Αναζήτηση κρυφών αρχείων και καταλόγων" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Αναζητεί αρχεία και καταλόγους που είναι κρυφά." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Αναζητεί αρχεία και καταλόγους που αρχίζουν με '.'." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Ακολούθηση δεσμών αρχείων" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1941,11 +1969,11 @@ msgstr "" "Ενεργοποιημένο: Σύγκριση του αρχείου στο οποίο δείχνει ο δεσμός.\n" "Απενεργοποιημένο: Σύγκριση των δεσμών." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Ακολούθηση δεσμών καταλόγων" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1953,11 +1981,11 @@ msgstr "" "Ενεργοποιημένο: Σύγκριση του καταλόγου στο οποίο δείχνει ο δεσμός.\n" "Απενεργοποιημένο: Σύγκριση των δεσμών." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "Σύγκριση αρχείων με ευαισθησία κεφαλαίων/πεζών" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1970,23 +1998,23 @@ msgstr "" "ταιριάζουν. (Προκαθορισμένο για τα Windows είναι ανενεργό, ενώ σε άλλη " "περίπτωση είναι ενεργό.)" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Λειτουργία σύγκρισης αρχείου" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Δυαδική σύγκριση" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Δυαδική σύγκριση του κάθε αρχείου (Προκαθορισμένο)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Πλήρης ανάλυση" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1994,39 +2022,61 @@ msgstr "" "Πραγματοποιεί πλήρη ανάλυση και εμφανίζει στατιστικά σε επιπλέον στήλες.\n" "(Πιο αργό από τη δυαδική σύγκριση, και πολύ πιο αργό για δυαδικά αρχεία)." -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Εμπιστοσύνη στην ημερομηνία τροποποίησης (μη ασφαλές)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" -"Θεώρησε ότι τα αρχεία είναι ίσα αν η ημερομηνία τροποποίησης και το μέγεθος των " -"αρχείων είναι ίσα.\n" +"Θεώρησε ότι τα αρχεία είναι ίσα αν η ημερομηνία τροποποίησης και το μέγεθος " +"των αρχείων είναι ίσα.\n" "Χρήσιμο για μεγάλους καταλόγους ή αργά δίκτυα." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Θεώρησε ότι τα αρχεία είναι ίσα αν η ημερομηνία τροποποίησης και το μέγεθος " +"των αρχείων είναι ίσα.\n" +"Χρήσιμο για μεγάλους καταλόγους ή αργά δίκτυα." + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Εμπιστοσύνη στο μέγεθος (μη ασφαλές)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" "Θεώρησε ότι τα αρχεία είναι ίσα αν το μέγεθος των αρχείων είναι ίσο.\n" -"Χρήσιμο για μεγάλους καταλόγους ή αργά δίκτυα όπου η ημερομηνία τροποποιείται " -"κατά τη λήψη." +"Χρήσιμο για μεγάλους καταλόγους ή αργά δίκτυα όπου η ημερομηνία " +"τροποποιείται κατά τη λήψη." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Συγχρονισμός καταλόγων" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -2037,11 +2087,11 @@ msgstr "" "Δουλεύει μόνο κατά τη σύγκριση δύο καταλόγων χωρίς να έχει καθοριστεί " "προορισμός." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Οι διαφορές των κενών θεωρούνται ίσες" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -2049,11 +2099,11 @@ msgstr "" "Αν τα αρχεία διαφέρουν μόνο σε κενούς χαρακτήρες θεωρούνται ότι είναι ίσα.\n" "Αυτό είναι ενεργοποιημένο μόνο όταν επιλεγεί η πλήρης ανάλυση." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Αντιγραφή του νεότερου αντί για συγχώνευση (μη ασφαλές)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2063,27 +2113,27 @@ msgstr "" "(Χρησιμοποιήστε το μόνο αν ξέρετε τι κάνετε!)\n" "Δουλεύει μόνο όταν συγκρίνονται δύο κατάλογοι." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Δημιουργία αντιγράφων ασφαλείας (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -"Όταν ένα αρχείο θα αποθηκευτεί με το όνομα ενός υπάρχοντος αρχείου, το υπάρχον " -"αρχείο θα μετονομαστεί με επέκταση '.orig' αντί να διαγραφεί." +"Όταν ένα αρχείο θα αποθηκευτεί με το όνομα ενός υπάρχοντος αρχείου, το " +"υπάρχον αρχείο θα μετονομαστεί με επέκταση '.orig' αντί να διαγραφεί." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Ρυθμίσεις περιοχής" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Γλώσσα (απαιτείται επανεκκίνηση)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2092,11 +2142,11 @@ msgstr "" "\"Αυτόματη\".\n" "Για να γίνει η αλλαγή της γλώσσας, επανεκκινήστε το KDiff3." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Χρήση της ίδιας κωδικοποίησης παντού:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." @@ -2106,21 +2156,21 @@ msgstr "" "Απενεργοποιήστε αυτή την επιλογή αν χρειάζεστε διαφορετικές επί μέρους " "επιλογές." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Σημείωση: Η τοπική κωδικοποίηση είναι " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "Κωδικοποίηση αρχείου για το Α:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" "Αν ενεργοποιηθεί θα γίνει ανίχνευση της κωδικοποίησης Unicode (UTF-16 or " "UTF-8).\n" @@ -2129,45 +2179,45 @@ msgstr "" "(Η ανίχνευση του Unicode εξαρτάται από τα πρώτα byte του αρχείου - αυτά θα " "είναι \"BOM\".)" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "Αυτόματη ανίχνευση Unicode" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "Κωδικοποίηση αρχείου για το Β:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "Κωδικοποίηση αρχείου για το Γ:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Κωδικοποίηση αρχείου για την έξοδο συγχώνευσης και την αποθήκευση:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "Αυτόματη επιλογή" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" "Αν ενεργοποιηθεί, θα χρησιμοποιηθεί η κωδικοποίηση του αρχείου εισόδου.\n" -"Σε περίπτωση αμφιβολίας θα εμφανιστεί ένα παράθυρο διαλόγου όπου ο χρήστης θα " -"πρέπει να επιλέξει την κωδικοποίηση για την αποθήκευση." +"Σε περίπτωση αμφιβολίας θα εμφανιστεί ένα παράθυρο διαλόγου όπου ο χρήστης " +"θα πρέπει να επιλέξει την κωδικοποίηση για την αποθήκευση." -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Κωδικοποίηση για τα αρχεία του προεπεξεργαστή:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Γλώσσας αναγνώσιμη από δεξιά στα αριστερά" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2175,19 +2225,19 @@ msgstr "" "Μερικές γλώσσες διαβάζονται από δεξιά στα αριστερά.\n" "Αυτή η ρύθμιση θα τροποποίηση τον προβολέα και τον επεξεργαστή κατάλληλα." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "Ενσωμάτωση" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "Ρυθμίσεις ενσωμάτωσης" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "Επιλογές γραμμής εντολών για αγνόηση:" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2199,7 +2249,27 @@ msgstr "" "Μπορούν να ορισθούν πολλές τιμές διαχωρισμένες με το ';'\n" "Αυτό καταστέλλει το σφάλμα \"Άγνωστης επιλογής\"." -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2214,19 +2284,19 @@ msgstr "" "μήκους ίσως έχετε προβλήματα κατά την επεξεργασία.\n" "Επιθυμείτε τη συνέχεια ή την επιλογή μιας άλλης γραμματοσειράς;" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Μη συμβατή γραμματοσειρά" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Συνέχεια με δικιά σας ευθύνη" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Επιλέξτε μία άλλη γραμματοσειρά" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" "Αυτό επαναφέρει όλες τις επιλογές. Όχι μόνο αυτές του τρέχοντος θέματος." @@ -2236,10 +2306,8 @@ msgid "PreprocessorCmd: " msgstr "Εντολή προεπεξεργαστή: " #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"Οι ακόλουθες επιλογές που κάνατε ίσως τροποποιήσουν δεδομένα:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "Οι ακόλουθες επιλογές που κάνατε ίσως τροποποιήσουν δεδομένα:\n" #: pdiff.cpp:264 msgid "" @@ -2304,15 +2372,8 @@ msgid "All input files contain the same text, but are not binary equal." msgstr "" "Όλα τα αρχεία εισόδου περιέχουν το ίδιο κείμενο, αλλά δεν είναι δυαδικά ίσα." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Τα αρχεία %1 και %2 είναι δυαδικά ίσα.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Τα αρχεία %1 και %2 περιέχουν το ίδιο κείμενο, αλλά δεν είναι δυαδικά ίσα.\n" @@ -2326,108 +2387,54 @@ msgstr "" "Σημειώστε ότι το KDiff3-merge δε φτιάχτηκε για δυαδικά δεδομένα.\n" "Αν συνεχίσετε θα είναι με δική σας ευθύνη." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Εγκατάλειψη" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Άνοιγμα αρχείων..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Σφάλμα ανοίγματος αρχείου" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Αποκοπή επιλογής..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Αντιγραφή της επιλογής στο πρόχειρο..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Εισαγωγή των περιεχομένων του προχείρου..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Αποθήκευση && συνέχεια" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Συνέχεια χωρίς αποθήκευση" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Η αναζήτηση ολοκληρώθηκε." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Η αναζήτηση ολοκληρώθηκε" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "Δεν έχει επιλεγεί τίποτα σε κανένα παράθυρο εισαγωγής διαφορών." -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "Σφάλμα κατά την προσθήκη χειροκίνητου εύρους διαφορών" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Ρύθμιση του KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Κατάλογος" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Λειτουργία συγχώνευσης του τρέχοντος αντικειμένου" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Λειτουργία συγχρονισμού του τρέχοντος αντικειμένου" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Μετακίνηση" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "Προβολή &διαφορών" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Συγχώνευση" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Παράθυρο" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "Α (Βάση):" @@ -2470,6 +2477,10 @@ msgstr "Έξοδος (προαιρετική):" msgid "Configure..." msgstr "Ρύθμιση..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Αναζήτηση κειμένου:" @@ -2544,14 +2555,22 @@ msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -"Αντιγράψτε μία γραμμή αρχής καταχώρησης ιστορικού όπως αυτή χρησιμοποιείται στα " -"αρχεία σας,\n" +"Αντιγράψτε μία γραμμή αρχής καταχώρησης ιστορικού όπως αυτή χρησιμοποιείται " +"στα αρχεία σας,\n" "χωρίς να περιλάβετε το σχόλιο που προηγείται." #: smalldialogs.cpp:486 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 "Επιτυχία ταιριάσματος." @@ -2565,3 +2584,85 @@ msgid "Opening and closing parentheses don't match in regular expression." msgstr "" "Αδυναμία ταιριάσματος παρενθέσεων ανοίγματος και κλεισίματος στην κανονική " "έκφραση." + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Κατάλογος" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Λειτουργία συγχώνευσης του τρέχοντος αντικειμένου" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Λειτουργία συγχρονισμού του τρέχοντος αντικειμένου" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Μετακίνηση" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "Προβολή &διαφορών" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Συγχώνευση" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Παράθυρο" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Τα αρχεία Α και Β είναι δυαδικά ίσα.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Τα αρχεία Α και Γ είναι δυαδικά ίσα.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Τα αρχεία Α και Γ περιέχουν το ίδιο κείμενο. \n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Τα αρχεία Β και Γ είναι δυαδικά ίσα.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Τα αρχεία Β και Γ περιέχουν το ίδιο κείμενο. \n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Διατήρηση επαναφοράς κεφαλής" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Εμφανίζει τους χαρακτήρες επαναφοράς κεφαλής '\\r' αν υπάρχουν.\n" +#~ "Βοηθάει στη σύγκριση αρχείων που τροποποιήθηκαν σε διαφορετικά " +#~ "λειτουργικά συστήματα." diff --git a/po/en_GB.po b/po/en_GB.po index 4d92607..6254ee9 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,36 +7,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2005-02-02 11:52+0000\n" "Last-Translator: Andrew Coles \n" "Language-Team: British English \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Jonathan Riddell" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "kde-en-gb@jriddell.org" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Writing clipboard data to temp file failed." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "From Clipboard" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -50,7 +51,7 @@ msgstr "" "\n" "The preprocessing command will be disabled now." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -64,7 +65,7 @@ msgstr "" "\n" "The line-matching-preprocessing command will be disabled now." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -72,16 +73,16 @@ msgstr "" "Data loss error:\n" "If it is reproducable please contact the author.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Severe Internal Error" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Top line %1" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "End" @@ -97,245 +98,249 @@ msgstr "Link: " msgid "Size. " msgstr "Size. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Date & Size: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Creating temp copy of %1 failed." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Opening %1 failed." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Comparing file..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Error reading from %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Name" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Operation" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Unsolved" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Solved" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Nonwhite" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "White" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Continue Merging" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Opening of directories failed:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir A \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Dir A \"%1\" does not exist or is not a directory.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir B \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Dir B \"%1\" does not exist or is not a directory.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir C \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Dir C \"%1\" does not exist or is not a directory.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Directory Open Error" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Parameter Warning" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Scanning directories..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Reading Directory A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Reading Directory B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Reading Directory C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Some subdirectories were not readable in" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Check the permissions of the subdirectories." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Ready." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Directory Comparison Status" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Number of subdirectories:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Number of equal files:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Number of different files:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Number of manual merges:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "This affects all merge operations." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Changing All Merge Operations" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "C&ontinue" -#: directorymergewindow.cpp:1169 +#: 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 " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "To do." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Copy A to B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Copy B to A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Delete A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Delete B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Delete A & B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Merge to A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Merge to B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Merge to A & B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Delete (if exists)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Merge" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Merge (manual)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Error: Conflicting File Types" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Error: Dates are equal but files are not." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "This operation is currently not possible." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Operation Not Possible" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -349,42 +354,47 @@ msgstr "" "\n" "If you know how to reproduce this, please contact the program author." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Program Error" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"An error occurred while copying.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "An error occurred while copying.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Error." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Done." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Not saved." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Unknown merge operation. (This must never happen!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Unknown merge operation." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -404,327 +414,330 @@ msgstr "" "Be aware that this program still has beta status and there is NO WARRANTY " "whatsoever! Make backups of your vital data!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Starting Merge" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Do It" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Simulate It" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Continue merge after an error" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Continue With Last Item" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Skip Item" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Skipped." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "In progress..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Merge operation complete." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Merge Complete" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Simulated merge complete: Check if you agree with the proposed operations." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "An error occurred. Press OK to see detailed information.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Error: While deleting %1: Creating backup failed." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "delete directory recursively( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "delete( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Error: delete dir operation failed while trying to read the directory." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Error: rmdir( %1 ) operation failed." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Error: delete operation failed." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "manual merge( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Note: After a manual merge the user should continue by pressing F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Error: copyLink failed: Remote links are not yet supported." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Error: copyLink failed." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "copy( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Error during rename( %1 -> %2 ): Cannot delete existing destination." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Error: Rename failed." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Error during makeDir of %1. Cannot delete existing file." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Error while creating directory." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Size" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Last Modification" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Link-Destination" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "File..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "not available" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Dest: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Directory Merge" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Start/Continue Directory Merge" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Run Operation for Current Item" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Compare Selected File" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Merge Current File" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Fold All Subdirs" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Unfold All Subdirs" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Choose A for All Items" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Choose B for All Items" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Choose C for All Items" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Auto-Choose Operation for All Items" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "No Operation for All Items" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Show Different Files" msgstr "Number of different files:" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Compare Selected File" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Compare Selected File" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Do Nothing" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Delete A && B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Merge to A && B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " @@ -732,7 +745,7 @@ msgstr "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -740,188 +753,196 @@ msgstr "" "While trying to make a backup, renaming failed. \n" "Filenames: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Getting file status: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Reading file: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Writing file: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Out of memory" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Making directory: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Removing directory: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Removing file: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Creating symbolic link: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Renaming file: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Copying file: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "Error during file copy operation: Reading failed. Filename: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Error during file copy operation: Writing failed. Filename: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Reading directory: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Listing directory: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 #, fuzzy msgid "Current Configuration:" msgstr "Current Item Sync Operation" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "File Open Error" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Option --auto used, but no output file specified." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Option --auto ignored for directory comparison." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Saving failed." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Opening of these files failed:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "File Open Error" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Opens documents for comparison..." -#: kdiff3.cpp:423 +#: 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!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Saves the current document as..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Quits the application" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Cuts the selected section and puts it to the clipboard" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Copies the selected section to the clipboard" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Pastes the clipboard contents to actual position" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Search for a string" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Search again for the string" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Enables/disables the toolbar" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Enables/disables the statusbar" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Configure KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Go to Current Delta" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Go to First Delta" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Go to Last Delta" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(Skips white space differences when \"Show White Space\" is disabled.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -929,237 +950,245 @@ msgstr "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Go to Previous Delta" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Go to Next Delta" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Go to Previous Conflict" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Go to Next Conflict" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Go to Previous Unsolved Conflict" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Go to Next Unsolved Conflict" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Select Line(s) From A" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Select Line(s) From B" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Select Line(s) From C" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Automatically Go to Next Unsolved Conflict After Source Selection" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Show Space && Tabulator Characters for Differences" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Show White Space" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Show Line Numbers" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Choose A Everywhere" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Choose B Everywhere" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Choose C Everywhere" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Choose A for All Unsolved Conflicts" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Choose B for All Unsolved Conflicts" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Choose C for All Unsolved Conflicts" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Choose A for All Unsolved Whitespace Conflicts" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Choose B for All Unsolved Whitespace Conflicts" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Choose C for All Unsolved Whitespace Conflicts" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Automatically Solve Simple Conflicts" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Set Deltas to Conflicts" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Automatically Solve Simple Conflicts" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 #, fuzzy msgid "Join Selected Diffs" msgstr "Compare Selected File" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Show Window A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Show Window B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Show Window C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Focus Next Window" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Normal Overview" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "A vs. B Overview" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "A vs. C Overview" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "B vs. C Overview" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Word Wrap Diff Windows" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Focus Prev Window" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Toggle Split Orientation" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Dir && Text Split Screen View" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Toggle Between Dir && Text View" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "The merge result hasn't been saved." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Save && Quit" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Quit Without Saving" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Saving the merge result failed." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "You are currently doing a directory merge. Are you sure, you want to abort?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Saving file..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Saving file with a new filename..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "Exiting..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 #, fuzzy msgid "Printing completed." msgstr "Merge operation complete." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Exiting..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Toggling toolbar..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Toggle the statusbar..." @@ -1174,12 +1203,12 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." #: main.cpp:35 msgid "Tool for Comparison and Merge of Files and Directories" @@ -1257,19 +1286,18 @@ msgstr "file3 to open" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "+ Many thanks to those who reported bugs and contributed ideas!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" @@ -1282,55 +1310,31 @@ msgstr "" "The output has been modified.\n" "If you continue your changes will be lost." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "All input files are binary equal." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "All input files contain the same text." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Files A and B are binary equal.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Files A and B have equal text. \n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Files A and C are binary equal.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Files A and C have equal text. \n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Files B and C are binary equal.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +#, fuzzy +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Files B and C are binary equal.\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Files B and C have equal text. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Files A and B have equal text. \n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Total number of conflicts: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1338,7 +1342,7 @@ msgstr "" "\n" "Nr of automatically solved conflicts: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1346,23 +1350,23 @@ msgstr "" "\n" "Nr of unsolved conflicts: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Conflicts" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1370,11 +1374,11 @@ msgstr "" "Not all conflicts are solved yet.\n" "File not saved.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Conflicts Left" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1384,29 +1388,29 @@ msgstr "" "\n" "Creating backup failed. File not saved." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "File Save Error" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Error while writing." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Output" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Modified]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 #, fuzzy msgid "Encoding for saving" msgstr "File Encoding for C:" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1426,6 +1430,15 @@ 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" @@ -1551,10 +1564,8 @@ msgid "Auto indentation" msgstr "Auto indentation" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "On: The indentation of the previous line is used for a new line.\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1590,61 +1601,54 @@ msgstr "KDiff3" msgid "Diff Settings" msgstr "Diff & Merge Settings" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Preserve carriage return" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Treat C/C++ comments like white space." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Ignore numbers" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Ignore C/C++ comments" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Treat C/C++ comments like white space." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Ignore case" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Treat case differences like white space changes. ('a'<=>'A')" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Preprocessor command:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "User defined pre-processing. (See the docs for details.)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Line-matching preprocessor command:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1652,11 +1656,11 @@ msgstr "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Try hard (slower)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1664,11 +1668,16 @@ msgstr "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Diff & Merge Settings" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Auto advance delay (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" @@ -1676,40 +1685,35 @@ msgstr "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Diff & Merge Settings" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "White space 2-file merge default:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Manual Choice" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "White space 3-file merge default:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1717,58 +1721,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1778,46 +1783,67 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Number of subdirectories:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Directory Merge" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Recursive directories" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Whether to analyse subdirectories or not." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "File pattern(s):" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1827,11 +1853,11 @@ msgstr "" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "File-anti-pattern(s):" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1841,11 +1867,11 @@ msgstr "" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Dir-anti-pattern(s):" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1855,11 +1881,11 @@ msgstr "" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Use .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1867,23 +1893,23 @@ msgstr "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Find hidden files and directories" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Finds files and directories with the hidden attribute." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Finds files and directories starting with '.'." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Follow file links" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1891,11 +1917,11 @@ msgstr "" "On: Compare the file the link points to.\n" "Off: Compare the links." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Follow directory links" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1903,11 +1929,11 @@ msgstr "" "On: Compare the directory the link points to.\n" "Off: Compare the links." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1915,23 +1941,23 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "File Comparison Mode" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Binary comparison" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Binary comparison of each file. (Default)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Full analysis" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1939,25 +1965,47 @@ msgstr "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Trust the modification date (unsafe)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" "Assume that files are equal if the modification date and file length are " "equal.\n" "Useful for big directories or slow networks." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Useful for big directories or slow networks." + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Trust the size (unsafe)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -1967,11 +2015,11 @@ msgstr "" "Useful for big directories or slow networks when the date is modified during " "download." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Synchronise directories" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -1981,11 +2029,11 @@ msgstr "" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "White space differences considered equal" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -1993,11 +2041,11 @@ msgstr "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Copy newer instead of merging (unsafe)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2007,11 +2055,11 @@ msgstr "" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Backup files (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2019,15 +2067,15 @@ msgstr "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Regional Settings" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Language (restart required)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2035,11 +2083,11 @@ msgstr "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Use the same encoding for everything:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." @@ -2047,60 +2095,60 @@ msgstr "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Note: Local Encoding is " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "File Encoding for A:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "File Encoding for B:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "File Encoding for C:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "File Encoding for Merge Output and Saving:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "Auto copy selection" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "File Encoding for Preprocessor Files:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Right To Left Language" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2108,21 +2156,21 @@ msgstr "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "Operation" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration Settings" msgstr "Regional Settings" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2130,7 +2178,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2146,19 +2214,19 @@ msgstr "" "\n" "Do you want to continue or do you want to select another font." -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Incompatible Font" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Continue at Own Risk" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Select Another Font" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "This resets all options. Not only those of the current topic." @@ -2167,10 +2235,8 @@ msgid "PreprocessorCmd: " msgstr "PreprocessorCmd: " #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "The following option(s) you selected might change data:\n" #: pdiff.cpp:264 msgid "" @@ -2235,19 +2301,10 @@ msgstr "Linediff: A <-> C" msgid "All input files contain the same text, but are not binary equal." msgstr "All input files contain the same text." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -#, fuzzy -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Files B and C are binary equal.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 #, fuzzy -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"Files A and B are binary equal.\n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Files A and B are binary equal.\n" #: pdiff.cpp:530 msgid "" @@ -2259,109 +2316,55 @@ msgstr "" "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Abort" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Opening files..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "File open error" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Cutting selection..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Copying selection to clipboard..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Inserting clipboard contents..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Save && Continue" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Continue Without Saving" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Search complete." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Search Complete" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "Error while creating directory." -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Configure KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Directory" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Current Item Merge Operation" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Current Item Sync Operation" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Movement" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "D&iffview" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Merge" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Window" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (Base):" @@ -2404,6 +2407,10 @@ msgstr "Output (optional):" msgid "Configure..." msgstr "Configure..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Search text:" @@ -2476,6 +2483,14 @@ 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 "" @@ -2489,6 +2504,88 @@ msgstr "Saving failed." msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Directory" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Current Item Merge Operation" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Current Item Sync Operation" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Movement" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "D&iffview" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Merge" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Window" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Files A and B are binary equal.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Files A and C are binary equal.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Files A and C have equal text. \n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Files B and C are binary equal.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Files B and C have equal text. \n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Preserve carriage return" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." + #, fuzzy #~ msgid "Diff and Merge" #~ msgstr "Diff & Merge" diff --git a/po/es.po b/po/es.po index 29f544e..90ebdc2 100644 --- a/po/es.po +++ b/po/es.po @@ -9,36 +9,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2006-11-06 22:21+0100\n" "Last-Translator: santi \n" "Language-Team: Español \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Carlos Mayo Hernández" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "carlos.mayo@hispalinux.es" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Error al escribir los datos del portapapeles en el archivo temporal." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Desde el portapapeles" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -52,7 +53,7 @@ msgstr "" "\n" "La orden de pre-procesamiento se desactivará ahora." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -60,14 +61,14 @@ msgid "" "\n" "The line-matching-preprocessing command will be disabled now." msgstr "" -"El preprocesamiento de combinación de linea probablemente falló. Compruebe esta " -"orden:\n" +"El preprocesamiento de combinación de linea probablemente falló. Compruebe " +"esta orden:\n" "\n" " %1\n" "\n" "La orden de preprocesamiento de combinación de linea se desactivará." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -75,15 +76,15 @@ msgstr "" "Error de pérdida de datos:\n" "Si se puede reproducir contacte con el autor.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Error interno grave" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "Linea superior" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Fin" @@ -99,245 +100,249 @@ msgstr "Enlace: " msgid "Size. " msgstr "Tamaño: " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Fecha y tamaño: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Falló la creación de la copia temporal de %1." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Falló la apertura de %1." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Comparando archivo..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Error al leer de %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Nombre" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Operación" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Estado" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Sin resolver" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Resuelto" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "No blanco" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Blanco" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -"Actualmente está haciendo una fusión de directorio. ¿Está seguro de que desea " -"abandonar la fusión y volver a leer el directorio?" +"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:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Continuar fusionando" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Falló la apertura de directorios:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir A «%1» no existe o no es un directorio.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Dir A «%1» no existe o no es un directorio.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir B «%1» no existe o no es un directorio.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Dir B «%1» no existe o no es un directorio.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir C «%1» no existe o no es un directorio.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Dir C «%1» no existe o no es un directorio.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Error al abrir directorio" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -"El directorio de destino no debe ser el mismo que A o B cuando tres directorio " -"estan fusionados.\n" +"El directorio de destino no debe ser el mismo que A o B cuando tres " +"directorio estan fusionados.\n" "Compruebe de nuevo antes de continuar." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Advertencia en el parámetro" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Escaneando directorios ..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Leyendo directorio A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Leyendo directorio B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Leyendo directorio C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Algunos subdirectorios no se pudieron leer" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Comprobar los permisos de los subdirectorios." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Listo." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Estado de la comparación del directorio" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Número de subdirectorios:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Número de archivos iguales:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Número de archivos diferentes:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Número de fusiones manuales:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Esto afecta a todas las operaciones de fusión." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Cambiando todas las operaciones de fusión" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "C&ontinuar" -#: directorymergewindow.cpp:1169 +#: 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" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Por hacer." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Copiar A a B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Copiar B a A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Eliminar A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Eliminar B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Eliminar A y B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Fusionar a A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Fusionar a B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Fusionar a A y B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Eliminar (si existe)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Fusionar" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Fusionar (manual)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Error: Conflicto de tipos de archivo" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Error: Las fechas son iguales pero los archivos no." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Esta operación no es posible actualmente." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Operación imposible" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -351,42 +356,47 @@ msgstr "" "\n" "Si sabe cómo reproducir esto, por favor contacte con el autor del programa." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Error de programa" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Ocurrió un error mientras se copiaba.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Ocurrió un error mientras se copiaba.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Error." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Hecho." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Sin guardar." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Operación de fusión desconocida. (Esto no debe ocurrir nunca)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Operación de fusión desconocida." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -405,331 +415,335 @@ msgstr "" "Tenga en cuenta que este programa todavía es una versión beta y no está " "totalmente garantizado. ¡Realice copias de seguridad de sus datos vitales!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Comenzando fusión" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Hacerlo" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Simularlo" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" "El elemento marcado tiene un tipo diferente en los diferentes directorios. " "Seleccione qué hacer." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" "Las fechas de modificación del archivo son iguales pero los archivos no. " "Seleccionar qué hacer." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -"Esta operación no es posible actualmente porque se esta ejecutando una fusión " -"de directorios." +"Esta operación no es posible actualmente porque se esta ejecutando una " +"fusión de directorios." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Hubo un error en el último paso.\n" "¿Desea continuar con el elemento que causó el error o desea omitir este " "elemento?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Continuar la fusión después de un error" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Continuar con el último elemento" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Omitir elemento" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Omitido." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "En progreso..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Operación de fusión completa." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Fusión completa" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Fusión simulada completa. Compruebe si está de acuerdo con las operaciones " "propuestas." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Ocurrió un error. Pulse OK para ver información mas detallada.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Ocurrió un error. Pulse OK para ver información mas detallada.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Error: Mientras se borraba %1: Falló la creación de copia de seguridad." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "eliminar directorio recursivamente( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "eliminar( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Error: la operación de eliminación de directorio falló al intentar leer el " "directorio." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Error: la operación rmdir( %1 ) falló." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Error: falló la operación de eliminación." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "fusión manual ( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -" Nota: Después de una fusión manual el usuario puede continuar presionando " -"F7." +" Nota: Después de una fusión manual el usuario puede continuar " +"presionando F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Error: falló la copia ( %1 -> %2 ). Fallo al eliminar destino existente." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Error: falló copyLink. Enlaces remotos no están soportados todavía." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Error: falló copyLink." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "copy( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -"Error durante renombrar( %1 -> %2 ): No se puede eliminar un destino existente." +"Error durante renombrar( %1 -> %2 ): No se puede eliminar un destino " +"existente." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "renombrar( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Error: Fallo al renombrar." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Error durante makeDir de %1. No se puede eliminar un archivo existente." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Error al crear el directorio." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Tamaño" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Atrib" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Última modificación" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Destino del enlace" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Archivo..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "no disponible" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (base): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Dest: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "Guardar estado del directorio de fusión como..." -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Comenzar/Continuar fusión de directorio" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Realizar operación para el elemento actual" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Comparar el archivo seleccionado" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Fusionar archivo actual" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Plegar todos los subdirectorios" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Desplegar todos los subdirectorios" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Elegir A para todos los elementos" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Elegir B para todos los elementos" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Elegir C para todos los elementos" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Auto-elegir operación para todos los elementos" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Ninguna operación para todos los elementos" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "Mostrar archivos idénticos" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "Mostrar archivos diferentes" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "Mostrar archivos solo en A" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "Mostrar archivos solo en B" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "Mostrar archivos solo en C" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "Comparar explícitamente los archivos seleccionados" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "Fusionar explícitamente los archivos seleccionados" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "No hacer nada" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Eliminar A y B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Fusionar a A y B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " @@ -738,7 +752,7 @@ msgstr "" "eliminar una copia de seguridad anterior.\n" "Nombre de archivo: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -747,432 +761,446 @@ msgstr "" "renombrar.\n" "Nombres de archivos: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Obteniendo estado de archivo: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Leyendo archivo: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Escribiendo archivo: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Fuera de memoria" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Creando directorio: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Eliminando directorio: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Eliminando archivo: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Creando enlace simbólico: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Renombrando archivo: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Copiando archivo: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" "Error durante la operación de copia de archivo. Falló al abrir archivo para " "lectura. Nombre de archivo: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" "Error durante la operación de copia de archivo. Falló al abrir archivo para " "escritura. Nombre de archivo: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" "Error durante la operación de copia de archivo. Falló al leer. Nombre de " "archivo: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" "Error durante la operación de copia de archivo. Falló al escribir. Nombre de " "archivo: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Leyendo directorio: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Listando directorio: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "Configuración actual:" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "Configuración de la opción de error:" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Opción --auto usada, pero sin archivo de salida especificado." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Opción --auto ignorada para comparación de directorio." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Fallo al guardar." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Fallo al abrir estos archivos:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Error de apertura de archivo" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Abre documentos para comparación..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Guarda el resultado de la fusión ¡Todos los conflictos deben estar resueltos!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Guarda el documento actual como..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "Imprimir las diferencias" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Sale de la aplicación" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Corta la sección seleccionada y la pega en el portapapeles" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Copia la sección seleccionada al portapapeles" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Pega el contenido del portapapeles en la posición actual" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "Seleccionar todo en la ventana actual" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Buscar por una cadena" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Buscar de nuevo la cadena" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Activar/desactivar la barra de herramientas" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Activar/desactivar la barra de estado" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Configurar KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Ir al Delta actual" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Ir al primer Delta" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Ir al último Delta" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Omite diferencias de espacios en blanco cuando «Mostrar espacios en blanco» " "esta desactivado.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -"(No omite diferencias de espacios en blanco incluso cuando «Mostrar espacios en " -"blanco» esta desactivado)" +"(No omite diferencias de espacios en blanco incluso cuando «Mostrar espacios " +"en blanco» esta desactivado)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Ir al Delta anterior" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Ir al siguiente Delta" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Ir al conflicto anterior" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Ir al conflicto siguiente" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Ir al conflicto anterior sin resolver" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Ir al conflicto siguiente sin resolver" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Seleccionar linea(s) de A" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Seleccionar linea(s) de B" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Seleccionar linea(s) de C" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -"Automáticamente Ir al conflicto siguiente sin resolver después de una selección " -"origen" +"Automáticamente Ir al conflicto siguiente sin resolver después de una " +"selección origen" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Mostrar carácteres espacio y tabulador por diferencias" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Mostar espacio en blanco" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Mostar número de lineas" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Elegir A en cualquier sitio" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Elegir B en cualquier sitio" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Elegir C en cualquier sitio" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Elegir A para todos los conflictos sin resolver" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Elegir B para todos los conflictos sin resolver" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Elegir C para todos los conflictos sin resolver" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Elegir A para todos los conflictos de espacios en blanco sin resolver" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Elegir B para todos los conflictos de espacios en blanco sin resolver" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Elegir C para todos los conflictos de espacios en blanco sin resolver" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Resolver automáticamente conflictos simples" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Establecer Deltas a conflictos" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "Ejecutar expresión regular de fusión automática" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "Resolver automáticamente conflictos históricamente" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "Dividir Diff en la selección" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "Unir las diferencias seleccionadas" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Mostar ventana A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Mostar ventana B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Mostar ventana C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Ir a la siguiente ventana" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Vista normal" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "Vista A vs. B" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "Vista A vs. C" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "Vista B vs. C" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Ventanas de diferencias con ajuste de palabra" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "Añadir alineación manual de las diferencias" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "Borrar todas las alineaciones de diferencias manuales" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Ir a la ventana anterior" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Cambiar orientación de división" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Vista de la división de pantalla Dir y Texto" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Cambiar entre vista Dir y Texto" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "El resultado de la fusión no ha sido guardado." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Guardar y salir" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Salir sin guardar" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Falló al guardar el resultado de la fusión." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -"Actualmente está haciendo una fusión de directorio. ¿Está seguro de que desea " -"abandonar?" +"Actualmente está haciendo una fusión de directorio. ¿Está seguro de que " +"desea abandonar?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Guardando archivo..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Guardando archivo con un nuevo nombre..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "Imprimiendo..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "Impresión abandonada." -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Selección" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "Impresión terminada." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Saliendo..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Cambiando barra de herramientas..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Cambiar la barra de estado..." @@ -1187,12 +1215,12 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "No pudo encontrar nuestra parte!\n" -"Esto normalmente ocurre debido a un problema de instalación. Por favor lea el " -"archivo README en el paquete fuente para mas detalles." +"Esto normalmente ocurre debido a un problema de instalación. Por favor lea " +"el archivo README en el paquete fuente para mas detalles." #: main.cpp:35 msgid "Tool for Comparison and Merge of Files and Directories" @@ -1275,24 +1303,24 @@ msgstr "archivo3 a abrir" msgid "Ignored. (User defined.)" msgstr "Ignorada (definida por el usuario)" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -"+ ¡Muchas gracias a aquellos que han informado de errores y han contribuido con " -"ideas!" +"+ ¡Muchas gracias a aquellos que han informado de errores y han contribuido " +"con ideas!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -"Número de conflictos sin resolver: %1 (%2 de los cuales son espacios en blanco)" +"Número de conflictos sin resolver: %1 (%2 de los cuales son espacios en " +"blanco)" #: mergeresultwindow.cpp:285 msgid "" @@ -1302,55 +1330,30 @@ msgstr "" "La salida ha sido modificada.\n" "Si continua, sus cambios se perderán." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Todos los archivos de entrada son binariamente iguales." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Todos los archivos de entrada contienen el mismo texto." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Los archivos A y B son binariamente iguales.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Los archivos A y B tiene el mismo texto. \n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Los archivos %1 y %2 son binariamente iguales.\n" -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Los archivos A y C son binariamente iguales.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Los archivos A y B tiene el mismo texto. \n" -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Los archivos A y C tiene el mismo texto. \n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Los archivos B y C son binariamente iguales.\n" - -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Los archivos B y C tiene el mismo texto. \n" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Número total de conflictos: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1358,7 +1361,7 @@ msgstr "" "\n" "Nº de conflictos resueltos automáticamente: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1366,23 +1369,23 @@ msgstr "" "\n" "Nº de conflictos sin resolver: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Conflictos" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1390,11 +1393,11 @@ msgstr "" "No todos los conflictos se han resuelto ya.\n" "Archivo sin guardar.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Conflictos que faltan" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1404,28 +1407,28 @@ msgstr "" "\n" "Fallo al crear copia de seguridad. Archivo sin guardar." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Error al guardar archivo" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Error al escribir." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Salida" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Modificado]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "Codificación para guardar" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "Códec de" @@ -1445,6 +1448,15 @@ 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" @@ -1526,8 +1538,8 @@ msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -"Cambiar este color solo será efectivo cuando inicie de nuevo la comparación de " -"directorios." +"Cambiar este color solo será efectivo cuando inicie de nuevo la comparación " +"de directorios." #: optiondialog.cpp:644 msgid "Oldest file color:" @@ -1570,8 +1582,7 @@ msgid "Auto indentation" msgstr "Auto identación" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" "On: Se usará la identación de la línea anterior para una nueva línea.\n" @@ -1607,65 +1618,57 @@ msgstr "Diff" msgid "Diff Settings" msgstr "Preferencias de Diff" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Conservar retorno de carro" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Mostrar carácteres de retorno de caro '\\r' si existen.\n" -"Ayuda a comparar archivos que fueron modificados bajo diferentes sistemas " -"operativos." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Trata los comentarios de C/C++ como espacios en blanco." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Ignorar números" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -"Ignorar carácteres numéricos durante la fase combinación de linea. (Similar a " -"ignorar espacios en blanco.)\n" +"Ignorar carácteres numéricos durante la fase combinación de linea. (Similar " +"a ignorar espacios en blanco.)\n" "Puede ayudar a comparar archivos con datos numéricos." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Ignorar comentarios de C/C++" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Trata los comentarios de C/C++ como espacios en blanco." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Ignorar mayúsculas" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -"Tratar las diferencias de mayúsculas como cambios de espacios en blanco ('a'<=>" -"'A')" +"Tratar las diferencias de mayúsculas como cambios de espacios en blanco " +"('a'<=>'A')" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Orden del preprocesador:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Usar pre-procesamiento definido. (Ver los documentos para mas detalles.)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Orden de preprocesador de coincidencia de línea:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1673,11 +1676,11 @@ msgstr "" "Este pre-procesador sólo se usa durante la combinación de línea.\n" "(Ver documentos para mas detalles.)" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Intentar mas a fondo (mas lento)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1685,11 +1688,15 @@ msgstr "" "Activa la --opción mínima para el diff externo.\n" "El análisis de archivos grandos será mas lento." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "Preferencias de fusión" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Retardo auto avanzado (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" @@ -1698,39 +1705,35 @@ msgstr "" "para el tiempo especificado, antes de saltar al siguiente conflicto. Rango: " "0-2000 ms" -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "Preferencias de fusión" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Fusionar espacios en blanco de dos archivos de forma predeterminada:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Elección manual" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" "Permitir el algoritmo de fusión para seleccionar automáticamente una entrada " "para sólo los cambios de espacios en blanco." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Fusionar espacios en blanco de tres archivos de forma predeterminada:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "Expresión regular de fusión automática" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "Expresión regular de fusión automática:" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1739,15 +1742,16 @@ msgid "" msgstr "" "Expresión regular para las líneas en las que KDiff3 debería seleccionar una " "fuente de forma automática.\n" -"Cuando una línea con un conflicto coincide con la expresión regular se elegirá\n" +"Cuando una línea con un conflicto coincide con la expresión regular se " +"elegirá\n" "- si está disponible - C, sino B." -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" "Ejecutar la expresión regular de fusión automática al iniciar la fusión" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" @@ -1755,15 +1759,15 @@ msgstr "" "Ejecuta la fusión para las expresiones regulares de fusión automática\n" "de forma inmediata cuando se inicia la fusión.\n" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "Fusionado del historial de control de versiones" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "Expresión regular de inicio del historial:" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" @@ -1774,42 +1778,44 @@ msgstr "" "Esta línea suele contener la palabra clave «$Log$».\n" "El valor predeterminado es: «.*\\$Log.*\\$.*»" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "Expresión regular de inicio de la entrada del historial:" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" "Una entrada del historial de control de versión está formada por varias " "líneas.\n" -"Especifique la expresión regular utilizada para detectar la primera línea (sin " -"el comentario inicial).\n" -"Utilice paréntesis para agrupar las claves de ordenación que desee utilizar.\n" -"Si lo deja vacío, KDiff3 asumirá que las líneas vacías separan las entradas del " -"historial.\n" +"Especifique la expresión regular utilizada para detectar la primera línea " +"(sin el comentario inicial).\n" +"Utilice paréntesis para agrupar las claves de ordenación que desee " +"utilizar.\n" +"Si lo deja vacío, KDiff3 asumirá que las líneas vacías separan las entradas " +"del historial.\n" "Consulte la documentación para obtener más detalles." -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "Ordenación de fusión del historial" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "Ordenar el historial del control de versiones con una clave." -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" "Orden de la clave de ordenación del inicio de la entrada del historial:" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1818,33 +1824,42 @@ msgid "" "If left empty, then no sorting will be done.\n" "See the documentation for details." msgstr "" -"Cada paréntesis utilizado en la expresión regular para la entrada de inicio del " -"historial\n" +"Cada paréntesis utilizado en la expresión regular para la entrada de inicio " +"del historial\n" "agrupa una clave que podrá utilizarse para la ordenación.\n" "Especifique la lista de claves (están numeradas por orden de aparición\n" "comenzando en 1) utilizando «,» como separador (p.ej. «4,5,6,1,2,3,7»).\n" "Si se deja vacío, no se realizará ordenación.\n" "Consulte la documentación para obtener más detalles." -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "Fusionar el historial de control de versiones al iniciar la fusión" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -"Ejecuta la fusión automática del historial del control de versiones al iniciar " -"el fusionado." +"Ejecuta la fusión automática del historial del control de versiones al " +"iniciar el fusionado." + +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Número de subdirectorios:" -#: optiondialog.cpp:947 +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "Verificar sus expresiones regulares" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "Orden de fusión irrelevante:" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" @@ -1854,23 +1869,35 @@ msgstr "" "cuando no se hayan detectado otros cambios relevantes.\n" "Se llama con los parámetros: nombrearchivo1 nombrearchivo2 nombrearchivo3" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Fusión de directorio" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Introducirse en los directorios" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Analizar los subdirectorios o no." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Patron(es) de archivo(s):" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1880,11 +1907,11 @@ msgstr "" "Comodines: '*' y '?'\n" "Se pueden especificar muchos patrones usando el separador: ';'" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Patron(es) anti-archivo(s):" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1894,11 +1921,11 @@ msgstr "" "Comodines: '*' y '?'\n" "Se pueden especificar muchos patrones usando el separador: ';'" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Patron(es) anti-directorio(s):" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1908,35 +1935,36 @@ msgstr "" "Comodines: '*' y '?'\n" "Se pueden especificar muchos patrones usando el separador: ';'" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Usar .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" "Extiende el antipatrón para todo lo que sería ignorado por CVS.\n" -"Esto puede ser especificado por directorios via archivos locales «.cvsignore»." +"Esto puede ser especificado por directorios via archivos locales «." +"cvsignore»." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Buscar archivos y directorios ocultos" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Busca archivos de directorios con el atributo de oculto." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Busca archivos y directorios que comiencen por '.'." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Seguir enlaces de archivos" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1944,11 +1972,11 @@ msgstr "" "On: Comparar el archivo que al que apunta el enlace.\n" "Off: Comparar los enlaces." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Seguir enlaces de directorios" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1956,11 +1984,11 @@ msgstr "" "On: Comparar el directorio al que apunta el enlace.\n" "Off: Comparar los enlaces." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "Comparación de nombres de archivo sensible a mayúsculas y minúsculas" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1970,53 +1998,76 @@ msgstr "" "La comparación de directorios comparará archivos o directorios cuando sus " "nombre coincidan.\n" "Active esta opción si deben compararse los nombres teniendo en cuenta " -"mayúsculas y minúsculas (para Windows el valor predeterminado es desactivado, " -"en otro caso, estará activado)" +"mayúsculas y minúsculas (para Windows el valor predeterminado es " +"desactivado, en otro caso, estará activado)" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Modo de comparación de archivos" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Comparación binaria" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Comparación binaria de cada archivo (predeterminado)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Análisis completo" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" "Hacer un análisis completo y mostrar información de las estadísticas en " "columnas extras.\n" -"(Mas lento que una comparación binara, mucho mas lento para archivos binarios.)" +"(Mas lento que una comparación binara, mucho mas lento para archivos " +"binarios.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Validar la fecha de modificación (inseguro)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" -"Asumir que los archivos son iguales si la fecha de modificación y la longitud " -"del archivos son iguales.\n" +"Asumir que los archivos son iguales si la fecha de modificación y la " +"longitud del archivos son iguales.\n" "Útil para directorios grandes y redes lentas." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Asumir que los archivos son iguales si la fecha de modificación y la " +"longitud del archivos son iguales.\n" +"Útil para directorios grandes y redes lentas." + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Validar el tamaño (inseguro)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -2026,11 +2077,11 @@ msgstr "" "Útil para directorios grandes y redes lentas cuando la fecha se modifica " "durante la descarga." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Sincronizar directorios" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -2040,23 +2091,24 @@ msgstr "" "ambios directorios sean después el mismo.\n" "Sólo funciona cuando se compara dos directorios sin especificar un destino." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Las diferencias de espacios en blanco se consideran igual" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -"Si el archivo se diferencia sólo por espacios en blanco, considerarlo igual.\n" +"Si el archivo se diferencia sólo por espacios en blanco, considerarlo " +"igual.\n" "Esto sólamente está activo cuando se elije análisis completo." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Copiar el mas nuevo en vez de fusionar (inseguro)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2066,11 +2118,11 @@ msgstr "" "(¡Utilice esto sólo si sabe qué está haciendo!)\n" "Sólo es efectivo cuando se compara dos directorios." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Archivos de copias de seguridad (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2078,15 +2130,15 @@ msgstr "" "Cuando un archivo se graba sobre otro mas antiguo, el archivo antiguo\n" "se renombrará con extensión '.orig' en vez de ser borrado." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Configuraciones regionales" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Idioma (requiere reiniciar)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2094,11 +2146,11 @@ msgstr "" "Elija el idioma para las cadenas de la interfaz o «Auto».\n" "Para que ocurra el cambio de lenguaje, salga y reinicie KDiff3." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Usar la misma codificación para todo:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." @@ -2107,49 +2159,49 @@ msgstr "" "primera.\n" "Desactivar esto si se necesitan configuración individuales diferentes." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Nota: Codificación local es" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "Codificación de archivo para A:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" "Si está activada la codificación Unicode (UTF-16 ó UTF-8) se detectará.\n" "Sino se detecta la codificación del archivo se utilizará la codificación " "seleccionada como alternativa.\n" -"(La detección Unicode depende de los primeros bytes de un archivo - la marca de " -"orden de byte «BOM»)." +"(La detección Unicode depende de los primeros bytes de un archivo - la marca " +"de orden de byte «BOM»)." -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "Detección automática de Unicode" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "Codificación de archivo para B:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "Codificación de archivo para C:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Codificación de archivo para la salida de la fusión y guardar:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "Selección automática" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " @@ -2159,15 +2211,15 @@ msgstr "" "En los casos dudosos un diálogo pedirá al usuario que elija la codificación " "para el guardado." -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Codificación de archivo para los archivos del preprocesador:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Lenguaje de derecha a izquierda" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2175,31 +2227,51 @@ msgstr "" "Algunos lenguajes se leen de derecha a izquierda.\n" "Esta configuración cambiará el visor y el editor adaptándolo." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "Integración" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "Preferencias de integración" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "Opciones de la línea de órdenes que se ignorarán:" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" "Several values can be specified if separated via ';'\n" "This will suppress the \"Unknown option\"-error." msgstr "" -"Lista de las opciones de la línea de órdenes que se ignorarán cuando KDiff3 se " -"utiliza con otras herramientas.\n" +"Lista de las opciones de la línea de órdenes que se ignorarán cuando KDiff3 " +"se utiliza con otras herramientas.\n" "Se pueden especificar varios valores separados por «;»\n" "Eliminará el error «Error desconocido»." -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2215,19 +2287,19 @@ msgstr "" "\n" "¿Desea continuar o desea seleccionar otra fuente?" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Fuente incompatible" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Continuar bajo nuestro riesgo" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Seleccionar otra fuente" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "Esto reestablece todas las opciones. No sólo las de tema actual." @@ -2236,8 +2308,7 @@ msgid "PreprocessorCmd: " msgstr "Orden del preprocesador: " #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" "La(s) siguiente(s) opcion(es) que ha seleccionado pueden cambiar datos:\n" @@ -2305,17 +2376,11 @@ msgstr "" "Todos los archivos de entrada contienen el mismo texto, pero no son " "binariamente iguales." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Los archivos %1 y %2 son binariamente iguales.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -"Los archivos %1 y %2 tienen el mismo texto, pero no son binariamente iguales. \n" +"Los archivos %1 y %2 tienen el mismo texto, pero no son binariamente " +"iguales. \n" #: pdiff.cpp:530 msgid "" @@ -2327,109 +2392,56 @@ msgstr "" "Tenga en cuenta que la fusión de KDiff3 no se creó para datos binarios.\n" "Continúe bajo su propia cuenta." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Abandonar" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Abriendo archivos..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Error al abrir el archivo" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Cortando selección..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Copiando la selección al portapapeles..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Insertando el contenido del portapapeles..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Guardar y continuar" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Continuar sin guardar" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Búsqueda completada." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Búsqueda completada" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -"No hay nada seleccionado en ninguna de las ventanas de entradas de diferencias." +"No hay nada seleccionado en ninguna de las ventanas de entradas de " +"diferencias." -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "Error al añadir un rango de diferencia manual" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Configurar KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Directorio" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Elemento actual de operación de fusión" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Elemento actual de operación de sincronización" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Movimiento" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "D&iffview" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Fusionar" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Ventana" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (Base):" @@ -2472,6 +2484,10 @@ msgstr "Salida (opcional):" msgid "Configure..." msgstr "Configurar..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Buscar texto:" @@ -2511,8 +2527,8 @@ msgstr "Ejemplo de línea de fusión automática:" #: smalldialogs.cpp:407 msgid "For auto merge test copy a line as used in your files." msgstr "" -"Para la copia de una prueba de fusión automática tal y como se utiliza en sus " -"archivos." +"Para la copia de una prueba de fusión automática tal y como se utiliza en " +"sus archivos." #: smalldialogs.cpp:413 smalldialogs.cpp:442 smalldialogs.cpp:479 msgid "Match result:" @@ -2528,7 +2544,8 @@ msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -"Copia una línea de inicio de historial tal y como se utiliza en sus archivos,\n" +"Copia una línea de inicio de historial tal y como se utiliza en sus " +"archivos,\n" "incluyendo los comentarios importantes." #: smalldialogs.cpp:461 @@ -2546,14 +2563,22 @@ msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -"Copia una línea de inicio de la entrada del historial tal y como se utiliza en " -"sus archivos,\n" +"Copia una línea de inicio de la entrada del historial tal y como se utiliza " +"en sus archivos,\n" "pero omite los comentarios importantes." #: smalldialogs.cpp:486 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." @@ -2566,3 +2591,85 @@ msgstr "Coincidencia fallida." msgid "Opening and closing parentheses don't match in regular expression." msgstr "" "Apertura y cierre de paréntesis que no coinciden en la expresión regular." + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Directorio" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Elemento actual de operación de fusión" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Elemento actual de operación de sincronización" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Movimiento" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "D&iffview" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Fusionar" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Ventana" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Los archivos A y B son binariamente iguales.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Los archivos A y C son binariamente iguales.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Los archivos A y C tiene el mismo texto. \n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Los archivos B y C son binariamente iguales.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Los archivos B y C tiene el mismo texto. \n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Conservar retorno de carro" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Mostrar carácteres de retorno de caro '\\r' si existen.\n" +#~ "Ayuda a comparar archivos que fueron modificados bajo diferentes sistemas " +#~ "operativos." diff --git a/po/et.po b/po/et.po index 62f56cb..4100731 100644 --- a/po/et.po +++ b/po/et.po @@ -5,36 +5,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2006-12-07 00:29+0300\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" +"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.0.2\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Marek Laane" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "bald@starman.ee" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Lõikepuhvri andmete kirjutamine ajutisse faili ebaõnnestus." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Lõikepuhvrist" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -48,7 +49,7 @@ msgstr "" "\n" "Praegu lülitatakse eeltöötluse käsu rakendamine välja." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -62,7 +63,7 @@ msgstr "" "\n" "Praegu lülitatakse reasobivuse eeltöötluse käsu rakendamine välja." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -70,15 +71,15 @@ msgstr "" "Andmekaotuse viga:\n" "Kui see on korratav, võta palun ühendust autoriga.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Tõsine seesmine viga" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "Ülarida" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Lõpp" @@ -94,244 +95,248 @@ msgstr "Viit: " msgid "Size. " msgstr "Suurus. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Kuupäev ja suurus: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "%1 ajutise koopia loomine ebaõnnestus-" -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "%1 avamine ebaõnnestus." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Faili võrdlemine..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Viga %1 lugemisel" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Nimi" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Operatsioon" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Staatus" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Lahendamata" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Lahendatud" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Mitte-tühimärk" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Tühimärk" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -"Sul on parajasti käsil kataloogi ühendamine. Kas tõesti ühendamine katkestada " -"ja kataloog uuesti läbi uurida?" +"Sul on parajasti käsil kataloogi ühendamine. Kas tõesti ühendamine " +"katkestada ja kataloog uuesti läbi uurida?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Jätka ühendamist" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Kataloogide avamine ebaõnnestus:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Kataloogi A \"%1\" ei ole olemas või ei ole see kataloog.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Kataloogi A \"%1\" ei ole olemas või ei ole see kataloog.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Kataloogi B \"%1\" ei ole olemas või ei ole see kataloog.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Kataloogi B \"%1\" ei ole olemas või ei ole see kataloog.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Kataloogi C \"%1\" ei ole olemas või ei ole see kataloog.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Kataloogi C \"%1\" ei ole olemas või ei ole see kataloog.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Kataloogi avamise viga" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "Sihtkataloog ei saa kolme kataloogi ühendamisel olla sama, mis A või B.\n" "Kontrolli seda asja enne jätkamist." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Parameetri hoiatus" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Kataloogide läbiuurimine..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Kataloogi A lugemine" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Kataloogi B lugemine" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Kataloogi C lugemine" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Mõned alamkataloogid ei olnud loetavad:" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Kontrolli alamkataloogide õigusi." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Valmis." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Kataloogi võrdlemise olek" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Alamkataloogide arv:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Võrdsete failide arv:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Erinevate failide arv:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Käsitsiühendamiste arv:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "See mõjutab kõiki ühendamisoperatsioone." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Kõigi ühendamisoperatsioonide muutmine" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Jätka" -#: directorymergewindow.cpp:1169 +#: 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 " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Veel tegemata." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Kopeeri A->B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Kopeeri B->A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Kustuta A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Kustuta B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Kustuta A ja B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Ühenda A-sse" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Ühenda B-sse" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Ühenda A-sse ja B-sse" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Kustuta (kui on olemas)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Ühenda" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Ühenda (käsitsi)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Viga: failitüüpide vastuolu" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Viga: kuupäevad on samad, aga mitte failid." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "See operatsioon ei ole praegu võimalik." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Operatsioon ei ole võimalik" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -345,42 +350,47 @@ msgstr "" "\n" "Kui sa tead, kuidas seda korrata, anna sellest teada rakenduse autorile." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Rakenduse viga" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Kopeerimisel tekkis viga.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Kopeerimisel tekkis viga.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Viga." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Tehtud." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Ei salvestatud." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Tundmatu ühendamisoperatsioon. (Seda ei peaks kunagi ette tulema!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Tundmatu ühendamisoperatsioon." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -393,333 +403,337 @@ msgid "" msgstr "" "Kohe algab ühendamine.\n" "\n" -"Vali \"Tee seda\", kui oled lugenud juhiseid ja tead täpselt, mida ette võtad.\n" +"Vali \"Tee seda\", kui oled lugenud juhiseid ja tead täpselt, mida ette " +"võtad.\n" "Vali \"Simuleeri\", kui soovid näha, mis juhtub.\n" "\n" "Arvesta, et rakendus on endiselt arendusjärgus ja pole MINGIT GARANTIID, et " "üldse midagi juhtub või et kõik õigesti juhtub! Tee kindlasti tähtsatest " "andmetest varukoopia!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Ühendamise alustamine" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Tee ära" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Simuleeri" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -"Esiletõstetud element on erinevates kataloogides erineva tüübiga. Otsusta, mida " -"teha." +"Esiletõstetud element on erinevates kataloogides erineva tüübiga. Otsusta, " +"mida teha." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" "Failide muutmise aeg on sama, aga failid ise mitte. Otsusta, mida teha." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" "See operatsioon ei ole praegu võimalik, sest käib kataloogide ühendamine." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Viimasel sammul tekkis viga.\n" "Kas soovid jätkata elemendiga, mis vea põhjustas, või selle vahele jätta?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Jätka ühendamist pärast viga" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Jätka viimase elemendiga" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Jäta vahele" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Vahele jäetud." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "Töös..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Ühendamisoperatsioon lõpetatud." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Ühendamine lõpetatud" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -"Ühendamise simulatsioon lõpetatud: märgi, kui oled pakutavate operatsioonidega " -"nõus." +"Ühendamise simulatsioon lõpetatud: märgi, kui oled pakutavate " +"operatsioonidega nõus." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Tekkis viga. Lähema info saamiseks klõpsa 'OK'.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Tekkis viga. Lähema info saamiseks klõpsa 'OK'.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Viga %1 kustutamisel: varukoopia loomine ebaõnnestus." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "kustuta kataloog rekursiivselt( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "kustuta( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Viga: kataloogi kustutamine ebaõnnestus juba kataloogi lugemise katsel." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Viga: operatsioon rmdir( %1 ) ebaõnnestus." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Viga: kustutamisoperatsioon ebaõnnestus." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "käsitsi ühendamine( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " Märkus: pärast käsitsi ühendamist tuleks jätkata klahviga F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Viga: kopeeri( %1 -> %2) ebaõnnestus, sest olemasoleva sihtkoha kustutamine " "ebaõnnestus." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "kopeeri viit( %1 -> %2)" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Viga: viida kopeerimine ebaõnnestus, sest kaugviidad ei ole veel toetatud." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Viga: viida kopeerimine ebaõnnestus." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "kopeeri( %1 -> %2)" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -"Viga operatsioonil 'nimeta ümber( %1 -> %2)': olemasoleva sihtkoha kustutamine " -"ebaõnnestus." +"Viga operatsioonil 'nimeta ümber( %1 -> %2)': olemasoleva sihtkoha " +"kustutamine ebaõnnestus." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "nimeta ümber( %1 -> %2)" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Viga: ümbernimetamine ebaõnnestus." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Viga kataloogi %1 loomisel: olemasoleva faili kustutamine ebaõnnestus." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "loo kataloog( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Viga kataloogi loomisel." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Sihtkoht" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Kataloog" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Tüüp" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Suurus" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Atribuut" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Viimase muutmise aeg" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Viit-sihtkoht" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Fail..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "pole kättesaadav" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (sihtkoht): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (baas): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (sihtkoht): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (sihtkoht): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Sihtkoht: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "Kataloogi ühendamisoleku salvestamine..." -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Alusta/jätka kataloogi ühendamist" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Käivita operatsioon käesoleva elemendiga" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Võrdle valitud faili" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Ühenda praegune fail" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Ava kõik alamkataloogid" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Sule kõik alamkataloogid" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Vali A kõigile elementidele" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Vali B kõigile elementidele" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Vali C kõigile elementidele" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Automaatne valik kõigile elementidele" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Ei ühtki operatsiooni kõigile elementidele" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "Näita identseid faile" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "Näita erinevaid faile" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "Näita ainult A faile" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "Näita ainult B faile" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "Näita ainult C faile" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "Võrdle valitud faile" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "Ühenda valitud failid" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Ära tee midagi" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Kustuta A ja B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Ühenda A-sse ja B-sse" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " @@ -727,7 +741,7 @@ msgstr "" "Varukoopia tegemisel ebaõnnestus vanema varukoopia kustutamine. \n" "Faili nimi: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -735,427 +749,441 @@ msgstr "" "Varukoopia tegemisel ebaõnnestus ümbernimetamine. \n" "Failide nimed: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Faili staatuse hankimine: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Faili lugemine: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Faili kirjutamine: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Mälu napib" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Kataloogi loomine: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Kataloogi eemaldamine: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Faili eemaldamine: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Nimeviida loomine: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Faili ümbernimetamine: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Faili kopeerimine: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" "Viga faili kopeerimise operatsioonil: faili avamine lugemiseks ebaõnnestus. " "Failinimi: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -"Viga faili kopeerimise operatsioonil: faili avamine kirjutamiseks ebaõnnestus. " -"Failinimi: %1" +"Viga faili kopeerimise operatsioonil: faili avamine kirjutamiseks " +"ebaõnnestus. Failinimi: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" "Viga faili kopeerimise operatsioonil: lugemine ebaõnnestus. Failinimi: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" "Viga faili kopeerimise operatsioonil: kirjutamine ebaõnnestus. Failinimi: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Kataloogi lugemine: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Kataloogi uurimine: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "Aktiivne seadistus:" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "Seadistusvõtme viga:" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Kasutati võtit --atuo, kuid väljundfail pole määratud." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Kataloogide võrdlemisel ignoreeriti võtit --auto." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Salvestamine ebaõnnestus." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Nende failide avamine ebaõnnestus:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Viga faili avamisel" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Avab dokumendid võrdlemiseks..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Salvestab ühendamise tulemuse. Kõik konfliktid peavad olema lahendatud!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Salvestab käesoleva dokumendi nimega..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "Trükib erinevused" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Väljub rakendusest" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Valitud teksti lõikamine ja asetamine lõikepuhvrisse" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Kopeerib valitud lõigu lõikepuhvrisse" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Lõikepuhvri sisu asetamine praegusesse asukohta" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "Kogu aktiivse akna sisu valimine" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Otsib stringi" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Otsib uuesti stringi" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Lülitab tööriistariba sisse/välja" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Lülitab staatusriba sisse/välja" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "KDiff3 seadistamine..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Liigu praegusele erinevusele" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Liigu esimesele erinevusele" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Liigu viimasele erinevusele" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Jätab tühimärkide erinevused vahele, kui \"Tühimärkide näitamine\" ei ole " "sees.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -"(Tühimärkide erinevusi näidatakse isegi siis, kui \"Tühimärkide näitamine\" ei " -"ole sees.)" +"(Tühimärkide erinevusi näidatakse isegi siis, kui \"Tühimärkide näitamine\" " +"ei ole sees.)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Liigu eelmisele erinevusele" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Liigu järgmisele erinevusele" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Liigu eelmisele konfliktile" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Liigu järgmisele konfliktile" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Liigu eelmisele lahendamata konfliktile" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Liigu järgmisele lahendamata konfliktile" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Vali rida/read A-st" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Vali rida/read B-st" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Vali rida/read C-st" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Pärast allikavalikut liigu automaatselt järgmisele lahendamata konfliktile" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Näita erinevusi tühiku- ja tabeldusmärkides" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Näita tühimärke" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Näita reanumbreid" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Vali A kõikjal" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Vali B kõikjal" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Vali C kõikjal" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Vali A kõigi lahendamata konfliktide korral" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Vali B kõigi lahendamata konfliktide korral" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Vali C kõigi lahendamata konfliktide korral" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Vali A kõigi lahendamata tühimärgikonkfliktide korral" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Vali B kõigi lahendamata tühimärgikonkfliktide korral" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Vali C kõigi lahendamata tühimärgikonkfliktide korral" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Lahenda automaatselt lihtsad konfliktid" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Määra erinevused konfliktideks" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "Käivita regulaaravaldis automaatühendamisel" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "Lahenda automaatselt ajalookonfliktid" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "Jaga erinevused valiku juures" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "Ühenda valitud erinevused" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Näita akent A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Näita akent B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Näita akent C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Fokuseeri järgmisele aknale" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Normaalne ülevaade" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "A-B ülevaade" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "A-C ülevaade" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "B-C ülevaade" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Reamurdmine võrdlusakendes" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "Lisa käsitsi samasus" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "Eemalda kõik käsitsi määratud samasused" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Fokuseeri eelmisele aknale" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Lülita poolitamissuund" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Kataloogi ja teksti poolitamisvaade" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Lülita kataloogi- ja tekstivaadet" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Ühendamise tulemust pole salvestatud." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Salvesta ja välju" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Välju salvestamata" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Ühendamise tulemuse salvestamine ebaõnnestus." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 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:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Faili salvestamine..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Faili salvestamine uue nimega..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "Trükkimine..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "Trükkimine katkestati" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Valik" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "Trükkimine lõpetatud." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Väljumine..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Tööriistariba lülitamine..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Olekuriba lülitamine..." @@ -1170,11 +1198,12 @@ msgstr "KDiff3 komponent" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "KDiff3 komponenti ei õnnestunud leida!\n" -"Tavaliselt tähendab see paigaldusprobleemi. Palun loe lähtepaketi faili README." +"Tavaliselt tähendab see paigaldusprobleemi. Palun loe lähtepaketi faili " +"README." #: main.cpp:35 msgid "Tool for Comparison and Merge of Files and Directories" @@ -1253,20 +1282,20 @@ msgstr "avatav fail3" msgid "Ignored. (User defined.)" msgstr "Ignoreeritakse (kasutaja määratud)" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -"+ palju tänu kõigile, kes andsid teada vigadest ja pakkusid välja uusi mõtteid!" +"+ palju tänu kõigile, kes andsid teada vigadest ja pakkusid välja uusi " +"mõtteid!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Lahendamata konfliktide arv: %1 (neist %2 on tühimärgierinevused)" @@ -1278,55 +1307,30 @@ msgstr "" "Väljundit on muudetud.\n" "Kui jätkad, lähevad sinu muudatused kaotsi." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Kõik sisendfailid on binaarselt võrdsed." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Kõik sisendfailid sisaldavad ühesugust teksti." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Failid A ja B on binaarselt võrdsed.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Failid A ja B on ühesuguse tekstiga. \n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Failid A ja C on binaarselt võrdsed.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Failid A ja C on ühesuguse tekstiga. \n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Failid %1 ja %2 on binaarselt võrdsed.\n" -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Failid B ja C on binaarselt võrdsed.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Failid A ja B on ühesuguse tekstiga. \n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Failid B ja C on ühesuguse tekstiga. \n" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Konfliktide koguarv: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1334,7 +1338,7 @@ msgstr "" "\n" "Automaatselt lahendatud konfliktide arv: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1342,23 +1346,23 @@ msgstr "" "\n" "Lahendamata konfliktide arv: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Konfliktid" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "<Ühendamise konflikt (ainult tühimärgid)>" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "<Ühendamise konflikt>" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1366,11 +1370,11 @@ msgstr "" "Kõik konfliktid pole veel lahendatud.\n" "Faili ei salvestatud.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Järelejäänud konfliktid" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1380,28 +1384,28 @@ msgstr "" "\n" "Varukoopia loomine ebaõnnestus. Faili ei salvestatud." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Faili salvestamise viga" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Kirjutamise viga." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Väljund" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Muudetud]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "Kodeering salvestamisel" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "Koodek" @@ -1421,6 +1425,15 @@ 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" @@ -1502,7 +1515,8 @@ msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -"Seda värvi muudetakse alles siis, kui alustad järgmist kataloogide võrdlemist." +"Seda värvi muudetakse alles siis, kui alustad järgmist kataloogide " +"võrdlemist." #: optiondialog.cpp:644 msgid "Oldest file color:" @@ -1545,10 +1559,8 @@ msgid "Auto indentation" msgstr "Automaatne taandus" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"Sees: uuel real kasutatakse eelmise rea taandust.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "Sees: uuel real kasutatakse eelmise rea taandust.\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1582,61 +1594,54 @@ msgstr "ERinevused" msgid "Diff Settings" msgstr "Erinevuse seadistused" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Säilitatakse reavahetus" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Näidatakse kelgutagastusmärke '\\r', kui neid on.\n" -"See on abiks erinevatest operatsioonisüsteemidest pärit failide võrdlemisel." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "C/C++ kommentaare käsitletakse tühimärkidena." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Numbreid ignoreeritakse" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "Reasobivuse juures ignoreeritakse numbreid (sarnane tühimärkide " "ignoreerimisega).\n" "Võib olla abiks numbrilisi andmeid sisaldavate failide võrdlemisel." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "C/C++ kommentaare ignoreeritakse" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "C/C++ kommentaare käsitletakse tühimärkidena." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Tõstu ignoreeritakse" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Tõstuerinevusi käsitletakse tühimärgimuutustena. ('a'<=>'A')" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Eeltöötluse käsk" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "Kasutaja määratud eeltöötlus (vaata lähemalt käsiraamatust)." -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Ridade sobivuse eeltöötluse käsk:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1644,11 +1649,11 @@ msgstr "" "Seda eeltöötlusvahendit kasutatakse ainult ridade sobivuse leidmisel\n" "(vaata lähemalt käsiraamatust)." -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Karm uurimine (aeglane)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1656,11 +1661,15 @@ msgstr "" "Lubab välise diff-rakenduse korral võtme --minimal.\n" "Suurte failide analüüs muutub palju aeglasemaks." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "Ühendamise seadistused" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Automaatse edasiliikumise viivitus (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" @@ -1668,39 +1677,35 @@ msgstr "" "Automaatse edasiliikumise režiimis näidatakse tulemust määratud aeg ning \n" "siis hüpatakse järgmisele konfliktile. Vahemik: 0-2000 ms" -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "Ühendamise seadistused" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Tühimärkide käsitlemine kahe faili ühendamisel:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Käsitsivalik" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" "Lubab ühendamisalgoritmil ainult tühimärkides seisneva erinevuse korral " "automaatselt valida sisendi." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Tühimärkide käsitlemine kolme faili ühendamisel:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "Automaatühendamise regulaaravaldis" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "Automaatühendamise regulaaravaldis:" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1711,12 +1716,12 @@ msgstr "" "Kui konflikti sisaldav rida sobib regulaaravaldisega, siis\n" "valitakse - kui võimalik - C, vastasel juhul B." -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" "Regulaarühendusega automaatühendamise käivitamine ühendamise alustamisel" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" @@ -1724,15 +1729,15 @@ msgstr "" "Regulaarühendusega automaatühendamine käivitatakse\n" "kohe ühendamise alustamisel.\n" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "Versioonikonrolli ajaloo ühendamine" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "Ajaloo alguse regulaaravaldis:" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" @@ -1742,39 +1747,41 @@ msgstr "" "Tavaliselt leidub seal real võtmesõna \"$Log$\".\n" "Vaikimisi: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "Ajaloo kirje alguse regulaaravaldis:" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" "Versioonikontrolli ajaloo kirje koosneb mitmest reast.\n" "Siin saab määrata esimese rea (ilma alustava kommentaarita) tuvastamiseks " "mõeldud regulaaravaldise.\n" "Sulgudega saab rühmitada võtmeid, mida tahad kasutada sortimiseks.\n" -"Kui see tühjaks jätta, eeldab KDiff3, et ajaloo kirjeid eraldavad tühjad read.\n" +"Kui see tühjaks jätta, eeldab KDiff3, et ajaloo kirjeid eraldavad tühjad " +"read.\n" "Täpsemalt räägib sellest käsiraamat." -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "Ajaloo ühendamise sortimine" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "Versioonikontrolli ajaloo sortimine võtmete järgi." -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "Ajaloo sortimisvõtmete järjekord:" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1790,25 +1797,34 @@ msgstr "" "Kui see tühjaks jätta, siis midagi ei sordita.\n" "Täpsemalt räägib sellest käsiraamat." -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "Versioonikontrolli ajaloo ühendamine ühendamise alustamisel" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" "Versioonikontrolli ajaloo automaatühendamise käivitamine kohe ühendamise " "alustamisel." -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Alamkataloogide arv:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "Regulaaravaldiste test" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "Ebaolulise ühendamise käsk:" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" @@ -1818,23 +1834,35 @@ msgstr "" "pärast automaatühendamist, kui muid muudatusi ei avastada.\n" "See kutsutakse välja parameetritega: failinimi1 failinimi2 failinimi3" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Kataloogi ühendamine" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Rekursiivsed kataloogid" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Kas analüüsida alamkatalooge või mitte." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Failimustrid:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1844,11 +1872,11 @@ msgstr "" "Metamärgid: '*' ja '?'\n" "Mitme mustri määramisel kasuta eraldajana semikoolonit (;)" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Anti-failimustrid:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1858,11 +1886,11 @@ msgstr "" "Metamärgid: '*' ja '?'\n" "Mitme mustri määramisel kasuta eraldajana semikoolonit (;)" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Anti-kataloogimustrid:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1872,11 +1900,11 @@ msgstr "" "Metamärgid: '*' ja '?'\n" "Mitme mustri määramisel kasuta eraldajana semikoolonit (;)" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr ".cvsignore kasutamine" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1884,23 +1912,23 @@ msgstr "" "Laiendab antimustrit kõigele, mida eiraks CVS.\n" "Kohalike \".cvsignore\" failide abil võib see olla kataloogipõhine." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Peidetud failide ja kataloogide otsimine" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Otsitakse peidetud faile ja katalooge." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Failide ja kataloogide otsimine, mille alguses seisab '.'." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Failiviitade järgimine" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1908,11 +1936,11 @@ msgstr "" "Sees: võrreldakse faili, mille viit osutab.\n" "Väljas: võrreldakse viitu." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Kataloogiviitade järgimine" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1920,11 +1948,11 @@ msgstr "" "Sees: võrreldakse kataloogi, mille viit osutab.\n" "Väljas: võrreldakse viitu." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "Tõstutundlik failinimede võrdlemine" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1935,23 +1963,23 @@ msgstr "" "Selle valiku sisselülitamisel peab sobima ka nimede tähesuurus (Windowsis on " "see vaikimisi välja lülitatud, muidu sees)." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Faili võrdlemise režiim" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Binaarvõrdlus" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Iga faili binaarvõrdlus. (vaikimisi)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Täielik analüüs" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1959,25 +1987,47 @@ msgstr "" "Tehakse täielik analüüs, statistikat näidatakse lisaveergudes.\n" "(Aeglasem kui binaarvõrdlus ja eriti aeglane binaarfailide korral.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Muutmiskuupäeva usaldamine (ebaturvaline)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" "Eeldatakse, et failid on võrdsed, kui muutmiskuupäev ja failipikkus on " "võrdsed.\n" "Mõttekas suurte kataloogide või aeglase võrgu korral." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Eeldatakse, et failid on võrdsed, kui muutmiskuupäev ja failipikkus on " +"võrdsed.\n" +"Mõttekas suurte kataloogide või aeglase võrgu korral." + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Suuruse usaldamine (ebaturvaline)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -1987,11 +2037,11 @@ msgstr "" "Mõttekas suurte kataloogide või aeglase võrgu korral, kui kuupäev võib " "allalaadimise käigus olla muutunud." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Kataloogide sünkroniseerimine" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -2001,11 +2051,11 @@ msgstr "" "nii et need näevad pärast seda välja ühesugused.\n" "Toimib ainult kahe kataloogi võrdlemisel ilma sihtkohta määramata." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Tühimärkide erinevust ei arvestata" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -2013,11 +2063,11 @@ msgstr "" "Kui failid erinevad ainult tühimärkide poolest, peetakse neid võrdseks.\n" "See valik on aktiivne ainult täieliku analüüsi korral." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Ühendamise asemel kopeeritakse uuem (ebaturvaline)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2027,11 +2077,11 @@ msgstr "" "(Kasuta ainult siis, kui tead, mida teed!)\n" "Toimib ainult kahe kataloogi võrdlemisel." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Failidest tehakse varukoopia (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2039,15 +2089,15 @@ msgstr "" "Kui fail salvestatakse vana faili asemele, ei kustutata vana faili,\n" "vaid sellele antakse uus nimi laiendiga '.orig'." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Lokaale seadistused" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Keel (vajalik taaskäivitus)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2055,11 +2105,11 @@ msgstr "" "Vali GUI stringide keel või \"Auto\".\n" "Keele tegelikuks muutmiseks tuleb KDiff3 sulgeda ja uuesti käivitada." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Kõikjal kasutatakse kodeeringut:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." @@ -2067,21 +2117,21 @@ msgstr "" "Lubab muuta kõiki kodeeringuid ainult esimest kodeeringut muutes.\n" "Kui vaja on erinevaid määratlusi, lülita välja." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Märkus: kohalik kodeering on " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "A kodeering:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" "Sisselülitamisel tuvastatakse Unicode (UTF-16 või UTF-8) kodeering.\n" "Kui faili kodeeringut ei tuvastata, kasutatakse selle asemel valitud " @@ -2089,27 +2139,27 @@ msgstr "" "(Unicode tuvastamine sõltub faili esimestest baitidest - baidijärjrekorra " "tähisest \"BOM\".)" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "Unicode automaatne tuvastamine" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "B kodeering:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "C kodeering:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Kodeering ühendamisväljundil ja salvestamisel:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "Automaatne valik" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " @@ -2119,15 +2169,15 @@ msgstr "" "Kahtluse korral ilmub dialoog, mis laseb kasutajal valida salvestamisel " "kasutatava kodeeringu." -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Eelprotsessori failide kodeering:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Paremalt-vasakule keeled" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2135,19 +2185,19 @@ msgstr "" "Mõningaid keeli loetakse ja kirjutatakse paremalt vasakule.\n" "Selle valikuga saab vastavalt muuta näitajat ja redaktorit." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "Integreerimine" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "Integreerimisseadistused" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "Ignoreeritavad käsurea võtmed:" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2159,7 +2209,27 @@ msgstr "" "Mitme väärtuse andmisel tuleb need eraldada semikooloniga (;).\n" "See väldib vigu \"Tundmatu võti\"." -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2175,19 +2245,19 @@ msgstr "" "\n" "Kas soovid jätkata või valid uue fondi?" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Sobimatu font" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Jätkan oma riskil" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Valin uue fondi" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "See lähtestab kõik valikud, mitte ainult praeguse teema omad." @@ -2196,10 +2266,8 @@ msgid "PreprocessorCmd: " msgstr "Eeltöötluse käsk: " #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"Järgmised valitud võimalused võivad muuta andmeid:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "Järgmised valitud võimalused võivad muuta andmeid:\n" #: pdiff.cpp:264 msgid "" @@ -2264,15 +2332,8 @@ msgid "All input files contain the same text, but are not binary equal." msgstr "" "Kõik sisendfailid sisaldavad ühesugust teksti, aga pole binaarselt võrdsed." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Failid %1 ja %2 on binaarselt võrdsed.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Failid %1 ja %2 sisaldavad ühesugust teksti, aga pole binaarselt võrdsed. \n" @@ -2286,108 +2347,54 @@ msgstr "" "Arvesta, et KDiff3 ühendamine ei ole mõeldud binaarfailidele.\n" "Jätka oma riskil." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Katkesta" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Failide avamine..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Viga faili avamisel" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Valitud teksti lõikamine..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Valitud teksti kopeerimine lõikepuhvrisse..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Lõikepuhvri sisu sisestamine..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Salvesta ja jätka" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Jätka salvestamata" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Otsing lõpetatud." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Otsing lõpetatud" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "Erinevuste sisendakendes pole midagi valitud." -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "Viga käsitsi määratud samasuse vahemiku lisamisel" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "KDiff&3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "KDiff3 seadistamine" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Kataloog" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Käesoleva elemendi ühendamisoperatsioon" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Käesoleva elemendi sünkroniseerimisoperatsioon" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Liikumine" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "Võrdlus&evaade" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "Ü&hendamine" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "Ake&n" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (baas):" @@ -2430,6 +2437,10 @@ msgstr "Väljund (lisavõimalus):" msgid "Configure..." msgstr "Seadista..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Otsitav tekst:" @@ -2506,6 +2517,14 @@ 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." @@ -2517,3 +2536,85 @@ msgstr "Sobivust ei leitud." #: smalldialogs.cpp:559 msgid "Opening and closing parentheses don't match in regular expression." msgstr "Regulaaravaldises ei sobi alustavad ja lõpetavad sulud." + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "KDiff&3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Kataloog" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Käesoleva elemendi ühendamisoperatsioon" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Käesoleva elemendi sünkroniseerimisoperatsioon" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Liikumine" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "Võrdlus&evaade" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "Ü&hendamine" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "Ake&n" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Failid A ja B on binaarselt võrdsed.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Failid A ja C on binaarselt võrdsed.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Failid A ja C on ühesuguse tekstiga. \n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Failid B ja C on binaarselt võrdsed.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Failid B ja C on ühesuguse tekstiga. \n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Säilitatakse reavahetus" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Näidatakse kelgutagastusmärke '\\r', kui neid on.\n" +#~ "See on abiks erinevatest operatsioonisüsteemidest pärit failide " +#~ "võrdlemisel." diff --git a/po/fr.po b/po/fr.po index f799286..6fa3e78 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,37 +5,38 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+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" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Simon Depiets" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "2df@tuxfamily.org" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "" "L'écriture des données du presse-papiers vers un fichier temporaire a échoué." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Depuis le Presse-papiers" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -49,7 +50,7 @@ msgstr "" "\n" "La commande préprocesseur sera désactivée désormais." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -57,13 +58,14 @@ msgid "" "\n" "The line-matching-preprocessing command will be disabled now." msgstr "" -"Le préprocessus de comparaison de lignes a échoué. Vérifiez cette commande :\n" +"Le préprocessus de comparaison de lignes a échoué. Vérifiez cette " +"commande :\n" "\n" " %1\n" "\n" "Le préprocessus de comparaison de lignes sera désormais désactivé." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -71,16 +73,16 @@ msgstr "" "Données perdues :\n" "Si cela se reproduit, contactez l'auteur.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Erreur interne sévère" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Première Ligne %1" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Fin" @@ -96,245 +98,249 @@ msgstr "Lien : " msgid "Size. " msgstr "Taille. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Date et Taille : " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "La création de la copie temporaire de %1 a échoué." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "L'ouverture de %1 a échoué." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Comparaison du fichier..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Erreur de lecture de %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Nom" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Opération" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "État" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Non résolu" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Résolu" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Non blanc" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Blanc" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" "Vous procédez à une fusion. Confirmez-vous l'abandon de la fusion et le " "rafraîchissement du dossier ?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "La fusion continue" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "L'ouverture des dossiers a échoué :" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Le dossier A « %1 » n'existe pas ou n'est pas un dossier.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Le dossier A « %1 » n'existe pas ou n'est pas un dossier.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Le dossier B « %1 » n'existe pas ou n'est pas un dossier.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Le dossier B « %1 » n'existe pas ou n'est pas un dossier.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Le dossier B « %1 » n'existe pas ou n'est pas un dossier.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Le dossier B « %1 » n'existe pas ou n'est pas un dossier.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Erreur lors de l'ouverture du dossier" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "Le dossier de destination ne doit pas être le même que A ou B quand trois " "fichiers sont fusionnés.\n" "Vérifiez avant de continuer." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Avertissement pour les paramètres" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Scan des dossiers..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Lecture du dossier A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Lecture du dossier B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Lecture du dossier C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Certains sous-dossiers ne sont pas lisibles" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Vérifiez les permissions des sous-dossiers." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Prêt." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "État de la comparaison des dossiers." -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Nombre de sous-dossiers :" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Nombre de fichiers identiques :" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Nombre de fichiers différents :" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Nombre de fusions manuelles :" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Cela affecte toutes les opérations de fusion" -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Changement de toutes les opérations de fusion" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "C&ontinuer" -#: directorymergewindow.cpp:1169 +#: 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 " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "A faire." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Copier A vers B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Copier B vers A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Supprimer A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Supprimer B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Supprimer A et B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Fusionner vers A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Fusionner vers B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Fusionner vers A et B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Supprimer (si existant)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Fusion" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Fusion (Manuelle)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Erreur : conflit de types de fichiers" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Erreur : les dates sont les mêmes, mais pas les fichiers." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Cette opération n'est pas possible actuellement." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Opération impossible" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -348,42 +354,47 @@ msgstr "" "\n" "Si vous savez comment reproduire cela, veuillez contacter l'auteur." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Erreur du programme" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Une erreur est survenue lors de la copie.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Une erreur est survenue lors de la copie.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Erreur." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Fait." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Non enregistré." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Opération de fusion inconnue. (Ceci ne devrait jamais arriver !)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Opération de fusion inconnue." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -403,339 +414,343 @@ msgstr "" "Sachez que ce programme est toujours en phase bêta et qu'il n'y a AUCUNE " "GARANTIE en aucun cas ! Enregistrez vos données vitales !" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Lancement de la fusion" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Faire" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Simuler" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -"L'objet surligné a un format différent dans les différents dossiers. Choisissez " -"que faire." +"L'objet surligné a un format différent dans les différents dossiers. " +"Choisissez que faire." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" "Les dates de modification du fichier sont égales, mais pas les fichiers. " "Sélectionnez que faire." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -"Cette opération n'est actuellement pas possible car une fusion de dossiers est " -"en cours." +"Cette opération n'est actuellement pas possible car une fusion de dossiers " +"est en cours." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Il y a eu une erreur à la dernière étape.\n" "Voulez-vous continuer avec l'élément ayant causé l'erreur ou voulez-vous le " "sauter ?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Continuer la fusion après une erreur" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Continuer avec le dernier élément" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Sauter l'élément" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Elément sauté." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "En cours..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Opération de fusion complète." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Fusion complète." -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Simulation de fusion complète : vérifiez si vous êtes d'accord avec les " "opérations proposées." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" "Une erreur s'est produite. Appuyez sur OK pour les informations détaillées.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Erreur : durant la suppression de %1 : échec de la création de sauvegarde." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "supprimer le dossier récursivement (%1)" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "supprimer (%1)" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -"Erreur : échec de la suppression d'un dossier durant la tentative de lecture du " -"dossier." +"Erreur : échec de la suppression d'un dossier durant la tentative de lecture " +"du dossier." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Erreur : échec de la suppression du dossier (%1)" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Erreur : échec de l'opération de suppression." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "Fusion manuelle (%1, %2, %3 vers %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Note : après une fusion manuelle, l'utilisateur peut continuer avec F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Erreur : la copie de %1 vers %2 a échoué. La suppression de la destination " "existante a échoué." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "copier le lien (%1 vers %2)" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Erreur : la copie des liens à échoué : les liens distants ne sont pas encore " "gérés." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Erreur : échec de la copie du lien" -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "copie (%1 vers %2)" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Erreur lors du changement de nom du fichier (%1 vers %2) : impossible de " "supprimer la destination." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "changement de nom (%1 vers %2)" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Erreur : échec du changement de nom." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Erreur durant la création du dossier %1. Impossible de supprimer le fichier " "existant." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "Création du Dossier (%1)" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Erreur durant la création du dossier" -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Destination" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Dossier" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Taille" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Attributs" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Dernière modification" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Destination du lien" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Fichier..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "non disponible" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (Destination) : " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (Base) : " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (Destination) : " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (Destination) : " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Destination : " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Fusion de dossiers" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Commencer/Continuer la fusion des dossiers" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Lancer l'opération pour l'élément courant" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Comparer le fichier sélectionné" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Fusionner le fichier en cours" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Inclure tous les sous-dossiers" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Ne pas suivre les sous-dossiers" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Choisir A pour tous les éléments" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Choisir B pour tous les éléments" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Choisir C pour tous les éléments" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Choisir automatiquement l'opération pour tous les éléments" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Pas d'opérations pour tous les éléments" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Show Different Files" msgstr "Nombre de fichiers différents :" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Comparer le fichier sélectionné" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Comparer le fichier sélectionné" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Ne rien faire" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Supprimer A && B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Fusionner vers A && B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " @@ -744,7 +759,7 @@ msgstr "" "précédent a échoué.\n" "Nom du fichier :" -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -752,195 +767,203 @@ msgstr "" "Pendant le tentative d'enregistrement, le changement de nom a échoué.\n" "Noms des fichiers :" -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Recherche de l'état du fichier : %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Lecture du fichier : %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Écriture du fichier : %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Plus de mémoire" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Création du dossier : %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Suppression du dossier  %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Suppression du fichier : %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Création d'un lien symbolique : %1 vers %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Changement de nom du fichier : %1 vers %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Copie du fichier : %1 vers %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -"Erreur durant la copie : l'ouverture du fichier pour la lecture a échoué. Nom " -"du Fichier : %1" +"Erreur durant la copie : l'ouverture du fichier pour la lecture a échoué. " +"Nom du Fichier : %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -"Erreur durant la copie : l'ouverture du fichier pour l'écriture a échoué. Nom " -"du Fichier : %1" +"Erreur durant la copie : l'ouverture du fichier pour l'écriture a échoué. " +"Nom du Fichier : %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" -"Erreur durant la copie d'un fichier : échec de la lecture. Nom du fichier : %1" +"Erreur durant la copie d'un fichier : échec de la lecture. Nom du fichier : " +"%1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -"Erreur durant la copie d'un fichier : échec de l'écriture. Nom du fichier : %1" +"Erreur durant la copie d'un fichier : échec de l'écriture. Nom du fichier : " +"%1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Lecture du dossier : " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Listage du dossier : %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 #, fuzzy msgid "Current Configuration:" msgstr "Synchronisation de l'élément actuel" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "Erreur d'ouverture d'un Fichier" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Option --auto-utilisée, mais pas de fichier résultat spécifié." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Option --auto-ignorée pour la comparaison de dossiers." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Échec de l'enregistrement." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "L'ouverture de ces fichiers a échoué :" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Erreur d'ouverture d'un Fichier" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Ouvre les documents pour comparaison..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Enregistre le résultat de la fusion. Tous les conflits doivent être résolus !" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Enregistre le document courant sous..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Quitte l'application" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Coupe la sélection et la met dans le presse-papiers" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Copie la sélection vers le presse-papiers" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Colle le contenu du presse-papiers à la position actuelle" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Cherche un passage" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Cherche de nouveau le passage" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Active/désactive la barre d'outils" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Active/désactive la barre de état" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Configurer KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Aller à la différence actuelle" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Aller à la première différence" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Aller à la dernière différence" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -"(Saute les différences d'espaces lorsqu'\"Afficher les différences d'espaces\" " -"est désactivé.)" +"(Saute les différences d'espaces lorsqu'\"Afficher les différences d'espaces" +"\" est désactivé.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -948,237 +971,246 @@ msgstr "" "(Ne saute pas les différences d'espaces lorsqu'\"Afficher les espaces\" est " "désactivé.)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Aller à la prochaine différence" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Aller à la différence suivante" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Aller au conflit précédent" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Aller au conflit suivant" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Aller au conflit conflit non résolu précédent" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Aller au conflit non résolu suivant" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Sélectionner la source depuis A" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Sélectionner la source depuis B" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Sélectionner la source depuis C" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Aller automatiquement au conflit suivant après sélection de la source" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Montrer les espaces et les alinéas en tant que différences" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Montrer les espaces" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Montrer les numéros de Ligne" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Choisir A partout" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Choisir B Partout" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Choisir C Partout" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Choisir A pour tous les conflits non résolus" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Choisir B pour tous les conflits non résolus" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Choisir C pour tous les conflits non résolus" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Choisir A pour tous les conflits d'espaces non résolus" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Choisir B pour tous les conflits d'espaces non résolus" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Choisir C pour tous les conflits d'espaces non résolus" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Résoudre automatiquement les conflits simples" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Rendre les différences comme conflits" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Résoudre automatiquement les conflits simples" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 #, fuzzy msgid "Join Selected Diffs" msgstr "Comparer le fichier sélectionné" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Montrer la fenêtre A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Montrer la fenêtre B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Montrer la fenêtre C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "S'aligner sur la fenêtre suivante" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Aperçu normal" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "Aperçu A contre B" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "Aperçu A contre C" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "Aperçu B contre C" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Fenêtre de diff de la mise en page" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "S'aligner sur la fenêtre précédente" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Partage et cadrage de l'écran" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Vue partagée entre dossier et texte" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Inverser entre vue dossier et texte" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Le résultat de la fusion n'a pas été enregistré." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Enregistrer et Quitter" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Quitter sans enregistrer" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "L'enregistrement du résultat de la fusion a échoué." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -"Vous faites actuellement une fusion de dossiers. Voulez-vous vraiment annuler ?" +"Vous faites actuellement une fusion de dossiers. Voulez-vous vraiment " +"annuler ?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Enregistrement du fichier..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Enregistrement du fichier avec un nouveau nom..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "Fermeture..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 #, fuzzy msgid "Printing completed." msgstr "Opération de fusion complète." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Fermeture..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Cadrage de la barre d'outils..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Cadrage de la barre de état..." @@ -1193,12 +1225,12 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Impossible de trouver le fichier part !\n" -"Cela est dû la plupart du temps a un problème d'installation. Veuillez lire le " -"fichier README dans le paquetage source pour plus de détails." +"Cela est dû la plupart du temps a un problème d'installation. Veuillez lire " +"le fichier README dans le paquetage source pour plus de détails." #: main.cpp:35 msgid "Tool for Comparison and Merge of Files and Directories" @@ -1281,21 +1313,20 @@ msgstr "fichier 3 à ouvrir" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -"+ Beaucoup de remerciements à ceux qui ont rapporté des bogues et contriibué a " -"des idées !" +"+ Beaucoup de remerciements à ceux qui ont rapporté des bogues et contriibué " +"a des idées !" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Nombre de conflits non résolus restants : %1 (dont %2 sont des conflits " @@ -1309,55 +1340,31 @@ msgstr "" "Le résultat a été modifié.\n" "Si vous continuez, vos changement seront perdus." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Tous les fichiers d'entrées sont égaux binairement." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Tous les fichiers d'entrées contiennent le même texte." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Les fichiers A et B sont égaux binairement.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Les fichiers A et B ont le même texte.\n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Les fichiers A et C sont égaux binairement.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Les fichiers A et C ont le même texte.\n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Les fichiers B et C sont égaux binairement.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +#, fuzzy +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Les fichiers B et C sont égaux binairement.\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Les fichiers B et C ont le même texte.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Les fichiers A et B ont le même texte.\n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Nombre total de conflits : " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1365,7 +1372,7 @@ msgstr "" "\n" "Nombre de conflits résolus automatiquement : " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1373,23 +1380,23 @@ msgstr "" "\n" "Nombre de conflits non résolus : " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Conflits" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1397,11 +1404,11 @@ msgstr "" "Tous les conflits ne sont pas encore résolus.\n" "Fichier non enregistré.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Il reste des conflits" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1411,29 +1418,29 @@ msgstr "" "\n" "La création de la sauvegarde a échoué. Fichier non enregistré." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Erreur d'enregistrement du fichier" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Erreur durant l'écriture." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Sortie" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Modifié]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 #, fuzzy msgid "Encoding for saving" msgstr "Encodage du fichier pour C :" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1454,6 +1461,15 @@ 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" @@ -1579,8 +1595,7 @@ msgid "Auto indentation" msgstr "Indentation automatique" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" "Activé : l'indentation de la ligne précédente est utilisée pour une nouvelle " "ligne.\n" @@ -1594,7 +1609,8 @@ msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "" -"Activé : toute sélection sera automatiquement copiée vers le presse-papiers.\n" +"Activé : toute sélection sera automatiquement copiée vers le presse-" +"papiers.\n" "Désactivé : vous devrez copier explicitement l'élément (ex : via Ctrl+C)." #: optiondialog.cpp:709 @@ -1619,65 +1635,58 @@ msgstr "KDiff3" msgid "Diff Settings" msgstr "Options de diff et fusion" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Préserver des les retours à la ligne" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Montre les retours à la ligne « \\r » s'ils existent.\n" -"Aide à comparer les fichiers s'ils ont été modifiées sous des OS différents." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Traiter les commentaires C/C++ comme des espaces." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Ignorer les nombres" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "Ignorer les nombres durant une diff ou une fusion. (Similaire à ignorer les " "espaces).\n" "Peut vous aider à comparer les fichiers ayant des données numériques." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Ignorer les Commentaires C/C++" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Traiter les commentaires C/C++ comme des espaces." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Ignorer la case" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Traiter les différences de casse comme les changements d'espaces. (\"a\"<=>" "\"A\")" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Commande de précompilation :" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Précompilation définie par l'utilisateur. (Voir les documentations pour les " "détails)." -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Commande de précompilation sur la comparaison de lignes :" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1686,11 +1695,11 @@ msgstr "" "lignes.\n" "(Voir les documentations pour les détails)." -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Essayer avec moins de mémoire (plus lent)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1698,54 +1707,54 @@ msgstr "" "Active l'option -minimal pour une diff externe.\n" "L'analyse de gros fichiers sera plus lente." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Options de diff et fusion" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Délai d'avance automatique (en ms) :" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -"La durée, dans le mode Avancée automatique, ou le résultat de la sélection est " -"montré \n" -" pour la période spécifiée, avant d'aller au conflit suivant. Étendue : 0-2000 " -"ms" +"La durée, dans le mode Avancée automatique, ou le résultat de la sélection " +"est montré \n" +" pour la période spécifiée, avant d'aller au conflit suivant. Étendue : " +"0-2000 ms" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Options de diff et fusion" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Option par défaut pour les espaces lors de la fusion de 2 fichiers :" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Choix manuel" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -"Autoriser l'algorithme de fusion à sélectionner une entrée pour les changements " -"d'espaces seulement." +"Autoriser l'algorithme de fusion à sélectionner une entrée pour les " +"changements d'espaces seulement." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Option par défaut pour les espaces lors de la fusion de 3 fichiers :" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1753,58 +1762,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1814,46 +1824,67 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Nombre de sous-dossiers :" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Fusion de dossiers" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Fusionner les sous-dossiers" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Si vous voulez analyser les sous-dossiers ou non." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Formats acceptés :" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1863,11 +1894,11 @@ msgstr "" "Inconnues : « * » et «  ? » \n" "Les formats peuvent être spécifiés en utilisant le séparateur : « ; »" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Formats refusés(s) :" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1877,11 +1908,11 @@ msgstr "" "Inconnues : « * » et  « ? »\n" "Les formats peuvent être spécifiés en utilisant le séparateur : « ; »" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Formats de dossiers refusés :" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1891,35 +1922,36 @@ msgstr "" "Inconnues : « * » et « ? »\n" "Les formats peuvent être spécifiés en utilisant le séparateur : « ; »" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Utiliser .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" "Étendre l'exlusion de format à tout ce qui pourrait être ignoré par CVS.\n" -" Via un « .cvsignore »-files local, cela pourra être le dossier spécifiquement." +" Via un « .cvsignore »-files local, cela pourra être le dossier " +"spécifiquement." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Trouver les fichiers et les dossiers cachés" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Trouver les fichiers et dossiers ayant l'attribut « caché »." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Trouver les fichiers et dossiers commençant par « . »." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Trouver les fichiers liens" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1927,11 +1959,11 @@ msgstr "" "Activé : compare les fichiers derrières les liens.\n" "Désactivé : compare les liens." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Suivre les liens vers un dossier" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1939,11 +1971,11 @@ msgstr "" "Activé : compare les dossiers derrière les liens.\n" "Désactivé : compare les liens." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1951,80 +1983,102 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Mode de comparaison de fichiers" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Comparaison binaire" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Comparaison binaire de chaque fichier. (Par défaut)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Analyse complète" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -"Effectuer une analyse complète et afficher les informations statistiques dans " -"des colonnes supplémentaires.\n" +"Effectuer une analyse complète et afficher les informations statistiques " +"dans des colonnes supplémentaires.\n" "Cela est plus lent qu'une comparaison binaire, particulièrement pour les " "fichiers binaires." -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Se fier à la date de modification (peu sûr)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Dire que les fichiers sont égaux si la dernière date de modification et la " +"taille du fichier sont égales.\n" +"Utile pour les gros dossiers ou les réseaux lents." + +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" "Useful for big directories or slow networks." msgstr "" "Dire que les fichiers sont égaux si la dernière date de modification et la " "taille du fichier sont égales.\n" "Utile pour les gros dossiers ou les réseaux lents." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Se fier à la taille (peu sûr)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" "Suppose que tous les fichiers sont égaux si leur taille est égale.\n" -"Utile pour les gros dossiers ou les réseaux lents, quand la taille est modifiée " -"durant le téléchargement." +"Utile pour les gros dossiers ou les réseaux lents, quand la taille est " +"modifiée durant le téléchargement." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Synchroniser les dossiers" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -"Stocker les fichiers dans les deux dossiers pour que les deux dossiers soient " -"égaux après.\n" +"Stocker les fichiers dans les deux dossiers pour que les deux dossiers " +"soient égaux après.\n" "Ne fonctionne que lors de la comparaison de dossiers sans spécification de " "destination." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Les différences d'espaces sont considérées comme égales" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -2033,11 +2087,11 @@ msgstr "" "égaux.\n" "Ceci n'est actif que si l'analyse complète est choisie." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Copier le plus récent au lieu de fusionner (peu sûr)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2047,11 +2101,11 @@ msgstr "" "(Ne faites cela que si vous savez ce que vous faites !)\n" "Effectif seulement lors de la comparaison de dossiers." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Copie de sauvegarde (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2059,91 +2113,92 @@ msgstr "" "Quand le fichier doit être enregistré sur un fichier plus ancien, le vieux " "fichier sera renommé avec une extension « .orig » au lieu d'être supprimé." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Options régionales" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Langue (redémarrage nécessaire)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" "Choisissez la langue de l'interface graphique ou \"Auto\".\n" -"Pour que le changement de langue prenne effet, quittez puis redémarrez KDiff3." +"Pour que le changement de langue prenne effet, quittez puis redémarrez " +"KDiff3." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Utiliser le même encodage pour tout :" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -"Activer ceci vous permet de changer tous les encodages en ne changeant que le " -"premier.\n" +"Activer ceci vous permet de changer tous les encodages en ne changeant que " +"le premier.\n" "Désactivez ceci si des configurations individuelles différentes sont " "nécessaires." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Note : L'encodage local est" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "Encodage du fichier pour A :" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "Encodage du fichier pour B :" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "Encodage du fichier pour C :" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" "Encodage du fichier pour le résultat de la fusion et l'enregistrement :" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "Copie de la sélection automatique" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Encodage du fichier pour les fichiers préprocesseurs :" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Encodage de droite à gauche" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2151,21 +2206,21 @@ msgstr "" "Certains langages sont lus de droite à gauche.\n" "Cette option changera le visionneur et l'éditeur." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "Opération" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration Settings" msgstr "Options régionales" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2173,7 +2228,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2189,19 +2264,19 @@ msgstr "" "\n" "Voulez-vous continuer ou voulez-vous sélectionner une autre police." -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Police incompatible" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Continuez à vos risques et périls" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Sélectionnez une autre police" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" "Cela remet à zéro toutes les options. Pas seulement celles de la rubrique " @@ -2212,10 +2287,10 @@ msgid "PreprocessorCmd: " msgstr "Commande de préprocessus :" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" -"Les options suivantes que vous avez sélectionné peuvent changer vos données :\n" +"Les options suivantes que vous avez sélectionné peuvent changer vos " +"données :\n" #: pdiff.cpp:264 msgid "" @@ -2280,19 +2355,10 @@ msgstr "Différence de ligne entre A et C" msgid "All input files contain the same text, but are not binary equal." msgstr "Tous les fichiers d'entrées contiennent le même texte." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -#, fuzzy -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Les fichiers B et C sont égaux binairement.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 #, fuzzy -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"Les fichiers A et B sont égaux binairement.\n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Les fichiers A et B sont égaux binairement.\n" #: pdiff.cpp:530 msgid "" @@ -2304,109 +2370,55 @@ msgstr "" "Notez que la fusion KDiff3 n'est pas prévue pour les données binaires.\n" "Continuez à vos risques et périls." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Abandonner" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Ouverture des fichiers..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Erreur d'ouverture du fichier" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Coupe de la sélection..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Copie de la sélection vers le presse-papiers..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Insertion du contenu du presse-papiers..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Enregistrer et continuer" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Continuer sans enregistrer" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Recherche terminée." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Recherche terminée." -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "Erreur durant la création du dossier" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Configurer KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Dossier" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Fusion de l'élément actuel" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Synchronisation de l'élément actuel" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Mouvement" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "Vue de D&iff" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Fusion" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Fenêtre" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (Base) :" @@ -2449,6 +2461,10 @@ 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 :" @@ -2521,6 +2537,14 @@ 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 "" @@ -2534,6 +2558,88 @@ msgstr "Échec de l'enregistrement." msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Dossier" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Fusion de l'élément actuel" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Synchronisation de l'élément actuel" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Mouvement" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "Vue de D&iff" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Fusion" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Fenêtre" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Les fichiers A et B sont égaux binairement.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Les fichiers A et C sont égaux binairement.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Les fichiers A et C ont le même texte.\n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Les fichiers B et C sont égaux binairement.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Les fichiers B et C ont le même texte.\n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Préserver des les retours à la ligne" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Montre les retours à la ligne « \\r » s'ils existent.\n" +#~ "Aide à comparer les fichiers s'ils ont été modifiées sous des OS " +#~ "différents." + #, fuzzy #~ msgid "Diff and Merge" #~ msgstr "Différences et fusion" @@ -2558,7 +2664,8 @@ msgstr "" #~ msgstr "Lister seulement les différences" #~ msgid "Files and directories without change will not appear in the list." -#~ msgstr "Fichiers et dossiers sans différences n'apparaîtront pas dans la liste." +#~ msgstr "" +#~ "Fichiers et dossiers sans différences n'apparaîtront pas dans la liste." #, fuzzy #~ msgid "no selection" diff --git a/po/ga.po b/po/ga.po index 9b1bf0a..48dadb3 100644 --- a/po/ga.po +++ b/po/ga.po @@ -1,35 +1,36 @@ msgid "" msgstr "" "Project-Id-Version: kdeextragear-1/kdiff3.po\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2004-12-03 14:52-0500\n" "Last-Translator: Kevin Patrick Scannell \n" "Language-Team: ga \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Séamus Ó Ciardhuáin,Kevin Scannell" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "seoc at iolfree dot ie,scannell at slu dot edu" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Ón nGearrthaisce" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -38,7 +39,7 @@ msgid "" "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -47,21 +48,21 @@ msgid "" "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Earráid Throm Inmheánach" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Deireadh" @@ -77,237 +78,244 @@ msgstr "Nasc: " msgid "Size. " msgstr "Méid. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Dáta & Méid: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "" -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Theip ar oscailt %1." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Ag cur comhad i gcomparáid..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Ainm" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Oibríocht" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Stádas" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Gan réiteach" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Réitithe" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Bán" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Theip ar oscailt na gcomhadlann:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Comhadlanna á scanadh..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Comhadlann A á Léamh" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Comhadlann B á Léamh" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Comhadlann C á Léamh" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Réidh." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Líon na bhFochomhadlann:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Líon na gcomhad difriúil:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Lean ar aghaidh" -#: directorymergewindow.cpp:1169 +#: 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 " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Le déanamh." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Cóipeáil A go B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Cóipeáil B go A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Scrios A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Scrios B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Scrios A & B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Scrios (má tá sé ann)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Cumaisc" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Cumaisc (de láimh)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Earráid: Cineálacha Comhaid Contrártha" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -316,42 +324,47 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Earráid Chláir" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Tharla earráid le linn cóipeála.\n" +#: directorymergewindow.cpp:1965 +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:1900 directorymergewindow.cpp:2306 +#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Earráid." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Críochnaithe." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Gan sábháil." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -363,731 +376,749 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Déan" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Ná Bac Le Mír" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "Ar siúl..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Earráid agus %1 á scriosadh: Theip ar chruthú cúltaca." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "scrios comhadlann go hathchúrsach( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "scrios( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Earráid: theip ar rmdir( %1 )." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Earráid: theip ar scriosadh." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "cumaisc de láimh( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "cóipeáil( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "athainmnigh( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Earráid: theip ar athainmniú." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Earráid agus comhadlann á cruthú." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Sprioc" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Cmhdlnn" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Cineál" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Méid" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Athrú Is Déanaí" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Comhad..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "níl ar fáil" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (Sprioc): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (Bun): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (Sprioc): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (Sprioc): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Sprioc: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Cuir Comhad Roghnaithe i gComparáid" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Cumaisc an Comhad Reatha" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "Taispeáin Comhaid Difriúla" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "Taispeáin Comhaid i A amháin" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "Taispeáin Comhaid i B amháin" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "Taispeáin Comhaid i C amháin" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Ná déan faic" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Scrios A && B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " msgstr "" -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Comhad á léamh: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Comhad á scríobh: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Cuimhne ídithe" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Comhadlann á déanamh: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Comhadlann á baint: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Comhad á bhaint: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Nasc siombalach á chruthú: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Comhad á athainmniú: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Comhad á chóipeáil: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Comhadlann á léamh: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "Cumraíocht Reatha:" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Rogha --auto in úsáid, ach níor sonraíodh aon aschomhad." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Theip ar shábháil." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Theip ar oscailt na comhad seo:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Earráid agus Comhad á Oscailt" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Éirigh as an bhfeidhmchlár" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Cumasaigh/díchumasaigh barra na n-uirlisí" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Cumasaigh/díchumasaigh an barra stádais" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Cumraigh KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Roghnaigh Lín(t)e Ó A" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Roghnaigh Lín(t)e Ó B" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Roghnaigh Lín(t)e Ó C" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Taispeáin Spás Bán" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Taispeáin Líne-Uimhreacha" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Taispeáin Fuinneog A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Taispeáin Fuinneog B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Taispeáin Fuinneog C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Foramharc Coitianta" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "Foramharc A vs. B" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "Foramharc A vs. C" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "Foramharc B vs. C" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Sábháil && Scoir" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Scoir Gan Sábháil" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Theip ar shábháil na torthaí an chumaisc." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Comhad á shábháil..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Comhad á shábháil le hainm comhaid nua..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "Á Phriontáil..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "Priontáil tobscortha." -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Roghnúchán" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "" -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Ag scor..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Barra uirlisí á scoránú..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Scoránaigh an barra stádais..." @@ -1102,8 +1133,8 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" #: main.cpp:35 @@ -1180,19 +1211,18 @@ msgstr "" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" @@ -1202,115 +1232,95 @@ msgid "" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "" -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " msgstr "" -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " msgstr "" -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Coinbhleachtaí" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Aschur" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Athraithe]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1330,6 +1340,15 @@ 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 "" @@ -1449,8 +1468,7 @@ msgid "Auto indentation" msgstr "UathEangú" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" #: optiondialog.cpp:701 @@ -1481,112 +1499,106 @@ msgstr "Difríochtaí" msgid "Diff Settings" msgstr "Socruithe: Difríochtaí" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Caomhnaigh aisfhilleadh carráiste" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." +#: optiondialog.cpp:750 +msgid "Treat as white space." msgstr "" -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Déan neamhaird de nótaí C/C++" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Ordú réamhphróiseálaí:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "Socruithe: Cumasc" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "Socruithe: Cumasc" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Rogha Láimhe" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1594,58 +1606,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1655,121 +1668,142 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Líon na bhFochomhadlann:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Cumasc Comhadlann" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Comhadlanna athchúrsacha" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Úsáid .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Aimsigh comhaid agus comhadlanna folaithe" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "" -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1777,187 +1811,203 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Comparáid dénártha" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Comparáid dénártha de gach comhad. (Réamhshocrú)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Anailís iomlán" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Sioncrónaigh comhadlanna" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Comhaid chúltaca (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Socruithe Réigiúnda" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Teanga (atosú de dhíth)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "Uathroghnú" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "Comhtháthú" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "Socruithe Comhtháthaithe" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -1965,7 +2015,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -1975,19 +2045,19 @@ msgid "" "Do you want to continue or do you want to select another font." msgstr "" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Cló Neamh-chomhoiriúnach" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Lean ort ar do phriacal féin" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Roghnaigh Cló Eile" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -1996,8 +2066,7 @@ msgid "PreprocessorCmd: " msgstr "" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" #: pdiff.cpp:264 @@ -2059,14 +2128,8 @@ msgstr "" msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" #: pdiff.cpp:530 @@ -2076,108 +2139,54 @@ msgid "" "Continue at your own risk." msgstr "" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Tobscoir" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Comhaid á n-oscailt..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Earráid agus comhad á oscailt" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Roghnúchán á ghearradh..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Roghnúchán á chóipeáil go dtí an gearrthaisce..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Sábháil && Lean" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Lean Gan Sábháil" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Cumraigh KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Comhadlann" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Gluaiseacht" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "Cu&maisc" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Fuinneog" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (Bun):" @@ -2220,6 +2229,10 @@ msgstr "Aschur (roghnach):" msgid "Configure..." msgstr "Cumraigh..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2292,6 +2305,14 @@ 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." @@ -2304,6 +2325,64 @@ msgstr "Theip ar mheaitseáil." msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Comhadlann" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Gluaiseacht" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "Cu&maisc" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Fuinneog" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Preserve carriage return" +#~ msgstr "Caomhnaigh aisfhilleadh carráiste" + #~ msgid "Diff and Merge" #~ msgstr "Difríochtaí & Cumaisc" diff --git a/po/gl.po b/po/gl.po index 50d7c7e..725d86a 100644 --- a/po/gl.po +++ b/po/gl.po @@ -4,36 +4,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2006-06-03 21:54+0200\n" "Last-Translator: mvillarino \n" "Language-Team: Galician \n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "mvillarino" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "mvillarino@users.sourceforge.net" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -42,7 +43,7 @@ msgid "" "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -51,21 +52,21 @@ msgid "" "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Fin" @@ -81,237 +82,244 @@ msgstr "" msgid "Size. " msgstr "" -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "" -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "" -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Nome" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Estado" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Listo." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -320,41 +328,46 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" +#: directorymergewindow.cpp:1965 +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:1900 directorymergewindow.cpp:2306 +#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "" -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "" -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -366,731 +379,748 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Tamaño" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +msgid "File" +msgstr "" + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "non disponíbel" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Non facer Nada" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " msgstr "" -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "" -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "" -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Sai da aplicazón" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Corta a seczón seleccionada e coloca-a no porta-retallos" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Copia a seczón seleccionada no porta-retallos" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Apega o contido do porta-retallos na posizón actual" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Activa/desactiva a barra de ferramentas" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Activa/desactiva a barra de estado" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "" -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "A imprimir..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Seleczón" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "" -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "A sair..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "A comutar a barra de ferramentas..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Comutar a barra de estado..." @@ -1105,8 +1135,8 @@ msgstr "" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" #: main.cpp:35 @@ -1183,19 +1213,18 @@ msgstr "" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" @@ -1205,115 +1234,95 @@ msgid "" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "" -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " msgstr "" -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " msgstr "" -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Conflitos" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Saída" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1333,6 +1342,15 @@ 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 "" @@ -1452,8 +1470,7 @@ msgid "Auto indentation" msgstr "" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" #: optiondialog.cpp:701 @@ -1484,112 +1501,106 @@ msgstr "" msgid "Diff Settings" msgstr "" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" +#: optiondialog.cpp:750 +msgid "Treat as white space." msgstr "" -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" - -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1597,58 +1608,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1658,121 +1670,141 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +msgid "Max number of history entries:" +msgstr "" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "" -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1780,188 +1812,204 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "Seleczón" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -1969,7 +2017,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -1979,19 +2047,19 @@ msgid "" "Do you want to continue or do you want to select another font." msgstr "" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2000,8 +2068,7 @@ msgid "PreprocessorCmd: " msgstr "" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" #: pdiff.cpp:264 @@ -2063,14 +2130,8 @@ msgstr "" msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" #: pdiff.cpp:530 @@ -2080,108 +2141,54 @@ msgid "" "Continue at your own risk." msgstr "" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Interromper" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "" -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "" -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "" -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Fiestra" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "" @@ -2224,6 +2231,10 @@ msgstr "" msgid "Configure..." msgstr "Configurar..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2296,6 +2307,14 @@ 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 "" @@ -2307,3 +2326,58 @@ msgstr "" #: smalldialogs.cpp:559 msgid "Opening and closing parentheses don't match in regular expression." msgstr "" + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "" + +#: kdiff3_part.rc:13 +#, no-c-format +msgid "Configure KDiff3" +msgstr "" + +#: kdiff3_shell.rc:4 +#, no-c-format +msgid "&File" +msgstr "" + +#: kdiff3_shell.rc:7 +#, no-c-format +msgid "&Directory" +msgstr "" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Fiestra" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" diff --git a/po/hi.po b/po/hi.po index e65976e..dad06c4 100644 --- a/po/hi.po +++ b/po/hi.po @@ -4,36 +4,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2005-01-22 16:10+0530\n" "Last-Translator: Ravishankar Shrivastava \n" "Language-Team: indlinux-hindi \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Hindi\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "रविशंकर श्रीवास्तव" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "raviratlami@yahoo.com" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "क्लिपबोर्ड डाटा को अस्थाई फ़ाइल में लिखना असफल." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "क्लिपबोर्ड से" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -42,7 +43,7 @@ msgid "" "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -51,22 +52,22 @@ msgid "" "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "गंभीर आंतरिक त्रुटि" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "शीर्ष पंक्ति %1" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "अंत" @@ -82,240 +83,244 @@ msgstr "कड़ी" msgid "Size. " msgstr "आकार." -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "तारीख व आकार:" -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "%1 की अस्थाई नक़ल बनाना असफल." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "%1 को खोलना असफल" -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "फ़ाइल की तुलना की जा रही है..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "%1 से पढ़ने में त्रुटि" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "नाम" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "ऑपरेशन" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "स्थिति" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "हल नहीं" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "हल कर लिया गया" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "सफेद-नहीं" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "सफेद" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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 "री-स्कैन" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "मिलाया जाना जारी रखें" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "डिरेक्ट्रीज़ खोलना असफल:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"डिरेक्ट्री अ \"%1\" या तो मौजूद नहीं है या फिर वह डिरेक्ट्री नहीं है.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "डिरेक्ट्री अ \"%1\" या तो मौजूद नहीं है या फिर वह डिरेक्ट्री नहीं है.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"डिरेक्ट्री ब \"%1\" या तो मौजूद नहीं है या फिर वह डिरेक्ट्री नहीं है.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "डिरेक्ट्री ब \"%1\" या तो मौजूद नहीं है या फिर वह डिरेक्ट्री नहीं है.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"डिरेक्ट्री स \"%1\" या तो मौजूद नहीं है या फिर वह डिरेक्ट्री नहीं है.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "डिरेक्ट्री स \"%1\" या तो मौजूद नहीं है या फिर वह डिरेक्ट्री नहीं है.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "डिरेक्ट्री खोलने में त्रुटि" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "पैरामीटर चेतावनी" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "डिरेक्ट्रीज़ स्कैन किया जा रहा है..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "डिरेक्ट्री अ को पढ़ा जा रहा है" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "डिरेक्ट्री ब को पढ़ा जा रहा है" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "डिरेक्ट्री स को पढ़ा जा रहा है" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "कुछ सबडिरेक्ट्रीज़ इसमें पढ़े नहीं जा सकने वाले हैं" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "सबडिरेक्ट्रीज़ की अनुमतियाँ जाँचें." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "तैयार." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "डिरेक्ट्री तुलना स्थिति" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "सबडिरेक्ट्रीज़ की संख्या:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "समान फ़ाइलों की संख्या:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "भिन्न फ़ाइलों की संख्या:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "हस्तचालित सम्मिलित करने की संख्या:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "यह सभी सम्मिलित ऑपरेशन को प्रभावित करेगा" -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "सभी सम्मिलित करने के ऑपरेशन को बदला जा रहा है" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "जारी रखें (&o)" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "प्रोसेसिंग" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "कार्य-सूची" -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "अ की नक़ल ब में करें" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "ब की नक़ल अ में करें" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "अ को मिटाएँ" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "ब को मिटाएँ" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "अ तथा ब को मिटाएँ" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "अ में सम्मिलित करें" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "ब में सम्मिलित करें" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "अ तथा ब में सम्मिलित करें" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "मिटाएँ (यदि मौजूद है)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "सम्मिलित करें" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "सम्मिलित करें (हस्तचालित)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "त्रुटि: परस्पर विरोधी फ़ाइल क़िस्में" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "त्रुटि: तारीखें तो एक समान हैं, परंतु फ़ाइलें नहीं." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "यह ऑपरेशन वर्तमान में संभव नहीं है." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "ऑपरेशन वर्तमान में संभव नहीं" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -324,42 +329,47 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "प्रोग्राम त्रुटि" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"नक़ल करने के दौरान एक त्रुटि हुई.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "नक़ल करने के दौरान एक त्रुटि हुई.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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 "सम्मिलित करने में त्रुटि" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "त्रुटि." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "सम्पन्न." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "सहेजा नहीं गया." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "सम्मिलित करने का अज्ञात ऑपरेशन. (ऐसा कभी नहीं होना चाहिए!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "सम्मिलित करने का अज्ञात ऑपरेशन. " -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -371,751 +381,764 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "सम्मिलित करना प्रारंभ किया जा रहा है" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "इसे करें" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "इसे सिमुलेट करें" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "त्रुटि के बाद भी सम्मिलित करना जारी रखें" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "पिछली वस्तु के साथ जारी रखें" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "वस्तु छोड़ें" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "छोड़ा." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "प्रगति पर है..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "सम्मिलित करने की क्रिया पूरी हुई." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "सम्मिलित करना सम्पन्न" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"एक त्रुटि हुई. विस्तृत जानकारी देखने के लिए ठीक को दबाएँ\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "एक त्रुटि हुई. विस्तृत जानकारी देखने के लिए ठीक को दबाएँ\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "त्रुटि: %1 को मिटाने के दौरान: बैकअप बनाने में असफल." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "डिरेक्ट्री ( %1 ) को रिकर्सिवली मिटाएँ" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "मिटाएं (%1)" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." -msgstr "" -"त्रुटि: डिरेक्ट्री को पढ़ने की कोशिश में डिरेक्ट्री मिटाने का कार्य असफल." +msgstr "त्रुटि: डिरेक्ट्री को पढ़ने की कोशिश में डिरेक्ट्री मिटाने का कार्य असफल." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "त्रुटि: rmdir( %1 ) क्रिया असफल." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "त्रुटि: डिरेक्ट्री मिटाने का कार्य असफल." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "हस्तचालित सम्मिलित करें( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" "टीप: हस्तचालित सम्मिलित करने के बाद उपयोक्ता को F7 को दबाकर जारी रखना चाहिए." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "त्रुटि: नक़ल ( %1 -> %2 ) असफल. मौजूदा गंतव्य को मिटाना असफल." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "कापीलिंक ( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "त्रुटि: कापीलिंक असफल: रिमोट कड़ियाँ अभी समर्थित नहीं हैं." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "त्रुटि: कापीलिंक असफल." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "नक़ल( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "नाम बदलें( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "त्रुटि: नाम-बदलना असफल." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "%1 के मेकडिर के दौरान त्रुटि. मौजूदा फ़ाइल मिटा नहीं सकते." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "मेकडिर( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "डिरेक्ट्री बनाने के दौरान त्रुटि." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "गंतव्य" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "डिर." -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "क़िस्म" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "आकार" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "एट्रि." -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "अंतिम परिवर्धन" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "लिंक-गंतव्य" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "फ़ाइल..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "उपलब्ध नहीं" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (गंत.): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (आधार): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (गंत.): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (गंत.): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "गंतव्य:" -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 #, fuzzy msgid "Save Directory Merge State As..." msgstr "डिरेक्ट्री सम्मिलित करें" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "डिरेक्ट्री सम्मिलित करना प्रारंभ करें/जारी रखें" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "मौज़ूदा वस्तु के लिए ऑपरेशन चलाएँ" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "चयनित फ़ाइल की तुलना करें" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "मौज़ूदा फ़ाइल सम्मिलित करें" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "सभी सबडिरेक्ट्रीज फ़ोल्ड करें" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "सभी सबडिरेक्ट्रीज अनफ़ोल्ड करें" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "सभी वस्तुओं के लिए अ का चयन करें" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "सभी वस्तुओं के लिए ब का चयन करें" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "सभी वस्तुओं के लिए स का चयन करें" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "सभी वस्तुओं के लिए क्रिया स्वचालित चयन करें" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "सभी वस्तुओं के लिए कोई क्रिया नहीं" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Show Different Files" msgstr "भिन्न फ़ाइलों की संख्या:" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "चयनित फ़ाइल की तुलना करें" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "चयनित फ़ाइल की तुलना करें" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "कुछ नहीं करें" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "अ" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "ब" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "स" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "अ तथा ब को मिटाएँ" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "अ तथा ब में सम्मिलित करें" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " msgstr "" -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "फ़ाइल स्थिति प्राप्त की जा रही है: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "फ़ाइल पढ़ा जा रहा है: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "फ़ाइल: %1 लिखा जा रहा है" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "मेमोरी कम पड़ गई" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "डिरेक्ट्री बनाया जा रहा है: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "डिरेक्ट्री मिटाया जा रहा है: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "फ़ाइल मिटाया जा रहा है: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "सिंबालिक कड़ी बनाई जा रही है: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "फ़ाइलनाम बदला जा रहा है: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "फ़ाइल नक़ल की जा रही है: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -"फ़ाइल की नक़ल करने की क्रिया के दौरान त्रुटि: फ़ाइल को पढ़ने के लिए खोलने में " -"असफल. फ़ाइल-नाम: %1" +"फ़ाइल की नक़ल करने की क्रिया के दौरान त्रुटि: फ़ाइल को पढ़ने के लिए खोलने में असफल. फ़ाइल-" +"नाम: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -"फ़ाइल की नक़ल करने की क्रिया के दौरान त्रुटि: फ़ाइल को लिखने के लिए खोलने में " -"असफल. फ़ाइल-नाम: %1" +"फ़ाइल की नक़ल करने की क्रिया के दौरान त्रुटि: फ़ाइल को लिखने के लिए खोलने में असफल. फ़ाइल-" +"नाम: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" -msgstr "" -"फ़ाइल की नक़ल करने की क्रिया के दौरान त्रुटि: पढ़ने में असफल. फ़ाइल-नाम: %1" +msgstr "फ़ाइल की नक़ल करने की क्रिया के दौरान त्रुटि: पढ़ने में असफल. फ़ाइल-नाम: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" -msgstr "" -"फ़ाइल की नक़ल करने की क्रिया के दौरान त्रुटि: लिखने में असफल. फ़ाइल-नाम: %1" +msgstr "फ़ाइल की नक़ल करने की क्रिया के दौरान त्रुटि: लिखने में असफल. फ़ाइल-नाम: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "डिरेक्ट्री को पढ़ा जा रहा है:" -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "डिरेक्ट्री सूचीबद्ध की जा रही है: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 #, fuzzy msgid "Current Configuration:" msgstr "मौजूदा वस्तु सिंक ऑपरेशन" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "फ़ाइल खोलने में त्रुटि" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." -msgstr "" -"विकल्प --auto का उपयोग किया गया, परंतु कोई आउटपुट फ़ाइल निर्दिष्ट नहीं." +msgstr "विकल्प --auto का उपयोग किया गया, परंतु कोई आउटपुट फ़ाइल निर्दिष्ट नहीं." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "विकल्प --auto को डिरेक्ट्री तुलना करने में छोड़ा गया." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "सहेजने में असफल." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "इन फ़ाइलों को खोलना असफल:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "फ़ाइल खोलने में त्रुटि" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "दस्तावेज़ों को तुलना के लिए खोलता है..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "मौजूदा दस्तावेज़ ऐसे सहेजता है..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "अनुप्रयोग से बाहर होता है" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "चुने हुए अंश को क्लिपबोर्ड पर नक़ल करता है" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "क्लिपबोर्ड अवयवों को सही स्थान पर चिपकाता है" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "स्ट्रिंग के लिए ढूंढें" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "स्ट्रिंग के लिए फिर से ढूंढें" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "औज़ार-पट्टी सक्षम/अक्षम करें" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "स्थिति-पट्टी सक्षम/अक्षम करें" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "के-डिफ3 को कॉन्फ़िगर करें..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "मौज़ूदा डेल्टा में जाएँ" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "प्रथम डेल्टा में जाएँ" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "अंतिम डेल्टा में जाएँ" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "पिछला डेल्टा में जाएँ" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "अगला डेल्टा में जाएँ" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "पिछले परस्पर विरोधों में जाएँ" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "अगले परस्पर विरोधों में जाएँ" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "पिछले समाधान-रहित परस्पर विरोधों में जाएँ" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "अगले समाधान-रहित परस्पर विरोधों में जाएँ" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "अ से लाइन चुनें" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "ब से लाइन चुनें" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "स से लाइन चुनें" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "भिन्नताओं के लिए टेबुलेटर अक्षर तथा जगह दिखाएँ " -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "सफेद जगह दिखाएँ" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "पंक्ति क्रमांक दिखाएँ" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "सभी जगह अ चुनें" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "सभी जगह ब चुनें" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "सभी जगह स चुनें" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "सभी समाधान-रहित परस्पर विरोधों के लिए अ चुनें" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "सभी समाधान-रहित परस्पर विरोधों के लिए ब चुनें" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "सभी समाधान-रहित परस्पर विरोधों के लिए स चुनें" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "सभी समाधान-रहित सफेद-जगह परस्पर विरोधों के लिए अ चुनें" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "सभी समाधान-रहित सफेद-जगह परस्पर विरोधों के लिए ब चुनें" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "सभी समाधान-रहित सफेद-जगह परस्पर विरोधों के लिए स चुनें" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "सादा परस्पर विरोधों का स्वचालित समाधान करें" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "डेल्टा को परस्पर विरोधों में सेट करें" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "सादा परस्पर विरोधों का स्वचालित समाधान करें" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 #, fuzzy msgid "Join Selected Diffs" msgstr "चयनित फ़ाइल की तुलना करें" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "विंडो अ दिखाएँ" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "विंडो ब दिखाएँ" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "विंडो स दिखाएँ" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "अगले विंडो पर फोकस" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "सामान्य ओवरव्यू" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "अ वि. ब ओवरव्यू" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "अ वि. स ओवरव्यू" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "ब वि. स ओवरव्यू" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "वर्ड व्रेप डिफ विंडोज़" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "पिछले विंडो में फोकस" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "अलग करने की दिशा टॉगल करें" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "डिरेक्ट्री तथा पाठ स्प्लिट स्क्रीन दृश्य" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "डिरेक्ट्री तथा पाठ दृश्य के बीच टॉगल करें" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "सम्मिलित करने का परिणाम अभी सहेजा नहीं गया." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "सहेजें तथा बाहर हों" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "सहेजे बगैर बाहर हों" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "सम्मिलित किया जाने का परिणाम सहेजना असफल." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "फ़ाइल सहेजा जा रहा है..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "फ़ाइल नए फ़ाइलनाम के साथ सहेजा जा रहा है..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "बाहर हो रहे हैं..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 #, fuzzy msgid "Printing completed." msgstr "सम्मिलित करने की क्रिया पूरी हुई." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "बाहर हो रहे हैं..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "टूलबार टॉगल किया जा रहा है..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "स्थिति पट्टी टॉगल करें..." @@ -1130,8 +1153,8 @@ msgstr "के-डिफ3पार्ट" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" #: main.cpp:35 @@ -1209,19 +1232,18 @@ msgstr "खोलने के लिए फ़ाइल3" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "के-डिफ3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 #, fuzzy msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "बचे हुए समाधान-रहित विरोधाभासों की संख्या: %1" @@ -1234,55 +1256,31 @@ msgstr "" "आउटपुट परिवर्धित किया जा चुका है.\n" "यदि आप जारी रखते हैं तो आपके परिवर्तन खो जाएँगे." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "सभी इनपुट फ़ाइलें बाइनरी समान हैं." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "सभी इनपुट फ़ाइलें एक ही पाठ रखे हैं." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"फ़ाइलें अ तथा ब बाइनरी समान हैं.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"फ़ाइलें अ तथा ब में पाठ समान हैं.\n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"फ़ाइलें अ तथा स बाइनरी समान हैं.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"फ़ाइलें अ तथा स में पाठ समान हैं.\n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"फ़ाइलें ब तथा स बाइनरी समान हैं.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +#, fuzzy +msgid "Files %1 and %2 are binary equal.\n" +msgstr "फ़ाइलें ब तथा स बाइनरी समान हैं.\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"फ़ाइलें ब तथा स में पाठ समान हैं.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "फ़ाइलें अ तथा ब में पाठ समान हैं.\n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "परस्पर विरोधों की कुल संख्या:" -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1290,7 +1288,7 @@ msgstr "" "\n" "स्वचालित समाधान किए विरोधाभासों की संख्या: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1298,24 +1296,24 @@ msgstr "" "\n" "समाधान-रहित विरोधाभासों की संख्या: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "परस्पर विरोध" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "<कोई स्रोत पंक्ति नहीं>" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 #, fuzzy msgid "" msgstr "<विरोधाभास सम्मिलित करें>" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "<विरोधाभास सम्मिलित करें>" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1323,39 +1321,39 @@ msgstr "" "अब तक सभी विरोधाभासों का समाधान नहीं किया गया है.\n" "फ़ाइल सहेजा नहीं गया.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "विरोधाभास बायाँ " -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "फ़ाइल सहेजने में त्रुटि" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "लिखने के दौरान त्रुटि." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "आउटपुट" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[परिवर्धित]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1375,6 +1373,15 @@ 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 "संपादक तथा डिफ़ आउटपुट फ़ॉन्ट" @@ -1496,8 +1503,7 @@ msgid "Auto indentation" msgstr "स्वचालित हाशिया छोड़ना" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" #: optiondialog.cpp:701 @@ -1530,113 +1536,108 @@ msgstr "के-डिफ3" msgid "Diff Settings" msgstr "डिफ तथा सम्मिलित करने का विन्यास" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "कैरिज रिटर्न बनाए रखें" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "C/C++ कमेंट्स को सफेद जगह के रूप में समझें" -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "संख्याओं को अनदेखा करें" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "C/C++ कमेंट्स को अनदेखा करें" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "C/C++ कमेंट्स को सफेद जगह के रूप में समझें" -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "केस अनदेखा करें" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "केस डिफरेंसेस को सफेद जगह परिवर्तन के रूप में समझें. ('a'<=>'A')" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "प्री-प्रोसेसर कमांड:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "उपयोक्ता पारिभाषित प्री-प्रोसेसिंग. (विवरण के लिए दस्तावेज़ देखें.)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "लाइन-मैचिंग प्री-प्रोसेसर कमांड:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "गंभीर कोशिश करें (धीमा)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "डिफ तथा सम्मिलित करने का विन्यास" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "स्वचालित एडवान्स देरी (मि.से.):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "डिफ तथा सम्मिलित करने का विन्यास" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "सफेद जगह 2-फ़ाइल सम्मिलित डिफ़ॉल्ट:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "हस्तचालित चुनाव" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "सफेद जगह 3-फ़ाइल सम्मिलित डिफ़ॉल्ट:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1644,58 +1645,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1705,121 +1707,142 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "सबडिरेक्ट्रीज़ की संख्या:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "डिरेक्ट्री सम्मिलित करें" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "डिरेक्ट्रीज़ रिकर्सिव करें" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "क्या सबडिरेक्ट्रीज़ को विश्लेषण करना है या नहीं. " -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "फ़ाइल पैटर्न:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "फ़ाइल-एन्टी-पैटर्न:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "डिर-एन्टी-पैटर्न:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr ".cvsignore का उपयोग करें" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "छुपी फ़ाइलों तथा डिरेक्ट्रीज़ ढूंढें" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "हिडन एट्रिब्यूट वाली फ़ाइल तथा डिरेक्ट्रीज़ को ढूंढें." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "'.'. से प्रारंभ हो रहे फ़ाइल तथा डिरेक्ट्रीज़ को ढूंढें" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "फ़ाइल कड़ियों का अनुसरण करें" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "डिरेक्ट्री कड़ियों का अनुसरण करें" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1827,192 +1850,209 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "फ़ाइल तुलना मोड" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "बाइनरी तुलना" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "प्रत्येक फ़ाइल की बाइनरी तुलना. (डिफ़ॉल्ट)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "पूर्ण विश्लेषण" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "परिवर्धन तारीख पर भरोसा करें (असुरक्षित)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "आकार पर भरोसा करें (असुरक्षित)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "डिरेक्ट्रीज़ सिंक्रोनाइज़ करें" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 #, fuzzy msgid "White space differences considered equal" msgstr "सफेद जगह 3-फ़ाइल सम्मिलित डिफ़ॉल्ट:" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "सम्मिलित करने के बजाए नए की नक़ल करें (असुरक्षित)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "बैकअप फ़ाइलें (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "क्षेत्रीय विन्यास" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "भाषा (फिर से प्रारंभ करना आवश्यक है)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 #, fuzzy msgid "Note: Local Encoding is " msgstr "स्थानीय एनकोडिंग इस्तेमाल करें" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "स्वचालित नक़ल चयन" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "ऑपरेशन" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration Settings" msgstr "क्षेत्रीय विन्यास" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2020,7 +2060,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2030,32 +2090,29 @@ msgid "" "Do you want to continue or do you want to select another font." msgstr "" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "फ़ॉन्ट असंगत है" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "अपने स्वयं के जोखिम पर जारी रखें" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "अन्य फ़ॉन्ट चुनें" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." -msgstr "" -"यह सभी विकल्पों को रीसेट करता है. सिर्फ उनको ही नहीं जो मौजूदा विषय में हैं. " +msgstr "यह सभी विकल्पों को रीसेट करता है. सिर्फ उनको ही नहीं जो मौजूदा विषय में हैं. " #: pdiff.cpp:258 msgid "PreprocessorCmd: " msgstr "प्री-प्रोसेसर-कमांड:" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"निम्न विकल्प जो आपने चुने हैं वे डाटा को बदल सकते हैं:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "निम्न विकल्प जो आपने चुने हैं वे डाटा को बदल सकते हैं:\n" #: pdiff.cpp:264 msgid "" @@ -2117,19 +2174,10 @@ msgstr "लाइनडिफ: अ <-> स" msgid "All input files contain the same text, but are not binary equal." msgstr "सभी इनपुट फ़ाइलें एक ही पाठ रखे हैं." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -#, fuzzy -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"फ़ाइलें ब तथा स बाइनरी समान हैं.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 #, fuzzy -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"फ़ाइलें अ तथा ब बाइनरी समान हैं.\n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "फ़ाइलें अ तथा ब बाइनरी समान हैं.\n" #: pdiff.cpp:530 msgid "" @@ -2138,109 +2186,55 @@ msgid "" "Continue at your own risk." msgstr "" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "छोड़ें" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "फ़ाइलें खोली जा रही हैं..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "फ़ाइल खोलने में त्रुटि" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "चयन को काटा जा रहा है..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "चुने हुए की नकल क्लिपबोर्ड पर बनाया जा रहा है..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "क्लिपबोर्ड के वस्तुओं को प्रविष्ट किया जा रहा है..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "सहेजें तथा जारी रखें" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "सहेजे बगैर जारी रखें" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "ढूंढना सम्पन्न" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "ढूंढना सम्पन्न" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "डिरेक्ट्री बनाने के दौरान त्रुटि." -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "के-डिफ3 (&K)" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "के-डिफ3 को कॉन्फ़िगर करें" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "डिरेक्ट्री (&D)" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "मौजूदा वस्तु सम्मिलित करने की क्रिया" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "मौजूदा वस्तु सिंक ऑपरेशन" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "गतिविधि (&M)" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "डिफव्यू (&i)" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "सम्मिलित करें (&M)" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "विंडो (&W)" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "अ (बेस):" @@ -2283,6 +2277,10 @@ msgstr "आउटपुट (वैकल्पिक):" msgid "Configure..." msgstr "कॉन्फ़िगर...." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "पाठ ढूंढें:" @@ -2355,6 +2353,14 @@ 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 "" @@ -2368,6 +2374,79 @@ msgstr "सहेजने में असफल." msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "के-डिफ3 (&K)" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "डिरेक्ट्री (&D)" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "मौजूदा वस्तु सम्मिलित करने की क्रिया" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "मौजूदा वस्तु सिंक ऑपरेशन" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "गतिविधि (&M)" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "डिफव्यू (&i)" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "सम्मिलित करें (&M)" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "विंडो (&W)" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "फ़ाइलें अ तथा ब बाइनरी समान हैं.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "फ़ाइलें अ तथा स बाइनरी समान हैं.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "फ़ाइलें अ तथा स में पाठ समान हैं.\n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "फ़ाइलें ब तथा स बाइनरी समान हैं.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "फ़ाइलें ब तथा स में पाठ समान हैं.\n" + +#~ msgid "Preserve carriage return" +#~ msgstr "कैरिज रिटर्न बनाए रखें" + #, fuzzy #~ msgid "Diff and Merge" #~ msgstr "डिफ तथा सम्मिलित" diff --git a/po/hu.po b/po/hu.po index f1dc4b9..d1aa821 100644 --- a/po/hu.po +++ b/po/hu.po @@ -5,35 +5,36 @@ msgid "" msgstr "" "Project-Id-Version: KDE 3.2\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2004-01-09 11:11+0100\n" "Last-Translator: Tamas Szanto \n" "Language-Team: Hungarian \n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Szántó Tamás" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "tszanto@mol.hu" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "A vágólapról" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -42,7 +43,7 @@ msgid "" "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -51,7 +52,7 @@ msgid "" "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -59,16 +60,16 @@ msgstr "" "Adatvesztési hiba:\n" "ha a jelenség többször is előfordul, kérjük jelentse be a hibát.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Súlyos belső hiba történt" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Felső sor - %1" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Vég" @@ -84,247 +85,251 @@ msgstr "Link: " msgid "Size. " msgstr "Méret. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Dátum és méret: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Nem sikerült ideiglenes másolatot készíteni a(z) %1 fájlról." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "%1 megnyitása nem sikerült." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 #, fuzzy msgid "Comparing file..." msgstr "A fájl mentése..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "%1 olvasása közben hiba történt" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Név" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Művelet" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Állapot" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" 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:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "A művelet folytatása" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Nem sikerült beolvasni ezeket a könyvtárakat:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Az \"A\" könyvtár (\"%1\") nem létezik vagy más típusú a bejegyzés.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Az \"A\" könyvtár (\"%1\") nem létezik vagy más típusú a bejegyzés.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"A \"B\" könyvtár (\"%1\") nem létezik vagy más típusú a bejegyzés.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "A \"B\" könyvtár (\"%1\") nem létezik vagy más típusú a bejegyzés.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"A \"C\" könyvtár (\"%1\") nem létezik vagy más típusú a bejegyzés.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "A \"C\" könyvtár (\"%1\") nem létezik vagy más típusú a bejegyzés.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Könyvtármegnyitási hiba" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -"A célkönyvtár nem egyezhet meg sem az A, sem a B könyvtárral, ha három könyvtár " -"lesz összeolvasztva.\n" +"A célkönyvtár nem egyezhet meg sem az A, sem a B könyvtárral, ha három " +"könyvtár lesz összeolvasztva.\n" "Továbblépés előtt ellenőrizze az értéket." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Figyelmeztetés - paraméter" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 #, fuzzy msgid "Scanning directories..." msgstr "A könyvtárak szinkronizálása" -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Az A könyvtár beolvasása" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "A B könyvtár beolvasása" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "A C könyvtár beolvasása" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Néhány alkönyvtár beolvasása nem sikerült itt:" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Ellenőrizze az alkönyvtárak jogosultságait." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Kész." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "A könyvtárak összehasonlítási állapota" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Az alkönyvtárak száma:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "A megegyező fájlok száma:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Az eltérő fájlok száma:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "A kézi összeolvasztások száma:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Ez minden összeolvasztási műveletet érint." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Az összes összeolvasztási művelet megváltoztatása" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "F&olytatás" -#: directorymergewindow.cpp:1169 +#: 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 " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Feladat." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "A másolása B-be" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "B másolása A-ba" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "A törlése" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "B törlése" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "A és B törlése" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Beolvasztás A-ba" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Beolvasztás B-be" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Beolvasztás A és B-be" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Törlés (ha létezik)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Összeolvasztás" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Összeolvasztás (kézi)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Hiba: ütköző fájltípusok" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Hiba: a dátumok megegyeznek, de a fájlok nem." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Ez a művelet jelenleg nem lehetséges." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "A művelet nem lehetséges" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -336,46 +341,52 @@ msgstr "" "\n" "mergeResultSaved: m_pMFI=0\n" "\n" -"Ha tudja, hogyan kell ezt a helyzetet reprodukálni, kérem értesítse a szerzőt." +"Ha tudja, hogyan kell ezt a helyzetet reprodukálni, kérem értesítse a " +"szerzőt." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Programhiba" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Hiba történt másolás közben.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Hiba történt másolás közben.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Hiba." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Kész." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Nincs elmentve." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "" "Ismeretlen összeolvasztási művelet (normál körülmények között nem fordulhat " "elő)." -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Ismeretlen összeolvasztási művelet." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -395,125 +406,124 @@ msgstr "" "Ez a program még béta állapotú, ezért nincs garancia a hibátlan működésre. A " "fontos adatokról mindenképpen készítsen biztonsági másolatot!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Az összeolvasztás megkezdése" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Kezdődjön" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Szimuláció" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -"A kijelölt elem típusa eltérő a könyvtárakban. Válassza ki, mit szeretne tenni." +"A kijelölt elem típusa eltérő a könyvtárakban. Válassza ki, mit szeretne " +"tenni." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" "A két fájl utolsó módosítási dátuma megegyezik, de a fájlok tartalma nem. Mi " "történjen?" -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 #, fuzzy msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" "Ez a művelet most nem hajtható végre, mert folyamatban van egy " "könyvtárösszeolvasztás." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Hiba történt az utolsó lépsnél.\n" -"Folytatni szeretné a műveletet a hiba ellenére vagy át szeretné ugrani a hibát " -"okozó elemet?" +"Folytatni szeretné a műveletet a hiba ellenére vagy át szeretné ugrani a " +"hibát okozó elemet?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Az összeolvasztás folytatása hiba esetén is" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Folytatás az utolsó elemmel" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Az elem átlépése" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Átlépve." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "Folyamatban..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Az összeolvasztási művelet befejeződött." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Az összeolvasztás befejeződött" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "A szimulált összeolvasztás befejeződött: ellenőrizze, hogy elfogadhatók-e a " "javasolt műveletek." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Hiba történt. Kattintson az OK gombra részletes tájékoztatáshoz.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Hiba történt. Kattintson az OK gombra részletes tájékoztatáshoz.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Hiba történt %1 törlése közben: nem sikerült létrehozni egy biztonsági " "másolatot." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "könyvtár (%1) törlése az alkönyvtárakkal együtt" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "törlés (%1)" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Hiba történt: a könyvtártörlés során, a könyvtár beolvasásakor, hiba történt." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Hiba: egy rmdir (%1) művelet nem sikerült." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Hiba történt: a törlési művelet nem sikerült." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "kézi összeolvasztás (%1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 #, fuzzy msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -521,223 +531,228 @@ msgstr "" " Megjegyzés: kézi összeolvasztás esetén a felhasználónak az F7-tel kell " "továbblépnie." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Hiba: egy másolás (%1 -> %2) nem sikerült. Nem sikerült törölni a már létező " "másolási célpontot." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "Link másolása (%1 -> %2)" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Hiba: egy link másolása nem sikerült. Távoli linkeket nem lehet használni." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Hiba történt: egy link másolása nem sikerült." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "másolás (%1 -> %2)" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Hiba történt átnevezés (%1 -> %2) közben: a célfájl nem törölhető." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "átnevezés (%1 -> %2)" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Hiba történt: egy átnevezés nem sikerült." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Hiba történt a könyvtár (%1) létrehozása közben. A már létező fájl nem " "törölhető." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "Könyvtár létrehozása (%1)" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Hiba történt egy könyvtár létrehozása közben." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Cél" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Könyvtár" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Típus" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Méret" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Attribútum" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Utolsó módosítás" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Link-Cél" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Fájl..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "nem áll rendelkezésre" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (cél):" -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (alap):" -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (cél):" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (cél):" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Cél: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Könyvtárösszeolvasztás" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "A könyvtárösszeolvasztás kezdése/folytatása" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "A művelet végrehajtása az aktuális elemen" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "A kiválasztott fájl összehasonlítása" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Az aktuális fájl összeolvasztása" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Az alkönyvtárak összecsukása" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Az alkönyvtárak kibontása" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Az 'A' kiválasztása az összes elemhez" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "A 'B' kiválasztása az összes elemhez" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "A 'C' kiválasztása az összes elemhez" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Automatikus kiválasztás az összes elemnél" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Nincs művelet az összes elemre" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Show Different Files" msgstr "Az eltérő fájlok száma:" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "A kiválasztott fájl összehasonlítása" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "A kiválasztott fájl összehasonlítása" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Nem kell semmit tenni" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 #, fuzzy msgid "Delete A && B" msgstr "A és B törlése" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 #, fuzzy msgid "Merge to A && B" msgstr "Beolvasztás A és B-be" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -"Biztonsági mentés készítése közben egy régebbi biztonsági mentést nem sikerült " -"törölni. \n" +"Biztonsági mentés készítése közben egy régebbi biztonsági mentést nem " +"sikerült törölni. \n" "Fájlnév: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -745,441 +760,456 @@ msgstr "" "Biztonsági mentés készítése közben egy átnevezés nem sikerült. \n" "A fájlok nevei: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "A fájlállapot lekérdezése: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Fájl beolvasása: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Fájl írása: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Elfogyott a memória" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Könyvtár létrehozása: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Könyvtár törlése: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Fájl törlése: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Szimbolikus link létrehozása: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Fájl átnevezése: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Fájl másolása: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -"Hiba történt fájlmásolás közben: nem sikerült olvasásra megnyitni egy fájlt. A " -"fájl neve: %1" +"Hiba történt fájlmásolás közben: nem sikerült olvasásra megnyitni egy fájlt. " +"A fájl neve: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" "Hiba történt fájlmásolás közben: nem sikerült írásra megnyitni egy fájlt. A " "fájl neve: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" "Hiba történt fájlmásolás közben: egy olvasási művelet nem sikerült. A fájl " "neve: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -"Hiba történt fájlmásolás közben: egy írási művelet nem sikerült. A fájl neve: " -"%1" +"Hiba történt fájlmásolás közben: egy írási művelet nem sikerült. A fájl " +"neve: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Könyvtár beolvasása: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Könyvtár kilistázása: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 #, fuzzy msgid "Current Configuration:" msgstr "Szinkronizálási művelet az aktuális elemmel" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "Fájlmegnyitási hiba" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "" "Az --auto opciót használná a program, de nincs megadva a kimeneti fájl." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "" "Az --auto opció figyelmen kívül lesz hagyva könyvtárak összehasonlításánál." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "A mentés nem sikerült." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Nem sikerült megnyitni a következő fájlokat:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Fájlmegnyitási hiba" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Dokumentumok megnyitása összehasonlításhoz..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Az összeolvasztás eredményének elmentése. Minden ütközést fel kell oldani." -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Az aktuális dokumentum mentése mint..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Kilépés az alkalmazásból" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Kivágja a kijelölt részt és a vágólapra helyezi" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Kimásolja a kijelölt részt és a vágólapra helyezi" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Beilleszti a vágólap tartalmát az aktuális pozíciónál" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Sztring keresése" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "A sztring keresése újból" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Az eszköztár ki-be kapcsolása" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Az állapotsor ki-be kapcsolása" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "A KDiff3 beállításai..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Ugrás az aktuális deltára..." -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Ugrás az első deltára" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Ugrás az utolsó deltára" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Ugrás az előző deltára" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Ugrás a következő deltára" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Ugrás az előző ütközésre" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Ugrás a következő ütközésre" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Ugrás az előző feloldatlan ütközésre" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Ugrás a következő feloldatlan ütközésre" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Sor(ok) kiválasztása A-ból" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Sor(ok) kiválasztása B-ből" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Sor(ok) kiválasztása C-ből" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -"A forrás kiválasztása után automatikus ugrás a következő feloldatlan ütközésre" +"A forrás kiválasztása után automatikus ugrás a következő feloldatlan " +"ütközésre" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "A szóközök és tabulátorok megjelenítése eltéréseknél" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Az üres karakterek megjelenítése" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "A sorszámok megjelenítése" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "A kiválasztása mindenhol" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "B kiválasztása mindenhol" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "C kiválasztása mindenhol" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 #, fuzzy msgid "Choose A for All Unsolved Conflicts" msgstr "A kiválasztása az összes feloldatlan ütközéshez" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 #, fuzzy msgid "Choose B for All Unsolved Conflicts" msgstr "B kiválasztása az összes feloldatlan ütközéshez" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 #, fuzzy msgid "Choose C for All Unsolved Conflicts" msgstr "C kiválasztása az összes feloldatlan ütközéshez" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 #, fuzzy msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "A kiválasztása az összes feloldatlan elválasztókarakter-ütközéshez" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 #, fuzzy msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "B kiválasztása az összes feloldatlan elválasztókarakter-ütközéshez" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 #, fuzzy msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "C kiválasztása az összes feloldatlan elválasztókarakter-ütközéshez" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Az egyszerű ütközések automatikus feloldása" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Delták beállítása az ütközésekhez" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Az egyszerű ütközések automatikus feloldása" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 #, fuzzy msgid "Join Selected Diffs" msgstr "A kiválasztott fájl összehasonlítása" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Az A ablak megjelenítése" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "A B ablak megjelenítése" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "A C ablak megjelenítése" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Fókusz a következő ablakra" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Fókusz az előző ablakra" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "A megosztás irányának megváltoztatása" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Osztott nézet (könyvtár és szöveg)" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Váltás a könyvtár- és szöveges nézet között" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Az összeolvasztás eredménye még nincs elmentve." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Mentés és kilépés" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Kilépés mentés nélkül" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Az összeolvasztás eredményét nem sikerült elmenteni." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Éppen folyamatban van egy könyvtárösszeolvasztás. Biztosan félbe szeretné " "szakítani a műveletet?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "A fájl mentése..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "A fájl elmentése más néven..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "Kilépés..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 #, fuzzy msgid "Printing completed." msgstr "Az összeolvasztási művelet befejeződött." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Kilépés..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Az eszköztár átkapcsolása..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Az állapotsor átkapcsolása..." @@ -1194,8 +1224,8 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "A keresett komponens nem található.\n" "Ez a hiba valószínűleg valamilyen telepítési probléma következménye. További " @@ -1290,19 +1320,18 @@ msgstr "a megnyitandó fájl (3)" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 #, fuzzy msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" @@ -1317,55 +1346,31 @@ msgstr "" "A kimenet megváltozott.\n" "Ha továbblép, a módosítások elvesznek." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Az összes bemeneti fájl megegyezik (bináris módban)." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Az összes bemeneti fájl megegyezik (szöveges módban)." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"A és B fájl binárisan megegyezik.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"A és B szövege megegyezik.\n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"A és C fájl binárisan megegyezik.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"A és C szövege megegyezik. \n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"B és C binárisan megegyezik.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +#, fuzzy +msgid "Files %1 and %2 are binary equal.\n" +msgstr "B és C binárisan megegyezik.\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"B és C szövege megegyezik.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "A és B szövege megegyezik.\n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Az ütközések száma: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1373,7 +1378,7 @@ msgstr "" "\n" "Az automatikusan feloldott ütközések száma: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1381,24 +1386,24 @@ msgstr "" "\n" "A fel nem oldott ütközések száma: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Ütközések" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 #, fuzzy msgid "" msgstr "<Összeolvasztási ütközés>" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "<Összeolvasztási ütközés>" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1406,39 +1411,39 @@ msgstr "" "Még nincs feloldva az összes ütközés.\n" "A fájl nem lesz elmentve.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Megmaradt ütközések" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Fájlmentési hiba" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Hiba történt írás közben." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Módosítva]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1461,6 +1466,15 @@ 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" @@ -1588,8 +1602,7 @@ msgid "Auto indentation" msgstr "A behúzás megőrzése" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" "Ha be van jelölve: új sor kezdésekor az előző sor behúzását használja a " "program.\n" @@ -1603,8 +1616,8 @@ msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "" -"Ha be van jelölve: a kijelölt adatok másolata mindig automatikusan a vágólapra " -"kerül.\n" +"Ha be van jelölve: a kijelölt adatok másolata mindig automatikusan a " +"vágólapra kerül.\n" "Ha nincs bejelölve: a másolás csak parancsra történik meg (pl. a Ctrl+C-vel)." #: optiondialog.cpp:709 @@ -1627,27 +1640,19 @@ msgstr "KDiff3" msgid "Diff Settings" msgstr "A diff és az összeolvasztás beállításai" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "A CR (kocsivissza) karakterek megőrzése" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"A kocsivissza ('\\r') karakterek megjelenítése.\n" -"Segít a különféle operációs rendszerekben megváltoztatott szövegek eltéréseinek " -"kezelésénél." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "A C/C++-megjegyzések üres helynek tekintése." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "A számok figyelmen kívül hagyása" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "A számjegyek figyelmen kívül hagyása sorillesztésnél. (Hasonló 'Az üres " @@ -1655,39 +1660,39 @@ msgstr "" "Néha szükség lehet erre az opcióra számadatokat tartalmazó fájlok " "összehasonlításánál." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 #, fuzzy msgid "Ignore C/C++ comments" msgstr "A C/C++-megjegyzések figyelmen kívül hagyása" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "A C/C++-megjegyzések üres helynek tekintése." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 #, fuzzy msgid "Ignore case" msgstr "A számok figyelmen kívül hagyása" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Előfeldolgozási parancs:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "A felhasználó által megadott előfeldolgozás használata (a részletek a " "dokumentációban találhatók)." -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Sorösszehasonlítási előparancs:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1695,11 +1700,11 @@ msgstr "" "Ezt a parancsot sorillesztésnél használja a program.\n" "(A részletek a dokumentációban találhatók.)" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Alaposabb próbálkozás (lassabb)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1707,11 +1712,16 @@ msgstr "" "Bekapcsolja a --minimal opciót a külső diff programnál.\n" "Hatására a sebesség jelentősen lecsökkenhet nagy fájlok esetén." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "A diff és az összeolvasztás beállításai" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Automatikus léptetési késleltetés (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" @@ -1720,41 +1730,36 @@ msgstr "" "utána a program automatikusan a következő ütközésre lép. A megengedett " "értéktartomány: 0-2000 ms" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "A diff és az összeolvasztás beállításai" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Üres karakterek 2 fájl összeolvasztásánál (alapértelmezés):" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 #, fuzzy msgid "Manual Choice" msgstr "Kézi választás" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -"Lehetővé teszi az összeolvasztási algoritmusnak, hogy automatikusan kiválassza " -"a megfelelő bemenetet, ha az üres helyek megváltozását kell nézni." +"Lehetővé teszi az összeolvasztási algoritmusnak, hogy automatikusan " +"kiválassza a megfelelő bemenetet, ha az üres helyek megváltozását kell nézni." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Üres karakterek 2 fájl összeolvasztásánál (alapértelmezés):" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1762,58 +1767,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1823,48 +1829,69 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Az alkönyvtárak száma:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Könyvtárösszeolvasztás" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Az alkönyvtárakban is" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "" "Itt lehet megadni, hogy az összehasonlítás az alkönyvtárak tartalmára is " "kiterjedjen-e." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Fájlminták:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1874,11 +1901,11 @@ msgstr "" "Használható illesztési karakterek: '*' és '?'\n" "Több minta is megadható pontosvesszővel elválasztva." -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Kizáró fájlminták:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1888,11 +1915,11 @@ msgstr "" "Használható illesztési karakterek: '*' és '?'\n" "Több minta is megadható pontosvesszővel elválasztva." -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Kizáró könyvtárminták:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1902,11 +1929,11 @@ msgstr "" "Használható illesztési karakterek: '*' és '?'\n" "Több minta is megadható pontosvesszővel elválasztva." -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "A .cvsignore használata" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1914,24 +1941,25 @@ msgstr "" "A kizárási mintát kiterjeszti a CVS által figyelmen kívül hagyott fájlokra.\n" "A \".cvsignore\" fájlok segítségével ez minden könyvtárban külön megadható." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "A keresések a rejtett fájlokra és könyvtárakra is terjedjenek ki" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "A keresések terjedjenek ki a rejtett fájlokra és könyvtárakra is." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "" -"A keresések a ponttal kezdődő nevű fájlokra és könyvtárakra is terjedjenek ki." +"A keresések a ponttal kezdődő nevű fájlokra és könyvtárakra is terjedjenek " +"ki." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "A fájllinkek követése" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1939,23 +1967,24 @@ msgstr "" "Be: összehasonlítás a link által mutatott fájllal.\n" "Ki: a linkek összehasonlítása." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "A linkek követése" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -"Ha be van jelölve: a linkek által mutatott könyvtárak lesznek összehasonlítva.\n" +"Ha be van jelölve: a linkek által mutatott könyvtárak lesznek " +"összehasonlítva.\n" "Ha nincs bejelölve: maguk a linkek lesznek összehasonlítva." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1963,62 +1992,84 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 #, fuzzy msgid "Binary comparison" msgstr "A könyvtárak összehasonlítási állapota" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "A módosítási dátum valósnak feltételezése (nem megbízható!)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Két fájlt egyezőnek feltételez majd a program, ha a hosszuk és az utolsó " +"módosítás dátuma megegyezik.\n" +"Nagy könyvtárak vagy lassú hálózat esetén lehet erre szükség." + +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" "Useful for big directories or slow networks." msgstr "" "Két fájlt egyezőnek feltételez majd a program, ha a hosszuk és az utolsó " "módosítás dátuma megegyezik.\n" "Nagy könyvtárak vagy lassú hálózat esetén lehet erre szükség." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "A méret valósnak feltételezése (nem megbízható!)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" "Két fájlt egyezőnek feltételez majd a program, ha a hosszuk megegyezik.\n" -"Nagy könyvtárak vagy lassú hálózat esetén lehet erre szükség, ha letöltéskor a " -"módosítási dátum megváltozik." +"Nagy könyvtárak vagy lassú hálózat esetén lehet erre szükség, ha letöltéskor " +"a módosítási dátum megváltozik." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "A könyvtárak szinkronizálása" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -2028,22 +2079,22 @@ msgstr "" "összehasonlítás után a könyvtárak meg fognak egyezni.\n" "Csak akkor működik, ha az összehasonlításnál nincs megadva a cél." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 #, fuzzy msgid "White space differences considered equal" msgstr "Üres karakterek 2 fájl összeolvasztásánál (alapértelmezés):" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Az újabb másolása összeolvasztás helyett (nem megbízható!)." -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2053,11 +2104,11 @@ msgstr "" "Csak akkor használja, ha tudja, milyen következményekkel jár ez a művelet!\n" "Az opciónak csak két könyvtár összehasonlításakor van hatása." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Biztonsági mentések (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2065,104 +2116,104 @@ msgstr "" "Mielőtt a program egy régebbi fájlt felülírna az újabbal, a régi fájl\n" "legyen átnevezve '.orig' kiterjesztéssel (törlés helyett)." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 #, fuzzy msgid "Note: Local Encoding is " msgstr "A helyi kódolás használata" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "A kijelölt adatok automatikus kimásolása a vágólapra" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "Művelet" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2170,7 +2221,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2186,19 +2257,19 @@ msgstr "" "\n" "Tovább szeretne lépni vagy inkább más betűtípust választ?" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Nem kompatibilis betűtípus" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Folytatás (kockázatos)" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Válasszon egy másik betűtípust" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" "Ezzel alapállapotba hozható az összes beállítás (nem csak az aktuális témáé)." @@ -2209,8 +2280,7 @@ msgid "PreprocessorCmd: " msgstr "Előfeldolgozási parancs:" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" #: pdiff.cpp:264 @@ -2273,19 +2343,10 @@ msgstr "Linediff: A <-> C" msgid "All input files contain the same text, but are not binary equal." msgstr "Az összes bemeneti fájl megegyezik (szöveges módban)." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -#, fuzzy -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"B és C binárisan megegyezik.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 #, fuzzy -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"A és B fájl binárisan megegyezik.\n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "A és B fájl binárisan megegyezik.\n" #: pdiff.cpp:530 msgid "" @@ -2297,109 +2358,55 @@ msgstr "" "A KDiff3-féle összeolvasztás szöveges fájlok kezelésére való.\n" "Csak akkor lépjen tovább, ha valóban ezt szeretne." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Félbeszakítás" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Fájlok megnyitása..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Fájlmegnyitási hiba" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "A kijelölt adatok kivágása..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "A kijelölt adatok másolása a vágólapra..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "A vágólap tartalmának beillesztése..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Mentés és folytatás" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Folytatás mentés nélkül" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "A keresés befejeződött." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "A keresés befejeződött" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "Hiba történt egy könyvtár létrehozása közben." -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "A KDiff3 beállításai" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "Köny&vtár" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Összevonási művelet az aktuális elemmel" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Szinkronizálási művelet az aktuális elemmel" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "Mozg&atás" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, fuzzy, no-c-format -msgid "D&iffview" -msgstr "KDiff3" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "Össze&olvasztás" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Ablak" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (alap):" @@ -2442,6 +2449,10 @@ msgstr "Kimenet (opcionális):" msgid "Configure..." msgstr "Beállítás..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 #, fuzzy msgid "Search text:" @@ -2515,6 +2526,14 @@ 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 "" @@ -2528,6 +2547,88 @@ msgstr "A mentés nem sikerült." msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "Köny&vtár" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Összevonási művelet az aktuális elemmel" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Szinkronizálási művelet az aktuális elemmel" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "Mozg&atás" + +#: kdiff3_shell.rc:61 +#, fuzzy, no-c-format +msgid "D&iffview" +msgstr "KDiff3" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "Össze&olvasztás" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Ablak" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "A és B fájl binárisan megegyezik.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "A és C fájl binárisan megegyezik.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "A és C szövege megegyezik. \n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "B és C binárisan megegyezik.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "B és C szövege megegyezik.\n" + +#~ msgid "Preserve carriage return" +#~ msgstr "A CR (kocsivissza) karakterek megőrzése" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "A kocsivissza ('\\r') karakterek megjelenítése.\n" +#~ "Segít a különféle operációs rendszerekben megváltoztatott szövegek " +#~ "eltéréseinek kezelésénél." + #, fuzzy #~ msgid "Diff and Merge" #~ msgstr "Diff és összeolvasztás" @@ -2603,7 +2704,8 @@ msgstr "" #~ msgid "Convert to upper case" #~ msgstr "Konvertálás nagybetűkre" -#~ msgid "Turn all lower case characters to upper case on reading. (e.g.: 'a'->'A')" +#~ msgid "" +#~ "Turn all lower case characters to upper case on reading. (e.g.: 'a'->'A')" #~ msgstr "A kisbetűk nagybetűkké alakítása olvasáskor (pl. 'a' -> 'A')" #, fuzzy @@ -2612,9 +2714,13 @@ msgstr "" #~ msgid "" #~ "Running the external diff failed.\n" -#~ "Check if the diff works, if the program can write in the temp folder or if the disk is full.\n" -#~ "The external diff option will be disabled now and the internal diff will be used." +#~ "Check if the diff works, if the program can write in the temp folder or " +#~ "if the disk is full.\n" +#~ "The external diff option will be disabled now and the internal diff will " +#~ "be used." #~ msgstr "" #~ "Nem sikerült futtatni a külső diff programot.\n" -#~ "Ellenőrizze, hogy a program használható-e, tud-e írni az ideiglenes könyvtárba és van-e elég szabad hely a lemezen.\n" -#~ "A külső diff program le lesz tiltva, helyette a beépített diff program lesz felhasználva." +#~ "Ellenőrizze, hogy a program használható-e, tud-e írni az ideiglenes " +#~ "könyvtárba és van-e elég szabad hely a lemezen.\n" +#~ "A külső diff program le lesz tiltva, helyette a beépített diff program " +#~ "lesz felhasználva." diff --git a/po/is.po b/po/is.po index 03a165c..467dedb 100644 --- a/po/is.po +++ b/po/is.po @@ -1,35 +1,36 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: ENCODING\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -38,7 +39,7 @@ msgid "" "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -47,21 +48,21 @@ msgid "" "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "" @@ -77,237 +78,244 @@ msgstr "" msgid "Size. " msgstr "" -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "" -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "" -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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 "" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "" -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -316,41 +324,46 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" +#: directorymergewindow.cpp:1965 +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:1900 directorymergewindow.cpp:2306 +#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "" -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "" -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -362,731 +375,748 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +msgid "File" +msgstr "" + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " msgstr "" -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "" -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "" -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "" -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "" -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "" -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "" -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "" -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "" @@ -1101,8 +1131,8 @@ msgstr "" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" #: main.cpp:35 @@ -1179,19 +1209,18 @@ msgstr "" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" @@ -1201,115 +1230,95 @@ msgid "" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "" -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " msgstr "" -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " msgstr "" -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1329,6 +1338,14 @@ 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 "" @@ -1448,8 +1465,7 @@ msgid "Auto indentation" msgstr "" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" #: optiondialog.cpp:701 @@ -1480,112 +1496,106 @@ msgstr "" msgid "Diff Settings" msgstr "" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." +#: optiondialog.cpp:750 +msgid "Treat as white space." msgstr "" -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1593,58 +1603,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1654,121 +1665,141 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +msgid "Max number of history entries:" +msgstr "" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "" -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1776,187 +1807,203 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -1964,7 +2011,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -1974,19 +2041,19 @@ msgid "" "Do you want to continue or do you want to select another font." msgstr "" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -1995,8 +2062,7 @@ msgid "PreprocessorCmd: " msgstr "" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" #: pdiff.cpp:264 @@ -2058,14 +2124,8 @@ msgstr "" msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" #: pdiff.cpp:530 @@ -2075,108 +2135,54 @@ msgid "" "Continue at your own risk." msgstr "" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "" -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "" -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "" -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "" @@ -2219,6 +2225,10 @@ msgstr "" msgid "Configure..." msgstr "" +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2291,6 +2301,14 @@ 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 "" @@ -2302,3 +2320,58 @@ msgstr "" #: smalldialogs.cpp:559 msgid "Opening and closing parentheses don't match in regular expression." msgstr "" + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "" + +#: kdiff3_part.rc:13 +#, no-c-format +msgid "Configure KDiff3" +msgstr "" + +#: kdiff3_shell.rc:4 +#, no-c-format +msgid "&File" +msgstr "" + +#: kdiff3_shell.rc:7 +#, no-c-format +msgid "&Directory" +msgstr "" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "" + +#: kdiff3_shell.rc:95 +#, 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 b59cefa..e3933d4 100644 --- a/po/it.po +++ b/po/it.po @@ -7,37 +7,38 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2006-12-08 16:52+0100\n" "Last-Translator: Marcello Anni \n" "Language-Team: italiano \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Andrea Celli, Marcello Anni" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "a.celli@caltanet.it, marcello.anni@alice.it" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "È fallita la copia da appunti a file temporaneo." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Dagli appunti" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -51,7 +52,7 @@ msgstr "" "\n" "Ora il comando di pre-elaborazione verrà disabilitato." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -65,7 +66,7 @@ msgstr "" "\n" "Ora il comando di pre-ricerca di righe simili verrà disabilitato." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -73,15 +74,15 @@ msgstr "" "Errore: perdita dati\n" "Se è riproducibile, ti prego di segnalarlo all'autore.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Grave errore interno" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "Riga superiore" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Fine" @@ -97,245 +98,249 @@ msgstr "Collegamento: " msgid "Size. " msgstr "Dimensione. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Data e dimensione: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Non ho potuto creare una copia temporanea di %1." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Non ho potuto aprire %1." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Confronto file ..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Errore nella lettura di %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Nome" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Operazione" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Stato" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Non risolto" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Risolto" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Non vuoto" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Vuoto" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" "Stai fondendo delle cartelle. Sei sicuro? Vuoi interrompere la fusione e " "riesaminare la cartella?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Continua la fusione" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Apertura di cartelle non riuscita:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir A \"%1\" non esiste o non è una cartella.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Dir A \"%1\" non esiste o non è una cartella.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir B \"%1\" non esiste o non è una cartella.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Dir B \"%1\" non esiste o non è una cartella.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir C \"%1\" non esiste o non è una cartella.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Dir C \"%1\" non esiste o non è una cartella.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Errore apertura cartella" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "Quando si fondono tre cartelle, la cartella di destinazione non può essere " "uguale ad A o B.\n" "Controlla meglio prima di continuare." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Attenzione ai parametri" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Esame cartelle in corso..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Lettura della cartella A in corso" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Lettura della cartella B in corso" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Lettura della cartella C in corso" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Alcune sotto-cartelle non erano leggibili" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Controlla i permessi per le sotto-cartelle." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Pronto." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Stato di confronto di cartelle" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Numero di sotto-cartelle:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Numero di file uguali:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Numero di file differenti:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Numero di fusioni manuali:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Questo riguarda tutte le operazioni di fusione." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Modifica tutte le operazioni di fusione" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "C&ontinua" -#: directorymergewindow.cpp:1169 +#: 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" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Da fare." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Copia A su B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Copia B su A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Elimina A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Elimina B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Elimina A e B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Fondi con A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Fondi con B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Fondi A e B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Elimina (se esiste)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Fondi" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Fondi (manuale)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Errore: Tipi di file incompatibili" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Errore: le date coincidono ma i file sono diversi." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Questa operazione per ora non è implementata." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Operazione non possibile" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -349,42 +354,47 @@ msgstr "" "\n" "Se sai come riprodurlo, per favore comunicalo all'autore del programma." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Errore nel programma" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Si è verificato un errore durante la copia.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Si è verificato un errore durante la copia.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Errore." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Fatto." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Non salvato." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Operazione di fusione sconosciuta. (Non deve mai succedere!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Operazione di fusione sconosciuta." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -404,327 +414,331 @@ msgstr "" "Stai attento perché questo programma è ancora una \"beta\" e non c'è NESSUNA " "GARANZIA che funzioni! Fai una copia di riserva dei tuoi dati importanti!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Inizio fusione" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Procedi" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Simulazione" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" "Gli elementi evidenziati sono di tipo diverso nelle diverse cartelle. Scegli " "cosa fare." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" "Le date di modifica dei file sono uguali ma i file sono diversi. Scegli cosa " "fare." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" "Non si può effettuare questa operazione poiché è in corso la fusione di due " "cartelle." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Si è verificato un errore nell'ultimo passaggio.\n" "Vuoi continuare con l'elemento che ha provocato l'errore o vuoi saltarlo?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Continua fusione dopo errore" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Continua con il prossimo elemento" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Salta l'elemento" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Saltato." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "In esecuzione..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Operazione di fusione completata." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Fusione completata" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -"Terminata simulazione fusione: controlla se le operazioni proposte vanno bene." +"Terminata simulazione fusione: controlla se le operazioni proposte vanno " +"bene." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Si è verificato un errore. Premi OK per maggiori informazioni.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Si è verificato un errore. Premi OK per maggiori informazioni.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Errore: nell'eliminare %1: non ho potuto creare una copia di riserva." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "elimina cartella ricorsivamente (%1)" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "elimina (%1)" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Errore: fallita l'eleminazione della cartella durante la sua lettura." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Errore: non è riuscita l'operazione rmdir (%1)." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Errore: eliminazione fallita." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "fusione manuale (%1, %2,%3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Nota: Dopo una fusione manuale l'utente deve premere F7 per continuare." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Errore: copia da %1 a %2 non riuscita. Eliminazione destinazione esistente " "fallita." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "copiaLink(%1 -> %2)" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Errore: copiaLink impossibile: i link remoti non sono ancora supportati." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Errore: copiaLink non riuscito." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "copia(%1 -> %2)" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Errore nel cambio nome (%1 -> %2): Impossibile eliminare la destinazione " "esistente." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "cambio nome(%1 -> %2)" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Errore: cambio nome non riuscito." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Errore eseguendo makeDir di %1. Impossibile eliminare file esistente." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "makeDir(%1)" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Errore nel creare una cartella." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Dimensione" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Ultima modifica" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Collegamento di destinazione" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "File..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "non disponibile" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Dest: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "Salva lo stato di fusione cartelle come..." -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Avvia/continua fusione cartelle" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Esegui operazione per questa voce" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Confronta file selezionato" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Fondi il file attuale" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Chiudi tutte le sottocartelle" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Apri tutte le sottocartelle" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Scegli A in tutti i casi" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Scegli B in tutti i casi" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Scegli C in tutti i casi" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Scelta automatica in tutti i casi" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Non fare nulla in tutti i casi" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "Mostra file uguali" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "Mostra file diversi" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "Mostra file solo in A" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "Mostra file solo in B" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "Mostra file solo in C" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "Confronta file selezionati" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "Fondi file selezionati" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Non fare nulla" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Elimina A e B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Fondi A e B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " @@ -732,7 +746,7 @@ msgstr "" "Nel creare una nuova copia, è fallita l'eliminazione di una precedente.\n" "Nome del file: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -740,192 +754,198 @@ msgstr "" "Nel creare una copia di riserva, non è riuscito un cambio di nome.\n" "Nome dei file: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Recupero informazioni su stato file: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Lettura file: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Scrittura file: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Memoria esaurita" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Creazione cartella: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Rimozione cartella: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Rimozione file: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Creazione link simbolico: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Cambiamento nome file: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Copia del file: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" "Errore durante la copia di un file: fallita l'apertura del file in lettura. " "Nome file: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -"Errore durante la copia di un file: fallita l'apertura del file in scrittura. " -"Nome file: %1" +"Errore durante la copia di un file: fallita l'apertura del file in " +"scrittura. Nome file: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "Errore durante la copia di un file: lettura fallita. Nome file: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Errore durante la copia di un file: Scrittura fallita. Nome file: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Lettura cartella: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Elencazione cartella: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "Configurazione attuale:" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "Errore opzioni di configurazione:" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Opzione --auto inserita, manca indicazione del file di output." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Opzione --auto ignorata nel confronto di cartelle." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Salvataggio non riuscito." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Non è riuscita l'apertura di questi file:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Errore nell'aprire file" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Apre documenti per confronto..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Salva il risultato della fusione. Tutti i conflitti devono essere stati " "risolti!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Salva questo documento con nome..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "Stampa le differenze" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Esce dall'applicazione" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Taglia la sezione selezionata e la mette negli appunti" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Copia la sezione selezionata negli appunti" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Incolla il contenuto degli appunti in questa posizione" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "Seleziona tutto nella finestra corrente" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Cerca una stringa" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Cerca di nuovo la stringa" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Mostra/nascondi la barra degli strumenti" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Mostra/nascondi la barra di stato" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Configura KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Vai alla differenza attuale" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Vai alla prima differenza" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Vai all'ultima differenza" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -"(Ignora le differenze di soli spazi bianchi quando \"Mostra spazi bianchi\" è " -"disattivato)" +"(Ignora le differenze di soli spazi bianchi quando \"Mostra spazi bianchi\" " +"è disattivato)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -933,234 +953,242 @@ msgstr "" "(Segnala le differenze di soli spazi bianchi anche quando \"Mostra spazi " "bianchi\" è disattivato)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Vai alla differenza precedente" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Vai alla differenza successiva" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Vai al conflitto precedente" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Vai al conflitto successivo" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Vai al precedente conflitto non risolto" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Vai al successivo conflitto non risolto" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Scegli righe da A" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Scegli righe da B" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Scegli righe da C" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -"Vai automaticamente al prossimo conflitto non risolto dopo aver selezionato la " -"fonte" +"Vai automaticamente al prossimo conflitto non risolto dopo aver selezionato " +"la fonte" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Mostra anche le differenze date da spazi e tabulazioni" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Mostra spazi vuoti" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Mostra numeri riga" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Scegli sempre A" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Scegli sempre B" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Scegli sempre C" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Scegli A per tutti i conflitti non risolti" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Scegli B per tutti i conflitti non risolti" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Scegli C per tutti i conflitti non risolti" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Scegli A per tutti i conflitti di \"spazi bianchi\" non risolti" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Scegli B per tutti i conflitti di \"spazi bianchi\" non risolti" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Scegli C per tutti i conflitti di \"spazi bianchi\" non risolti" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Risolvi automaticamente i conflitti semplici" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Considera le differenze come conflitti" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "Avvia la fusione automatica espressioni regolari" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "Risolvi automaticamente i conflitti semplici" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "Dividi differenze a selezione" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "Unisci i file selezionati" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Mostra finestra A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Mostra finestra B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Mostra finestra C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Focus prossima finestra" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Vista globale normale" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "Confronto di A con B" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "Confronto di A con C" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "Confronto di B con C" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "A capo nelle finestre delle differenze" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "Aggiungi allineamento manuale delle differenze" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "Cancella tutti gli allineamenti manuali delle differenze" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Focus finestra prec" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Inverti orientamento divisione" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Separa visione di testi e cartelle" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Commuta tra visualizzazione di testi e di cartelle" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Il risultato della fusione non è stato salvato." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Salva ed esci" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Esci senza salvare" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Non è riuscito il salvataggio della fusione." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 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:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Salvataggio file..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Salvataggio file con nuovo nome..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "Stampa..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "Stampa interrotta." -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Selezione" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "Stampa completata." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Uscita..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "(dis)attiva barra degli strumenti..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "(dis)attiva la barra di stato..." @@ -1175,8 +1203,8 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Non si trova una componente!\n" "Questo di solito accade per problemi di installazione. Per maggiori dettagli " @@ -1233,8 +1261,8 @@ msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -"Ignora un'impostazione di configurazione. Usa una volta per ogni impostazione. " -"P. e.: --cs \"AutoAdvance=1\"" +"Ignora un'impostazione di configurazione. Usa una volta per ogni " +"impostazione. P. e.: --cs \"AutoAdvance=1\"" #: main.cpp:54 msgid "Show list of config settings and current values." @@ -1261,22 +1289,22 @@ msgstr "file3 da aprire " msgid "Ignored. (User defined.)" msgstr "Ignorato. (definito dall'utente)" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "+ Mille grazie a coloro che hanno segnalato errori o fornito idee!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -"Numero di conflitti non ancora risolti: %1 (di cui %2 relativi a spazi bianchi)" +"Numero di conflitti non ancora risolti: %1 (di cui %2 relativi a spazi " +"bianchi)" #: mergeresultwindow.cpp:285 msgid "" @@ -1286,55 +1314,30 @@ msgstr "" "L'ouput è stato modificato.\n" "Se continui le modifiche andranno perse." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Tutti i file in input sono uguali a livello binario." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Tutti i file in input contengono lo stesso testo." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"I file A e B sono uguali a livello binario.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" +msgstr "I file %1 e %2 sono uguali a livello binario.\n" -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"I file A e B contengono lo stesso testo.\n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"I file A e C sono uguali a livello binario.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"I file A e C contengono lo stesso testo.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "I file A e B contengono lo stesso testo.\n" -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"I file B e C sono uguali a livello binario.\n" - -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"I file B e C contengono lo stesso testo.\n" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Numero totale di conflitti: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1342,7 +1345,7 @@ msgstr "" "\n" "N. di conflitti risolti automaticamente: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1350,23 +1353,23 @@ msgstr "" "\n" "N. di conflitti non risolti: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Conflitti" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1374,11 +1377,11 @@ msgstr "" "Permangono dei conflitti non risolti.\n" "Il file non verrà salvato.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Conflitti restanti" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1388,28 +1391,28 @@ msgstr "" "\n" "Impossibile fare una copia di riserva. File non salvato." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Errore nel salvare il file" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Errore di scrittura." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Output" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Modificato]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "Codifica per il salvataggio" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "Codec da" @@ -1429,6 +1432,15 @@ 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" @@ -1554,10 +1566,8 @@ msgid "Auto indentation" msgstr "Rientro automatico" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"Attivo: la nuova riga avrà lo stesso rientro della riga precedente.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "Attivo: la nuova riga avrà lo stesso rientro della riga precedente.\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1591,62 +1601,55 @@ msgstr "Diff" msgid "Diff Settings" msgstr "Impostazioni Diff" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Conserva il ritorno carrello" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Mostra i caratteri di ritorno carrello \"\\r\"se presenti.\n" -"Aiuta a confrontare file modificati sotto sistemi operativi diversi." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Tratta i commenti C/C++ come spazi bianchi." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Ignora i numeri" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -"Ignora i caratteri numerici durante il confronto. (Analogo a \"Ignora " -"spazi\".)\n" +"Ignora i caratteri numerici durante il confronto. (Analogo a \"Ignora spazi" +"\".)\n" "Può essere utile per confrontare file con dati numerici." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Ignora i commenti C/C++" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Tratta i commenti C/C++ come spazi bianchi." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Ignora maiuscole" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Tratta differenze maiusc./minusc. come spazi bianchi. ('a'<=>'A')" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Comando per il preprocessore:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Preprocessore definito dall'utente. Vedi il manuale per maggiori dettagli" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Preprocessore per confronto righe:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1655,11 +1658,11 @@ msgstr "" "per verificare la corrispondenza di righe.\n" "Vedi il manuale per maggiori dettagli" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Ricerca approfondita (lenta)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1667,11 +1670,15 @@ msgstr "" "Abilita l'opzione --minimal del \"diff\" esterno.\n" "L'analisi di grandi file sarà molto più lenta." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "Impostazioni fusioni" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Ritardo nell'avanzamento automatico(ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" @@ -1680,39 +1687,35 @@ msgstr "" "selezione attuale viene mostrato per questo tempo, prima di passare\n" "al prossimo conflitto. Valori ammessi: 0-2000 ms" -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "Impostazioni fusioni" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Trattamento predefinito degli spazi bianchi nel fondere 2 file:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Scelta manuale" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" "Consente all'algoritmo di fusione di definire il file da cui prendere le " "modifiche per gli spazi bianchi." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Trattamento predefinito degli spazi bianchi nel fondere 3 file:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "Fusione automatica espressioni regolari" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "Fondi automaticamente espressione regolare:" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1725,11 +1728,11 @@ msgstr "" "sarà scelto\n" "- se disponibile - C, altrimenti B." -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "Avvia fusione automatica dell'espressione regolare all'avvio fusione" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" @@ -1737,15 +1740,15 @@ msgstr "" "Esegue la fusione per l'operazione automatica con le espressioni regolari\n" "immediatamente all'avvio dell'operazione.\n" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "Fusione della cronologia del controllo della versione" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "Avvio cronologia dell'espressione regolare:" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" @@ -1756,17 +1759,18 @@ msgstr "" "Solitamente questa riga contiene \"$Log$\"-keyword.\n" "Valore predefinito: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "Espressione regolare di inizio dell'elemento di cronologia:" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" "Un elemento di cronologia del controllo della versione consiste di diverse " @@ -1775,24 +1779,24 @@ msgstr "" "commento principale).\n" "Usa le parentesi per raggruppare le chiavi che si vogliono usare per " "l'ordinamento.\n" -"Se la parte sinistra è mancante, KDiff3 considera che le linee vuote saparano " -"gli elementi di cronologia.\n" +"Se la parte sinistra è mancante, KDiff3 considera che le linee vuote " +"saparano gli elementi di cronologia.\n" "Consulta la documentazione per ulteriori dettagli." -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "Ordinamento della fusione della cronologia" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "Ordina la cronologia del controllo di versione per chiavi." -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" "Ordine della chiave d'ordinamento d'inizio dell'elemento di cronologia:" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1808,25 +1812,34 @@ msgstr "" "iniziando con 1) usando ',' come separatore (p.e. \"4,5,6,1,2,3,7\").\n" "Consulta la documentazione per i ulteriori dettagli." -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "Fondi la cronologia del controllo di versione all'inizio della fusione" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -"Avvia l'autofusione della cronologia del controllo di versione all'inizio della " -"fusione." +"Avvia l'autofusione della cronologia del controllo di versione all'inizio " +"della fusione." + +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Numero di sotto-cartelle:" -#: optiondialog.cpp:947 +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "Prova le tue espressioni regolari" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "Comando di fusione irrilevante:" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" @@ -1836,23 +1849,35 @@ msgstr "" "quando non sono rilevati altri cambiamenti rilevanti.\n" "Chiamati con i paramentri: filename1 filename2 filename3" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Fusione di directory" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Anche sottodirectory" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Per scegliere se analizzare anche le sottodirectory o no." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Tipi di file:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1862,11 +1887,11 @@ msgstr "" "Caratteri jolly ammessi: \"*\" e \"?\"\n" "Puoi specificare più categorie separandole con un \";\"" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "File da escludere:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1876,11 +1901,11 @@ msgstr "" "Caratteri jolly ammessi: \"*\" e \"?\"\n" "Puoi specificare più categorie separandole con un \";\"" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Directory da escludere:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1890,11 +1915,11 @@ msgstr "" "Caratteri jolly ammessi: \"*\" e \"?\"\n" "Puoi specificare più categorie separandole con un \";\"" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Utilizza .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1902,23 +1927,23 @@ msgstr "" "Escludi anche tutto quello che sarebbe ignorato dal CVS.\n" "Puoi usare un file \".cvsignore\" diverso per ogni directory." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Esamina file e directory nascosti" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Esamina file e directory con l'attributo \"nascosto\"." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Esamina file e directory che iniziano con \".\"." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Segui i link dei file" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1926,11 +1951,11 @@ msgstr "" "Attivo: Confronta il file a cui punta il link.\n" "Non attivo: Confronta i link." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Segui i link delle directory" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1938,11 +1963,11 @@ msgstr "" "Attivo: Confronta la directory a cui punta il link.\n" "Non attivo: Confronta i link." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "Confronto nomi file sensibili alle maiuscole/minuscole" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1954,23 +1979,23 @@ msgstr "" "Imposta questa opzione se il caso dei nomi deve coincidere. (l'opzione " "predefinita per Windows è off, altrimenti on.)" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Modalità di confronto file" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Confronto binario" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Confronto binario per ogni file. (predefinito)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Analisi completa" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1978,24 +2003,45 @@ msgstr "" "Esegue analisi completa e mostra informazioni statistiche in nuove colonne.\n" "(Più lento del confronto binario, lentissimo su file binari.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Basati sulla data di modifica (non sicuro)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" "Assumi che i file sono uguali se hanno la stessa data e dimensione.\n" "Utile per confrontare grandi directory o per connessioni lente." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Assumi che i file sono uguali se hanno la stessa data e dimensione.\n" +"Utile per confrontare grandi directory o per connessioni lente." + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Basati sulla dimensione (non sicuro)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -2005,11 +2051,11 @@ msgstr "" "Utile per confrontare grandi directory o per connessioni lente,\n" "quando la data viene modificata durante il download." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Sincronizza le directory" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -2020,11 +2066,11 @@ msgstr "" "Funziona solo quando si confrontano due directory\n" "senza specificare una destinazione." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Se diversi per spazi bianchi sono considerati uguali" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -2032,11 +2078,11 @@ msgstr "" "Considera uguali i file diversi solo per spazi bianchi.\n" "Funziona solo quando si effettua un'analisi completa." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Copia il più recente invece di fondere (non sicuro)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2046,11 +2092,11 @@ msgstr "" "(Utilizza questo metodo solo a ragion veduta!)\n" "Ha effetto solo quando si confrontano due directory." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "File di backup (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2059,15 +2105,15 @@ msgstr "" "uno precedente, quello vecchio non verrà cancellato,\n" "ma salvato con l'estensione \".orig\"." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Impostazioni locali" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Lingua (bisogna riavviare kdiff3)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2075,11 +2121,11 @@ msgstr "" "Scegli una lingua dell'interfaccia grafica o \"Auto\".\n" "Affinché la lingua venga cambiata, devi uscire e riavviare KDiff3." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Usa la stessa codifica per tutto:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." @@ -2087,49 +2133,49 @@ msgstr "" "Permette di cambiare tutte le codifiche cambiando solo la prima.\n" "Disattivala se servono impostazioni differenziate." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Nota: La codifica locale è " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "Codifica per file A:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" "Se abilitato, la codifica Unicode (UTF-16 o UTF-8) verrà abilitata.\n" -"Se la codifica del file non viene rilevata, la codifica selezionata verrà usata " -"come riserva.\n" +"Se la codifica del file non viene rilevata, la codifica selezionata verrà " +"usata come riserva.\n" "(la rilevazione unicode dipende dal primo byte di un file - l'indicazione " "dell'ordine dei byte \"BOM\")." -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "Autorileva Unicode" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "Codifica per file B:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "Codifica per file C:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Codifica per i file fusione e salvataggio:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "Seleziona automaticamente" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " @@ -2139,15 +2185,15 @@ msgstr "" "In casi ambigui una finestra di dialogo chiederà all'utente di scegliere la " "codifica per il salvataggio." -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Codifica per i file sottoposti al preprocessore:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Lingue scritte da destra a sin." -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2155,19 +2201,19 @@ msgstr "" "Alcune lingue si scrivono da destra a sinistra.\n" "Questa opzione cambia editor e visualizzazione per adattarvisi." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "Integrazione" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "Impostazioni di integrazione" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "Opzioni di riga di comando da ignorare:" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2179,7 +2225,27 @@ msgstr "" "Molti valori possono essere specificati se separati con ';'\n" "Questo elimina l'errore \"Opzione sconosciuta\"." -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2195,19 +2261,19 @@ msgstr "" "\n" "Vuoi continuare o preferisci cambiare font?" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Font incompatibile " -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Continua a tuo rischio" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Scegli un altro font" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" "Verranno ripristinate tutte le opzioni.\n" @@ -2218,10 +2284,8 @@ msgid "PreprocessorCmd: " msgstr "Cmd-Preprocess.:" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"Tra le opzioni selezionate, queste potrebbero modificare dei dati:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "Tra le opzioni selezionate, queste potrebbero modificare dei dati:\n" #: pdiff.cpp:264 msgid "" @@ -2284,18 +2348,11 @@ msgstr "Diff. righe: A <-> C" #: pdiff.cpp:513 msgid "All input files contain the same text, but are not binary equal." msgstr "" -"Tutti i file in input contengono lo stesso testo, ma non sono uguali a livello " -"binario." - -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"I file %1 e %2 sono uguali a livello binario.\n" +"Tutti i file in input contengono lo stesso testo, ma non sono uguali a " +"livello binario." #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "I file %1 e %2 contengono lo stesso testo, ma non sono uguali a livello " "binario. \n" @@ -2310,109 +2367,55 @@ msgstr "" "Tieni conto che la fusione di KDiff3 non ha senso per file binari.\n" "Se vuoi continuare, lo fai a tuo rischio e pericolo." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Interrompi" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Apertura dei file..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Errore nell'apertura del file" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Taglio selezione..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Copia selezione negli appunti..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Inserimento dagli appunti..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Salva e continua" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Continua senza salvare" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Ricerca completata." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Ricerca completata." -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" "Non è selezionato niente neanche nella finestra di input delle differenze." -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "Errore nell'aggiungere intervalli di differenza manuali" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Configura KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Directory" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Operazione di fusione su questo file/dir." - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Operazione di sincronizzazione su questo file/dir." - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Va" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "VistaD&iff" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "F&usione" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "Fine&stra" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (Base):" @@ -2455,6 +2458,10 @@ msgstr "Output (Opzionale):" msgid "Configure..." msgstr "Configura..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Testo da cercare:" @@ -2531,6 +2538,14 @@ 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." @@ -2542,3 +2557,84 @@ msgstr "Confronto fallito." #: smalldialogs.cpp:559 msgid "Opening and closing parentheses don't match in regular expression." msgstr "Aprire e chiudere parentesi non confronta le espressioni regolari." + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Directory" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Operazione di fusione su questo file/dir." + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Operazione di sincronizzazione su questo file/dir." + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Va" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "VistaD&iff" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "F&usione" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "Fine&stra" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "I file A e B sono uguali a livello binario.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "I file A e C sono uguali a livello binario.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "I file A e C contengono lo stesso testo.\n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "I file B e C sono uguali a livello binario.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "I file B e C contengono lo stesso testo.\n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Conserva il ritorno carrello" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Mostra i caratteri di ritorno carrello \"\\r\"se presenti.\n" +#~ "Aiuta a confrontare file modificati sotto sistemi operativi diversi." diff --git a/po/ja.po b/po/ja.po index 249599f..508c79c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,36 +5,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2006-04-14 21:25+0900\n" "Last-Translator: Yukiko Bando \n" "Language-Team: Japanese \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.0.2\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "SATOH Satoru" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "ss@kde.gr.jp" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "クリップボードのデータを一時ファイルに書き込めませんでした。" -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "クリップボードから" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -43,7 +44,7 @@ msgid "" "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -52,7 +53,7 @@ msgid "" "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -60,15 +61,15 @@ msgstr "" "データ損失エラー:\n" "もし再現するようなら作者にコンタクトをとってください\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "深刻な内部エラー" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "上部行" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "最後" @@ -84,242 +85,249 @@ msgstr "リンク: " msgid "Size. " msgstr "容量 " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "日付と容量: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "%1 の一時コピー作成に失敗" -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "%1 を開けません" -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "ファイルを比較中..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "%1 から読み込み時にエラー" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "名前" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "操作" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "状態" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "未解決" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "解決済み" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "空白以外" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "空白" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" -msgstr "今ディレクトリマージ中です. 本当にマージを中止し、ディレクトリを再スキャンしますか?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"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:320 directorymergewindow.cpp:2868 +#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "再スキャン" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "マージを続行" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "ディレクトリオープンに失敗:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"ディレクトリ A %1 は存在しないか、ディレクトリではありません\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "ディレクトリ A %1 は存在しないか、ディレクトリではありません\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"ディレクトリ B %1 は存在しないか、ディレクトリではありません\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "ディレクトリ B %1 は存在しないか、ディレクトリではありません\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"ディレクトリ C %1 は存在しないか、ディレクトリではありません\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "ディレクトリ C %1 は存在しないか、ディレクトリではありません\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "ディレクトリオープンエラー" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -"三つのディレクトリをマージする際、マージ先ディレクトリは A / B と同じであってはいけません.\n" +"三つのディレクトリをマージする際、マージ先ディレクトリは A / B と同じであって" +"はいけません.\n" "続行する前にもう一度調べてください" -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "パラメータ警告" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "ディレクトリをスキャン中..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "ディレクトリ A を読み込み中" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "ディレクトリ B を読み込み中" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "ディレクトリ C を読み込み中" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "いくつかのサブディレクトリが読み込み不可でした" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "サブディレクトリの許可属性を確かめてください" -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "準備完了." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "ディレクトリ比較状態" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "サブディレクトリ数:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "等しいファイルの数:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "異なるファイルの数:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "手作業でのマージ数:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "これはすべてのマージ操作に影響します" -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "すべてのマージ操作を更新中" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "続行(&O)" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "処理中" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "To do." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "A を B にコピー" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "B を A にコピー" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "A を削除" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "B を削除" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "A と B を削除" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "A にマージ" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "B にマージ" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "A と B にマージ" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "(存在すれば)削除" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "マージ" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "マージ (手作業)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "エラー: ファイルタイプが衝突しています" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "エラー: 日付は等しいですがファイルはそうでありません" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "この操作は今はできません" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "操作不可" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -333,42 +341,47 @@ msgstr "" "\n" "再現方法がわかったならプログラム作者にコンタクトを取ってください" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "プログラムエラー" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"コピー中にエラー発生\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "コピー中にエラー発生\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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 "マージエラー" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "エラー" -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "完了" -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "未保存" -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "不明なマージ操作 (起り得ないはず!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "不明なマージ操作" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -385,317 +398,325 @@ msgstr "" "\n" "何が起きるか知りたいなら \"試行\" を選択してください\n" "\n" -"このプログラムはまだβ段階で何が起きても無保証だということに注意してください!重要なデータはバックアップをとってください!" +"このプログラムはまだβ段階で何が起きても無保証だということに注意してください!" +"重要なデータはバックアップをとってください!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "マージ開始" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "実行" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "試行" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." -msgstr "強調表示された項目は異なるディレクトリの異なるタイプです.何をするか選択してください" +"The highlighted item has a different type in the different directories. " +"Select what to do." +msgstr "" +"強調表示された項目は異なるディレクトリの異なるタイプです.何をするか選択してく" +"ださい" -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." -msgstr "ファイルの更新日時は等しいですがファイルは異なっています. 何をするか選択してください" +"The modification dates of the file are equal but the files are not. Select " +"what to do." +msgstr "" +"ファイルの更新日時は等しいですがファイルは異なっています. 何をするか選択して" +"ください" -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "ディレクトリマージ中なのでこの操作を実行することはできません" -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "最終段階でエラー発生.\n" "エラーを起した項目について続行しますか? それともスキップしますか?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "エラー後にもマージ続行" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "最後の項目について続行" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "項目をスキップ" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "スキップされました" -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "進行中..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "マージ操作完了" -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "マージ完了" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "マージ試行完了: 先の操作をしてもよいか確認してください." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"エラー発生. 詳細情報を見るには OK をクリックしてください\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "エラー発生. 詳細情報を見るには OK をクリックしてください\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "エラー: %1 削除中: バックアップ作成失敗" -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "再帰的にディレクトリを削除 ( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "削除( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "エラー: ディレクトリ読み込み中にディレクトリ削除失敗" -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "エラー: rmdir( %1 ) 操作失敗" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "エラー: 削除失敗" -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "手作業でのマージ( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " 注意: 手作業でのマージ後に続行するには F7 を押してください" -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "エラー: copy( %1 -> %2 )失敗. 既存のコピー先の削除に失敗" -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "エラー: copyLink 失敗: リモートリンクは未サポートです" -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "エラー: copyLink 失敗" -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "copy( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "rename( %1 -> %2 ) 中にエラー: 既存のコピー先を削除できません" -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "エラー: 名称変更失敗" -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "makeDir %1 中にエラー. 既存ファイルを削除できません" -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "ディレクトリ作成中にエラー" -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "先" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "ディレクトリ" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "タイプ" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "容量" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "属性" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "最終更新" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "リンク先" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "ファイル..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "利用不可" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (先): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (元): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (先): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (先): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "先: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 #, fuzzy msgid "Save Directory Merge State As..." msgstr "ディレクトリマージ" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "ディレクトリマージを開始/続行" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "現在の項目について操作を実行" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "選択ファイルを比較 " -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "現在のファイルをマージ " -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "すべてのサブディレクトリをたたみ込み" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "すべてのサブディレクトリを展開" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "すべての項目について A を選択" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "すべての項目について B を選択" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "すべての項目について C を選択" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "すべての項目について自動選択" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "すべての項目について操作なし" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "等しいファイルを表示" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "異なるファイルを表示" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "A にのみ存在するファイルを表示" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "B にのみ存在するファイルを表示" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "C にのみ存在するファイルを表示" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "明示的に選択したファイルを比較 " -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "明示的に選択したファイルをマージ " -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "何もしない" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "A と B を削除" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "A と B にマージ" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " @@ -703,7 +724,7 @@ msgstr "" "バックアップ作成中、古いバックアップを削除に失敗.\n" "ファイル名: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -711,416 +732,430 @@ msgstr "" "バックアップ作成中、名前変更に失敗\n" "ファイル名: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "ファイルの状態を取得中: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "ファイルを読み込み中: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "ファイルに書き込み中: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "メモリが足りません" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "ディレクトリ作成中: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "ディレクトリ削除中: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "ファイル削除中: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "シンボリックリンク作成中: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "ファイルの名称変更中: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "ファイルをコピー中: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "ファイルコピー中にエラー: ファイル読み込みに失敗. ファイル名: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "ファイルコピー中にエラー: ファイル書き込みに失敗. ファイル名: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "ファイルコピー中にエラー: 読み込みに失敗. ファイル名: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "ファイルコピー中にエラー: 書き込みに失敗. ファイル名: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "ディレクトリを読み込み中: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "ディレクトリをリスト中: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "現在の設定:" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "設定オプションエラー:" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "オプション --auto を使用していますが出力ファイルが未指定です" -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "オプション --auto はディレクトリ比較時には無視されます" -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "保存に失敗" -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "ファイルを開けませんでした:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "ファイルを開く際にエラー" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "比較のために文書を開いています..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "マージ結果を保存. すべての衝突を回避しなければなりません!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "現在の文書を別名で保存..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "差異を印刷" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "アプリケーションを終了" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "選択された範囲を切り取りクリップボードへ" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "選択された範囲をコピーしクリップボードへ" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "クリップボードの内容を現在の位置に貼り付け" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "現在のウィンドウのすべてを選択" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "文字列を検索" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "文字列を再検索" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "ツールバーを有効/無効に" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "ステータスバーを有効/無効に" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "KDiff3 を設定..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "異なる部分に移動" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "最初の異なる部分に移動" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "最後の異なる部分に移動" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(\"空白文字を表示\"が無効なときは空白の差異をスキップする)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "(\"空白文字を表示\"が無効なときも空白の差異をスキップしない)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "前の異なる部分に移動" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "次の異なる部分に移動" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "前の衝突部分に移動" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "次の衝突部分に移動" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "前の未解決の衝突部分に移動" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "次の未解決の衝突部分に移動" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "A からの選択行" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "B からの選択行" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "C からの選択行" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "ソース選択後に次の未解決の衝突部分に自動的に移動" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "スペース/タブ文字の差異を表示 " -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "空白文字を表示" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "行番号を表示" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "常に A を選択" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "常に B を選択" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "常に C を選択" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "未解決の衝突について常に A を選択" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "未解決の衝突について常に B を選択" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "未解決の衝突について常に C を選択" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "未解決の空白の衝突について常に A を選択" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "未解決の空白の衝突について常に B を選択" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "未解決の空白の衝突について常に C を選択" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "単純な衝突について自動的に解決" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "衝突について異なる部分として設定" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "単純な衝突について自動的に解決" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "選択した差異を分離" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "選択した差異を結合" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "ウィンドウ A を表示" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "ウィンドウ B を表示" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "ウィンドウ C を表示" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "次のウィンドウにフォーカス" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "すべて比較 (標準)" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "A と B を比較" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "A と C を比較" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "B と C を比較" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Diffウィンドウで行を折り返す" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "前のウィンドウにフォーカス" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "分割軸を切り替え" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "ディレクトリ/テキスト分割画面表示" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "ディレクトリ/テキスト表示を切り替え" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "マージ結果は保存されませんでした." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "保存/終了" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "保存しないで終了" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "マージ結果保存に失敗" -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "ディレクトリマージ実行中です. 本当に中止しますか?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "ファイルを保存中..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "名前を付けてファイルを保存中..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "印刷中..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "印刷を中止しました。" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "選択" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "印刷が完了しました。" -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "終了中..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "ツールバー切り替え中..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "ステータスバーの表示を切り替え..." @@ -1135,11 +1170,12 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "パーツを見つけられませんでした\n" -"普通これはインストールの問題です. 詳細についてはソースパッケージの README ファイルを参照のこと" +"普通これはインストールの問題です. 詳細についてはソースパッケージの README " +"ファイルを参照のこと" #: main.cpp:35 msgid "Tool for Comparison and Merge of Files and Directories" @@ -1219,19 +1255,18 @@ msgstr "開く file3" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "未解決の衝突の数: %1 (内 %2 は空白)" @@ -1243,55 +1278,30 @@ msgstr "" "出力が更新されました\n" "続行すると更新内容は失われます" -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "すべての入力ファイルバイナリは同じです" -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "すべての入力ファイルは同じテキストです" -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"ファイル A と B は同じバイナリです\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"ファイル A と B は同じテキストです\n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"ファイル A と C は同じバイナリです\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"ファイル A と C は同じテキストです\n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"ファイル B と C は同じバイナリです\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" +msgstr "ファイル %1 と %2 はバイナリ的に同じです。\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"ファイル B と C は同じテキストです\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "ファイル A と B は同じテキストです\n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "衝突の総計: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1299,7 +1309,7 @@ msgstr "" "\n" "自動的に解決された衝突の数: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1307,23 +1317,23 @@ msgstr "" "\n" "未解決の衝突の数: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "衝突" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "<ソース行なし>" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "<マージ衝突 (空白のみ)>" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "<マージ衝突>" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1331,11 +1341,11 @@ msgstr "" "すべての衝突がまだ解決されていません\n" "ファイルは保存されません\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "衝突(左)" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1345,29 +1355,29 @@ msgstr "" "\n" "バックアップファイルの作成に失敗。ファイルは保存されません。" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "ファイル保存エラー" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "書き込み中にエラー" -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "出力" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[更新]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 #, fuzzy msgid "Encoding for saving" msgstr "C のファイルのエンコーディング:" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1387,6 +1397,15 @@ 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 出力フォント" @@ -1510,10 +1529,8 @@ msgid "Auto indentation" msgstr "自動字下げ" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"オン: 新規改行に前の行の字下げを使う\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "オン: 新規改行に前の行の字下げを使う\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1549,60 +1566,53 @@ msgstr "KDiff3" msgid "Diff Settings" msgstr "Diff/マージの設定" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "キャリッジリターンを保存" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"キャリッジリターンがあれば `\\r` と表示\n" -"異なる OS で更新されたファイルを比較するのを手助け" +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "C/C++ コメントを空白と同じように扱う" -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "数字を無視" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "行マッチ時に数字の違いを無視. (空白を無視に類似)\n" "数字データファイルの比較を手助け" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "C/C++ コメントを無視 " -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "C/C++ コメントを空白と同じように扱う" -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "大文字小文字の差を無視" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "大文字小文字の差を空白と同じように扱う ('a' <=>'A')" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "プリプロセッサコマンド:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "ユーザ定義プリプロセッサ (詳細については文書を参照)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "行マッチプリプロセッサコマンド:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1610,11 +1620,11 @@ msgstr "" "このプリプロセッサは行マッチ時にだけ使われます\n" "(詳細については文書を参照)" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "厳密に試行(遅い)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1622,11 +1632,16 @@ msgstr "" "外部 diff コマンドについて --minimal オプションを有効に\n" "大きなファイルでは解析がより遅くなります" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Diff/マージの設定" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "自動前進遅延(ミリ秒):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" @@ -1634,38 +1649,33 @@ msgstr "" "自動前進モードでは選択結果が、次の衝突に行く前に指定時間ごとに\n" "表示されます (レンジ: 0-2000 ミリ秒)" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Diff/マージの設定" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "空白 2 ファイルマージ標準:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "手作業での選択" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "マージアルゴリズムが空白の変更だけについて入力を自動的に選択するように" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "空白 3 ファイルマージ標準:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1673,58 +1683,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1734,46 +1745,67 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "サブディレクトリ数:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "ディレクトリマージ" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "ディレクトリを再帰" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "サブディレクトリを解析するかどうか" -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "ファイルパターン:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1783,11 +1815,11 @@ msgstr "" "ワイルドカード: `*` と `?`\n" "複数のパターンは `:` で区切って指定できます" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "ファイル否定パターン:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1797,11 +1829,11 @@ msgstr "" "ワイルドカード: `*` と `?`\n" "複数のパターンは `:` で区切って指定できます" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "ディレクトリ否定パターン:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1811,11 +1843,11 @@ msgstr "" "ワイルドカード: `*` と `?`\n" "複数のパターンは `:` で区切って指定できます" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr ".cvsignore を使用" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1823,23 +1855,23 @@ msgstr "" "CVS で無視されるすべてについて否定パターンを拡張\n" "ローカルの \".cvsignore\" ファイルによってディレクトリ固有に利用できます" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "隠しファイルとディレクトリを検索 " -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "隠し属性を持つファイルとディレクトリを検索" -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "`.` で始まるファイルとディレクトリを検索" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "ファイルリンクを追跡" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1847,11 +1879,11 @@ msgstr "" "オン: ファイルのリンク先を比較\n" "オフ: リンクを比較" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "ディレクトリリンクを追跡" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1859,11 +1891,11 @@ msgstr "" "オン: ディレクトリのリンク先を比較\n" "オフ: リンクを比較" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "大文字小文字を区別してファイル名を比較" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1871,26 +1903,27 @@ msgid "" "off, otherwise on.)" msgstr "" "ディレクトリ比較は名前が一致するファイルおよびディレクトリを比較します。\n" -"名前の大文字小文字も一致しなければならない場合は、このオプションを有効にしてください。\n" +"名前の大文字小文字も一致しなければならない場合は、このオプションを有効にして" +"ください。\n" "(Windowsの標準はオフ、その他はオンです)" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "ファイル比較モード" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "バイナリ比較" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "それぞれのファイルをバイナリ比較します。(標準)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "完全分析" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1898,37 +1931,59 @@ msgstr "" "完全な比較を実行し、統計情報を別のカラムに表示します。\n" "(バイナリ比較より遅く、バイナリファイルの場合は非常に時間がかかります)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "更新日時を信用 (安全ではありません)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" +"ファイルの更新日時とファイル長が等しければ同じものと見なす\n" +"大きなディレクトリや遅いネットワークで有効" + +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" "Useful for big directories or slow networks." msgstr "" "ファイルの更新日時とファイル長が等しければ同じものと見なす\n" "大きなディレクトリや遅いネットワークで有効" -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "容量を信用 (安全ではありません)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" "ファイル長が等しいならファイルは同じと見なす\n" -"大きなディレクトリやダウンロード間に更新日時が変わるような遅いネットワークで有効" +"大きなディレクトリやダウンロード間に更新日時が変わるような遅いネットワークで" +"有効" -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "ディレクトリを同期" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -1937,11 +1992,11 @@ msgstr "" "両ディレクトリに以後同じになるようにファイルを置く\n" "方向を未指定で二つのディレクトリを比較する際のみ機能します" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "空白の違いを無視" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -1949,11 +2004,11 @@ msgstr "" "ファイルの差異が空白だけの場合は等しいものと見なします。\n" "このオプションは完全分析が選択されているときにのみアクティブになります。" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "マージではなくより新しいものをコピー (安全ではありません)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -1963,125 +2018,147 @@ msgstr "" "(何をしているのかわかっている場合だけ使用してください!)\n" "二つのディレクトリを比較しているときのみ有効です" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "バックアップファイル (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "古いファイルも削除せずに '.orig' 拡張子を付けて保存されます" -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "言語の設定" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "言語 (再スタートが必要)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "すべてに同じエンコーディングを使用:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -"このオプションを有効にすると、最初を変更するだけですべてのエンコーディングを同時に変更できます。\n" +"このオプションを有効にすると、最初を変更するだけですべてのエンコーディングを" +"同時に変更できます。\n" "それぞれに個別に設定する必要がある場合は、これを無効にしてください。" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "現在のロカールエンコーディング: " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "A のファイルのエンコーディング:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "B のファイルのエンコーディング:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "C のファイルのエンコーディング:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "マージ出力と保存時のエンコーディング:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "選択を自動的にコピー" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "プリプロセッサファイルのエンコーディング:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "右から左に読む言語" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "統合" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "統合の設定" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "無視するコマンドラインオプション:" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" "Several values can be specified if separated via ';'\n" "This will suppress the \"Unknown option\"-error." msgstr "" -"KDiff3が他のツールによって使用されるときに無視すべきコマンドラインオプションのリストです。\n" +"KDiff3が他のツールによって使用されるときに無視すべきコマンドラインオプション" +"のリストです。\n" "複数のオプションはセミコロン(;)で区切って指定してください。\n" "これによって \"不明なオプション\" エラーを抑制できます。" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2097,19 +2174,19 @@ msgstr "" "\n" "続行するか、他のフォントを選択してください" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "非互換なフォント" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "自己責任で続行" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "他のフォントを選択" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "現在のトピックだけでなくすべてのオプションをリセット" @@ -2118,8 +2195,7 @@ msgid "PreprocessorCmd: " msgstr "プリプロセッサコマンド: " #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" #: pdiff.cpp:264 @@ -2179,17 +2255,11 @@ msgstr "Linediff: A <-> C" #: pdiff.cpp:513 msgid "All input files contain the same text, but are not binary equal." -msgstr "すべての入力ファイルのテキストは同じですが、バイナリ的に等しくありません。" - -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" msgstr "" -"ファイル %1 と %2 はバイナリ的に同じです。\n" +"すべての入力ファイルのテキストは同じですが、バイナリ的に等しくありません。" #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "ファイル %1 と %2 のテキストは同じですが、バイナリ的に等しくありません。\n" @@ -2203,109 +2273,55 @@ msgstr "" "KDiff3 マージはバイナリデータを意図したものではないことに注意してください\n" "自己責任で続行してください" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "中止" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "ファイルを開いています..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "ファイルオープンエラー" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "選択範囲を切り取り..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "選択範囲をクリップボードにコピー..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "クリップボードの内容を挿入..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "保存/続行" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "保存しないで続行" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "検索完了" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "検索完了" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "ディレクトリ作成中にエラー" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "KDiff3(&K)" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "KDiff3 を設定" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "ディレクトリ(&D)" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "現在の項目のマージ操作" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "現在の項目の同期操作" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "移動(&M)" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "Diffビュー(&I)" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "マージ(&M)" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "ウィンドウ(&W)" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (ベース):" @@ -2348,6 +2364,10 @@ msgstr "出力 (オプション):" msgid "Configure..." msgstr "設定..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "検索テキスト:" @@ -2420,6 +2440,14 @@ 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 "" @@ -2433,6 +2461,87 @@ msgstr "保存に失敗" msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "KDiff3(&K)" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "ディレクトリ(&D)" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "現在の項目のマージ操作" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "現在の項目の同期操作" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "移動(&M)" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "Diffビュー(&I)" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "マージ(&M)" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "ウィンドウ(&W)" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "ファイル A と B は同じバイナリです\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "ファイル A と C は同じバイナリです\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "ファイル A と C は同じテキストです\n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "ファイル B と C は同じバイナリです\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "ファイル B と C は同じテキストです\n" + +#~ msgid "Preserve carriage return" +#~ msgstr "キャリッジリターンを保存" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "キャリッジリターンがあれば `\\r` と表示\n" +#~ "異なる OS で更新されたファイルを比較するのを手助け" + #~ msgid "Diff and Merge" #~ msgstr "Diff/マージ" diff --git a/po/ka.po b/po/ka.po index ae91c69..8462bf5 100644 --- a/po/ka.po +++ b/po/ka.po @@ -5,36 +5,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2006-03-28 01:44+0400\n" "Last-Translator: Giasher \n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.2\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "რუსუდან ცისკრელი" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "tsiskreli@gmail.com" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "ბუფერის მონაცემის დროებით ფაილში ჩაწერა ვერ შედგა." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "გაცვლის ბუფერიდან " -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -48,7 +49,7 @@ msgstr "" "\n" "გაგრძელების ბრძანება ახლა გამოირთვება." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -62,7 +63,7 @@ msgstr "" "\n" "ხაზთა დამთხვევა ახლა გამოირთვება." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -70,16 +71,16 @@ msgstr "" "მონაცემების დაკარგვის შეცდომა:\n" "თუ ეს მეორდება, გთხოვთ დაუკავშირდეთ ავტორს.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "მკაცრი შინაგანი შეცდომა" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "ზედა ხაზი %1" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "დასასრული" @@ -95,245 +96,249 @@ msgstr "ბმული: " msgid "Size. " msgstr "ზომა. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "თარიღი და ზომა: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "%1-ს დროებითი ასლის შექმნა ვერ შედგა." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "%1-ს გახსნა ვერ შედგა." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "ფაილების შედარება..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "%1-ს წაკითხვის შეცდომა" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "სახელი" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "ოპერაცია" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "სტატუსი" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "გადაუჭრელი" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "გადაჭრილი" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "არათეთრი" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "თეთრი" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" "თქვენ ახლა დირექტორიების შერწყმას ახორციელებთ.დარწმუნებული ხართ რომ გსურთ " "შერწყმის შეწყვეტა და დირექტორიის თავიდან სკანირება?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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 "თავიდან სკანირება" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "შერწყმის გაგრძელება" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "დირექტორიის გახსნა ვერ შედგა:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir A \"%1\" არ არსებობს ან არ არის დირექტორია.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Dir A \"%1\" არ არსებობს ან არ არის დირექტორია.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir B \"%1\" არ არსებობს ან არ არის დირექტორია.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Dir B \"%1\" არ არსებობს ან არ არის დირექტორია.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir C \"%1\" არ არსებობს ან არ არის დირექტორია.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Dir C \"%1\" არ არსებობს ან არ არის დირექტორია.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "დირექტორიის გახსნის შეცდომა" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "დანიშნულების დირექტორია არ უნდა იყოს იგივე A ან B როდესაც ხდება სამი " "დირექტორიის შერწყმა.\n" "გაგრძელებამდე კიდევ შეამოწმეთ." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "გაფრთხილების პარამეტრი" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "დირექტორიების სკანირება..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "დირექტორია A-ს წაკითხვა" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "დირექტორია B-ს წაკითხვა" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "დირექტორია C-ს წაკითხვა" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "ზოგიერთი ქვედირექტორიის წაკითხვა ვერ განხორციელდა" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "ქვედირექტორიების უფლებების შემოწმება." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "მზად." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "დირექტორიის შედარების სტატუსი" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "ქვედირექტორიების რაოდენობა:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "ტოლი ფაილების რაოდენობა:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "განსხვავებული ფაილების რაოდენობა:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "ხელით შერწყმების რაოდენობა:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "ეს მოსდის ყველა შერწყმის ოპერაციას." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "ყველა შერწყმის ოპერაციების შეცვლა" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&გაგრძელება" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "მიმდინარეობა " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "გასაკეთებელი." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "A-ს ასლი B-ში" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "B-ს ასლი A-ში" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "A-ს წაშლა" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "B-ს წაშლა" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "A და B-ს წაშლა" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "შერწყმა A-სკენ" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "შერწყმა B-სკენ" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "შერწყმა A და B-სკენ" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "წაშლა (თუ არსებობს)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "შერწყმა" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "შერწყმა (ხელით)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "შეცდომა: კონფლიქტურ ფაილთა ტიპები" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "შეცდომა: თარიღები იდენტურია, მარა ფაილები არა." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "ეს ოპერაცია ახლა შეუძლებელია." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "ოპერაცია შეუძლებელია" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -347,42 +352,47 @@ msgstr "" "\n" "თუ იცით როგორ განახორციალოთ ეს, გთხოვთ დაუკავსირდეთ პროგრამის ავტორს." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "პროგრამის შეცდომა" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"ასლის გაკეთებისას შეცდომა მოხდა.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "ასლის გაკეთებისას შეცდომა მოხდა.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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 "შერწმის შეცდომა" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "შეცდომა." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "შესრულებულია." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "არაა შენახული." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "შერწყმის უცნობი ოპერაცია. (ეს არასდროს არ უნდა მომხდარიყო!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "შერწყმის უცნობი ოპერაცია." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -401,338 +411,343 @@ msgstr "" "გაითვალისწინეთ ეს პროგრამა ჯერ კიდევ ბეტაა და არანაერი გარანტია არ არსებობს! " "სასიცოცხლო მნიშვნელობის მონაცემების სარეზერვო ასლები გააკეთეთ!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "შერწყმის დაწყება" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "გააკეთე" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "სიმულაცია" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" "მარკირებული ელემენტი სხვადასხვა დირექტორიებში სხვადასხვაა. აირჩიეთ რა ქნათ." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" "ფაილის მოდიფიკაციის თარიღები იდენტურია მარა ფაილები არა. აირჩიეთ რა გააკეთოთ." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" "ოპერაცია ახლა შეუძლებელია, რადგან დირექტორიათა შერწყმა უკვე გაშვებულია." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "უკანასკნელ ნაბიჯში შეცდომა მოხდა.\n" -"გსურთ ამ ელემენტით გაგრძელება, რომლის გამოც გდება შეცდომა, თუ გსურთ გადაახტეთ " -"მას?" +"გსურთ ამ ელემენტით გაგრძელება, რომლის გამოც გდება შეცდომა, თუ გსურთ " +"გადაახტეთ მას?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "შეცდომის შემდეგ შერწმის გაგრძელება" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "უკანასკნელი ელემენტით გაგრძელება" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "ელემენტის გაცდენა" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "გაცდენილია." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "მიმდინარეობს..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "შერწყმის ოპერაცია დასრულდა." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "შერწყმა დასრულდა" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -"შერწყმის სიმულაცია დასრულდა: შეამოწმეთ თუ ეთანხმებით შემოთავაზებულ ოპერაციებს." +"შერწყმის სიმულაცია დასრულდა: შეამოწმეთ თუ ეთანხმებით შემოთავაზებულ " +"ოპერაციებს." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"შეცდომა მოხდა. დააწკაპუნეთ OK დეტალური ცნობების სანახავად.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "შეცდომა მოხდა. დააწკაპუნეთ OK დეტალური ცნობების სანახავად.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "შეცდომა: %1-ს წასლის დროს: სარეზერვო ასლის შექმნა ვერ შედგა." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "დირექტორიის რეკურსიულად წაშლა( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "წაშლა( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "შეცდომა: დირექტორიის წაშლის ოპერაცია ვერ შედგა წაკითხვის მცდელობისას." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "შეცდომა: rmdir( %1 ) ოპერაცია ვერ შედგა." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "შეცდომა: წაშლის ოპპერაცია ვერ შედგა." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ხელით შერწყმა( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -" გაითვალისწინეთ: ხელით შერწყმის შემდეგ მომხმარებელმა უნდა გააგრძელოს F7-ის " -"დაჭერით." +" გაითვალისწინეთ: ხელით შერწყმის შემდეგ მომხმარებელმა უნდა გააგრძელოს F7-" +"ის დაჭერით." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "შეცდომა: ასლი( %1 -> %2 ) ვერ შედგა.არსებული დანიშნულების ფაილის წაშლა ვერ " "შედგა." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "შეცდომა copyLink ვერ შედგა: დაშორებული ბმულები ჯერ არ არის მხარდაჭერილი." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "შეცდომა: copyLink ვერ შედგა." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "ასლი( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "შეცდომა სახელის გადარქმევისას( %1 -> %2 ): არსებული დანიშნულების წაშლა " "შეუძლებელია." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "შეცდომა: სახელის გადარქმევა ვერ შედგა." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "შეცდომა %1-ს makeDir-ის დროს. არსებული ფაილის წაშლა შეუძლებელია," -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "დირექტორიის შექმნისას შეცდომა." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "ტიპი" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "ზომა" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "უკანასკნელად ჩასწორებულია" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "ბმულის დანიშნულება" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "ფაილი..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "ხელმიუწვდომელია" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (ფუძე): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Dest:" -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 #, fuzzy msgid "Save Directory Merge State As..." msgstr "დირექტორიათა შერწყმა" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "დირექტორიის შერწყმის დაწყება/გაგრძელება" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "მიმდინარე ელემენტიდან ოპერაციის გაშვება" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "მონიშნული ფაილების შედარება" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "მიმდინარე ფაილის შერწყმა" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "ყველა ქვედირექტორიის ჩაკეცვა" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "ყველა ქვედირექტორიის არჩაკეცვა" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "A -თვის ყველა ელემენტების არჩევა" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "B -თვის ყველა ელემენტების არჩევა" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "C -თვის ყველა ელემენტების არჩევა" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "ყველა ელემენტების ოპერაციების ავტო-არჩევა" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "ყველა ელემენტისთვის არავითარი ოპერაცია" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Show Different Files" msgstr "განსხვავებული ფაილების რაოდენობა:" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "მონიშნული ფაილების შედარება" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "მონიშნული ფაილების შედარება" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "არაფრის არ გაკეთება" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "A და B წაშლა" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "შერწყმა A და B-სკენ" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -"სარეზერვო ასლის გაკეთების მცდელობისას, ძველი სარეზერვო ასლის წაშლა ვერ შედგა. \n" +"სარეზერვო ასლის გაკეთების მცდელობისას, ძველი სარეზერვო ასლის წაშლა ვერ " +"შედგა. \n" "ფაილის სახელი: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -740,428 +755,442 @@ msgstr "" "სარეზერვო ასლის გაკეთების მცდელობისას, სახელის გადარქმევა ვერ შედგა. \n" "ფაილის სახელები: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "ფაილის მდგომარეობის მიღება: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "ფაილის წაკითხვა: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "ფაილის ჩაწერა: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "მეხსიერება არაა საკმარისი" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "დირექტორიის შექმნა: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "დირექტორიის წაშლა: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "ფაილის წაშლა: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "სიმბოლური ბმულის შექმნა: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "ფაილის სახელის გადარქმევა: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "ფაილის ასლი: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -"შეცდომა ასლის გაკეთების ოპერაციისას: ფაილის წასაკითხად გახსნა ვერ შედგა. ფაილის " -"სახელი: %1" +"შეცდომა ასლის გაკეთების ოპერაციისას: ფაილის წასაკითხად გახსნა ვერ შედგა. " +"ფაილის სახელი: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -"შეცდომა ასლის გაკეთების ოპერაციისას: ფაილის ჩასაწერად გახსნა ვერ შედგა. ფაილის " -"სახელი: %1" +"შეცდომა ასლის გაკეთების ოპერაციისას: ფაილის ჩასაწერად გახსნა ვერ შედგა. " +"ფაილის სახელი: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" "შეცდომა ასლის გაკეთების ოპერაციისას: წაკითხვა ვერ შედგა. ფაილის სახელი: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" "შეცდომა ასლის გაკეთების ოპერაციისას: ჩაწერა ვერ შედგა. ფაილის სახელი: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "დირექტორიის წაკითხვა:" -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "დირექტორიის სია: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 #, fuzzy msgid "Current Configuration:" msgstr "მიმდინარე ელემენტის სინქრონიზაციის ოპერაცია" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "ფაილის გახსნის შეცდომა" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "" "პარამეტრი --auto გამოყენებულია, მაგრამ გამონატანი ფაილი არაა მითითებული." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "პარამეტრი --auto დირექტორიების შედარებისთვის იგნორირებულია." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "შენახვა ვერ შედგა." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "ამ ფაილების გახსნა ვერ შედგა:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "ფაილის გახსნის შეცდომა" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "ხსნის დოკუმენტებს შესადარებლად..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "ინახავს შერწყმის შედეგებს. ყველა კონფლიქტი უნდა გადაიჭრას!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "მიმდინარე დოკუმენტს ინახავს როგორც..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "პროგრამის დახურვა" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "ჭრის მონიშნულ სექციას და გაცვლით ბუფერში ათავსებს" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "მონიშნულ სექციის ასლს ქმნის გაცვლით ბუფერში" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "გაცვლის ბუფერის შემადგენლობას სვამს მიმდინარე პოზიციაზე" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "სტრიქონის ძიება" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "სტრიქონის თავიდან ძიება" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "ხელსაწყოთა პანელს რთავს" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "სტატუსის ველს რთავს" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "KDiff3 კონფიგურაცია..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "მიმდინარე დელტაზე გადასვლა" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "პირველ დელტაზე გადასვლა" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "უკანასკნელ დელტაზე გადასვლა" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "წინა დელტაზე გადასვლა" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "შემდეგ დელტაზე გადასვლა" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "წინა კონფლიქტზე გადასვლა" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "შემდეგ კონფლიქტზე გადასვლა" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "წინა გადაუჭრელ კონფლიქტზე გადასვლა" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "შემდეგ გადაუჭრელ კონფლიქტზე გადასვლა" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "აირჩიეთ ხაზ(ებ)ი A-დან" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "აირჩიეთ ხაზ(ებ)ი B-დან" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "აირჩიეთ ხაზ(ებ)ი C-დან" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "წყაროს არჩევისას ავტომატურად გადასვლა შემდეგ გადაუჭრელ კონფლიკტზე" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "ღარების ჩვენება და ტაბულაციის სიმბოლოების განსხვავებისთვის" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "ხაზების ნომრების ჩვენება" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "ყველგან A-ს არჩევა" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "ყველგან B-ს არჩევა" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "ყველგან C-ს არჩევა" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "A-ს არჩევა ყველა გადაუჭრელი კონფლიქტისთვის" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "B-ს არჩევა ყველა გადაუჭრელი კონფლიქტისთვის" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "C-ს არჩევა ყველა გადაუჭრელი კონფლიქტისთვის" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "მარტივი კონფლიქტების ავრომატურად გადაჭრა" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "კონფლიქტებისთვის დელტას მინიჭება" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "მარტივი კონფლიქტების ავრომატურად გადაჭრა" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 #, fuzzy msgid "Join Selected Diffs" msgstr "მონიშნული ფაილების შედარება" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "ფანჯარა A-ს ჩვენება " -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "ფანჯარა B-ს ჩვენება" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "ფანჯარა C-ს ჩვენება" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "ფოკუსი შემდეგ ფანჯარაზე" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "ჩვეულებრივი გადახედვა" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "A წინააღმდეგ B გადახედვა" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "A წინააღმდეგ C გადახედვა" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "B წინააღმდეგ C გადახედვა" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Word Wrap Diff ფანჯრები" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "ფოკუსი წინა ფანჯარაზე" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "გახლეჩვის ორიენტაციის გადართვა" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "დირექტორიისა და ტექსტი განლაგების ეკრანის ხედი" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "დირექტორიათა და ტექსტის ხედებს შორის გადართვა" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "შერწყმის შედეგები არ იყო შენახული." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "შენახვა და გასვლა" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "გასვლა შენახვის გარეშე" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "შერწყმის შედეგების შენახვა ვერ შედგა." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "თქვენ ახლა დირექტორიათა შერწყმას აკეთებთ. ნამდვილად გსურთ შეწყვეტა?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "ფაილის შენახვა..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "ფაილის ახალი სახელით შენახვა..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "გამოსვლა..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 #, fuzzy msgid "Printing completed." msgstr "შერწყმის ოპერაცია დასრულდა." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "გამოსვლა..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "ხელსაწყოთა პანელის გადართვა..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "სტატუსის ზოლის გადართვა..." @@ -1176,12 +1205,12 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "ჩვენი ნაწილი ვერ მოიძებნა!\n" -"ეს როგორც წესი დაყენების პრობლემების გამო ხდება. გთხოვთ წაიკითხოთ README-ფაილი " -"წყაროს პაკეტში დამასტებითი ცნობებისთვის." +"ეს როგორც წესი დაყენების პრობლემების გამო ხდება. გთხოვთ წაიკითხოთ README-" +"ფაილი წყაროს პაკეტში დამასტებითი ცნობებისთვის." #: main.cpp:35 msgid "Tool for Comparison and Merge of Files and Directories" @@ -1260,20 +1289,19 @@ msgstr "ფაილი3-ის გახსნა" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" "+ დიდი მადლობა მათ ვინც გვატყობინებს ბზიკების შესახებ და გვაწოდებს იდეებს!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "დარჩენილი გადაუჭრელი კონფლიქტების რაოდენობა: %1 (საიდანაც %2 არის ღარი)" @@ -1286,55 +1314,31 @@ msgstr "" "გამონატანი ჩასწორებულია.\n" "თუ გააგრძელებთ ცვლილებები დაგეკარგებათ." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "ყველა შეტანილი ბაილის ბინარი ტოლია." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "ყველა შეტანილი ფაილის შეიცავს ერთიდაიგივე ტექსტი." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"A და B ბინარულად ტოლია.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"A და B აქვთ ერთიდაიგივე ტექსტი. \n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"A და C ბინარულად ტოლია.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"A და C აქვთ ერთიდაიგივე ტექსტი. \n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"B და C ბინარულად ტოლია.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +#, fuzzy +msgid "Files %1 and %2 are binary equal.\n" +msgstr "B და C ბინარულად ტოლია.\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"B და C აქვთ ერთიდაიგივე ტექსტი. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "A და B აქვთ ერთიდაიგივე ტექსტი. \n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "კონფლიქტების სრული რაოდენობა: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1342,7 +1346,7 @@ msgstr "" "\n" "ავტომატურად გადაჭრილი კონფლიქტების რაოდენობა: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1350,23 +1354,23 @@ msgstr "" "\n" "გადაუჭრელი კონფლიქტების რაოდენობა: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "კონფლიქტები" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1374,11 +1378,11 @@ msgstr "" "ყველა კონფლიქტი ჯერ არაა გადაჭრილი.\n" "ფაილი არაა შენახული.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "დარჩენილი კონფლიქტები" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1388,29 +1392,29 @@ msgstr "" "\n" "სარეზერვო ასლის შექმნა ვერ შედგა. ფაილი არაა შენახული." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "ფაილის შენახვის შეცდომა" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "ჩაწერისას შეცდომა." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "გამონატანი" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[ჩასწორებულია]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 #, fuzzy msgid "Encoding for saving" msgstr "ფაილის კოდირება C-თვის:" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1430,6 +1434,15 @@ 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 გამონატანის შრიფტი" @@ -1555,10 +1568,8 @@ msgid "Auto indentation" msgstr "ავტო შეწევა" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"ჩართულია: წინა ხაზის შეწევა გამოიყენება ახალი ხაზისთვის.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "ჩართულია: წინა ხაზის შეწევა გამოიყენება ახალი ხაზისთვის.\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1594,70 +1605,65 @@ msgstr "KDiff3" msgid "Diff Settings" msgstr "Diff & შერწყმის პარამეტრები" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "C/C++ კომენტარების ღარებად განხილვა." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "როცხვების იგნორირება" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "რიცხვების იგნორირება ფრაზების შედარებისას. (იგივე ნაერად როგორ ღარების " "იგნორირება.)\n" "შეიძლება დაგეხმაროთ ციფრული მონაცემებით ფაილების შედარებისას." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "C/C++ კომენტარების იგნორირება" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "C/C++ კომენტარების ღარებად განხილვა." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "რეგისტრის იგნორირება" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "რეგისტრის სხვაობის ღარებად განხილვა. ('a'<=>'A')" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Preprocessor ბრძანება:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "მომხმარებლის მიერ განსაზღვრული processing. (დეტალებისთვის იხ. დოკუმენტაცია.)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "ხაზის დამთხვევის preprocessor ბრძანება:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "მაგრად ცდა (ნელია)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1665,48 +1671,48 @@ msgstr "" "გარე diff-სთვის რთავს --minimal პარამეტრს.\n" "დიდი ფაილების ანალიზი ბევრად შენელდება." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Diff & შერწყმის პარამეტრები" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Diff & შერწყმის პარამეტრები" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "ხელით არჩევა" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1714,58 +1720,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1775,46 +1782,67 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "ქვედირექტორიების რაოდენობა:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "დირექტორიათა შერწყმა" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "დირექტორიათა რეკურსია" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "ქვესაქაღალდეები გაანალიზდეს თუ არა." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "ფაილის შაბლონ(ებ)ი:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1824,11 +1852,11 @@ msgstr "" "Wildcards: '*' და '?'\n" "რამდენიმე შაბლონის მითითება შეიძლება ';' გამყოფით" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "ფაილის-ანტი-შაბლონ(ებ)ი:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1838,11 +1866,11 @@ msgstr "" "Wildcards: '*' და '?'\n" "რამდენიმე შაბლონის მითითება შეიძლება ';' გამყოფით" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Dir-ანტი-შაბლონ(ებ)ი:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1852,33 +1880,33 @@ msgstr "" "Wildcards: '*' და '?'\n" "რამდენიმე შაბლონის მითითება შეიძლება ';' გამყოფით" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr ".cvsignore-ის გამოყენება" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "დამალული ფაილების და დირექტორიების ძიება" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "ფაილების და დირექტორიების ძიება დამალული ატრიბუტით." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "'.'-ით დაწყებული ფაილების და დირექტორიების ძიება." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "ფაილთა ბმულზე გადასვლა" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1886,11 +1914,11 @@ msgstr "" "ჩართულია: იმ ფაილთა შედარება რაზეც მიუთითებს ბმული.\n" "გამორთულია: ბმულების შედარება." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "დირექტორიათა ბმულზე გადასვლა" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1898,11 +1926,11 @@ msgstr "" "ჩართულია: იმ დირექტორიათა შედარება რაზეც მიუთითებს ბმული.\n" "გამორთულია: ბმულების შედარება." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1910,23 +1938,23 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "ფაილთა შედარების რეჟიმი" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "ორობითი შედარება" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "ყოველი ფაილის ორობითი შედარება. (ნაგულისხმები)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "სრული ანალიზი" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1934,24 +1962,45 @@ msgstr "" "სრული ანალიზის გაკეთება და სტატისტიკური ინფორმაციის ექსტრა სვეტში ასახვა.\n" "(უფრო ნელია ვიდრე ბინარული შედარება, ბევრად ნელი ბინარული ფაილებისთვის.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "მოდიფიცირების თარიღი ნდობა (არაა სანდო)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" +"თუ მოდიფიცირების თარიღი და ფაილის ზომა ტოლია, მათ იდენტურად მიჩნევა.\n" +"კარგია დიდი დირექტორიებისთვის და ნელი ქსელებისთვის." + +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" "Useful for big directories or slow networks." msgstr "" "თუ მოდიფიცირების თარიღი და ფაილის ზომა ტოლია, მათ იდენტურად მიჩნევა.\n" "კარგია დიდი დირექტორიებისთვის და ნელი ქსელებისთვის." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "ზომის ნდობა (არაა სანდო)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -1961,22 +2010,22 @@ msgstr "" "კარგია დიდი დირექტორიებისთვის და ნელი ქსელებისთვის, როდესაც მოდიფიკაციის დრო " "ჩამოქაჩვისას იცვლება." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "დირექტორიების სინქრონიზაცია" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "ინტერვალების სხვაობის ტოლად ჩათვლა" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -1984,11 +2033,11 @@ msgstr "" "თუ ფაილები მხოლოდ ინტერვალებით განსხვავდება, მათი ტოლად ჩათთვლა.\n" "ეს აქტიურია მხოლოდ თუ სრული ანალიზია არჩეული." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "შერწმის ნაცვლად ახლის ასლი (სახიფათო)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -1998,11 +2047,11 @@ msgstr "" "(გამოიყენეთ ეს მარტო მაშინ თუ იცით რას აკეთებთ!)\n" "მაშინაა ეფექტური, როდესაც ორ დირექტორიას ადარებთ." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "სარეზერვო ასლის ფაილი (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2010,15 +2059,15 @@ msgstr "" "როდესაც ფაილი ძველ ფაილზე უნდა იქნას შენახული, მაშინ ძველ ფაილს\n" "სახელი გადაერქმევა '.orig' გაფართოვებით იმის მაგივრად რომ წაიშალოს." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "რეგიონალური პარამეტრები" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "ენა (გადატვირთვაა საჭირო)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2026,11 +2075,11 @@ msgstr "" "GUI-სტრიქონისთვის ენის შეცვლა ან \"ავტო\".\n" "ენის ცვლილება რომ გააქტიურდეს დახურეთ და გადატვირთეთ KDiff3." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "ყველასთვის იგივე კოდირების გამოყენება:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." @@ -2039,60 +2088,60 @@ msgstr "" "შეცვლით.\n" "გამორთეთ ეს თუ განსხვავებული ინდივიდუალურუი პარამეტრებია საჭირო." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "შენიშვნა: ლოკალური კოდირება არის" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "ფაილის კოდირება A-თვის:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "ფაილის კოდირება B-თვის:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "ფაილის კოდირება C-თვის:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "ფაილის კოდირება გამონატანის შერწყმისა და შენახვისთვის:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "მონიშვნის ავტო ასლი" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "ფაილის კოდირება -პრეპროცესორის ფაილებისთვის:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "მარჯვნიდან მარცხნივ ენა" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2100,21 +2149,21 @@ msgstr "" "ზოგი ენა მარჯვნიდან მარცხნივ იკითხება.\n" "ეს პარამეტრი შეცვლის ხედს და რედაქტორს." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "ოპერაცია" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration Settings" msgstr "რეგიონალური პარამეტრები" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2122,7 +2171,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2138,30 +2207,30 @@ msgstr "" "\n" "გსურთ გააგრძელოთ თუ სხვა შრიფტს აირჩევთ." -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "შეუთავსებელი შრიფტი" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "საკუთარი თავის იმედათ გაგრძელება" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "სხვა შრიფტის ამორჩევა" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" -"ეს ყველა პარამეტრს საწყის მდგომარეობაზე აბრუნებს. არა მხოლოდ მიმდინარე თემისას." +"ეს ყველა პარამეტრს საწყის მდგომარეობაზე აბრუნებს. არა მხოლოდ მიმდინარე " +"თემისას." #: pdiff.cpp:258 msgid "PreprocessorCmd: " msgstr "PreprocessorCmd: " #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" "შემდეგმა პარამეტრ(ებ)მა, რომლებიც აირჩიეთ, შეიძლება შეცვალოს მონაცემები:\n" @@ -2228,19 +2297,10 @@ msgstr "Linediff: A <-> C" msgid "All input files contain the same text, but are not binary equal." msgstr "ყველა შეტანილი ფაილის შეიცავს ერთიდაიგივე ტექსტი." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -#, fuzzy -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"B და C ბინარულად ტოლია.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 #, fuzzy -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"A და B ბინარულად ტოლია.\n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "A და B ბინარულად ტოლია.\n" #: pdiff.cpp:530 msgid "" @@ -2252,109 +2312,55 @@ msgstr "" "გაითვალისწინეთ რომ KDiff3-შერწყმა არ გულისხმობს ბინარულ მონაცემებს.\n" "გააგრძელეთ საკუთარი თავის იმედათ." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "შეწყვეტა" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "ფაილთა გახსნა..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "ფაილის გახსნის შეცდომა" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "მონიშნული ფრაგმენტის მოჭრა..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "მონიშნულის გაცვლით ბიფერში განთავსება..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "გაცვლის ბუფერის შიგთავსის ჩასმა..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "შენახვა და გაგრძელება" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "შენახვის გარეშე გაგრძელება" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "ძიება დასრულდა." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "ძიება დასრულდა" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "დირექტორიის შექმნისას შეცდომა." -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "KDiff3 კონფიგურაცია" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&დირექტორია" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "მიმდინარე ელემენტის შერწყმის ოპერაცია" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "მიმდინარე ელემენტის სინქრონიზაციის ოპერაცია" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&მოძრაობა" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "D&iffview" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "შ&ერწყმა" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&ფანჯარა" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (ფუძე):" @@ -2397,6 +2403,10 @@ msgstr "გამონატანი (არასავალდებულ msgid "Configure..." msgstr "კონფიგურაცია..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "ტექსტის ძიება:" @@ -2469,6 +2479,14 @@ 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 "" @@ -2482,6 +2500,76 @@ msgstr "შენახვა ვერ შედგა." msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&დირექტორია" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "მიმდინარე ელემენტის შერწყმის ოპერაცია" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "მიმდინარე ელემენტის სინქრონიზაციის ოპერაცია" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&მოძრაობა" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "D&iffview" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "შ&ერწყმა" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&ფანჯარა" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "A და B ბინარულად ტოლია.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "A და C ბინარულად ტოლია.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "A და C აქვთ ერთიდაიგივე ტექსტი. \n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "B და C ბინარულად ტოლია.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "B და C აქვთ ერთიდაიგივე ტექსტი. \n" + #, fuzzy #~ msgid "Diff and Merge" #~ msgstr "Diff & შერწყმა" diff --git a/po/lt.po b/po/lt.po index e748745..920b4a7 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4,37 +4,38 @@ msgid "" msgstr "" "Project-Id-Version: ziogelis 77\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2005-02-23 01:27+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 #, fuzzy msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "nobody" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 #, fuzzy msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "nobody@nowhere.lt" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -43,7 +44,7 @@ msgid "" "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -52,21 +53,21 @@ msgid "" "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Pab" @@ -82,28 +83,28 @@ msgstr "" msgid "Size. " msgstr "" -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "" -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "" -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 #, fuzzy msgid "Name" msgstr "" @@ -226,11 +227,11 @@ msgstr "" "#-#-#-#-# noatun.po (noatun) #-#-#-#-#\n" "Vardas" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Operacija" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 #, fuzzy msgid "Status" msgstr "" @@ -273,97 +274,99 @@ msgstr "" "#-#-#-#-# ksirc.po (ksirc) #-#-#-#-#\n" "Būsena" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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 "" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 #, fuzzy msgid "Ready." msgstr "" @@ -398,110 +401,115 @@ msgstr "" "#-#-#-#-# kopete.po (kopete) #-#-#-#-#\n" "Pasirengęs." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Tęsti" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -510,41 +518,47 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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 "" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Klaida." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Baigta." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -556,445 +570,454 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Tipas" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Dydis" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +msgid "File" +msgstr "" + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 #, fuzzy msgid "Do Nothing" msgstr "Nieko" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " msgstr "" -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "" -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "" -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 #, fuzzy msgid "Quits the application" msgstr "" @@ -1011,258 +1034,262 @@ msgstr "" "#-#-#-#-# umbrello.po (umbrello) #-#-#-#-#\n" "Baigs programos darbą" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Iškirps pažymėtą sritį ir padės į talpyklą" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Nukopijuos pažymėtą sritį į talpyklą" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Padės talpyklės turinį dabartinėje pozicijoje" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Įjungs arba išjungs įrankinę" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Įjungs arba išjungs būsenos juostą" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 #, fuzzy msgid "Saving file..." msgstr "" @@ -1277,7 +1304,7 @@ msgstr "" "#-#-#-#-# umbrello.po (umbrello) #-#-#-#-#\n" "Išsaugojama byla..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 #, fuzzy msgid "Saving file with a new filename..." msgstr "" @@ -1292,32 +1319,36 @@ msgstr "" "#-#-#-#-# umbrello.po (umbrello) #-#-#-#-#\n" "Išsaugojama byla nauju vardu..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "Išeinama..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "" -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Išeinama..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "" -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Perjungti būsenos juostą..." @@ -1332,8 +1363,8 @@ msgstr "" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" #: main.cpp:35 @@ -1410,19 +1441,18 @@ msgstr "" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" @@ -1432,102 +1462,82 @@ msgid "" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "" -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " msgstr "" -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " msgstr "" -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 #, fuzzy msgid "Output" msgstr "" @@ -1536,16 +1546,16 @@ msgstr "" "#-#-#-#-# kbabel.po (kbabel) #-#-#-#-#\n" "Išvestis" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1576,6 +1586,47 @@ 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 "" @@ -1702,8 +1753,7 @@ msgid "Auto indentation" msgstr "" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" #: optiondialog.cpp:701 @@ -1734,112 +1784,106 @@ msgstr "" msgid "Diff Settings" msgstr "" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" +#: optiondialog.cpp:750 +msgid "Treat as white space." msgstr "" -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" - -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1847,58 +1891,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1908,121 +1953,141 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +msgid "Max number of history entries:" +msgstr "" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "" -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -2030,189 +2095,205 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "Iškerpamas žymėjimas..." -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "Operacija" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2220,7 +2301,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2230,19 +2331,19 @@ msgid "" "Do you want to continue or do you want to select another font." msgstr "" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2251,8 +2352,7 @@ msgid "PreprocessorCmd: " msgstr "" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" #: pdiff.cpp:264 @@ -2314,14 +2414,8 @@ msgstr "" msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" #: pdiff.cpp:530 @@ -2331,108 +2425,54 @@ msgid "" "Continue at your own risk." msgstr "" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Nutraukti" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "" -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Klaida atveriant bylą" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Iškerpamas žymėjimas..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Kopijuojama pažymėtą vietą į talpyklę..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Įterpamas talpyklės turinys..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Langas" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "" @@ -2508,6 +2548,10 @@ msgstr "" "#-#-#-#-# kcmwifi.po (kcmwifi) #-#-#-#-#\n" "Derinti..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2591,6 +2635,14 @@ 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 "" @@ -2602,3 +2654,58 @@ msgstr "" #: smalldialogs.cpp:559 msgid "Opening and closing parentheses don't match in regular expression." msgstr "" + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "" + +#: kdiff3_part.rc:13 +#, no-c-format +msgid "Configure KDiff3" +msgstr "" + +#: kdiff3_shell.rc:4 +#, no-c-format +msgid "&File" +msgstr "" + +#: kdiff3_shell.rc:7 +#, no-c-format +msgid "&Directory" +msgstr "" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Langas" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" diff --git a/po/nb.po b/po/nb.po index 53564ef..b71b132 100644 --- a/po/nb.po +++ b/po/nb.po @@ -6,36 +6,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2006-06-10 22:03+0200\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Bjørn Steensrud" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "bjornst@powertech.no" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Klarte ikke å skrive fra utklippstavla til midlertidig fil." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Fra utklippstavla" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -49,7 +50,7 @@ msgstr "" "\n" "Kommandoen for forarbeide blir nå slått av." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -63,7 +64,7 @@ msgstr "" "\n" "Forarbeide-kommandoen for linjesamordning blir nå slått av." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -71,15 +72,15 @@ msgstr "" "Datatap-feil:\n" "Hvis det kan gjenskapes, vennligst kontakt forfatteren.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Alvorlig intern feil" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "Øverste linje" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Slutt" @@ -95,244 +96,248 @@ msgstr "Lenke: " msgid "Size. " msgstr "Størrelse: " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Dato og størrelse: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Klarte ikke opprette midlertidig kopi av %1." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Klarte ikke åpne %1." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Sammenlikner fil ..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Feil ved lesing fra %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Navn" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Handling" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Uløst" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Løst" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Ikkehvitt" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Hvitt" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -"Nå utfører du en mappefletting. Er du sikker på at du vil avbryte flettingen og " -"lese gjennom mappa på nytt?" +"Nå utfører du en mappefletting. Er du sikker på at du vil avbryte flettingen " +"og lese gjennom mappa på nytt?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Fortsett fletting" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Klarte ikke åpne mapper:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Mappe A «%1» finnes ikke eller er ikke en mappe.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Mappe A «%1» finnes ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Mappe B «%1» finnes ikke eller er ikke en mappe.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Mappe B «%1» finnes ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Mappe C «%1» finnes ikke eller er ikke en mappe.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Mappe C «%1» finnes ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Feil ved åpning av mappe" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "Målmappa må være en annen enn A eller B når tre mapper flettes.\n" "Kontroller igjen før du fortsetter." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Parameter-advarsel" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Leser mapper ..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Leser mappe A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Leser mappe B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Leser mappe C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Noen undermapper var ikke lesbare i" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Kontroller rettigheter på undermappene." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Klar." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Status for mappesammenlikning" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Antall undermapper:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Antall like filer:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Antall forskjellige filer:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Antall manuelle flettinger:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Dette påvirker alle flettehandlinger." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Endre alle flette-handlinger" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "F&ortsett" -#: directorymergewindow.cpp:1169 +#: 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 " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Gjenstår." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Kopier A til B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Kopier B til A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Slett A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Slett B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Slett A & B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Flett til A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Flett til B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Flett til A & B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Slett (hvis det finnes)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Flett sammen" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Flett (manuelt)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Feil: Konflikt mellom filtyper" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Feil: Datoene er like, men ikke filene." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Denne handlingen er ikke mulig nå." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Handling ikke mulig" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -346,42 +351,47 @@ msgstr "" "\n" "Hvis du vet hvordan dette kan gjenskapes, ta kontakt med programforfatteren." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Programfeil" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Det oppsto en feil under kopiering.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Det oppsto en feil under kopiering.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Feil." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Ferdig." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Ikke lagret." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Ukjent flettehandling. (Dette må aldri skje!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Ukjent flettehandling." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -400,320 +410,325 @@ msgstr "" "Vær oppmerksom på at dette programmet er i beta-status og det er OVERHODET " "INGEN GARANTI! Ta sikkerhetskopi av vitale data!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Starter fletting" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Gjør det" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Simuler det" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -"Det markerte elementet har forskjellig type i de forskjellige mappene. Velg hva " -"som skal gjøres." +"Det markerte elementet har forskjellig type i de forskjellige mappene. Velg " +"hva som skal gjøres." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -"Filene er ulike men har samme dato for siste endring. Velg hva som skal gjøres." +"Filene er ulike men har samme dato for siste endring. Velg hva som skal " +"gjøres." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "Denne handlingen er ikke mulig nå fordi en mappefletting pågår." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Det var en feil i siste steg.\n" "Vil du fortsette med elementet som ga feil, eller hoppe over det?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Fortsett fletting etter feil" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Fortsett med siste element" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Hopp over element" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Hoppet over." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "Pågår ..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Flettehandling fullført." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Fletting fullført" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -"Simulert fletting fullført. Se etter om du er enig i de foreslåtte handlingene." +"Simulert fletting fullført. Se etter om du er enig i de foreslåtte " +"handlingene." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Det oppsto en feil. Trykk OK for å se detaljerte opplysninger.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Det oppsto en feil. Trykk OK for å se detaljerte opplysninger.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Feil: Under sletting av %1: oppretting av sikkerhetskopi mislyktes." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "slett mappe rekursivt( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "slett ( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Feil: mappesletting mislyktes under forsøk på å lese mappa." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Feil: rmdir( %1 ) mislyktes." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Feil: sletting mislyktes." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "manuell fletting( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Merk: Etter en manuell fletting bør brukeren fortsette ved å trykke F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Feil: kopiering (%1 -> %2) mislyktes. Eksisterende mål kunne ikke slettes." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Feil: copyLink mislyktes. Det er ikke støtte for nettverkslenker ennå." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Feil: copyLink mislyktes." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "kopier(%1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Feil under navneendring( %1 -> %2 ): Kan ikke slette eksisterende mål." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "endre navn ( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Feil: navneendring mislyktes." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Feil ved oppretting av mappe %1. Kan ikke slette eksisterende fil." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "Lag mappe( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Feil under oppretting av mappe." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Mål" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Mappe" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Størrelse" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Siste endring" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Lenkemål" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Fil ..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "ikke tilgjengelig" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (mål): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (basis): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (mål): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (mål) :" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Mål: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "Lagre status for mappefletting som ..." -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Start/fortsett mappefletting" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Kjør handling for gjeldende element" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Sammenlikne valgt fil" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Flett gjeldende fil" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Brett sammen alle undermapper" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Fold ut alle undermapper" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Velg A for alle elementer" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Velg B for alle elementer" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Velg C for alle elementer" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Auto-velg handling for alle elementer" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Ingen handling for alle elementer" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "Vis identiske filer" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "Vis forskjellige filer" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "Vis filer bare i A" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "Vis filer bare i B" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "Vis filer bare i C" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "Sammenlikne uttrykkelig valgte filer" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "Flett uttrykkelig valgte filer" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Ikke gjør noe" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Slett A && B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Flett til A && B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " @@ -721,7 +736,7 @@ msgstr "" "Under forsøk på å lage sikkerhetskopi lyktes det ikke å slette \n" "en tidligere kopi. Filnavn: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -729,417 +744,431 @@ msgstr "" "Under forsøk på å lage sikkerhetskopi lyktes det ikke å endre navn.\n" "Filnavn: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Henter filstatus: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Leser fil: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Skriver fil: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Slapp opp for minne" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Lager mappe: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Fjerner mappe: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Fjerner fil: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Oppretter symbolsk lenke: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Endrer navn på fil: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Kopierer fil: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "Feil under filkopiering: Klarte ikke åpne fil for lesing. Filnavn: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" "Feil under filkopiering: Klarte ikke åpne fil for skriving. Filnavn: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "Feil under filkopiering: Lesing mislyktes. Filnavn: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Feil under filkopiering: Skriving mislyktes. Filnavn: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Leser mappe: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Lister mappe: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "Gjeldende oppsett:" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "Feil i oppsett:" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "--auto brukt, men ingen utdatafil er oppgitt." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "--auto ignorert for mappesammelikning." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Lagring mislyktes." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Klarte ikke åpne disse filene:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Feil ved åpning av fil" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Åpner dokumentere for sammenlikning ..." -#: kdiff3.cpp:423 +#: 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!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Lagrer gjeldende dokument som ..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "Skriv ut forskjellene" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Avslutter programmet" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Klipper ut det markerte og legger det på utklippstavla" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Kopierer det markerte til utklippstavla" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Limer innholdet inn der markøren står" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "Velg alt i gjeldende vindu" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Søk etter en streng" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Søk igjen etter strengen" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Slår verktøylinja av/på" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Slår statuslinja av/på" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Sett opp KDiff3 ..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Gå til gjeldende Delta" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Gå til første Delta" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Gå til siste Delta" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(Hopper over forskjeller i tomrom når «Vis tomrom» er slått av.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" "(Hopper ikkeover forskjeller i tomrom selv når «Vis tomrom» er slått av.)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Gå til forrige Delta" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Gå til neste Delta" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Gå til forrige konflikt" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Gå til neste konflikt" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Gå til forrige uløste konflikt" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Gå til neste uløste konflikt" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Velg linje(r) fra A" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Velg linje(r) fra B" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Velg linje(r) fra C" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Gå automatisk til neste uløste konflikt etter at kildene er valgt" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Vis mellomrom og tabulatortegn for forskjeller" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Vis tomrom" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Vis linjenumre" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Velg A overalt" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Velg B overalt" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Velg C overalt" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Velg A for alle uløste konflikter" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Velg B for alle uløste konflikter" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Velg C for alle uløste konflikter" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Velg A for alle uløste tomromkonflikter" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Velg B for alle uløste tomromkonflikter" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Velg C for alle uløste tomromkonflikter" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Løs enkle konflikter automatisk" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Sett deltaer til konflikter" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "Kjør autofletting med regulære uttrykk" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "Løs opp historiekonflikter automatisk" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "Splitt differansen ved utvalget" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "Slå sammen valgte differ" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Vis vindu A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Vis vindu B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Vis vindu C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Fokus på neste vindu" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Normal oversikt" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "Oversikt A mot B" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "Oversikt A mot C" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "Oversikt B mot C" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Ordbryt i diff-vinduer" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "Legg til manuell diff-innretting" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "Tilbakestill all manuell diff-innretting" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Fokus på forrige vindu" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Bytt om splitt-orientering" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Mappe og tekst delt visning" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Bytt mellom mappe- og tekstvisning" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Fletteresultatet er ikke lagret." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Lagre og avslutt" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Avslutt uten lagring" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Fletteresultatet kunne ikke lagres." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 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:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Lagrer fil ..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Lagrer fil med nytt filnavn ..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "Skriver ut ..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "Utskrift avbrutt." -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Utvalg" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "Utskrift fullført." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Avslutter ..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Slår verktøylinje av/på ..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Slå statuslinje av/på ..." @@ -1154,12 +1183,12 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Fant ikke vår part!\n" -"Dette skyldes oftest et installasjonsproblem. Det står mer om dette i " -"README-fila i kildekoden." +"Dette skyldes oftest et installasjonsproblem. Det står mer om dette i README-" +"fila i kildekoden." #: main.cpp:35 msgid "Tool for Comparison and Merge of Files and Directories" @@ -1237,19 +1266,18 @@ msgstr "fil 3 som skal åpnes" msgid "Ignored. (User defined.)" msgstr "Ignorert. (Selvvalgt.)" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "+ Mange takk til dem som rapporterte feil og bidro med ideer!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Antall uløste konflikter som gjenstår: %1 ( herav %2 tomrom )" @@ -1261,55 +1289,30 @@ msgstr "" "Utdata er blitt endret.\n" "Hvis du fortsetter mister du endringene dine." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Alle inn-filer er binært like." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Alle inn-filer inneholder samme tekst." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Filer A og B er binært like.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Filer A og B har lik tekst. \n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Filer A og C er binært like.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Filer A og C har lik tekst. \n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Filer B og C er binært like.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Filene %1 og %2 er binært like.\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Filer B og C har lik tekst. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Filer A og B har lik tekst. \n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Totalt antall konflikter: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1317,7 +1320,7 @@ msgstr "" "\n" "Antall automatisk løste konflikter: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1325,23 +1328,23 @@ msgstr "" "\n" "Antall uløste konflikter :" -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Konflikter" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1349,11 +1352,11 @@ msgstr "" "Ikke alle konflikter er løst ennå.\n" "Fila er ikke lagret.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Gjenstående konflikter" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1363,29 +1366,29 @@ msgstr "" "\n" "Det lyktes ikke å lage sikkerhetskopi. Fila er ikke lagret." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Feil ved fillagring" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Feil ved skriving." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Utdata" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Endret]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 #, fuzzy msgid "Encoding for saving" msgstr "Filkoding for A :" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1405,6 +1408,15 @@ 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" @@ -1530,10 +1542,8 @@ msgid "Auto indentation" msgstr "Automatisk innrykk" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"På: Innrykket for forrige linje brukes for en ny linje.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "På: Innrykket for forrige linje brukes for en ny linje.\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1569,60 +1579,53 @@ msgstr "KDiff3" msgid "Diff Settings" msgstr "Innstillinger for Diff og fletting" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Bevar vognretur" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Vis tegn «\\r» for vognretur hvis de finnes.\n" -"Hjelper å sammenlikne filer som ble endret i forskjellige operativsystemer." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Behandle kommentarer i C/C++ som tomrom." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Ignorer tall" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "Ignorer sifre når linjene søkes opp. (Likner Ignorer tomrom)\n" "Kan hjelpe til å sammenlikne filer med numeriske data." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Ignorer C/C++-kommentarer" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Behandle kommentarer i C/C++ som tomrom." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Ikke ta hensyn til store/små bokstaver" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Behandle endringer små/store som endring i tomrom («a»<=>«A»)" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Forarbeide-kommando:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "Selvvalgt forarbeide. (Detaljer finnes i dokumentasjonen)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Linjesøkende forarbeide, kommando:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1630,11 +1633,11 @@ msgstr "" "Denne forbehandleren brukes bare når linjer søkes.\n" "(Detaljer i dokumentasjonen)." -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Grundig (langsommere)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1642,11 +1645,16 @@ msgstr "" "Slår på --minimal for det eksterne diff-programmet.\n" "Analyse av store filer blir mye langsommere." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Innstillinger for Diff og fletting" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Forsinkelse for auto-avansering (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" @@ -1654,40 +1662,35 @@ msgstr "" "Når det brukes auto-avansering vises resultatet av gjeldende utvalg \n" "i oppgitt tid, før det hoppes til neste konflikt. Verdiområde fra 0-2000 ms" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Innstillinger for Diff og fletting" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Standard for 2-fils tomromsfletting:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Manuelt valg" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" "Tillat flettealgoritmen å velge inn-data automatisk for endringer som bare " "gjelder tomrom." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Standard for 3-fils tomromsfletting:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "Automatisk fletting med regulært uttrykk" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "Regulært uttrykk for automatisk fletting:" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1698,11 +1701,11 @@ msgstr "" "Når en linje med konflikt stemmer med det regulære uttrykket, så \n" "velges C hvis tilgjengelig, ellers B." -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "Kjør autofletting med regulære uttrykk ved flettestart" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" @@ -1710,15 +1713,15 @@ msgstr "" "Kjør autoflettingen med regulære uttrykk med en\n" "gang når en fletting begynner.\n" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "Fletting av historien fra versjonskontroll" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "Regulært uttrykk for start på historien:" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" @@ -1728,17 +1731,18 @@ msgstr "" "Denne linja inneholder som regel \"$Log$\"-nøkkelordet.\n" "Standard: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "Regulært uttrykk for start på historieoppføring:" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" "En historieoppføring består av flere linjer.\n" @@ -1748,19 +1752,19 @@ msgstr "" "historieoppføringene.\n" "Se i dokumentasjonen etter detaljer." -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "Flettesortering av historien" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "Sorter versjonskontroll-historien etter en nøkkel." -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "Nøkkelrekkefølge for sortering av historiestart:" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1769,30 +1773,40 @@ msgid "" "If left empty, then no sorting will be done.\n" "See the documentation for details." msgstr "" -"Hver parentes brukt i det regulære uttrykket for start på historieoppføringen\n" +"Hver parentes brukt i det regulære uttrykket for start på " +"historieoppføringen\n" "definerer en nøkkel som kan brukes til sortering.\n" "Oppgi en liste over nøkler (nummerert i den rekkefølge de opptrer\n" "med start på 1), med «,» som skilletegn (f.eks. \"4,5,6,1,2,3,7\").\n" "Står dette tomt blir det ikke sortert.\n" "Detaljer finnes i dokumentasjonen." -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "Flett versjonshistorien når flettingen begynner" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "Kjør autofletting på versjonshistorien når fletting begynner." -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Antall undermapper:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "Test de regulære uttrykkene" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "Irrelevant flettekommando:" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" @@ -1802,23 +1816,35 @@ msgstr "" "autofletting når ingen andre relevante endringer \n" "ble funnet. Kalles med parametre filnavn1 filnavn2 filnavn3" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Mappefletting" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Rekursive mapper" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Om undermapper skal analyseres eller ikke." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Filmønster(e):" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1828,11 +1854,11 @@ msgstr "" "Jokertegn: «*» og «?»\n" "Flere mønstre kan oppgis med «;» som skilletegn" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Fil-antimønster(e):" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1842,11 +1868,11 @@ msgstr "" "Jokertegn: «*» og «?»\n" "Flere mønstre kan oppgis med «;» som skilletegn" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Mappe-antimønster(e) :" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1856,11 +1882,11 @@ msgstr "" "Jokertegn: «*» og «?»\n" "Flere mønstre kan oppgis med «;» som skilletegn" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Bruk .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1868,23 +1894,23 @@ msgstr "" "Utvider antimønsteret til alt som CVS ville ignorere.\n" "Dette kan gjøres pr. mappe med lokale «.cvsignore»-filer." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Finn skjulte filer og mapper" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Finner filer og mapper som har attributten «skjult." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Finner filer og mapper med navn som begynner med «.»." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Følg fil-lenker" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1892,11 +1918,11 @@ msgstr "" "På: Sammenlikne filer som lenkene peker på.\n" "Av: Sammenlikne lenkene." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Følg mappelenker" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1904,11 +1930,11 @@ msgstr "" "På: Sammenlikne mapper lenkene peker på.\n" "Av: Sammenlikne lenkene." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "Store/små bokstaver i filnavn" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1916,26 +1942,26 @@ msgid "" "off, otherwise on.)" msgstr "" "Mappesammenlikningen behandler filer og mapper når navnene er like.\n" -"Slå på dette hvis navnene er versalvâre - dvs store/små bokstaver må være like. " -"(Standard for Windows er av, ellers på.)v" +"Slå på dette hvis navnene er versalvâre - dvs store/små bokstaver må være " +"like. (Standard for Windows er av, ellers på.)v" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Hvordan filer sammenliknes" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Binær sammenlikning" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Binær sammenlikning av hver fil. (Standard)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Full analyse" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1943,24 +1969,45 @@ msgstr "" "Gjør en full analyse og vis statistikk i ekstra kolonner.\n" "(Langsommere enn binær sammenlikning, mye langsommere for binære filer.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Stol på endringsdatoen (utrygt)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Anta at filer er like hvis endringsdatoene og størrelsene er like.\n" +"Nyttig for store mapper eller langsomme nett." + +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" "Useful for big directories or slow networks." msgstr "" "Anta at filer er like hvis endringsdatoene og størrelsene er like.\n" "Nyttig for store mapper eller langsomme nett." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Stol på størrelsen (utrygt)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -1970,11 +2017,11 @@ msgstr "" "Nyttig for store mapper eller langsomme nett når datoen endres under " "nedlasting." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Synkroniser mapper" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -1984,11 +2031,11 @@ msgstr "" "mappene er like etterpå. Dette virker bare hvis\n" "to mapper sammenliknes uten å oppgi et mål." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Tomromsforskjeller betraktes som like" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -1996,11 +2043,11 @@ msgstr "" "Hvis filer er forskjellige bare i tomrom, betrakt dem som\n" "like. Dette er bare aktivt når det kjøres full analyse." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Kopier den nyeste i stedet for å flette (utrygt)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2010,11 +2057,11 @@ msgstr "" "(Bruk dette bare når du vet hva du gjør!)\n" "Bare virksomt når to mapper sammenliknes." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Ta sikkerhetskopi av filer (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2022,15 +2069,15 @@ msgstr "" "Når en ny fil ville bli lagret oppå en gammel, så får den gamle\n" "fila nytt navn med «.orig» til slutt i stedet for å bli slettet." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Regionale innstillinger" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Språk (krever omstart av KDiff3)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2038,72 +2085,73 @@ msgstr "" "Velg språk for GUI-strengene, eller «Auto».\n" "KDiff3 må stoppes og startes på nytt for at dette skal få virkning." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Bruk samme koding for alt:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -"Hvis dette er slått på kan alle kodinger endres ved bare å endre den første.\n" +"Hvis dette er slått på kan alle kodinger endres ved bare å endre den " +"første.\n" "Slå av hvis det trengs separate innstillinger." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Merk: Lokal koding er " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "Filkoding for A :" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "Filkoding for B :" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "Filkoding for C :" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Filkoding for flettet resultat og lagring:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "Autokopier utvalg" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Filkoding for forbehandlingsfiler:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Høyre mot venstre-språk" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2111,19 +2159,19 @@ msgstr "" "Noen språk leses fra høyre mot venstre.\n" "Denne innstillingen endrer visning og redigering tilsvarende." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "Integrasjon" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "Integrasjonsinnstillinger" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "Kommandolinjeparametre som skal ignoreres:" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2135,7 +2183,27 @@ msgstr "" "Flere verdier kan oppgis atskilt med «;»\n" "Da forsvinner feilmeldingen «Ukjent parameter»." -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2151,19 +2219,19 @@ msgstr "" "\n" "Vil du fortsette, eller vil du velge en annen skrift." -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Ikke kompatibel skrift" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Fortsett på egen risiko" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Velg en annen skrift" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "Dette tilbakestiller alle valg, ikke bare dem i dette emnet." @@ -2172,10 +2240,8 @@ msgid "PreprocessorCmd: " msgstr "Forbehandlingskommando :" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"Følgende innstillinger som er valgt kan endre data:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "Følgende innstillinger som er valgt kan endre data:\n" #: pdiff.cpp:264 msgid "" @@ -2239,17 +2305,9 @@ msgstr "Linjediff A <-> C" msgid "All input files contain the same text, but are not binary equal." msgstr "Alle inn-filene inneholder samme tekst, men er ikke binært like." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Filene %1 og %2 er binært like.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"Filene %1 og %2 har lik tekst, men er ikke binært like. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Filene %1 og %2 har lik tekst, men er ikke binært like. \n" #: pdiff.cpp:530 msgid "" @@ -2261,108 +2319,54 @@ msgstr "" "Merk at KDiff3-fletting ikke er beregnet for binære data.\n" "Fortsett på egen risiko." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Avbryt" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Åpner filer ..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Feil ved filåpning" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Klipper ut utvalget ..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Kopierer utvalg til utklippstavla ..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Setter inn fra utklippstavla ..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Lagre og fortsett" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Fortsett uten lagring" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Søk fullført." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Søk fullført" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "Ingenting er valgt i noe av inndata-vinduene." -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "Feil oppsto ved tillegg av manuelt diff-område" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Sett opp KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "M&appe" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Flettehandling på gjeldende element" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Synk-handling på gjeldende element" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "F&lytting" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "D&iffvisning" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Flett" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Vindu" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (Basis):" @@ -2405,6 +2409,10 @@ msgstr "Utdata (valgfri):" msgid "Configure..." msgstr "Sett opp ..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Søketekst:" @@ -2483,6 +2491,14 @@ 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." @@ -2495,6 +2511,88 @@ msgstr "Ikke tilslag." msgid "Opening and closing parentheses don't match in regular expression." msgstr "Begynn- og sluttparenteser stemmer ikke overens i regulært uttrykk." +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "M&appe" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Flettehandling på gjeldende element" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Synk-handling på gjeldende element" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "F&lytting" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "D&iffvisning" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Flett" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Vindu" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Filer A og B er binært like.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Filer A og C er binært like.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Filer A og C har lik tekst. \n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Filer B og C er binært like.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Filer B og C har lik tekst. \n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Bevar vognretur" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Vis tegn «\\r» for vognretur hvis de finnes.\n" +#~ "Hjelper å sammenlikne filer som ble endret i forskjellige " +#~ "operativsystemer." + #~ msgid "Diff and Merge" #~ msgstr "Diff og fletting" diff --git a/po/nl.po b/po/nl.po index 6dfdc52..1f5ad83 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11,38 +11,39 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2006-11-27 00:05+0100\n" "Last-Translator: Rinse de Vries \n" "Language-Team: Dutch \n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Frank Schoolmeesters,Rinse de Vries,Bram Schoenmakers" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "" "frank_schoolmeesters@yahoo.com,rinsedevries@kde.nl,bramschoenmakers@kde.nl" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Het opslaan van de klembordinhoud in een tijdelijk bestand is mislukt." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Van klembord" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -56,7 +57,7 @@ msgstr "" "\n" "Dit commando zal nu worden uitgeschakeld." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -64,14 +65,14 @@ msgid "" "\n" "The line-matching-preprocessing command will be disabled now." msgstr "" -"De voorverwerking van regelovereenkomsten is mogelijk mislukt. Controleer dit " -"commando:\n" +"De voorverwerking van regelovereenkomsten is mogelijk mislukt. Controleer " +"dit commando:\n" "\n" " %1\n" "\n" "Dit commando zal nu worden uitgeschakeld." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -79,15 +80,15 @@ msgstr "" "Fout met dataverlies:\n" "Als dit reproduceerbaar is, neem dan contact op met de auteur.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Ernstige interne fout" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "Bovenste regel" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Einde" @@ -103,245 +104,250 @@ msgstr "Koppeling: " msgid "Size. " msgstr "Grootte: " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Datum en grootte: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Het aanmaken van de tijdelijke kopie van %1 is mislukt." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Het openen van %1 is mislukt." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Bestand wordt vergeleken..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Fout bij het lezen van %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Naam" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Handeling" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Niet opgelost" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Opgelost" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Niet-wit" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Wit" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" "U bent momenteel bezig met het samenvoegen van een directory. Wilt u dat " -"werkelijk, of wilt u het samenvoegen afbreken en de directory opnieuw inlezen?" +"werkelijk, of wilt u het samenvoegen afbreken en de directory opnieuw " +"inlezen?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Doorgaan met samenvoegen" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Het openen van de directorypen is mislukt:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Directory A \"%1\" bestaat niet of is geen directory.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Directory A \"%1\" bestaat niet of is geen directory.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Directory B \"%1\" bestaat niet of is geen directory.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Directory B \"%1\" bestaat niet of is geen directory.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Directory C \"%1\" bestaat niet of is geen directory.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Directory C \"%1\" bestaat niet of is geen directory.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Fout bij openen van directory" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "De doeldirectory kan niet hetzelfde zijn als A of B als er drie directorypen " "worden samengevoegd.\n" "Controleer dit opnieuw voordat u doorgaat." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Parameter-waarschuwing" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Directorypen worden geanalyseerd..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Inlezen van directory A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Inlezen van directory B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Inlezen van directory C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Sommige subdirectorypen waren niet leesbaar in" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Controleer de toegangsrechten van de subdirectorypen." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Gereed." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Status van directorypenvergelijking" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Aantal subdirectorypen:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Aantal identieke bestanden:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Aantal verschillende bestanden:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Aantal handmatige samenvoegingen:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Dit heeft effect op alle samenvoegingen." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Verandering van alle samenvoegingen" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "D&oorgaan" -#: directorymergewindow.cpp:1169 +#: 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" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Onvoltooid." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "A naar B kopiëren" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "B naar A kopiëren" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "A verwijderen" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "B verwijderen" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "A & B verwijderen" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Samenvoegen met A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Samenvoegen met B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Samenvoegen met A & B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Verwijderen (indien voorhanden)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Samenvoegen" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Samenvoegen (handmatig)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Fout: botsende bestandstypen" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Fout: de datums zijn hetzelfde, maar de bestanden niet." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Deze handeling is momenteel niet beschikbaar." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Handeling niet mogelijk" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -356,42 +362,47 @@ msgstr "" "Als u dit kunt reproduceren, neem dan contact op met de auteur van dit " "programma." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Programmafout" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Er deed zich een fout voor tijdens het kopiëren.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Er deed zich een fout voor tijdens het kopiëren.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Fout." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Gereed." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Niet opgeslagen." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Onbekende samenvoeging. (Dit mag niet voorkomen!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Onbekende samenvoeging." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -412,344 +423,347 @@ msgstr "" "GEEN ENKELE GARANTIE dat het programma naar behoren zal werken. Maak " "reservekopieën van uw vitale gegevens!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Samenvoeging starten" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Starten" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Simuleren" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" "Het gemarkeerde item is van een verschillend type in de verschillende " "directorypen. Kies wat er moet gebeuren." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -"De wijzigingsdatums van het bestanden zijn gelijk, maar de bestanden niet. Kies " -"wat er moet gebeuren." +"De wijzigingsdatums van het bestanden zijn gelijk, maar de bestanden niet. " +"Kies wat er moet gebeuren." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" "Deze handeling is niet mogelijk omdat er momenteel een directory wordt " "samengevoegd." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Er deed zich een fout voor tijdens de laatste stap.\n" "Wilt u doorgaan met het item dat de fout veroorzaakte of wilt u dit item " "overslaan?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Samenvoegen voortzetten na een foutmelding" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Verdergaan met het laatste item" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Item overslaan" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Overgeslagen." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "In uitvoering..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "De samenvoeging is voltooid." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Samenvoeging voltooid" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Samenvoegsimulatie is voltooid. Controleer of u akkoord kunt gaan met de " "voorgestelde handelingen." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Er deed zich een fout voor. Klik op OK voor meer details.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Er deed zich een fout voor. Klik op OK voor meer details.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Fout tijdens het wissen van %1: reservekopie aanmaken is mislukt." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "directory ( %1 ) recursief wissen" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "wissen ( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -"Fout: het wissen van de directory is mislukt omdat de directory niet kon worden " -"geopend." +"Fout: het wissen van de directory is mislukt omdat de directory niet kon " +"worden geopend." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Fout: handeling voor directory verwijderen( %1 ) is mislukt." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Fout: wissen is mislukt." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "handmatig samenvoegen ( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Opmerking: na een handmatige samenvoeging dient de gebruiker verder te " "gaan via F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -"Fout: kopiëren( %1 -> %2 ) is mislukt. De bestaande bestemming kon niet gewist " -"worden." +"Fout: kopiëren( %1 -> %2 ) is mislukt. De bestaande bestemming kon niet " +"gewist worden." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "Koppeling kopiëren ( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -"Fout: koppeling kopiëren is mislukt: externe koppelingen worden vooralsnog niet " -"ondersteund." +"Fout: koppeling kopiëren is mislukt: externe koppelingen worden vooralsnog " +"niet ondersteund." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Fout: koppeling kopiëren is mislukt." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "kopiëren ( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Fout tijdens het hernoemen ( %1 -> %2 ): de bestaande bestemming kan niet " "worden gewist." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "hernoemen( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Fout: hernoemen is mislukt." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -"Fout tijdens het aanmaken van de directory %1. Bestaand bestand kan niet worden " -"gewist." +"Fout tijdens het aanmaken van de directory %1. Bestaand bestand kan niet " +"worden gewist." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "Directory aanmaken( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Fout bij het aanmaken van de directory." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Doel" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Directory" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Grootte" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Laatste wijziging" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Koppelingsbestemming" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Bestand..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "niet beschikbaar" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (doel): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (basis): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (doel): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (doel): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Doel: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "Staat van directorypen samenvoegen opslaan als..." -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Directorysamenvoeging starten/voortzetten" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Handeling uitvoeren voor huidig item" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Geselecteerde bestand vergelijken" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Huidig bestand samenvoegen" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Alle subdirectorypen invouwen" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Alle subdirectorypen uitvouwen" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Voor alle items A kiezen" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Voor alle items B kiezen" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Voor alle items C kiezen" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Handeling voor alle items automatisch kiezen" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Geen handeling voor alle items" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "Identieke bestanden tonen" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "Verschillende bestanden tonen" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "Bestanden alleen in A tonen" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "Bestanden alleen in B tonen" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "Bestanden alleen in C tonen" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "Expliciet geselecteerde bestand vergelijken" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "Expliciet geselecteerde bestanden samenvoegen" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Niets doen" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "A && B verwijderen" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Samenvoegen met A && B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -"Het wissen van een oudere reservekopie is mislukt tijdens het aanmaken van de " -"nieuwe reservekopie.\n" +"Het wissen van een oudere reservekopie is mislukt tijdens het aanmaken van " +"de nieuwe reservekopie.\n" "Bestandsnaam: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -757,194 +771,200 @@ msgstr "" "Tijdens het aanmaken van een reservekopie is het hernoemen mislukt. \n" "Bestandsnamen: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Bestandstatus opvragen: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Bestand lezen: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Bestand schrijven: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Onvoldoende geheugen" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Directory aanmaken: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Directory verwijderen: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Bestand verwijderen: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Symbolische koppeling aanmaken: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Bestand hernoemen: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Bestand kopiëren: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" "Fout tijdens bestanden kopiëren: het openen van het bestand is mislukt.\n" "Bestandsnaam: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" "Fout tijdens bestanden kopiëren: het bestand kon niet worden opgeslagen.\n" "Bestandsnaam: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" "Fout tijdens bestanden kopiëren: het openen is mislukt.\n" "Bestandsnaam: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" "Fout tijdens bestanden kopiëren: het opslaan is mislukt.\n" "Bestandsnaam: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Directory lezen: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Directory inlezen: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "Huidige configuratie:" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "Fout bij configuratie-optie:" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Optie '--auto' is gebruikt, maar er is geen uitvoerbestand opgegeven." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Optie '--auto' is genegeerd voor directorypenvergelijking." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Opslag is mislukt." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Het openen van deze bestanden is mislukt:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Fout bij bestanden openen" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Opent documenten voor vergelijking..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Slaat het samenvoegresultaat op. Alle conflicten dienen te worden opgelost!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Slaat het huidige document op als..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "Verschillen afdrukken" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Sluit de toepassing" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Knipt de geselecteerde sectie uit en plaatst deze op het klembord" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Kopieert de geselecteerde sectie naar het klembord" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Plakt de inhoud van het klembord op de huidige cursorpositie" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "Alles in huidig venster selecteren" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Tekst opzoeken" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Opnieuw zoeken" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Activeert/deactiveert de werkbalk" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Activeert/deactiveert de statusbalk" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "KDiff3 instellen..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Ga naar huidig onderscheid" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Ga naar eerste onderscheid" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Ga naar laatste onderscheid" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Slaat witruimteverschilen over als \"Witruimte tonen\" is uitgeschakeld.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -952,234 +972,242 @@ msgstr "" "(Slaat witruimteverschillen niet over, zelfs als \"Witruimte tonen\" is " "uitgeschakeld.)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Ga naar vorig onderscheid" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Ga naar volgend onderscheid" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Ga naar vorig conflict" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Ga naar volgend conflict" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Ga naar vorig onopgelost conflict" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Ga naar volgend onopgelost conflict" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Regel(s) van A selecteren" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Regel(s) van B selecteren" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Regel(s) van C selecteren" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Automatisch naar het volgende onopgeloste conflict gaan" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Spaties && tabulator-tekens in verschillen tonen" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Witruimte tonen" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Regelnummering tonen" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "A overal kiezen" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "B overal kiezen" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "C overal kiezen" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "A voor alle onopgeloste conflicten kiezen" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "B voor alle onopgeloste conflicten kiezen" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "C voor alle onopgeloste conflicten kiezen" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "A voor alle onopgeloste witruimteconflicten kiezen" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "B voor alle onopgeloste witruimteconflicten kiezen" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "C voor alle onopgeloste witruimteconflicten kiezen" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Automatisch eenvoudige conflicten oplossen" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Elk onderscheid maken bij conflicten" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "Automatisch samenvoegen d.m.v. reguliere expressie uitvoeren" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "Automatisch geschiedenisconflicten oplossen" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "Vergelijking bij selectie splitsen" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "Geselecteerde verschillen samenvoegen" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Venster A tonen" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Venster B tonen" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Venster C tonen" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Focus op volgend venster zetten" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Normaal overzicht" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "A vs B overzicht" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "A vs C overzicht" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "B vs C overzicht" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Regels afbreken in vensters met verschillen" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "Handmatige uitlijning van vergelijking toevoegen" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "Alle handmatige uitlijningen van vergelijkingen wissen" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Focus op vorig venster zetten" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Splitsen van vensters omschakelen" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Directory- en tekstweergave splitsen in hoofdvenster" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Tussen directory- en tekstweergave wisselen" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Het resultaat van de samenvoeging is niet opgeslagen." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Opslaan && afsluiten" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Afsluiten zonder opslag" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "De opslag van het resultaat van de samenvoeging is mislukt." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -"U bent momenteel bezig met het samenvoegen van directorypen. Wilt u werkelijk " -"afbreken?" +"U bent momenteel bezig met het samenvoegen van directorypen. Wilt u " +"werkelijk afbreken?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Bestand wordt opgeslagen..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Bestand wordt opgeslagen met een nieuwe naam..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "Afdrukken..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "Afdrukken afgebroken." -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Selectie" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "Afdrukken is voltooid." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Programma wordt afgesloten..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Werkbalk aan/uit..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Statusbalk aan/uit..." @@ -1194,8 +1222,8 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Het KPart is niet gevonden.\n" "Dit doet zich meestal voor door een installatieprobleem. Lees a.u.b. het " @@ -1284,19 +1312,18 @@ msgstr "Derde bestand om te openen" msgid "Ignored. (User defined.)" msgstr "Genegeerd. (Gebruikergedefinieerd.)" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "En iedereen bedankt die fouten heeft gemeld en met ideeën kwam!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Aantal overgebleven onopgeloste conflicten: %1 (waarvan %2 witruimtes zijn)" @@ -1309,55 +1336,30 @@ msgstr "" "De uitvoer is gewijzigd.\n" "Als u verder gaat zullen uw wijzigingen verloren gaan." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Alle invoerbestanden zijn binair gelijk." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Alle invoerbestanden bevatten dezelfde tekst." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Bestanden A en B zijn binair gelijk.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Bestanden A en B hebben dezelfde tekst.\n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Bestanden A en C zijn binair gelijk.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Bestanden A en C hebben dezelfde tekst.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Bestanden %1 en %2 zijn binair gelijk.\n" -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Bestanden B en C zijn binair gelijk.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Bestanden A en B hebben dezelfde tekst.\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Bestanden B en C hebben dezelfde tekst.\n" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Totaal aantal conflicten: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1365,7 +1367,7 @@ msgstr "" "\n" "Aantal automatisch opgeloste conflicten: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1373,23 +1375,23 @@ msgstr "" "\n" "Aantal onopgeloste conflicten: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Conflicten" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1397,11 +1399,11 @@ msgstr "" "Nog niet alle conflicten zijn opgelost.\n" "Bestand is niet opgeslagen.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Er zijn nog onopgeloste conflicten" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1411,28 +1413,28 @@ msgstr "" "\n" "Het aanmaken van de reservekopie is mislukt. Het bestand is niet opgeslagen." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Fout bij opslaan van het bestand" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Fout bij het opslaan." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Uitvoer" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Gewijzigd]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "Codering voor opslaan" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "Codec van" @@ -1452,6 +1454,15 @@ 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" @@ -1578,8 +1589,7 @@ msgid "Auto indentation" msgstr "Automatisch inspringen" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" "Aan: de insprong van de vorige regel wordt gebruikt voor een nieuwe regel.\n" @@ -1615,65 +1625,57 @@ msgstr "Verschil" msgid "Diff Settings" msgstr "Instellingen voor verschil" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "'Carriage return' behouden" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"'Carriage return'-tekens ('\\r') tonen als deze bestaan.\n" -"Helpt bij het vergelijken van bestanden die gewijzigd werden onder " -"verschillende besturingssystemen." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "C/C++ commentaar als witruimtes behandelen." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Getallen negeren" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "Numerieke tekens negeren tijdens de vergelijkingfase. (Gelijk aan witruimtes " "negeren.)\n" "Kan helpen bij het vergelijken van bestanden met numerieke gegevens." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "C/C++ commentaar negeren" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "C/C++ commentaar als witruimtes behandelen." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Geen onderscheid hoofd-/kleine letters" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -"Verschil in hoofd-/kleine letters behandelen als witruimteverschillen ('a' <=> " -"'A')" +"Verschil in hoofd-/kleine letters behandelen als witruimteverschillen ('a' " +"<=> 'A')" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Preprocessorcommando:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Gebruikergedefinieerde voorbehandeling (zie documentatie voor meer details.)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Preprocessor-commando alleen voor regelcontroles:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1681,11 +1683,11 @@ msgstr "" "Deze preprocessor wordt alleen gebruikt bij regelcontroles.\n" "(Zie documentatie voor meer details)" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Grondig zoeken (trager)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1693,11 +1695,15 @@ msgstr "" "Activeert de optie '--minimal' voor een externe vergelijking.\n" "De analyse van grote bestanden zal veel trager zijn." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "Instellingen samenvoegen" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Vertraging voor automatisch doorgaan (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" @@ -1707,55 +1713,51 @@ msgstr "" "conflict springt.\n" "Bereik: 0-2000 ms" -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "Instellingen samenvoegen" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Standaardsamenvoeging van witruimtes bij 2 bestanden:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Handmatige keuze" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" "Bij het samenvoegen van bestanden toestaan dat er automatisch een oplossing " "gekozen wordt voor witruimteconflicten." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Standaardsamenvoeging van witruimtes bij 3 bestanden:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "Reguliere expressie voor automatisch samenvoegen" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "Reguliere expressie voor automatisch samenvoegen:" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" "When a line with a conflict matches the regular expression then\n" "- if available - C, otherwise B will be chosen." msgstr "" -"Reguliere expressies voor regels waar KDiff3 automatisch voor een bepaalde bron " -"moet kiezen.\n" +"Reguliere expressies voor regels waar KDiff3 automatisch voor een bepaalde " +"bron moet kiezen.\n" "Als een regel met een conflict overeenkomt met de reguliere expressie, dan\n" " - indien beschikbaar - C, anders wordt B gekozen." -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "Bij starten van samenvoegen automatisch reguliere expressie gebruiken" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" @@ -1763,15 +1765,15 @@ msgstr "" "Onmiddellijk het automatisch samenvoegen beginnen aan de hand\n" "van reguliere expressies als een samenvoeging wordt gestart.\n" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "amenvoegen aan de hand van versiebeheergeschiedenis" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "Reguliere expressie voor begin van geschiedenis:" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" @@ -1781,17 +1783,18 @@ msgstr "" "Normaal gesproken bevat deze regel het trefwoord \"$Log$\".\n" "Standaard waarde: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "Reguliere expressie voor begin van geschiedenisitem:" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" "Een geschiedenisitem van het versiebeheer bevat enkele regels.\n" @@ -1803,19 +1806,19 @@ msgstr "" "geschiedenisitems scheidt.\n" "Raadpleeg de documentatie voor meer details." -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "Geschiedenis samenvoegend sorteren" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "Geschiedenis versiebeheer sorteren met een sleutel." -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "Sorteervolgorde van begin van geschiedenisitems:" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1828,28 +1831,39 @@ msgstr "" "gebruikt kan\n" "worden voor sorteren.\n" "Geef de lijst met sleutels op (genummerd in de volgorde van hun voorkomen\n" -"beginnend bij 1) met een komma als scheidingsteken (bijv.\"4,5,6,1,2,3,7\").\n" +"beginnend bij 1) met een komma als scheidingsteken (bijv." +"\"4,5,6,1,2,3,7\").\n" "Wanneer dit wordt leeggelaten zal er niet gesorteerd worden.\n" "Raadpleeg de documentatie voor meer details." -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "Geschiedenis versiebeheer samenvoegen bij aanvang van samenvoegen" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -"Automatisch samenvoegen van geschiedenis versiebeheer bij aanvang samenvoegen." +"Automatisch samenvoegen van geschiedenis versiebeheer bij aanvang " +"samenvoegen." + +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Aantal subdirectorypen:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "Uw reguliere expressies testen" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "Irrelevant samenvoegcommando:" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" @@ -1858,25 +1872,38 @@ msgstr "" "Indien opgegeven zal dit script uitgevoerd worden na het automatisch " "samenvoegen,\n" "als er geen relevante wijzigingen waren gevonden.\n" -"Wordt aangeroepen met de argumenten: bestandsnaam1 bestandsnaam2 bestandsnaam 3" +"Wordt aangeroepen met de argumenten: bestandsnaam1 bestandsnaam2 " +"bestandsnaam 3" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Directorysamenvoeging" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Recursieve directorypen" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Bepaalt of subdirectorypen wel of niet worden ingelezen." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Bestandspatroon(en):" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1886,11 +1913,11 @@ msgstr "" "Jokers: '*' en '?'\n" "Meerdere patronen kunnen opgegeven worden d.m.v. het scheidingsteken ';'" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Bestand antipatroon(en):" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1900,11 +1927,11 @@ msgstr "" "Jokers: '*' en '?'\n" "Meerdere patronen kunnen opgegeven worden d.m.v. het scheidingsteken ';'" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Directory antipatroon(en):" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1914,11 +1941,11 @@ msgstr "" "Jokers: '*' en '?'\n" "Meerdere patronen kunnen opgegeven worden d.m.v. het scheidingsteken. ';'" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr ".cvsignore gebruiken" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1926,23 +1953,23 @@ msgstr "" "Breidt het antipatroon uit met alles dat genegeerd zou worden door CVS.\n" "Via lokale \".cvsignore\"-bestanden kan dit directoryspecifiek zijn." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Verborgen bestanden en directorypen zoeken" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Zoekt naar verborgen bestanden en directorypen." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Zoekt naar bestanden en directorypen die beginnen met '.'." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Bestandskoppelingen volgen" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1950,11 +1977,11 @@ msgstr "" "Aan: vergelijk het bestand naarwaar de koppeling verwijst.\n" "Uit: vergelijk de koppelingen." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Directorykoppelingen volgen" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1962,11 +1989,11 @@ msgstr "" "Aan: vergelijk de directory naarwaar de koppeling verwijst.\n" "Uit: vergelijk de koppeling." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "Hoofdlettergevoelige bestandsnaamvergelijking" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1978,23 +2005,23 @@ msgstr "" "Schakel deze optie in als ook het gebruik van hoofd-/kleine letters overeen " "moet komen. (Standaard voor Windows is uit, anders aan.)" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Bestandsvergelijkingsmodus" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Binaire vergelijking" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Binaire vergelijking van elk bestand (standaard)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Volledige analyse" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -2002,39 +2029,62 @@ msgstr "" "Doe een volledige analyse en toon de statistieken in extra kolommen.\n" "(Trager dan een binaire vergelijking, veel trager bij binaire bestanden.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Wijzigingsdatum vertrouwen (onveilig)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" "Gaat er van uit dat de bestanden gelijk zijn als de wijzigingsdatum en de " "bestandsgroottes gelijk zijn.\n" "Nuttig voor grote directorypen en trage netwerken." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Gaat er van uit dat de bestanden gelijk zijn als de wijzigingsdatum en de " +"bestandsgroottes gelijk zijn.\n" +"Nuttig voor grote directorypen en trage netwerken." + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Grootte vertrouwen (onveilig)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" -"Gaat er van uit dat bestanden gelijk zijn als de bestandsgroottes gelijk zijn.\n" +"Gaat er van uit dat bestanden gelijk zijn als de bestandsgroottes gelijk " +"zijn.\n" "Nuttig voor grote directorypen en trage netwerken wanneer de datum verandert " "tijdens een download." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Directorypen synchroniseren" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -2045,24 +2095,24 @@ msgstr "" "Werkt alleen wanneer twee directorypen vergeleken worden zonder dat er een " "bestemming is opgegeven." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Witruimteverschillen worden als gelijk beschouwd" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -"Als bestanden alleen qua witruimtes van elkaar verschillen worden ze als gelijk " -"beschouwd.\n" +"Als bestanden alleen qua witruimtes van elkaar verschillen worden ze als " +"gelijk beschouwd.\n" "Dit is alleen actief als volledige analyse is gekozen." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Nieuwere bestanden kopiëren in plaats van samenvoegen (onveilig)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2072,27 +2122,28 @@ msgstr "" "(Gebruik dit enkel als u weet wat u doet!)\n" "Alleen effectief wanneer men twee directorypen met elkaar vergelijkt." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Reservekopie aanmaken (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -"Wanneer een bestand bewaard moet worden over een oud bestand, dan zal het oude " -"bestand worden hernoemd met als extensie '.orig', i.p.v. gewist te worden." +"Wanneer een bestand bewaard moet worden over een oud bestand, dan zal het " +"oude bestand worden hernoemd met als extensie '.orig', i.p.v. gewist te " +"worden." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Regionale instellingen" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Taal (herstart vereist)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2100,80 +2151,81 @@ msgstr "" "Kies de taal voor de GUI-tekst, of \"Auto\".\n" "Om de taal te wijzigen dient u KDiff3 te herstarten." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Dezelfde codering gebruiken voor alles:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -"Schakel dit in dit om alle coderingen te wijzigen door alleen de eerste aan te " -"passen.\n" +"Schakel dit in dit om alle coderingen te wijzigen door alleen de eerste aan " +"te passen.\n" "Schakel dit uit als er verschillende individuele instellingen nodig zijn." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Opmerking: lokale codering is " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "Bestandscodering voor A:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" -msgstr "" -"Indien ingeschakeld zal Unicode-codering (UTF-16 of UTF-8 worden gedetecteerd.\n" -"Als de bestandscodering niet gedetecteerd wordt zal de geselecteerde codering " -"worden gebruikt om op terug te vallen.\n" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" +msgstr "" +"Indien ingeschakeld zal Unicode-codering (UTF-16 of UTF-8 worden " +"gedetecteerd.\n" +"Als de bestandscodering niet gedetecteerd wordt zal de geselecteerde " +"codering worden gebruikt om op terug te vallen.\n" "(Unicode-detectie is afhankelijk van de eerste bites in een bestand - de " "bytevolgordemarkering \"BOM\".)" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "Unicode autodetecteren" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "Bestandscodering voor B:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "Bestandscodering voor C:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Bestandscodering voor samenvoeguitvoer en opslag:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "Automatisch selecteren" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" "Indien ingeschakeld zal de codering van de invoerbestanden worden gebruikt.\n" -"Bij twijfelgevallen zult u gevraagd worden welke codering er voor het opslaan " -"gebruikt moet worden." +"Bij twijfelgevallen zult u gevraagd worden welke codering er voor het " +"opslaan gebruikt moet worden." -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Bestandscodering voor preprocessorbestanden:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Rechts-naar-links-taal" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2181,19 +2233,19 @@ msgstr "" "Sommige talen worden van rechts naar links gelezen.\n" "Deze instelling zal de viewer en editor hierop aanpassen." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "Integratie" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "Integratie-instellingen" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "Te negeren commandoregelopties:" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2206,7 +2258,27 @@ msgstr "" "';'\n" "Dit onderdrukt de foutmelding \"Onbekende optie\"." -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2222,19 +2294,19 @@ msgstr "" "\n" "Wilt u doorgaan, of wilt u een ander lettertype selecteren?" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Incompatibel lettertype" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Doorgaan op eigen risico" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Ander lettertype kiezen" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "Dit zet alle opties terug, niet alleen die van het huidige onderwerp." @@ -2243,10 +2315,8 @@ msgid "PreprocessorCmd: " msgstr "Preprocessorcommando: " #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"De volgende optie(s) die hebt gekozen kunnen data wijzigen:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "De volgende optie(s) die hebt gekozen kunnen data wijzigen:\n" #: pdiff.cpp:264 msgid "" @@ -2256,7 +2326,8 @@ msgid "" msgstr "" "\n" "Dit is meestal niet gewenst bij een samenvoeging.\n" -"Wilt u deze instellingen uitschakelen of doorgaan met deze instellingen actief?" +"Wilt u deze instellingen uitschakelen of doorgaan met deze instellingen " +"actief?" #: pdiff.cpp:266 msgid "Option Unsafe for Merging" @@ -2312,15 +2383,8 @@ msgstr "" "Alle invoerbestanden bevatten dezelfde tekst, maar zijn binair gezien niet " "gelijk." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Bestanden %1 en %2 zijn binair gelijk.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Bestanden %1 en %2 hebben dezelfde tekst, maar zijn binair gezien ongelijk.\n" @@ -2334,108 +2398,54 @@ msgstr "" "Opmerking: KDiff3 is niet bedoeld voor binaire gegevens.\n" "U kunt verder gaan op eigen risico." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Afbreken" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Bestanden openen..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Fout bij openen van bestand" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Selectie wordt geknipt..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Selectie wordt op het klembord geplaatst..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Klembordinhoud wordt ingevoegd..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Opslaan && doorgaan" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Doorgaan zonder opslaan" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Zoeken voltooid." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Zoeken voltooid" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "Er is niets geselecteerd in beide invoervensters voor de vergelijking." -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "Fout bij het toevoegen van handmatig vergelijkingsbereik" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "KDiff3 instellen" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Directory" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Samenvoeging van huidig item" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Synchronisatie van huidig item" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Navigatie" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "Versch&ilweergave" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "Sa&menvoegen" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Venster" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (basis):" @@ -2478,6 +2488,10 @@ msgstr "Uitvoer (optioneel):" msgid "Configure..." msgstr "Instellen..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Zoektekst:" @@ -2543,21 +2557,30 @@ msgstr "Sorteervolgorde geschiedenis:" #: smalldialogs.cpp:469 msgid "Example history entry start line (without leading comment):" msgstr "" -"Voorbeeld van beginregel van geschiedenisitem (zonder voorafgaand commentaar):" +"Voorbeeld van beginregel van geschiedenisitem (zonder voorafgaand " +"commentaar):" #: smalldialogs.cpp:471 msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -"Kopieer een beginregel van een geschiedenisitem zoals die in uw bestanden wordt " -"gebruikt.\n" +"Kopieer een beginregel van een geschiedenisitem zoals die in uw bestanden " +"wordt gebruikt.\n" "Voeg echter geen voorafgaand commentaar bij." #: smalldialogs.cpp:486 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" @@ -2569,4 +2592,87 @@ msgstr "Overeenkomst mislukt." #: smalldialogs.cpp:559 msgid "Opening and closing parentheses don't match in regular expression." msgstr "" -"Er zijn niet evenveel openings- als sluitingshaakjes in de reguliere expressie." +"Er zijn niet evenveel openings- als sluitingshaakjes in de reguliere " +"expressie." + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Directory" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Samenvoeging van huidig item" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Synchronisatie van huidig item" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Navigatie" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "Versch&ilweergave" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "Sa&menvoegen" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Venster" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Bestanden A en B zijn binair gelijk.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Bestanden A en C zijn binair gelijk.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Bestanden A en C hebben dezelfde tekst.\n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Bestanden B en C zijn binair gelijk.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Bestanden B en C hebben dezelfde tekst.\n" + +#~ msgid "Preserve carriage return" +#~ msgstr "'Carriage return' behouden" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "'Carriage return'-tekens ('\\r') tonen als deze bestaan.\n" +#~ "Helpt bij het vergelijken van bestanden die gewijzigd werden onder " +#~ "verschillende besturingssystemen." diff --git a/po/pl.po b/po/pl.po index e64d73c..6ffb71f 100644 --- a/po/pl.po +++ b/po/pl.po @@ -14,38 +14,39 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2005-12-30 14:10+0100\n" "Last-Translator: Robert Gomulka \n" "Language-Team: polish \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10.2\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n" +"%100<10 || n%100>=20) ? 1 : 2);\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Tomasz Waleńczak, Marcin Bokszczanin" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "tom@w.pl" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Błąd zapisu zawartości schowka do pliku tymczasowego." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "ze schowka" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -59,7 +60,7 @@ msgstr "" "\n" "Polecenie przetwarzenia wstępnego zostanie wyłączone." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -67,14 +68,14 @@ msgid "" "\n" "The line-matching-preprocessing command will be disabled now." msgstr "" -"Przetwarzenie wstępne dopasowywania wierszy nie powiodło się. Proszę sprawdzić " -"polecenie:\n" +"Przetwarzenie wstępne dopasowywania wierszy nie powiodło się. Proszę " +"sprawdzić polecenie:\n" "\n" " %1\n" "\n" "Polecenie przetwarzenia wstępnego dopasowywania wierszy zostanie wyłączone." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -82,16 +83,16 @@ msgstr "" "Błąd utraty danych:\n" "Jeśli jest powtarzalny, to skontaktuj się z autorem programu.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Poważny błąd wewnętrzny" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Nr pierwszej linii na ekranie: %1" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Koniec" @@ -107,245 +108,249 @@ msgstr "Dowiązanie: " msgid "Size. " msgstr "Rozmiar. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Data & Rozmiar: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Tworzenie tymczasowej kopii %1 nieudane." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Otwieranie %1 nie powiodło się." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Porównywanie pliku..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Błąd czytania z %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Nazwa" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Operacja" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Nierozwiązane" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Rozwiązane" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Nie biały" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Biały" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -"Obecnie wykonywane jest łączenie katalogów. Jesteś pewny że chcesz przerwać tą " -"operację i ponownie przeskanować katalog?" +"Obecnie wykonywane jest łączenie katalogów. Jesteś pewny że chcesz przerwać " +"tą operację i ponownie przeskanować katalog?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Wznów łączenie" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Otwieranie katalogu nie powiodło się:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Katalog A \"%1\" nie istnieje lub nie jest katalogiem.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Katalog A \"%1\" nie istnieje lub nie jest katalogiem.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Katalog B \"%1\" nie istnieje lub nie jest katalogiem.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Katalog B \"%1\" nie istnieje lub nie jest katalogiem.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Katalog C \"%1\" nie istnieje lub nie jest katalogiem.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Katalog C \"%1\" nie istnieje lub nie jest katalogiem.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Błąd otwierania katalogu" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "Docelowy katalog nie może być taki sam jak A lub B jeśli łączone są trzy " "katalogi.\n" "Sprawdź ponownie zanim będziesz kontynuować." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Ostrzeżenie co do parametru" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Skanowanie katalogów ..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Czytanie katalogu A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Czytanie katalogu B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Czytanie katalogu C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Niektóre podkatalogi są nie do odczytu w" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Sprawdź prawa dostępu do podkatalogów." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Gotowe." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Status porównywania katalogów" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Liczba podkatalogów:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Liczba identycznych plików:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Liczba różniących się plików:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Liczba ręcznych połączeń:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "To wpłynie na wszystkie operacje łączenia." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Zmiana wszystkich operacji łączenia" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "K&ontynuuj" -#: directorymergewindow.cpp:1169 +#: 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 " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Do zrobienia." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Kopiuj A do B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Kopiuj B do A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Usuń A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Usuń B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Usuń A i B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Połącz z A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Połącz z B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Połącz z A i B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Usuń (jeśli istnieje)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Połącz" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Połącz (ręcznie)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Błąd: Konflikt typów plików" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Błąd: Data identyczna ale pliki nie." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Ta operacja jest w tej chwili niemożliwa." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Niemożliwa operacja" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -359,42 +364,47 @@ msgstr "" "\n" "Jeśli wiesz jak to powtórzyć, proszę skontaktować się z autorem programu." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Błąd programu" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Wystąpił błąd w trakcie kopiowania.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Wystąpił błąd w trakcie kopiowania.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Błąd." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Zrobione." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Niezapisane." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Nieznana operacja połączenia. (To się nigdy nie powinno wydarzyć!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Nieznana operacja łączenia." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -410,340 +420,346 @@ msgstr "" "Wybierz \"Zrób to\" jeśli czytałeś instrukcję i wiesz co robisz.\n" "Wybierz \"Symuluj\" otrzymasz informacje co otrzymasz\n" "\n" -"Miej na uwadze że program nadal jest wersji beta i BRAK GWARANCJI co do wyników " -"działania! Wykonaj kopie zapasowe swoich istotnych danych!" +"Miej na uwadze że program nadal jest wersji beta i BRAK GWARANCJI co do " +"wyników działania! Wykonaj kopie zapasowe swoich istotnych danych!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Rozpoczęcie połączenia" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Wykonaj" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Symuluj" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" "Podświetlona pozycja jest innego typu w innym katalogu. Wybierz co zrobić." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" "Data modyfikacji plików jest taka sama ale pliki nie. Wybierz co zrobić." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -"Ta operacja jest nie możliwa do wykonania w tej chwili gdyż obecnie wykonywana " -"jest operacja połączenia katalogów." +"Ta operacja jest nie możliwa do wykonania w tej chwili gdyż obecnie " +"wykonywana jest operacja połączenia katalogów." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "W ostatnim kroku wystąpił błąd.\n" "Chcesz kontynuować z pozycja która powoduje błąd czy tez pominąć tą pozycję?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Kontynuuj połączenie po błędzie" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Kontynuuj z ostatnią pozycją" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Pomiń pozycję" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Pominięto." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "W trakcie..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Operacja połączenia zakończona." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Połączenie zakończone" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Symulacja połączenia zakończona. Sprawdź czy zgadzasz się na zaproponowane " "operacje." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Wystąpił błąd. Wciśnij OK aby zobaczyć szczegółowe informacje.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Wystąpił błąd. Wciśnij OK aby zobaczyć szczegółowe informacje.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Błąd: W trakcie usuwania %1: Błąd tworzenia kopii zapasowej." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "usuwaj katalogi rekursywnie( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "usuń( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Błąd: Nieudane usuwanie katalogu w momencie próby czytania katalogu." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Błąd: rmdir( %1 ) operacja nieudana." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Błąd: Nieudana operacja usuwania." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ręczne połączenie( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -" Uwaga: Po ręcznym połączeniu użytkownik powinien kontynuować wciskając F7." +" Uwaga: Po ręcznym połączeniu użytkownik powinien kontynuować wciskając " +"F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -"Błąd: Nieudane kopiowanie( %1 -> %2 ) .Nieudane kasowanie katalogu docelowego." +"Błąd: Nieudane kopiowanie( %1 -> %2 ) .Nieudane kasowanie katalogu " +"docelowego." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Błąd: Nie udane copyLink: Odległe dowiązania nie są jeszcze obsługiwane." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Błąd: Nieudane copyLink." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "kopiowanie( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -"Błąd w czasie zmiany nazwy( %1 -> %2 ): Nie można usunąć istniejącego miejsca " -"docelowego." +"Błąd w czasie zmiany nazwy( %1 -> %2 ): Nie można usunąć istniejącego " +"miejsca docelowego." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "zmiana nazwy( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Błąd: Nieudana zmiana nazwy." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Błąd w czasie makeDir %1. Nie można usunąć istniejącego pliku." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Błąd w trakcie tworzenia katalogu." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Cel" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Katalog" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Typ" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Rozmiar" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Atrybut" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Ostatnia modyfikacja" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Dowiązanie do pliku" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Plik..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "niedostępne" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (Cel): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (Podstawa): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (Cel): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (Cel): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Cel: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Połączenia katalogów" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Start/Kontynuuj Połączenie Katalogów " -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "wykonaj operację na bieżącej pozycji" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Porównaj zaznaczone pliki" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Połącz bieżący plik" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Uwzględnij podkatalogi" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Nie uwzględniaj podkatalogów" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Wybierz A dla wszystkich pozycji" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Wybierz B dla wszystkich pozycji" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Wybierz C dla wszystkich pozycji" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Automatyczny wybór dla wszystkich pozycji" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Brak operacji dla wszystkich pozycji" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Show Different Files" msgstr "Liczba różniących się plików:" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Porównaj zaznaczone pliki" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Porównaj zaznaczone pliki" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Nic nie rób" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Usuń A i B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Połącz z A i B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -"Błąd w trakcie wykonywania kopii zapasowej. Nieudane kasowanie starej kopii. \n" +"Błąd w trakcie wykonywania kopii zapasowej. Nieudane kasowanie starej " +"kopii. \n" "Nazwa pliku: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -751,192 +767,198 @@ msgstr "" "Błąd w trakcie wykonywania kopii zapasowej. Nieudana zmiana nazwy. \n" "Nazwa plików: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Pobranie statusu pliku: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Czytanie pliku: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Zapisywanie pliku: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Brak pamięci" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Tworzenie katalogu: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Usuwanie katalogu: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Usuwanie pliku: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Tworzenie dowiązania symbolicznego:%1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Zmiana nazwy pliku: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Kopiowanie pliku: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" "Błąd podczas kopiowania pliku: Nieudane otwarcie pliku. Nazwa pliku: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" -msgstr "" -"Błąd podczas kopiowania pliku: Nieudane otwarcie pliku do zapisu. Nazwa pliku: " +"Error during file copy operation: Opening file for writing failed. Filename: " "%1" +msgstr "" +"Błąd podczas kopiowania pliku: Nieudane otwarcie pliku do zapisu. Nazwa " +"pliku: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "Błąd w czasie kopiowania. Nieudany odczyt. Nazwa pliku: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Błąd w czasie kopiowania. Nieudany zapis. Nazwa pliku: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Czytanie katalogu: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Wyświetlenie zawartości katalogu: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 #, fuzzy msgid "Current Configuration:" msgstr "Operacja synchronizacji dla bieżącej pozycji" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "Błąd otwarcia pliku" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Użyta opcja --auto, ale nie określone wyjście." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Opcja --auto-zignorowana przy porównywaniu katalogów." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Nieudany zapis." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Nieudane otwarcie następujących plików:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Błąd otwarcia pliku" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Otwieranie dokumentów do porównania..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Zapisywanie rezultatu połączenia. Wszystkie konflikty muszą być rozwiązane!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Zapisywanie bieżącego dokumentu jako..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Wyjście z programu" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Wycina zaznaczony fragment i umieszcza go w schowku" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Kopiuje zaznaczony fragment do schowka" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Wklejanie zawartości schowka w aktualne położenie" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Znajdź tekst" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Szukaj ponownie tekstu" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Włącza/wyłącza pasek narzędzi" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Włącza/wyłącza pasek statusu" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Konfiguracja KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Idź do bieżącej różnicy" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Idź do pierwszej różnicy" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Idź do ostatniej różnicy" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Pomija różnice w znakach odstępu gdy opcja \"Pokaż znaki odstępu\" jest " "wyłączona)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -944,238 +966,246 @@ msgstr "" "(Nie pomija różnic w znakach odstępu gdy opcja \"Pokaż znaki odstępu\" jest " "wyłączona)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Idź do poprzedniej różnicy" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Idź do następnej różnicy" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Idź do poprzedniego konfliktu" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Idź do następnego konfliktu" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Idź do poprzedniego nie rozwiązanego konfliktu" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Idź do następnego nie rozwiązanego konfliktu" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Wybierz linie z A" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Wybierz linie z B" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Wybierz linie z C" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Automatycznie idź do następnego nierozwiązanego konfliktu po wybraniu źródła" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Pokaż spacje i tabulację w miejsce różnic" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Pokaż znaki odstępu" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Pokaż numery linii" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Wybierz wszędzie A" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Wybierz wszędzie B" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Wybierz wszędzie C" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Wybierz A dla wszystkich nierozwiązanych konfliktów" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Wybierz B dla wszystkich nierozwiązanych konfliktów" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Wybierz C dla wszystkich nierozwiązanych konfliktów" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Wybierz A dla wszystkich nierozwiązanych konfliktów znaków odstępu" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Wybierz B dla wszystkich nierozwiązanych konfliktów znaków odstępu" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Wybierz C dla wszystkich nierozwiązanych konfliktów znaków odstępu" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Automatycznie rozwiąż proste konflikty" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Zamień różnice na konflikty" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Automatycznie rozwiąż proste konflikty" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 #, fuzzy msgid "Join Selected Diffs" msgstr "Porównaj zaznaczone pliki" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Pokaż okno A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Pokaż okno B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Pokaz okno C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Uaktywnij następne okno" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Normalne przeglądanie" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "Przegląd różnic między A i B" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "Przegląd różnic między A i C" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "Przegląd różnic między B i C" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Zawijanie wyrazów w oknach różnic" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Uaktywnij poprzednie okno" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Przełącz orientację podziału okien" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Widok dzielony katalogu i tekstu" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Przełącza między widokiem katalogów i tekstu" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Rezultat połączenia nie został zapisany." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Zapisz i Wyjdź" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Zakończ bez zapisywania" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Nieudany zapis rezultatu połączenia." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Obecnie wykonujesz połączenie katalogów. Jesteś pewny że chcesz przerwać?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Zapisywanie pliku..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Zapisywanie pliku pod nową nazwą..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "Wyjście..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 #, fuzzy msgid "Printing completed." msgstr "Operacja połączenia zakończona." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Wyjście..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Przełączanie paska narzędzi..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Przełączanie paska statusu..." @@ -1190,12 +1220,12 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Nie można znaleźć fragmentu programu!\n" -"Może to być spowodowane niepoprawną instalacją. Przeczytaj README aby uzyskać " -"szczegółowe informacje." +"Może to być spowodowane niepoprawną instalacją. Przeczytaj README aby " +"uzyskać szczegółowe informacje." #: main.cpp:35 msgid "Tool for Comparison and Merge of Files and Directories" @@ -1223,8 +1253,8 @@ msgstr "" #: main.cpp:46 msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -"Brak GUI jeśli wszystkie konflikty mogą być automatycznie rozwiązane. (Wymaga " -"pliku -o)" +"Brak GUI jeśli wszystkie konflikty mogą być automatycznie rozwiązane. " +"(Wymaga pliku -o)" #: main.cpp:47 msgid "Don't solve conflicts automatically. (For compatibility...)" @@ -1279,23 +1309,22 @@ msgstr "Otwórz plik3" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "+ Wielkie dzięki zgłaszającym błędy i wnoszącym nowe pomysły!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -"Liczba pozostałych nie rozwiązanych konfliktów: %1 (z których %2 dotyczy znaków " -"odstępu)" +"Liczba pozostałych nie rozwiązanych konfliktów: %1 (z których %2 dotyczy " +"znaków odstępu)" #: mergeresultwindow.cpp:285 msgid "" @@ -1305,55 +1334,31 @@ msgstr "" "Plik wyjściowy został zmieniony.\n" "Jeśli będziesz kontynuować zmiany zostaną utracone." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Wszystkie pliki wejściowe są binarnie równe." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Wszystkie wejściowe pliki zawierając ten sam tekst." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Pliki A i B są binarnie identyczne.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Pliki A i B mają identyczny tekst.\n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Pliki A i C są binarnie identyczne.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Pliki A i C mają identyczny tekst.\n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Pliki B i C są binarnie identyczne.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +#, fuzzy +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Pliki B i C są binarnie identyczne.\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Pliki B i C mają identyczny tekst. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Pliki A i B mają identyczny tekst.\n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Całkowita liczba konfliktów: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1361,7 +1366,7 @@ msgstr "" "\n" "Liczba automatycznie rozwiązanych konfliktów: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1369,23 +1374,23 @@ msgstr "" "\n" "Liczba nie rozwiązanych konfliktów: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Konflikty" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1393,11 +1398,11 @@ msgstr "" "Nie wszystkie konflikty zostały rozwiązane.\n" "Plik nie został zapisany.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Pozostałe konflikty" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1407,29 +1412,29 @@ msgstr "" "\n" "Tworzenie pliku zapasowego nie powiodło się. Plik nezapisany." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Błąd zapisu pliku" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Błąd w czasie zapisu." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Wyjście" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[zmodyfikowane]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 #, fuzzy msgid "Encoding for saving" msgstr "Kodowanie pliku C:" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1449,6 +1454,15 @@ 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" @@ -1574,10 +1588,8 @@ msgid "Auto indentation" msgstr "Automatyczne wcięcia" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"Włą: Wcięcie poprzedniej linii będzie użyte w nowej linii.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "Włą: Wcięcie poprzedniej linii będzie użyte w nowej linii.\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1613,61 +1625,53 @@ msgstr "KDiff3" msgid "Diff Settings" msgstr "Ustawienia różnic i połączeń" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Zachowuj znak końca linii" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Pokazuj znaki końca linii '\\r' jeśli istnieją.\n" -"Pomaga to w porównywaniu plików które zostały\n" -"zmodyfikowane w rożnych systemach operacyjnych." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Traktuj komentarze C/C++ jak białe znaki." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Ignoruj cyfry" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "Ignoruj liczby podczas sprawdzania (Podobne do Ignoruj białe znaki)\n" "Może być pomocne przy porównywania plików z danymi numerycznymi." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Ignoruj komentarze C/C++ " -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Traktuj komentarze C/C++ jak białe znaki." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Ignoruj cyfry" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Różnice wielkości liter traktuj jak zmiany znaków odstępu. ('a'<=>'A')" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Komenda preprocesora:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "Zdefiniowany przez użytkownika pre-proces. (Zobacz szczegóły w docs.)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Linia komend preprocesora:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1675,11 +1679,11 @@ msgstr "" "Ta komenda może być użyta tylko z linii poleceń.\n" "(Aby uzyskać szczegóły zobacz docs.)" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Próbuj bardziej (wolne)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1687,11 +1691,16 @@ msgstr "" "Udostępnia opcję --minimal dla zewnętrznego.\n" "Analizowanie dużych plików będzie znacznie wolniejsze." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Ustawienia różnic i połączeń" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Czas automatycznego przejścia (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" @@ -1700,40 +1709,35 @@ msgstr "" "jest pokazywany przez podany czas zanim nastąpi przejście do następnego \n" "konfliktu. Zakres: 0-2000 ms" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Ustawienia różnic i połączeń" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Domyślne łączenie znaków białych przy 2 plikach:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Wybór użytkownika" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -"Pozwól algorytmowi łączenia dokonać automatycznego wyboru wejścia - tylko dla " -"znaków odstępu." +"Pozwól algorytmowi łączenia dokonać automatycznego wyboru wejścia - tylko " +"dla znaków odstępu." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Domyślne łączenie znaków białych przy 3 plikach:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1741,58 +1745,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1802,46 +1807,67 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Liczba podkatalogów:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Połączenia katalogów" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Rekursywne katalogi" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Czy mają być analizowane podkatalogi." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Wzorzec plików:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1851,11 +1877,11 @@ msgstr "" "Znaki szablonowe (wildcards): '*' i '?'\n" "Można określić kilka wzorców poprzez użycie separatora: ';'" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Anty wzorzec plików:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1865,11 +1891,11 @@ msgstr "" "Znaki szablonowe (wildcards): '*' i '?'\n" "Możesz określić kilka wzorców używając separatora: ';'" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Anty wzorzec katalogów:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1879,11 +1905,11 @@ msgstr "" "Znaki szablonowe (wildcards): '*' and '?'\n" "Możesz użyć kilku wzorców poprzez użycie separatora: ';'" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Użyj .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1891,23 +1917,23 @@ msgstr "" "Rozszerz anty wzorzec na wszystko co będzie ignorowane przez CVS. \n" "W lokalnym \".cvsignore\" -pliki mogą być specyficzne dla katalogów." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Znajdź ukryte pliki i katalogi" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Znajduje pliki i katalogi z atrybutem ukryty." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Znajduje pliki i katalogi z nazwą zaczynającą się na '.' ." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Podążaj za dowiązaniami" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1915,11 +1941,11 @@ msgstr "" "Włą: Porównuj pliki na które wskazuje dowiązanie.\n" "Wył: Porównuj dowiązania." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Podążaj za dowiązaniami katalogów" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1927,11 +1953,11 @@ msgstr "" "Włą: Porównuj katalogi na które wskazuje dowiązanie. \n" "Wył: Porównuj dowiązania." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1939,23 +1965,23 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Tryb porównania plików" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Porównanie binarne" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Binarne porównanie dla każdego pliku (domyślne)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Pełna analiza" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1964,25 +1990,47 @@ msgstr "" "(Wolniejsze niż porównanie binarne, i znacznie wolniejsze dla plików " "binarnych.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Ufaj dacie modyfikacji (niepewne)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" "Zakłada że pliki są identyczne jeśli data modyfikacji i rozmiar jest " "identyczny\n" "Użyteczne przy dużych katalogach lub wolnych połączeniach sieciowych." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Zakłada że pliki są identyczne jeśli data modyfikacji i rozmiar jest " +"identyczny\n" +"Użyteczne przy dużych katalogach lub wolnych połączeniach sieciowych." + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Ufaj rozmiarowi (niepewne)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -1992,11 +2040,11 @@ msgstr "" "Użyteczne przy dużych katalogach lub wolnych połączeniach \n" "sieciowych gdzie data jest modyfikowana w trakcie ściągania." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Synchronizacja katalogów" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -2007,11 +2055,11 @@ msgstr "" "Działa tylko przy porównywaniu dwóch katalogów \n" "bez określonego miejsca docelowego." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Różnice w znakach odstępu ignorowane" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -2019,11 +2067,11 @@ msgstr "" "Jeśli pliki różnią się tylko znakami odstępu, to uznaj je za identyczne.\n" "Opcja aktywna tylko w przypadku pełnej analizy." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Kopiuj nowsze zamiast łączyć (niepewne)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2033,11 +2081,11 @@ msgstr "" "(Użyj tego tylko jeśli wiesz co robisz!)\n" "Efektywne tylko przy porównywaniu dwóch katalogów." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Tworzenie kopii zapasowych (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2045,15 +2093,15 @@ msgstr "" "Gdy plik będzie zapisywany w miejsce starego, to stary plik\n" "zmieni nazwę z rozszerzeniem '.orig', zamiast zostać usuniętym." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Ustawienia regionalne" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Język(wymaga ponownego uruchomienia)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2061,11 +2109,11 @@ msgstr "" "Wybierz język dla GUI lub ustaw na\"Automatycznie\". \n" "Po zmianie języka należy uruchomić ponownie KDiff3." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Używanie tego samego kodowania dla wszystkiego:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." @@ -2074,60 +2122,60 @@ msgstr "" "pierwsze. \n" "Proszę wyłączyć jeśli potrzebne są różne ustawienia indywidualne. " -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Uwaga: lokalne kodowanie to " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "Kodowanie pliku A:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "Kodowanie pliku B:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "Kodowanie pliku C:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Kodowanie pliku wynikowego i przy zapisywaniu:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "Wybór auto kopiowania" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Kodowanie plików preprocesora:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Język z pismem prawy-do-lewego" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2135,21 +2183,21 @@ msgstr "" "Niektóre języka pisze się od prawej strony do lewej. \n" "Ustawienie to zmieni odpowiednio za równo przeglądarkę jak i edutor." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "Operacja" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration Settings" msgstr "Ustawienia regionalne" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2157,7 +2205,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2173,19 +2241,19 @@ msgstr "" "\n" "Chcesz kontynuować czy też wybrać inną czcionkę." -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Niekompatybilna czcionka" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Kontynuacja na własne ryzyko" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Wybierz inną czcionkę" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "Kasuje wszystkie ustawienia. Działa nie tylko na bieżącej zakładce." @@ -2194,10 +2262,8 @@ msgid "PreprocessorCmd: " msgstr "Komenda preprocesora: " #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"Następująca opcja(e) które wybrano mogą zmienić dane:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "Następująca opcja(e) które wybrano mogą zmienić dane:\n" #: pdiff.cpp:264 msgid "" @@ -2262,19 +2328,10 @@ msgstr "Różnica: A <-> C" msgid "All input files contain the same text, but are not binary equal." msgstr "Wszystkie wejściowe pliki zawierając ten sam tekst." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -#, fuzzy -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Pliki B i C są binarnie identyczne.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 #, fuzzy -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"Pliki A i B są binarnie identyczne.\n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Pliki A i B są binarnie identyczne.\n" #: pdiff.cpp:530 msgid "" @@ -2286,109 +2343,55 @@ msgstr "" "Zauważ że KDiff3 nie nadaje się do łączenia danych binarnych.\n" "Kontynuuj na własne ryzyko." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "O programie" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Otwieranie plików..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Błąd otwarcia pliku" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Wytnij zaznaczenie..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Kopiuj zaznaczony fragment do schowka..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Wkleja zawartość schowka..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Zapisz i Kontynuuj" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Zakończ bez zapisywania" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Wynik szukania." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Połączenie zakończone" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "Błąd w trakcie tworzenia katalogu." -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "K&Diff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Konfiguracja KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Katalog" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Operacja połączenia dla bieżącej pozycji" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Operacja synchronizacji dla bieżącej pozycji" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Idź" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "&Różnice" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Połączenie" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Okno" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (Podstawa):" @@ -2431,6 +2434,10 @@ msgstr "Wynik (opcjonalnie):" msgid "Configure..." msgstr "Konfiguracja..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Szukaj tekstu:" @@ -2503,6 +2510,14 @@ 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 "" @@ -2516,6 +2531,88 @@ msgstr "Nieudany zapis." msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "K&Diff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Katalog" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Operacja połączenia dla bieżącej pozycji" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Operacja synchronizacji dla bieżącej pozycji" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Idź" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "&Różnice" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Połączenie" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Okno" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Pliki A i B są binarnie identyczne.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Pliki A i C są binarnie identyczne.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Pliki A i C mają identyczny tekst.\n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Pliki B i C są binarnie identyczne.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Pliki B i C mają identyczny tekst. \n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Zachowuj znak końca linii" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Pokazuj znaki końca linii '\\r' jeśli istnieją.\n" +#~ "Pomaga to w porównywaniu plików które zostały\n" +#~ "zmodyfikowane w rożnych systemach operacyjnych." + #, fuzzy #~ msgid "Diff and Merge" #~ msgstr "Różnice i Połączenia" @@ -2551,7 +2648,9 @@ msgstr "" #~ msgstr "Wybór użytkownika" #~ msgid "Has no effect. For compatibility with certain tools." -#~ msgstr "Nie ma wpływu na wynik. Ze względu na kompatybilność z pewnymi narzędziami." +#~ msgstr "" +#~ "Nie ma wpływu na wynik. Ze względu na kompatybilność z pewnymi " +#~ "narzędziami." #~ msgid "For compatibility with certain tools." #~ msgstr "Ze względu na kompatybilność z pewnymi narzędziami." diff --git a/po/pt.po b/po/pt.po index 51868c1..78608bb 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,10 +1,11 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2006-11-05 14:35+0000\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -13,28 +14,29 @@ msgstr "" "X-POFile-SpellExtra: orig Log\n" "X-POFile-IgnoreConsistency: End\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "José Nuno Pires,Pedro Morais" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "jncp@netcabo.pt,morais@kde.org" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "" -"A escrita de dados da área de transferência para o ficheiro temporário falhou." +"A escrita de dados da área de transferência para o ficheiro temporário " +"falhou." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Da Área de Transferência" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -46,7 +48,7 @@ msgstr "" " %1\n" "O comando de pré-processamento vai ser desactivado." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -54,12 +56,12 @@ msgid "" "\n" "The line-matching-preprocessing command will be disabled now." msgstr "" -"O pré-processamento com procura de linhas possivelmente falhou. Verifique este " -"comando:\n" +"O pré-processamento com procura de linhas possivelmente falhou. Verifique " +"este comando:\n" " %1\n" "O comando de pré-processamento com procura de linhas vai ser desactivado." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -67,15 +69,15 @@ msgstr "" "Erro de perda de dados:\n" "Se for reprodutível, contacte por favor o autor.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Erro Interno Grave" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "Linha de topo" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Fim" @@ -91,245 +93,249 @@ msgstr "Ligação: " msgid "Size. " msgstr "Tamanho. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Data e Tamanho: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "A criação da cópia temporária do %1 falhou." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "O acesso ao %1 foi mal-sucedido." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "A comparar o ficheiro..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Erro ao ler de %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Nome" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Operação" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Estado" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Não resolvido" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Resolvido" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Não vazio" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Vazio" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" 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?" +"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:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Continuar a Junção" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "O acesso às pastas foi mal-sucedido:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"A pasta A \"%1\" não existe ou não é uma pasta.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "A pasta A \"%1\" não existe ou não é uma pasta.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"A pasta B \"%1\" não existe ou não é uma pasta.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "A pasta B \"%1\" não existe ou não é uma pasta.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"A pasta C \"%1\" não existe ou não é uma pasta.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "A pasta C \"%1\" não existe ou não é uma pasta.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Erro de Acesso à Pasta" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -"A pasta de destino não pode ser a mesma que a A ou a B quando são reunidas três " -"pastas.\n" +"A pasta de destino não pode ser a mesma que a A ou a B quando são reunidas " +"três pastas.\n" "Verifique de novo antes de continuar." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Aviso do Parâmetro" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "A pesquisar as pastas..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "A Ler a Pasta A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "A Ler a Pasta B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "A Ler a Pasta C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Algumas das sub-pastas não eram legíveis" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Verifique as permissões das sub-pastas." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Pronto." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Estado da Comparação da Pasta" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Número de sub-pastas:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Número de ficheiros iguais:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Número de ficheiros diferentes:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Número de junções manuais:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Isto afecta todas as operações de junção." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "A Mudar Todas as Operações de Junção" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "C&ontinuar" -#: directorymergewindow.cpp:1169 +#: 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 " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "A fazer." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Copiar A para B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Copiar B para A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Apagar A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Apagar B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Apagar A e B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Juntar a A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Juntar a B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Juntar a A e B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Apagar (se existir)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Reunir" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Juntar (manual)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Erro: Tipos de Ficheiros em Conflito" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Erro: As datas são iguais mas os ficheiros não." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Esta operação não é possível de momento." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Operação Não Possível" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -343,42 +349,47 @@ msgstr "" "\n" "Se souber como reproduzir isto, contacte por favor o autor do programa." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Erro no Programa" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Ocorreu um erro ao copiar.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Ocorreu um erro ao copiar.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Erro." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Terminado." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Não gravado." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Operação de junção desconhecida. (Isto nunca deve acontecer!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Operação de junção desconhecida." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -397,334 +408,339 @@ msgstr "" "Tenha em atenção que este programa está ainda em estado Beta e NÃO EXISTE " "NENHUMA GARANTIA! Faça cópias de segurança dos seus dados vitais!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "A Iniciar a Junção" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Fazê-lo" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Simulá-lo" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" "O item realçado tem um tipo diferente nas várias pastas. Seleccione o que " "fazer." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" "As datas de modificação dos ficheiros são iguais mas estes não o são. " "Seleccione o que fazer." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -"Esta operação não é possível de momento que a junção da pasta está a decorrer." +"Esta operação não é possível de momento que a junção da pasta está a " +"decorrer." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Ocorreu um erro no último passo.\n" "Deseja continuar com o item que causou o erro ou deseja saltar este item?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Continuar a junção após um erro" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Continuar com o Último Item" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Saltar o Item" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Ignorado." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "Em progresso..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "A operação de junção terminou." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Junção Completa" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "A simulação da junção terminou: Verifique se concorda com as operações " "propostas." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Ocorreu um erro. Carregue em OK para ver a informação detalhada.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Ocorreu um erro. Carregue em OK para ver a informação detalhada.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Erro: Ao tentar apagar o %1: a criação da cópia de segurança falhou." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "apagar recursivamente as pastas( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "delete( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Erro: a operação de remoção da pasta falhou ao tentar ler a pasta." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Erro: a operação rmdir( %1 ) falhou." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Erro: a operação de remoção falhou." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "junção manual( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Nota: Após uma junção manual o utilizador deve continuar com o F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Erro: a cópia( %1 -> %2 ) falhou. A remoção do destino existente falhou." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Erro: o copyLink falhou: As ligações remotas ainda não são suportadas." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Erro: o copyLink falhou." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "cópia( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -"Erro durante o rename( %1 -> %2 ): Não é possível remover o destino existente." +"Erro durante o rename( %1 -> %2 ): Não é possível remover o destino " +"existente." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Erro: A mudança de nome falhou." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Erro durante o makeDir do %1. Não é possível remover o ficheiro existente." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Erro ao criar a pasta." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Tamanho" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Atrib" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Última Modificação" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Ligação-Destino" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Ficheiro..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "não disponível" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Dest: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "Gravar o Estado da Junção de Pastas Como..." -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Iniciar/Continuar a Junção da Pasta" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Executar a Operação no Item Actual" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Comparar o Ficheiro Seleccionado" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Juntar o Ficheiro Actual" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Fechar Todas as Sub-Pasta" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Expandir Todas as Sub-Pastas" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Seleccionar Todos os Itens do A" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Seleccionar Todos os Itens do B" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Seleccionar Todos os Itens do C" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Escolher Automaticamente a Operação para Todos os Itens" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Nenhuma Operação para Todos os Itens" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "Mostrar os Ficheiros Idênticos" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "Mostrar os Ficheiros Diferentes" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "Mostrar os Ficheiros Apenas no A" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "Mostrar os Ficheiros Apenas no B" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "Mostrar os Ficheiros Apenas no C" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "Comparar os Ficheiros Seleccionados Explicitamente" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "Juntar os Ficheiros Seleccionados Explicitamente" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Não Fazer Nada" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Apagar A e B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Juntar a A e B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -"Ao tentar fazer uma cópia de segurança, a remoção de uma cópia anterior falhou. " -"\n" +"Ao tentar fazer uma cópia de segurança, a remoção de uma cópia anterior " +"falhou. \n" "Ficheiro: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -732,431 +748,446 @@ msgstr "" "Ao tentar fazer uma cópia de segurança, a mudança de nome falhou. \n" "Ficheiros: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "A obter o estado do ficheiro: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "A ler o ficheiro: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "A escrever o ficheiro: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Sem memória" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "A criar a pasta: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "A remover a pasta: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "A remover o ficheiro. %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "A criar a ligação simbólica: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "A mudar o nome do ficheiro: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "A copiar o ficheiro: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -"Erro durante a operação de cópia do ficheiro: O acesso ao ficheiro para leitura " -"falhou. Ficheiro: %1" +"Erro durante a operação de cópia do ficheiro: O acesso ao ficheiro para " +"leitura falhou. Ficheiro: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -"Erro durante a operação de cópia do ficheiro: O acesso ao ficheiro para escrita " -"falhou. Ficheiro: %1" +"Erro durante a operação de cópia do ficheiro: O acesso ao ficheiro para " +"escrita falhou. Ficheiro: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" "Erro durante a operação de cópia do ficheiro: A leitura falhou. Ficheiro: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" "Erro durante a operação de cópia do ficheiro: A escrita falhou. Ficheiro: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "A ler a pasta: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "A analisar a pasta: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "Configuração Actual:" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "Erro da Opção de Configuração:" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "" -"A opção --auto foi indicada, mas não foi especificado nenhum ficheiro de saída." +"A opção --auto foi indicada, mas não foi especificado nenhum ficheiro de " +"saída." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "A opção --auto é ignorada para a comparação de pastas." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "A gravação falhou." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "O acesso a estes ficheiros falhou:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Erro de Acesso ao Ficheiro" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Abre os documentos para os comparar..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Grava o resultado da gravação. Todos os conflitos devem ficar resolvidos!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Grava o documento actual como..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "Imprimir as diferenças" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Sai da aplicação" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Corta a secção seleccionada e coloca-a na área de transferência" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Copia a secção seleccionada para a área de transferência" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Cola o conteúdo da área de transferência na posição actual" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "Selecciona tudo na janela actual" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Procura por um texto" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Procura de novo pelo texto" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Activa/desactiva a barra de ferramentas" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Activa/desactiva a barra de estado" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Configurar o KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Ir para o Delta Actual" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Ir para o Primeiro Delta" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Ir para o Último Delta" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Ignora as diferenças de espaço em branco quando \"Mostrar os Espaços em " "Branco\" está desactivado.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -"(Não ignora as diferenças de espaço em branco mesmo quando \"Mostrar os Espaços " -"em Branco\" está desactivado.)" +"(Não ignora as diferenças de espaço em branco mesmo quando \"Mostrar os " +"Espaços em Branco\" está desactivado.)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Ir para o Delta Anterior" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Ir para o Próximo Delta" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Ir para o Conflito Anterior" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Ir para o Próximo Conflito" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Ir para o Conflito por Resolver Anterior" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Ir para o Conflito por Resolver Seguinte" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Seleccionar as Linhas do A" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Seleccionar as Linhas do B" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Seleccionar as Linhas do C" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Ir Automaticamente para o Próximo Conflito por Resolver Após a Selecção do " "Código" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Mostrar as Diferenças de Espaços e Tabulações" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Mostrar os Espaços em Branco" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Mostrar os Números de Linha" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Escolher o A em Todo o Lado" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Escolher o B em Todo o Lado" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Escolher o C em Todo o Lado" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Escolher A em Todos os Conflitos por Resolver" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Escolher B em Todos os Conflitos por Resolver" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Escolher C em Todos os Conflitos por Resolver" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Escolher A em Todos os Conflitos de Espaço em Branco por Resolver" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Escolher B em Todos os Conflitos de Espaço em Branco por Resolver" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Escolher C em Todos os Conflitos de Espaço em Branco por Resolver" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Resolver Automaticamente os Conflitos Simples" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Passar os Deltas para Conflitos" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "Executar a Junção Automática de Expressões Regulares" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "Resolver Automaticamente os Conflitos do Histórico" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "Dividir a Diferença na Selecção" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "Juntar as Diferenças Seleccionadas" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Mostrar a Janela A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Mostrar a Janela B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Mostrar a Janela C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Foco na Próxima Janela" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Vista Normal" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "Vista A vs. B" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "Vista A vs. C" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "Vista B vs. C" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Quebrar Linha nas Janelas de Diferenças" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "Adicionar o Alinhamento Manual das Diferenças" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "Limpar Todos os Alinhamentos de Diferenças Manuais" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Foco na Janela Anterior" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Comutar a Orientação da Repartição" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Janela Repartida de Pastas e Texto" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Mudar Entre a Janela de Pastas e de Texto" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "O resultado da junção não foi ainda gravado." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Gravar e Sair" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Sair sem Gravar" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "A gravação do resultado da junção falhou." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Você está a fazer uma junção de pastas de momento. Tem a certeza que quer " "interromper?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "A gravar o ficheiro..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "A gravar o ficheiro com um novo nome..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "A imprimir..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "Impressão cancelada." -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Selecção" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "A impressão terminou." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "A sair..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "A comutar a barra de ferramentas..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Comutar a barra de estado..." @@ -1171,12 +1202,12 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Não foi possível obter a componente!\n" -"Isto acontece normalmente devido a um problema de instalação. Leia por favor o " -"ficheiro README no pacote de código para mais detalhes." +"Isto acontece normalmente devido a um problema de instalação. Leia por favor " +"o ficheiro README no pacote de código para mais detalhes." #: main.cpp:35 msgid "Tool for Comparison and Merge of Files and Directories" @@ -1203,8 +1234,8 @@ msgstr "" #: main.cpp:46 msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -"Sem interface se todos os conflitos são resolvidos automaticamente (precisa do " -"-o ficheiro)" +"Sem interface se todos os conflitos são resolvidos automaticamente (precisa " +"do -o ficheiro)" #: main.cpp:47 msgid "Don't solve conflicts automatically. (For compatibility...)" @@ -1232,8 +1263,8 @@ msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -"Substitui uma opção de configuração. Use uma vez para todas as opções. P.ex.: " -"--cs \"AutoAdvance=1\"" +"Substitui uma opção de configuração. Use uma vez para todas as opções. P." +"ex.: --cs \"AutoAdvance=1\"" #: main.cpp:54 msgid "Show list of config settings and current values." @@ -1259,20 +1290,19 @@ msgstr "o ficheiro 3 a abrir" msgid "Ignored. (User defined.)" msgstr "Ignorado. (Definido pelo utilizador.)" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" "Muitos agradecimentos a todos os que comunicaram erros e contribuíram ideias!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Número de conflitos por resolver: %1 (dos quais %2 são espaço em branco)" @@ -1285,55 +1315,30 @@ msgstr "" "O resultado foi modificado.\n" "Se você continuar as suas alterações serão perdidas." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Todos os ficheiros de entrada são iguais a nível binário." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Todos os ficheiros de entrada contêm o mesmo texto." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Os ficheiros A e B são iguais a nível binário.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Os ficheiros A e B têm texto igual.\n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Os ficheiros A e C são iguais a nível binário.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Os ficheiros A e C têm texto igual.\n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Os ficheiros B e C são iguais a nível binário.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Os ficheiros %1 e %2 são iguais a nível binário.\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Os ficheiros B e C têm texto igual.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Os ficheiros A e B têm texto igual.\n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Número total de conflitos: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1341,7 +1346,7 @@ msgstr "" "\n" "Número total de conflitos resolvidos automaticamente: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1349,23 +1354,23 @@ msgstr "" "\n" "Número de conflitos por resolver: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Conflitos" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1373,11 +1378,11 @@ msgstr "" "Nem todos os conflitos estão ainda resolvidos.\n" "O ficheiro não foi gravado.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Conflitos Restantes" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1387,28 +1392,28 @@ msgstr "" "\n" "A criação de salvaguarda falhou. Ficheiro não gravado." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Erro na Gravação do Ficheiro" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Erro ao gravar." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Resultado" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Modificado]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "Codificação da gravação" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "Codificador de" @@ -1429,6 +1434,15 @@ 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" @@ -1553,10 +1567,8 @@ msgid "Auto indentation" msgstr "Indentação automática" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"Ligado: A indentação da linha anterior é usada para uma nova linha.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "Ligado: A indentação da linha anterior é usada para uma nova linha.\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1590,65 +1602,58 @@ msgstr "Diferenças" msgid "Diff Settings" msgstr "Configuração das Diferenças" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Manter o 'carriage return'" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Mostrar os caracteres de 'carriage return' '\\r' se existirem.\n" -"Ajuda a compara os ficheiros modificados em sistemas operativos diferentes." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Tratar os comentários de C/C++ como espaço em branco." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Ignorar os números" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "Ignora os caracteres numéricos durante a fase de correspondência das linhas " "(Semelhante ao Ignorar os Espaços).\n" "Pode ajudar a comparar os ficheiros com dados numéricos." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Ignorar comentários de C/C++" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Tratar os comentários de C/C++ como espaço em branco." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Ignorar a capitalização" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -"Tratar diferenças de capitalização como mudanças de espaço em branco. ('a'<=>" -"'A')" +"Tratar diferenças de capitalização como mudanças de espaço em branco. " +"('a'<=>'A')" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Comando do pré-processador:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Pré-processamento definido pelo utilizador. (Veja a documentação para mais " "detalhes)." -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Comando do pré-processador para a correspondência de linhas:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1656,11 +1661,11 @@ msgstr "" "Este pré-processador só é usado na correspondência das linhas.\n" "(Veja a documentação para mais detalhes)." -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Tentar com persistência (lento)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1668,68 +1673,69 @@ msgstr "" "Activa a opção --minimal do 'diff' externo.\n" "A análise dos ficheiros grandes será muito mais lenta." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "Configuração da Junção" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Atraso no avanço automático (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -"Quando estiver no modo de Avanço Automático, o resultado da selecção actual é " -"mostrado durante o período indicado, antes de saltar para o próximo conflito. " -"Intervalo: 0-2000 ms" - -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "Configuração da Junção" +"Quando estiver no modo de Avanço Automático, o resultado da selecção actual " +"é mostrado durante o período indicado, antes de saltar para o próximo " +"conflito. Intervalo: 0-2000 ms" -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Junção de espaço em branco com 2 ficheiros:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Escolha Manual" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -"Permite ao algoritmo de junção escolher automaticamente o ficheiro a utilizar " -"para as alterações de apenas espaço em branco." +"Permite ao algoritmo de junção escolher automaticamente o ficheiro a " +"utilizar para as alterações de apenas espaço em branco." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Junção de espaço em branco com 3 ficheiros:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "Expressão Regular de Junção Automática" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "Expressão regular de junção automática:" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" "When a line with a conflict matches the regular expression then\n" "- if available - C, otherwise B will be chosen." msgstr "" -"A expressão regular das linhas em que o KDiff3 deverá escolher automaticamente " -"uma origem.\n" -"Quando uma linha com um conflito corresponder à expressão regular então será -\n" +"A expressão regular das linhas em que o KDiff3 deverá escolher " +"automaticamente uma origem.\n" +"Quando uma linha com um conflito corresponder à expressão regular então será " +"-\n" "se disponível - o C, caso contrário será escolhido o B." -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "Executar a junção automática da expressão regular ao iniciar a junção" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" @@ -1737,15 +1743,15 @@ msgstr "" "Executa a junção para as expressões regulares de junção automática\n" "imediatamente após o início de uma junção.\n" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "Junção do Histórico do Controlo de Versões" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "Expressão regular do início do histórico:" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" @@ -1755,17 +1761,18 @@ msgstr "" "Normalmente, este valor contém a palavra-chave \"$Log$\".\n" "Valor por omissão: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "Expressão regular do início do item de histórico:" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" "Um item de histórico da junção consiste em várias linhas.\n" @@ -1776,19 +1783,19 @@ msgstr "" "itens de histórico.\n" "Veja a documentação para saber mais detalhes." -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "Ordenação da junção do histórico" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "Ordenar o histórico do controlo de versões por uma chave." -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "Ordem da chave de ordenação do início do item de histórico:" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1805,25 +1812,34 @@ msgstr "" "Se for deixado em branco, não será feita nenhuma ordenação.\n" "Veja a documentação para saber mais detalhes." -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "Juntar o histórico do controlo de versões ao iniciar a junção" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -"Executar a junção automática do histórico do controlo de versões ao iniciar a " -"junção." +"Executar a junção automática do histórico do controlo de versões ao iniciar " +"a junção." + +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Número de sub-pastas:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "Testar as suas expressões regulares" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "Comando de junção irrelevante:" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" @@ -1833,23 +1849,35 @@ msgstr "" "quando não forem detectadas mais alterações relevantes.\n" "É invocado com os parâmetros: ficheiro1 ficheiro2 ficheiro3" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Junção de Pastas" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Pastas recursivas" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Se se analisam as sub-pastas ou não." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Padrões de ficheiros:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1859,11 +1887,11 @@ msgstr "" "Caracteres especiais: '*' e '?'\n" "Podem ser indicados vários padrões usando o separador: ';'" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Anti-padrões de ficheiros:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1873,11 +1901,11 @@ msgstr "" "Caracteres especiais: '*' e '?'\n" "Podem ser indicados vários padrões usando o separador: ';'" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Anti-padrões de pastas:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1887,11 +1915,11 @@ msgstr "" "Caracteres especiais: '*' e '?'\n" "Podem ser indicados vários padrões usando o separador: ';'" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Usar o .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1900,23 +1928,23 @@ msgstr "" "Isto pode ser específico para cada pasta, através dos ficheiros '.cvsignore' " "locais." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Procurar os ficheiros e pastas escondidos" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Procura os ficheiros e pastas com o atributo 'escondido'." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Procura os ficheiros e pastas que comecem por '.'." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Seguir as ligações de ficheiros" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1924,11 +1952,11 @@ msgstr "" "Ligado: Compara o ficheiro para o qual a ligação aponta.\n" "Desligado: Compara as ligações." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Seguir as ligações de pastas" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1936,39 +1964,39 @@ msgstr "" "Ligado: Compara a pastas para a qual a ligação aponta.\n" "Desligado: Compara as ligações." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "Comparação de nomes de ficheiros com distinção de maiúsculas" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" "Set this option if the case of the names must match. (Default for Windows is " "off, otherwise on.)" msgstr "" -"A comparação de pastas irá comparar os ficheiros ou pastas quando os seus nomes " -"corresponderem.\n" +"A comparação de pastas irá comparar os ficheiros ou pastas quando os seus " +"nomes corresponderem.\n" "Configure esta opção, no caso de os nomes terem mesmo de corresponder. (Por " "omissão, no Windows, está desligada; caso contrário, está ligada.)" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Modo de Comparação de Ficheiros" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Comparação binária" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Comparação binária de cada ficheiro. (Por omissão)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Análise completa" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1978,25 +2006,47 @@ msgstr "" "(Mais lento que a comparação binária, muito mais lento para ficheiros " "binários.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Confiar na data de modificação (inseguro)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" "Assumir que os ficheiros são iguais se a data de modificação e o tamanho do " "ficheiro são iguais.\n" "Útil para as pastas grandes ou para redes lentas." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Assumir que os ficheiros são iguais se a data de modificação e o tamanho do " +"ficheiro são iguais.\n" +"Útil para as pastas grandes ou para redes lentas." + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Confiar no tamanho (inseguro)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -2005,11 +2055,11 @@ msgstr "" "Assumir que os ficheiros são iguais se o seu tamanho é igual.\n" "Útil para as pastas grandes ou para redes lentas." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Sincronizar as pastas" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -2019,11 +2069,11 @@ msgstr "" "de modo a que ambas as pastas fiquem iguais no fim.\n" "Funciona apenas ao comparar duas pastas sem indicar um destino." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Diferenças de espaço em branco consideradas iguais" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -2031,11 +2081,11 @@ msgstr "" "Se os ficheiros apenas diferem em espaço em branco considerá-los iguais.\n" "Isto está activo apenas quando é escolhida a análise completa." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Copiar o mais recente em vez de juntar (inseguro)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2045,11 +2095,11 @@ msgstr "" "(Use isto apenas se souber o que está a fazer!)\n" "Só faz efeito ao comparar duas pastas." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Salvaguarda dos ficheiros (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2057,15 +2107,15 @@ msgstr "" "Quando um ficheiro for gravado por cima de um anterior, então o ficheiro\n" "antigo será renomeado para uma extensão '.orig' em vez de ser removido." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Configuração Regional" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Língua (necessário reiniciar)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2073,11 +2123,11 @@ msgstr "" "Escolha a língua da interface gráfica ou \"Auto\".\n" "Para mudar de língua tem que reiniciar o KDiff3." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Utilizar a mesma codificação para tudo:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." @@ -2086,50 +2136,50 @@ msgstr "" "primeira.\n" "Torne inactivo se forem necessárias opções individuais." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Nota: A codificação local é" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "Codificação do Ficheiro A:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" "Se estiver activo, então será detectada a codificação Unicode (UTF-16 ou " "UTF-8).\n" -"Se a codificação do ficheiro não for detectada, então será usada a codificação " -"seleccionada como alternativa.\n" -"(A detecção de Unicode depende dos primeiros 'bytes' de um ficheiro - a marca " -"de ordem de 'bytes' \"BOM\".)" +"Se a codificação do ficheiro não for detectada, então será usada a " +"codificação seleccionada como alternativa.\n" +"(A detecção de Unicode depende dos primeiros 'bytes' de um ficheiro - a " +"marca de ordem de 'bytes' \"BOM\".)" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "Auto-Detectar o Unicode" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "Codificação do Ficheiro B:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "Codificação do Ficheiro C:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Codificação do Ficheiro para Junção de Resultado e Gravação:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "Selecção Automática" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " @@ -2140,15 +2190,15 @@ msgstr "" "Nos casos ambíguos, irá aparecer uma janela a perguntar ao utilizador qual a " "codificação com que deseja gravar." -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Codificação do Ficheiro dos Ficheiros de Pré-processador:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Língua da Direita para a Esquerda" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2156,31 +2206,51 @@ msgstr "" "Algumas línguas são lidas da direita para esquerda.\n" "Esta opção muda o visualizador e editor de acordo com elas." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "Integração" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "Configuração da Integração" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "Opções da linha de comandos a ignorar:" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" "Several values can be specified if separated via ';'\n" "This will suppress the \"Unknown option\"-error." msgstr "" -"Uma lista das opções da linha de comandos que deverão ser ignoradas, quando o " -"KDiff3 for usado por outras ferramentas.\n" +"Uma lista das opções da linha de comandos que deverão ser ignoradas, quando " +"o KDiff3 for usado por outras ferramentas.\n" "Se desejar indicar vários valores, separe-os por ';'\n" "Isto irá eliminar o erro de \"Opção desconhecida\"." -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2196,19 +2266,19 @@ msgstr "" "\n" "Deseja continuar ou prefere seleccionar outro tipo de letra." -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Tipo de Letra Incompatível" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Continuar à Mesma" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Seleccionar Outro Tipo de Letra" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "Isto repõe todas as opções, não só as do tópico actual." @@ -2217,10 +2287,8 @@ msgid "PreprocessorCmd: " msgstr "Comando do pré-processador: " #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"As seguintes opções que seleccionou podem alterar os dados:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "As seguintes opções que seleccionou podem alterar os dados:\n" #: pdiff.cpp:264 msgid "" @@ -2284,18 +2352,11 @@ msgstr "Dif. Linhas: A <-> C" #: pdiff.cpp:513 msgid "All input files contain the same text, but are not binary equal." msgstr "" -"Todos os ficheiros de entrada contêm o mesmo texto, mas não são iguais a nível " -"binário." - -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Os ficheiros %1 e %2 são iguais a nível binário.\n" +"Todos os ficheiros de entrada contêm o mesmo texto, mas não são iguais a " +"nível binário." #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Os ficheiros %1 e %2 têm texto igual, mas não são iguais a nível binário.\n" @@ -2309,109 +2370,55 @@ msgstr "" "Lembre-se que a junção do KDiff3 não foi pensada para os dados binários.\n" "Continue por sua conta e risco." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Interromper" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "A aceder aos ficheiros..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Erro ao abrir o ficheiro" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "A cortar a selecção..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "A copiar a selecção para a área de transferência..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "A inserir o conteúdo da área de transferência..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Gravar e Continuar" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Continuar sem Gravar" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Procura terminada." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Procura Terminada" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" "Não está nada seleccionado em nenhuma janela de entrada das diferenças." -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "Erro ao adicionar o intervalo manual de diferenças" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Configurar o KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Pasta" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Operação de Junção do Item Actual" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Operação de Sincronização do Item Actual" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Movimento" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "D&iferenças" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "Reu&nir" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Janela" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (Base):" @@ -2454,6 +2461,10 @@ msgstr "Resultado (opcional):" msgid "Configure..." msgstr "Configurar..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Texto da procura:" @@ -2525,13 +2536,22 @@ msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -"Copie uma linha inicial do item de histórico, como a usada nos seus ficheiros,\n" +"Copie uma linha inicial do item de histórico, como a usada nos seus " +"ficheiros,\n" "mas omita o comentário inicial." #: smalldialogs.cpp:486 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." @@ -2544,3 +2564,85 @@ msgstr "A correspondência falhou." msgid "Opening and closing parentheses don't match in regular expression." msgstr "" "Os parêntesis de abertura e fecho não correspondem na expressão regular." + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Pasta" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Operação de Junção do Item Actual" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Operação de Sincronização do Item Actual" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Movimento" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "D&iferenças" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "Reu&nir" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Janela" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Os ficheiros A e B são iguais a nível binário.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Os ficheiros A e C são iguais a nível binário.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Os ficheiros A e C têm texto igual.\n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Os ficheiros B e C são iguais a nível binário.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Os ficheiros B e C têm texto igual.\n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Manter o 'carriage return'" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Mostrar os caracteres de 'carriage return' '\\r' se existirem.\n" +#~ "Ajuda a compara os ficheiros modificados em sistemas operativos " +#~ "diferentes." diff --git a/po/pt_BR.po b/po/pt_BR.po index 6ee8734..21f753d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -18,38 +18,40 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2007-01-30 20:41-0200\n" "Last-Translator: Diniz Bortolotto \n" "Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Diniz Bortolotto, Paulo Henrique Alkmin da Costa" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "diniz.bb@gmail.com, phalkmin@yahoo.com.br" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "" -"A gravação de dados da área de transferência para o arquivo temporário falhou." +"A gravação de dados da área de transferência para o arquivo temporário " +"falhou." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Da Área de Transferência" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -63,7 +65,7 @@ msgstr "" "\n" "O comando de pré-processamento vai ser desativado." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -71,14 +73,14 @@ msgid "" "\n" "The line-matching-preprocessing command will be disabled now." msgstr "" -"O pré-processamento com procura de linhas possivelmente falhou. Verifique este " -"comando:\n" +"O pré-processamento com procura de linhas possivelmente falhou. Verifique " +"este comando:\n" "\n" " %1\n" "\n" "O comando de pré-processamento com procura de linhas vai ser desativado." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -86,15 +88,15 @@ msgstr "" "Erro de perda de dados:\n" "Se for reproduzível por favor contate o autor.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Erro Interno Grave" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "Linha de topo" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Fim" @@ -110,245 +112,249 @@ msgstr "Link: " msgid "Size. " msgstr "Tamanho. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Data e Tamanho: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "A criação da cópia temporária de %1 falhou." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "O acesso a %1 falhou." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Comparando arquivo..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Erro ao ler de %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Nome" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Operação" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Não resolvido" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Resolvido" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Não vazio" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Vazio" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" 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:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Continuar Mesclando" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Abertura de diretórios falhou:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir A \"%1\" não existe ou não é um diretório.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Dir A \"%1\" não existe ou não é um diretório.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir B \"%1\" não existe ou não é um diretório.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Dir B \"%1\" não existe ou não é um diretório.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir C \"%1\" não existe ou não é um diretório.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Dir C \"%1\" não existe ou não é um diretório.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Erro na abertura do Diretório" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "O diretório de destino não pode ser o mesmo que A ou B quando são mesclados " "três diretórios.\n" "Verifique de novo antes de continuar." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Aviso de Parâmetro" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Pesquisando diretórios..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Lendo Diretório A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Lendo Diretório B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Lendo Diretório C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Alguns sub-diretórios não eram legíveis" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Verifique as permissões dos sub-diretórios." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Pronto." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Status da Comparação de Diretório" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Número de sub-diretórios:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Número de arquivos iguais:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Número de arquivos diferentes:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Número de mesclagens manuais:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Isto afeta todas as operações de mesclagem." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Mudando Todas as Operações de Mesclagem" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "C&ontinuar" -#: directorymergewindow.cpp:1169 +#: 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 " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Fazer." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Copiar A para B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Copiar B para A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Apagar A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Apagar B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Apagar A e B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Mesclar com A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Mesclar com B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Mesclar com A e B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Apagar (se existir)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Mesclar" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Mesclar (manual)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Erro: Tipos de Arquivos em Conflito" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Erro: As datas são iguais mas os arquivos não." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Esta operação não é possível no momento." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Operação Não Possível" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -362,42 +368,47 @@ msgstr "" "\n" "Se souber como reproduzir isto, contate por favor o autor do programa." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Erro no Programa" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Ocorreu um erro ao copiar.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Ocorreu um erro ao copiar.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Erro." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Terminado." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Não salvo." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Operação de mesclagem desconhecida. (Isto nunca deve acontecer!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Operação de mesclagem desconhecida." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -416,335 +427,341 @@ msgstr "" " Saiba que esse programa ainda está em fase beta, e NÃO HÁ GARANTIA alguma! " "Faça backups dos seus dados!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Iniciando Mesclagem" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Faça" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Simular" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -"O item selecionado tem um tipo diferente nos diferentes diretórios. Selecione o " -"que fazer." +"O item selecionado tem um tipo diferente nos diferentes diretórios. " +"Selecione o que fazer." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" "As datas de modificação do arquivo são iguais mas os arquivos não são. " "Selecione o que fazer." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -"Esta operação não é possível no momento porque uma mesclagem de diretório está " -"em execução." +"Esta operação não é possível no momento porque uma mesclagem de diretório " +"está em execução." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Houve um erro no último passo.\n" "Você quer continuar com o item que causou o erro ou prefere pular esse item?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Continuar mesclagem após um erro" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Continuar com o Último Item" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Pular Item" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Ignorado." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "Em progresso..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Operação de mesclagem completa." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Mesclagem completa." -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "A simulação de mesclagem terminou: Verifique se concorda com as operações " "propostas." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Ocorreu um erro. Pressione OK para ver informações detalhadas.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Ocorreu um erro. Pressione OK para ver informações detalhadas.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Erro: Ao tentar apagar %1: Criação da cópia de segurança falhou." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "apagar diretório recursivamente( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "apagar( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -"Erro: a operação de remoção de diretório falhou quando tentava ler o diretório." +"Erro: a operação de remoção de diretório falhou quando tentava ler o " +"diretório." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Erro: rmdir( %1 ) operação falhou." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Erro: a operação de remoção falhou." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "mesclagem manual( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -" Nota: Após uma mesclagem manual o usuário deve continuar pressionando F7." +" Nota: Após uma mesclagem manual o usuário deve continuar pressionando " +"F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "Erro: cópia( %1 -> %2 ) falhou. Remoção do destino existente falhou." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Erro: copyLink falhou: Ligações remotas ainda não são suportadas." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Erro: copyLink falhou." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "cópia( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -"Erro durante renomear( %1 -> %2 ): Não é possível remover o destino existente." +"Erro durante renomear( %1 -> %2 ): Não é possível remover o destino " +"existente." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "renomear( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Erro: Renomear falhou." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Erro durante makeDir de %1. Não foi possível remover o arquivo existente." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Erro ao criar diretório." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Destino" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Tamanho" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Atributos" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Última modificação" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Ligação-Destino" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Arquivo..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "não disponível" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (Destino):" -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (Destino): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Destino: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "Salvar o Estado da Mesclagem de Diretório Como..." -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Iniciar/Continuar Mesclagem de Diretório" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Executar Operação para o Item Atual" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Comparar Arquivo Selecionado" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Mesclar Arquivo Atual" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Fechar Todos Sub-diretórios" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Expandir Todos Sub-diretórios" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Selecionar Todos os Itens de A" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Selecionar Todos os Itens de B" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Selecionar Todos os Itens de C" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Escolher Automaticamente a Operação para Todos os Itens" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Nenhuma Operação para Todos os Itens" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "Mostrar Arquivos Idênticos" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "Mostrar os Arquivos Diferentes" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "Mostrar Arquivos apenas em A" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "Mostrar Arquivos apenas em B" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "Mostrar Arquivos apenas em C" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "Comparar Explicitamente os Arquivos Selecionados" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "Mesclar Explicitamente os Arquivos Selecionados" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Não Faça Nada" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Apagar A e B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Mesclar para A e B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -"Ao tentar fazer uma cópia de segurança, a remoção de uma cópia anterior falhou. " -"\n" +"Ao tentar fazer uma cópia de segurança, a remoção de uma cópia anterior " +"falhou. \n" "Nome do Arquivo: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -752,430 +769,446 @@ msgstr "" "Ao tentar fazer uma cópia de segurança, a mudança de nome falhou. \n" "Nome dos Arquivos: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Obtendo status do arquivo: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Lendo arquivo:%1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Gravando arquivo: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Memória insuficiente" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Criando diretório: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Removendo diretório: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Removendo arquivo: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Criando link simbólico: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Renomeando arquivo: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Copiando arquivo: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -"Erro durante a operação de cópia de arquivo: Abertura de arquivo para leitura " -"falhou. Nome do Arquivo: %1" +"Erro durante a operação de cópia de arquivo: Abertura de arquivo para " +"leitura falhou. Nome do Arquivo: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" "Erro durante operação de cópia de arquivo: Abertura do arquivo para escrita " "falhou. Nome do Arquivo: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" -"Erro durante operação de cópia de arquivo: Leitura falhou. Nome do Arquivo: %1" +"Erro durante operação de cópia de arquivo: Leitura falhou. Nome do Arquivo: " +"%1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -"Erro durante operação de cópia de arquivo: Escrita falhou. Nome do Arquivo: %1" +"Erro durante operação de cópia de arquivo: Escrita falhou. Nome do Arquivo: " +"%1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Lendo diretório: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Listando diretório: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "Configuração Atual:" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "Erro da Opção de Configuração:" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Opção --auto usada, mas nenhum arquivo de saída especificado." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Opção --auto ignorada para comparação de diretórios." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Falha ao salvar." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Abertura desses arquivos falhou: " -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Erro na abertura do arquivo" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Abre documentos para comparação..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Salva o resultado da mesclagem. Todos os conflitos precisam ser resolvidos!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Salva o documento atual como..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "Imprimir as diferenças" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Fecha o aplicativo" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Recorta a seção selecionada e a coloca na Área de Transferência" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Copia a seção selecionada para a área de transferência" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Cola o conteúdo da área de transferência na posição atual" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "Seleciona tudo na janela atual" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Procura por um texto" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Procura de novo pelo texto" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Habilita / Desabilita a barra de ferramentas" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Habilita / Desabilita a barra de status" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Configurar KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Vá para o Delta Atual" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Vá para o Primeiro Delta" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Vá para o Último Delta" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Ignora as diferenças de espaço em branco quando \"Mostrar os Espaços em " "Branco\" está desativado.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -"(Não ignora as diferenças de espaço em branco mesmo quando \"Mostrar os Espaços " -"em Branco\" está desativado.)" +"(Não ignora as diferenças de espaço em branco mesmo quando \"Mostrar os " +"Espaços em Branco\" está desativado.)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Vá para o Delta Anterior" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Vá para o Próximo Delta" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Vá para o Conflito Anterior" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Vá para o Próximo Conflito" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Vá para o Conflito Não-Resolvido Anterior." -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Vá para o Próximo Conflito Não-Resolvido" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Seleciona Linha(s) De A" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Seleciona Linha(s) De B" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Selecione Linha(s) De C" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Ir Automaticamente para o Próximo Conflito Não-Resolvido Após a Seleção da " "Fonte." -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Mostrar as Diferenças de Espaços e Tabulações" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Mostrar Espaços em Branco" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Mostrar Números de Linha" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Escolher A em qualquer lugar" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Escolher B em qualquer lugar" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Escolher C em qualquer lugar" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Escolha A em Todos os Conflitos Não-Resolvidos" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Escolha B em Todos os Conflitos Não-Resolvidos" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Escolha C em Todos os Conflitos Não-Resolvidos" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Escolha A em Todos os Conflitos de Espaço em Branco Não-Resolvidos" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Escolha B em Todos os Conflitos de Espaço em Branco Não-Resolvidos" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Escolha C em Todos os Conflitos de Espaço em Branco Não-Resolvidos" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Resolva Conflitos Simples Automaticamente" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Defina Delta para Conflitos" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "Executar Mesclagem Automática de Expressões Regulares" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "Resolva Conflitos de Histórico Automaticamente" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "Dividir Diferenças ao Selecionar" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "Juntar Diferenças Selecionadas" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Mostrar Janela A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Mostrar Janela B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Mostrar Janela C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Foco na Próxima Janela" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Visão Normal" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "Visão A vs. B" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "Visão A vs. C" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "Visão B vs. C" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Quebrar Linha nas Janelas de Diferenças" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "Adicionar Alinhamento Manual das Diferenças" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "Limpar Todos Alinhamentos de Diferenças Manuais" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Foco na Janela Anterior" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Alterar Orientação da Divisão" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Janela Dividida de Diretórios e Texto" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Alternar entre visualização de Diretório e Texto" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "O resultado da Mesclagem não foi salvo." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Salvar e Sair" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Sair sem Salvar" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Falha ao salvar o resultado da mesclagem" -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Você está fazendo uma mesclagem de diretórios. Tem certeza de que deseja " "cancelar?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Salvando arquivo...." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Salvando arquivo com um novo nome..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "Imprimindo..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "Impressão cancelada." -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Seleção" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "A impressão terminou." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Saindo..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Mudando Barra de Ferramentas..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Mudar a Barra de Status..." @@ -1190,8 +1223,8 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Não foi possível encontrar componente!\n" "Isso normalmente acontece por problemas na instalação. Leia nosso arquivo de " @@ -1221,7 +1254,8 @@ msgstr "" #: main.cpp:46 msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -"Sem GUI se todos os conflitos forem auto-solucionáveis. (Necessita -o arquivo)" +"Sem GUI se todos os conflitos forem auto-solucionáveis. (Necessita -o " +"arquivo)" #: main.cpp:47 msgid "Don't solve conflicts automatically. (For compatibility...)" @@ -1242,15 +1276,16 @@ msgstr "Substituição do nome vísivel para o arquivo de entrada 3." #: main.cpp:52 msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -"Substituição alternativa do nome vísivel. Coloque apenas um para cada entrada." +"Substituição alternativa do nome vísivel. Coloque apenas um para cada " +"entrada." #: main.cpp:53 msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -"Substitui uma opção de configuração. Use uma vez para todas as opções. P.ex.: " -"--cs \"AutoAdvance=1\"" +"Substitui uma opção de configuração. Use uma vez para todas as opções. P." +"ex.: --cs \"AutoAdvance=1\"" #: main.cpp:54 msgid "Show list of config settings and current values." @@ -1276,20 +1311,19 @@ msgstr "arquivo 3 abrindo" msgid "Ignored. (User defined.)" msgstr "Ignorado. (Definido pelo usuário.)" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" "Muito obrigada para aqueles que relataram bugs e contribuíram com idéias!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Número de conflitos não resolvidos: %1 (dos quais %2 são espaços em branco)" @@ -1302,55 +1336,30 @@ msgstr "" "A saída foi modificada.\n" "Se você continuar suas mudanças serão perdidas." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Todos os arquivos de entrada são iguais em nível binário." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Todos os arquivos de entrada contém o mesmo texto." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Arquivos A e B são iguais em nível binário.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Arquivos A e B possuem texto igual. \n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Arquivos A e C são iguais em nível binário. \n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Arquivos A e C possuem texto igual. \n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Os arquivos %1 e %2 são iguais em nível binário.\n" -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Arquivos B e C são iguais em nível binário. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Arquivos A e B possuem texto igual. \n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Arquivos B e C possuem texto igual. \n" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Número total de conflitos:" -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1358,7 +1367,7 @@ msgstr "" "\n" "Número de conflitos resolvidos automaticamente: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1366,23 +1375,23 @@ msgstr "" "\n" "Número de conflitos não resolvidos: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Conflitos" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1390,11 +1399,11 @@ msgstr "" "Nem todos os conflitos foram resolvidos.\n" "Arquivo não foi salvo.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Conflitos Restantes" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1404,28 +1413,28 @@ msgstr "" "\n" "Criação do backup falhou. Arquivo não salvo." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Erro ao salvar arquivo" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Erro ao gravar." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Saída" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Modificado]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "Codificação da gravação" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "Codificador de" @@ -1446,6 +1455,15 @@ 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 " @@ -1571,10 +1589,8 @@ msgid "Auto indentation" msgstr "Auto identação" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"Ligado: A identação da linha anterior é usada para uma nova linha. \n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "Ligado: A identação da linha anterior é usada para uma nova linha. \n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1585,7 +1601,8 @@ msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitely copy e.g. via Ctrl-C." msgstr "" -"Ligado: Qualquer seleção é imediatamente enviada para a Área de Transferência.\n" +"Ligado: Qualquer seleção é imediatamente enviada para a Área de " +"Transferência.\n" "Desligado: Você deve explicitamente copiar, p.ex. via Ctrl+C." #: optiondialog.cpp:709 @@ -1608,63 +1625,55 @@ msgstr "Diff" msgid "Diff Settings" msgstr "Configurações de Diff" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Preservar retorno de carro." - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Exibir caracteres de retorno de carro '\\r' se existirem.\n" -"Ajuda a comparar arquivos que foram modificados em diferentes sistemas " -"operacionais." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Trata comentários C/C++ como espaços em branco." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Ignorar Números" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -"Ignorar caracteres numéricos durante fase de combinação de linhas. (Similar a " -"Ignorar espaços em branco.)\n" +"Ignorar caracteres numéricos durante fase de combinação de linhas. (Similar " +"a Ignorar espaços em branco.)\n" "Pode ajudar a comparar arquivos com dados numéricos." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Ignorar comentários de C/C++" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Trata comentários C/C++ como espaços em branco." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Ignorar caixa" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Tratar casos diferentes como mudanças de espaços em branco ('a'<=>'A')" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Comando do Pré-processador:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Pré-processamento definido pelo usuário. (Veja a documentação para detalhes.)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Comando do Pré-processador para correspondência de linhas:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1672,11 +1681,11 @@ msgstr "" "Esse pré-processador é usado somente durante correspondência de linhas.\n" "(Veja a documentação para detalhes.)" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Tentar com persistência (lento)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1684,70 +1693,70 @@ msgstr "" "Habilita a opção --minimal para o diff externo.\n" "A análise dos arquivos grandes será muito mais lenta." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "Configurações de Mesclagem" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Atraso no avanço automático (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" "Quando estiver no modo de Avanço Automático, o resultado da seleção atual é " "mostrado\n" -"durante o período indicado, antes de saltar para o próximo conflito. Intervalo: " -"0-2000 ms" +"durante o período indicado, antes de saltar para o próximo conflito. " +"Intervalo: 0-2000 ms" -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "Configurações de Mesclagem" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Mesclagem padrão de 2 arquivos com espaços em branco:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Escolha Manual" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -"Permite que o algoritmo de mesclagem selecione automaticamente uma entrada para " -"mudanças somente em espaços em branco." +"Permite que o algoritmo de mesclagem selecione automaticamente uma entrada " +"para mudanças somente em espaços em branco." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Mesclagem padrão de 3 arquivos com espaços em branco:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "Expressão Regular de Mesclagem Automática" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "Expressão regular de mesclagem automática:" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" "When a line with a conflict matches the regular expression then\n" "- if available - C, otherwise B will be chosen." msgstr "" -"A expressão regular para linhas em que o KDiff3 deverá escolher automaticamente " -"umaorigem.\n" +"A expressão regular para linhas em que o KDiff3 deverá escolher " +"automaticamente umaorigem.\n" "Quando uma linha com um conflito corresponder à expressão regular então\n" "- se possível - será C, caso contrário B será escolhido." -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" "Executar a mesclagem automática da expressão regular ao iniciar a mesclagem" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" @@ -1755,15 +1764,15 @@ msgstr "" "Executa a mesclagem para as expressões regulares de mesclagem automática\n" "imediatamente após o início de uma mesclagem.\n" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "Mesclagem do Histórico de Controle de Versões" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "Expressão regular do início do histórico:" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" @@ -1773,17 +1782,18 @@ msgstr "" "Normalmente este valor contém a palavra-chave \"$Log$\".\n" "Valor padrão: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "Expressão regular do início do item de histórico:" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" "Um item de histórico da mesclagem consiste em várias linhas.\n" @@ -1794,19 +1804,19 @@ msgstr "" "itens de histórico.\n" "Veja a documentação para detalhes." -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "Ordenação da mesclagem do histórico" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "Ordenar o histórico do controle de versões por uma chave." -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "Ordem da chave de ordenação do início do item de histórico:" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1823,25 +1833,34 @@ msgstr "" "Se for deixado em branco, não será feita nenhuma ordenação.\n" "Veja a documentação para detalhes." -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "Mesclar o histórico do controle de versões ao iniciar a mesclagem" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -"Executar mesclagem automática do histórico de controlo de versões ao iniciar a " -"mesclagem." +"Executar mesclagem automática do histórico de controlo de versões ao iniciar " +"a mesclagem." + +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Número de sub-diretórios:" -#: optiondialog.cpp:947 +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "Testar suas expressões regulares" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "Comando de mesclagem irrelevante:" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" @@ -1851,23 +1870,35 @@ msgstr "" "quando não forem detectadas mais alterações relevantes.\n" "É invocado com os parâmetros: arquivo1 arquivo2 arquivo3" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Mesclagem de Diretório" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Diretórios Recursivos" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Decide analisar sub-diretórios ou não." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Padrão(ões) de Arquivo:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1877,11 +1908,11 @@ msgstr "" "Caracteres especiais: '*' e '?'\n" "Podem ser indicados vários padrões usando o separador: ';'" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Anti-padrão(ões) de arquivo:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1891,11 +1922,11 @@ msgstr "" "Caracteres especiais: '*' e '?'\n" "Podem ser indicados vários padrões usando o separador: ';'" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Anti-padrão(ões) de diretório:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1905,11 +1936,11 @@ msgstr "" "Caracteres especiais: '*' e '?'\n" "Podem ser indicados vários padrões usando o separador: ';'" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Usar .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1918,23 +1949,23 @@ msgstr "" "Através de arquivos \".cvsignore\" locais isso pode ser específico para cada " "diretório." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Encontrar arquivos e diretórios ocultos" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Encontra arquivos e diretórios com o atributo oculto." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Encontrar arquivos e diretórios começando com '.'." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Seguir as ligações de arquivos" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1942,11 +1973,11 @@ msgstr "" "Ligado: Compara o arquivo para o qual a ligação aponta.\n" "Desligado: Compara as ligações." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Seguir ligações de diretório" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1954,66 +1985,89 @@ msgstr "" "Ligado: Compara o diretório para o qual a ligação aponta.\n" "Desligado: Compara as ligações." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "Comparação de nomes de arquivos sensível à caixa" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" "Set this option if the case of the names must match. (Default for Windows is " "off, otherwise on.)" msgstr "" -"A comparação de diretório irá comparar os arquivos ou diretórios quando os seus " -"nomes corresponderem.\n" +"A comparação de diretório irá comparar os arquivos ou diretórios quando os " +"seus nomes corresponderem.\n" "Configure esta opção se a caixa dos nomes deve corresponder. (O padrão para " "Windows é desligada; caso contrário ligada.)" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Modo de Comparação de Arquivo" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Comparação binária" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Comparação binária de cada arquivo. (Padrão)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Análise completa" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" "Fazer uma análise completa e mostrar informações estatísticas em colunas " "extra.\n" -"(Mais lento que a comparação binária, muito mais lento para arquivos binários.)" +"(Mais lento que a comparação binária, muito mais lento para arquivos " +"binários.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Confiar na data de modificação (inseguro)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" "Assumir que os arquivos são iguais se a data de modificação e o tamanho do " "arquivo são iguais.\n" "Útil para diretórios grandes ou para redes lentas." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Assumir que os arquivos são iguais se a data de modificação e o tamanho do " +"arquivo são iguais.\n" +"Útil para diretórios grandes ou para redes lentas." + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Confiar no tamanho (inseguro)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -2023,11 +2077,11 @@ msgstr "" "Útil para diretórios grandes ou para redes lentas quando a data é modificada " "durante o download." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Sincronizar diretórios" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -2037,11 +2091,11 @@ msgstr "" "de modo que ambos fiquem iguais no fim.\n" "Funciona apenas ao comparar dois diretórios sem indicar um destino." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Diferenças de espaço em branco consideradas iguais" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -2049,11 +2103,11 @@ msgstr "" "Se os arquivos apenas diferem em espaço em branco considerá-los iguais.\n" "Isto está ativo apenas quando é escolhida a análise completa." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Copiar mais novo ao invés de mesclar (inseguro)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2063,11 +2117,11 @@ msgstr "" "(Use somente se você sabe o que está fazendo!)\n" "Só é efetivo quando comparando dois diretórios." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Backup dos arquivos (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2075,15 +2129,15 @@ msgstr "" "Quando um arquivo for salvo sobre um arquivo antigo, o arquivo antigo\n" "será renomeado com uma extensão '.orig' ao invés de ser removido." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Configurações Regionais" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Idioma (é necessário reiniciar)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2091,11 +2145,11 @@ msgstr "" "Escolha o idioma dainterface gráfica ou \"Auto\".\n" "Para que a mudança de idioma tenha efeito, saia e reinicie o KDiff3." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Utilizar a mesma codificação para tudo:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." @@ -2104,50 +2158,50 @@ msgstr "" "primeira.\n" "Desative se forem necessárias opções individuais." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Nota: A codificação local é" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "Codificação de Arquivo para A:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" "Se estiver ativo, então a codificação Unicode (UTF-16 ou UTF-8) será " "detectada.\n" -"Se a codificação do arquivo não for detectada, então a codificação selecionada " -"será usada como alternativa.\n" -"(A detecção de Unicode depende dos primeiros bytes de um arquivo - a marca de " -"ordem de bytes \"BOM\".)" +"Se a codificação do arquivo não for detectada, então a codificação " +"selecionada será usada como alternativa.\n" +"(A detecção de Unicode depende dos primeiros bytes de um arquivo - a marca " +"de ordem de bytes \"BOM\".)" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "Auto-Detectar o Unicode" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "Codificação de Arquivo para B:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "Codificação de Arquivo para C:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Codificação de Arquivo para Mesclagem de Resultado e Gravação:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "Seleção Automática" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " @@ -2157,15 +2211,15 @@ msgstr "" "Em casos ambíguos, uma caixa de diálogo irá pedir ao usuário para escolher a " "codificação com que deseja gravar." -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Codificação de Arquivo dos Arquivos de Pré-processamento:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Idioma da Direita para a Esquerda" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2173,31 +2227,51 @@ msgstr "" "Alguns idiomas são lidos da direita para esquerda.\n" "Esta opção muda o visualizador e editor apropriadamente." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "Integração" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "Configuração de Integração" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "Opções da linha de comandos a ignorar:" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" "Several values can be specified if separated via ';'\n" "This will suppress the \"Unknown option\"-error." msgstr "" -"Uma lista das opções da linha de comandos que deverão ser ignoradas, quando o " -"KDiff3 for usado por outras ferramentas.\n" +"Uma lista das opções da linha de comandos que deverão ser ignoradas, quando " +"o KDiff3 for usado por outras ferramentas.\n" "Se desejar indicar vários valores, separe-os por ';'\n" "Isto irá eliminar o erro de \"Opção desconhecida\"." -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2213,19 +2287,19 @@ msgstr "" "\n" "Deseja continuar ou prefere selecionar outro tipo de letra." -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Fonte Incompatível" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Continue por sua conta e risco" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Selecionar outra fonte" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "Reinicia todas as opções. Não somente as desse tópico." @@ -2234,8 +2308,7 @@ msgid "PreprocessorCmd: " msgstr "Comando do pré-processador: " #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" "A(s) seguinte(s) opção(ões) que você selecionou podem modificar os dados:\n" @@ -2300,18 +2373,11 @@ msgstr "Dif. Linhas: A <-> C" #: pdiff.cpp:513 msgid "All input files contain the same text, but are not binary equal." msgstr "" -"Todos os arquivos de entrada contêm o mesmo texto, mas não são iguais em nível " -"binário." - -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Os arquivos %1 e %2 são iguais em nível binário.\n" +"Todos os arquivos de entrada contêm o mesmo texto, mas não são iguais em " +"nível binário." #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Os arquivos %1 e %2 têm texto igual, mas não são iguais em nível binário.\n" @@ -2325,108 +2391,54 @@ msgstr "" "Lembre-se que a mesclagem do KDiff3 não foi pensada para dados binários.\n" "Continue por sua conta e risco." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Interromper" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Abrindo arquivos..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Erro ao abrir o arquivo" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Recortando seleção..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Copiando seleção para a área de transferência..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Inserindo conteúdo da Área de Transferência..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Salvar e Continuar" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Continuar sem Salvar" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Procura terminada." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Procura Terminada" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "Nada foi selecionado em nenhuma janela de entrada de diferenças." -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "Erro ao adicionar o intervalo manual de diferenças" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Configurar KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Diretório" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Operação de Mesclagem do Item Atual" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Operação de Sincronismo do Item Atual" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Movimento" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "Visão das D&iferenças" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Mesclar" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Janela" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (Base):" @@ -2469,6 +2481,10 @@ msgstr "Saída (opcional):" msgid "Configure..." msgstr "Configurar..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Texto da procura:" @@ -2508,7 +2524,8 @@ msgstr "Linha de mesclagem automática do exemplo:" #: smalldialogs.cpp:407 msgid "For auto merge test copy a line as used in your files." msgstr "" -"Para um teste da mesclagem automática, copie uma linha usada nos seus arquivos." +"Para um teste da mesclagem automática, copie uma linha usada nos seus " +"arquivos." #: smalldialogs.cpp:413 smalldialogs.cpp:442 smalldialogs.cpp:479 msgid "Match result:" @@ -2540,13 +2557,22 @@ msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -"Copie uma linha inicial do item de histórico, como a usada nos seus arquivos,\n" +"Copie uma linha inicial do item de histórico, como a usada nos seus " +"arquivos,\n" "mas omita o comentário inicial." #: smalldialogs.cpp:486 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." @@ -2559,3 +2585,85 @@ msgstr "A correspondência falhou." msgid "Opening and closing parentheses don't match in regular expression." msgstr "" "Os parênteses de abertura e fechamento não correspondem na expressão regular." + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Diretório" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Operação de Mesclagem do Item Atual" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Operação de Sincronismo do Item Atual" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Movimento" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "Visão das D&iferenças" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Mesclar" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Janela" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Arquivos A e B são iguais em nível binário.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Arquivos A e C são iguais em nível binário. \n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Arquivos A e C possuem texto igual. \n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Arquivos B e C são iguais em nível binário. \n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Arquivos B e C possuem texto igual. \n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Preservar retorno de carro." + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Exibir caracteres de retorno de carro '\\r' se existirem.\n" +#~ "Ajuda a comparar arquivos que foram modificados em diferentes sistemas " +#~ "operacionais." diff --git a/po/ro.po b/po/ro.po index 2391c35..d428908 100644 --- a/po/ro.po +++ b/po/ro.po @@ -5,36 +5,37 @@ msgid "" msgstr "" "Project-Id-Version: @PACKAGE\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2003-11-08 18:45+0200\n" "Last-Translator: Claudiu Costin \n" "Language-Team: Romanian \n" +"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.0.1\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Claudiu Costin" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "claudiuc@kde.org" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -43,7 +44,7 @@ msgid "" "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -52,21 +53,21 @@ msgid "" "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "" @@ -82,237 +83,244 @@ msgstr "" msgid "Size. " msgstr "" -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "" -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "" -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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 "" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "" -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -321,41 +329,46 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" +#: directorymergewindow.cpp:1965 +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:1900 directorymergewindow.cpp:2306 +#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "" -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "" -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -367,731 +380,748 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +msgid "File" +msgstr "" + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " msgstr "" -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "" -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "" -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "" -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "" -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "" -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "" -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "" -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "" @@ -1106,8 +1136,8 @@ msgstr "" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" #: main.cpp:35 @@ -1184,19 +1214,18 @@ msgstr "" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" @@ -1206,115 +1235,95 @@ msgid "" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "" -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " msgstr "" -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " msgstr "" -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1334,6 +1343,14 @@ 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 "" @@ -1453,8 +1470,7 @@ msgid "Auto indentation" msgstr "" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" #: optiondialog.cpp:701 @@ -1485,112 +1501,106 @@ msgstr "" msgid "Diff Settings" msgstr "" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." +#: optiondialog.cpp:750 +msgid "Treat as white space." msgstr "" -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1598,58 +1608,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1659,121 +1670,141 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +msgid "Max number of history entries:" +msgstr "" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "" -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1781,187 +1812,203 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -1969,7 +2016,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -1979,19 +2046,19 @@ msgid "" "Do you want to continue or do you want to select another font." msgstr "" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2000,8 +2067,7 @@ msgid "PreprocessorCmd: " msgstr "" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" #: pdiff.cpp:264 @@ -2063,14 +2129,8 @@ msgstr "" msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" #: pdiff.cpp:530 @@ -2080,108 +2140,54 @@ msgid "" "Continue at your own risk." msgstr "" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "" -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "" -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "" -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "" @@ -2224,6 +2230,10 @@ msgstr "" msgid "Configure..." msgstr "" +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2296,6 +2306,14 @@ 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 "" @@ -2307,3 +2325,58 @@ msgstr "" #: smalldialogs.cpp:559 msgid "Opening and closing parentheses don't match in regular expression." msgstr "" + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "" + +#: kdiff3_part.rc:13 +#, no-c-format +msgid "Configure KDiff3" +msgstr "" + +#: kdiff3_shell.rc:4 +#, no-c-format +msgid "&File" +msgstr "" + +#: kdiff3_shell.rc:7 +#, no-c-format +msgid "&Directory" +msgstr "" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "" + +#: kdiff3_shell.rc:95 +#, 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 a152f27..b7bd76c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,36 +5,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2005-02-01 10:56+0200\n" "Last-Translator: Nick Shaforostoff \n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Николай Шафоростов" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "linux@l10n.org.ua" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Из буфера обмена" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -43,7 +44,7 @@ msgid "" "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -52,23 +53,22 @@ msgid "" "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" -msgstr "" -"Потеря данных.\n" +msgstr "Потеря данных.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Внутренняя ошибка" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Первая строка %1" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Конец" @@ -84,242 +84,246 @@ msgstr "Ссылка: " msgid "Size. " msgstr "Размер. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Дата и размер: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Не удалось создать временную копию %1." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Не удалось открыть %1." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Сравнивание файла..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Ошибка чтения из %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Имя" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Действие" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Состояние" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Неразрешённый" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Разрешённый" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Чёрный" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Белый" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" "Сейчас программа работает в режиме объединения каталогов. Вы действительно " "хотите отменить все изменения и обновить содержание каталогов?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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 "Обновить" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Продолжить" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Не удалось открыть каталоги:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Каталог A \"%1\" не существует.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Каталог A \"%1\" не существует.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Каталог B \"%1\" не существует.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Каталог B \"%1\" не существует.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Каталог C \"%1\" не существует.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Каталог C \"%1\" не существует.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Ошибка чтения каталога" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "Путь к конечному каталогу не должен совпадать с A или B." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Неправильный параметр" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Сканирование каталогов..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Чтение каталога A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Чтение каталога B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Чтение каталога C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Не удалось почитать некоторые подкаталоги в" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Проверьте права этих каталогов." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Готово." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Состояние сравнения каталогов" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Количество подкаталогов:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Количество одинаковых файлов:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Количество разных файлов:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Количество объединений вручную:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Это влияет на все объединения" -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Изменение всех объединений" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Продолжить" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Обработка " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Осталось сделать." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Копировать A в B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Копировать B в A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Удалить A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Удалить B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Удалить A и B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Объединить в A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Объединить в B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Объединить в A & B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Удалить (если существует)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Объединить" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Объединить (вручную)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Ошибка: Несовместимые типы файлов" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Ошибка: Время совпадает, а содержимое файлов - нет." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Пока невозможно" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Пока невозможно" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -331,42 +335,47 @@ msgstr "" "\n" "Если вы знаете в чём причина, сообщите автору." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Ошибка программы" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Ошибка копирования.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Ошибка копирования.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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 "Ошибка объединения" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Ошибка." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Готово." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Не сохранено." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Неизвестное объединение" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Неизвестное объединение" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -384,323 +393,326 @@ msgstr "" "\n" "Мы советуем всегда делать резервные копии данных перед объединением!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Начало объединения" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Выполнить" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Эмулировать" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" "Выделенный файл имеет разный тип в каждом каталоге. Выберите что делать." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" "Даты последнего изменения файлов одинаковы, о содержимое - нет. Выберите что " "делать." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "Сейчас выполняется объединение каталогов" -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "На текущем этапе произошла ошибка.\n" "Продолжить или пропустить?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Продолжить после ошибки" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Продолжить" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Пропустить" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Пропущено." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "Идёт работа..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Объединение завершено." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Объединение завершено" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "Объединение завершено. Вы согласны с предлагаемыми изменениями?" -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Произошла ошибка. Нажмите OK для подробностей.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Произошла ошибка. Нажмите OK для подробностей.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Не удалось создать резервную копию %1." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "удалить каталог рекурсивно(%1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "удалить( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Не удалось удалить каталог" -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Ошибка rmdir( %1 )." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Не удалось удалить." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "объединение вручную( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " После завершения объединения вручную нажмите F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Не удалось скопировать %1 в %2. Не удалось удалить существующее назначение." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "символическая ссылка( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Ошибка: Удалённые ссылки не поддерживаются." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Не удалось создать ссылку." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "копировать( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Не удалось переименовать %1 в%2. Не удалось удалить существующее назначение." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "переименовать( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Не удалось переименовать" -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Не удалось создать каталог %1. Не удалось удалить существующий файл." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "создать каталог( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Не удалось создать каталог" -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Назначение" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Каталог" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Тип" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Размер" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Атрибуты" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Последнее изменение" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Объект ссылки" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Файл..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "не доступно" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (назначение): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (исходное): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (назначение): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (назначение): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Назначение: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Объединение каталогов" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Начать/продолжить объединение каталогов" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Выполнить для текущего пункта" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Сравнить выделенный файл" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Объединить текущий файл" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Включая все подкаталоги" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Исключая все подкаталоги" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Выбрать A для всех" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Выбрать B для всех" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Выбрать C для всех" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Автоматически выбирать тип действия для всех" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Убрать действия для всех" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Show Different Files" msgstr "Количество разных файлов:" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Сравнить выделенный файл" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Сравнить выделенный файл" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Ничего" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Удалить A и B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Объединить в A & B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " @@ -708,7 +720,7 @@ msgstr "" "Не удалось удалить старую резервную копию. \n" "Файл: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -716,421 +728,435 @@ msgstr "" "Не удалось выполнить переименование. \n" "Файлы: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Получение состояния файла: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Чтение файла: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Запись в файл: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Вне памяти" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Создание каталога: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Удаление каталога: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Удаление файла: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Создание символической ссылки: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Переименование файла: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Копирование файла: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "Не удалось открыть для чтения файл %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "Не удалось открыть для записи файл %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "Не удалось прочитать файл %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Не удалось записать в файл %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Чтение каталога: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Вывод содержимого каталога: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "Ошибка открытия файлов" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Ключ --auto использован, но не указаны выходные файлы." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Ключ --auto игнорируется для каталогов" -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Не удалось произвести сохранение." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Не удалось открыть файлы:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Ошибка открытия файлов" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Открыть файлы для сравнения..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Сохранить результат объединения. Все конфликты должны быть разрешены!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Сохранить с другим именем..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Выйти" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Вырезать в буфер обмена" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Скопировать в буфер обмена" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Вставить из буфера обмена" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Искать текст" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Продолжить поиск текста" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Отобразить/скрыть панель инструментов" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Отобразить/скрыть панель состояния" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Настроить KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Перейти к текущему различию" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Перейти к первому различию" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Перейти к последнему различию" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Перейти к предыдущему различию" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Перейти к следующему различию" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Перейти к предыдущему конфликту" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Перейти к следующему конфликту" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Перейти к предыдущему неразрешённому конфликту" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Перейти к следующему неразрешённому конфликту" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Выбрать строки из A" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Выбрать строки из B" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Выбрать строки из C" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Перейти к следующему неразрешённому конфликту после выделения исходника" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Отображать пробелы и табуляции в различиях" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Отображать пустые промежутки" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Отображать номера строк" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Выбрать A везде" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Выбрать B везде" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Выбрать C везде" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Выбрать A для всех неразрешённых конфликтов" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Выбрать B для всех неразрешённых конфликтов" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Выбрать C для всех неразрешённых конфликтов" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Выбрать A для всех неразрешённых конфликтов пустых промежутков" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Выбрать B для всех неразрешённых конфликтов пустых промежутков" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Выбрать C для всех неразрешённых конфликтов пустых промежутков" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Разрешать простые конфликты автоматически" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Определить различия как конфликты" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Разрешать простые конфликты автоматически" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 #, fuzzy msgid "Join Selected Diffs" msgstr "Сравнить выделенный файл" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Отобразить окно A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Отобразить окно B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Отобразить окно C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Активировать следующее окно" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Обычнный обзор " -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "Обзор A vs. B" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "Обзор A vs. C " -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "Обзор B vs. C" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Активировать предыдущее окно" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Поменять ориентация разделения" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Каталоги/текст" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Результат объединения не сохранён" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Сохранить и выйти" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Выйти без сохранения" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Не удалось сохранить результат объединения" -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Остановить объединение каталогов?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Сохранение файла..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Сохранение файла с новым именем..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "Выход..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 #, fuzzy msgid "Printing completed." msgstr "Объединение завершено." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Выход..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Отображение/скрытие панели инструментов..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Отображение/скрытие панели состояния..." @@ -1145,8 +1171,8 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" #: main.cpp:35 @@ -1226,20 +1252,19 @@ msgstr "" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" "Благодарю всех, кто отправлях отчёты об ошибках и предлагал новые идеи!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Неразрешённых конфликтов осталось: %1 (%2 из которых - конфликты пустых " @@ -1253,55 +1278,31 @@ msgstr "" "Вывод был изменён.\n" "Если вы продолжите, изменения будут утеряны." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Все входные файлы одинаковы бинарно" -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Все входные файлы содержт одинаковый текст" -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Файлы A и B бинарно одинаковы.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Файлы A и B содержат одинаковый текст. \n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Файлы A и C бинарно одинаковы.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Файлы A и C содержат одинаковый текст. \n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Файлы B и C бинарно одинаковы.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +#, fuzzy +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Файлы B и C бинарно одинаковы.\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Файлы B и C содержат одинаковый текст. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Файлы A и B содержат одинаковый текст. \n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Общее количество конфликтов: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1309,7 +1310,7 @@ msgstr "" "\n" "Количество разрешённых автоматически конфликтов: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1317,23 +1318,23 @@ msgstr "" "\n" "Количество неразрешённых конфликтов: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Конфликты" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "<Нет исходной строки>" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "<Конфликт объединения (пустые промежутки)>" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "<Конфликт объединения>" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1341,40 +1342,40 @@ msgstr "" "Не все конфликты разрешены.\n" "Файл не сохранён.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Осталось конфликтов" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Ошибка сохранения файла" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Ошибка записи" -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Вывод" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Изменён]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 #, fuzzy msgid "Encoding for saving" msgstr "Кодировка файла C:" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1394,6 +1395,15 @@ 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 "Шрифт редактора и вывода различий" @@ -1515,8 +1525,7 @@ msgid "Auto indentation" msgstr "Проставлять отступы автоматически" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" #: optiondialog.cpp:701 @@ -1549,117 +1558,112 @@ msgstr "KDiff3" msgid "Diff Settings" msgstr "Настройки сравнения и объединения" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Отображать символ перевода каретки" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Обрабатывать комментарии C/C++ как пробелы." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Пропускать цифры" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Пропускать комментарии C/C++" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Обрабатывать комментарии C/C++ как пробелы." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Без учёта регистра" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Предварительная команда:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Предварительная обработка, определяемая пользователем (для подробностей см. " "документацию)." -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Предварительная команда для сравнения строк:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Задействовать все алгоритмы (медленно)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Настройки сравнения и объединения" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Задержка перед переходом, мс:" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -"Показывать результат текущего выбора на некоторое время, а затем переходить к " -"следующему конфликту. Диапазон: 0..2000 мс" +"Показывать результат текущего выбора на некоторое время, а затем переходить " +"к следующему конфликту. Диапазон: 0..2000 мс" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Настройки сравнения и объединения" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Выбор вручную" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1667,58 +1671,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1728,121 +1733,142 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Количество подкаталогов:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Объединение каталогов" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Рекурсия" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Маски файлов:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Пропускать файлы по маске:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Пропускать каталоги по маске:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Использовать .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Учитывать скрытые файлы и каталоги" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "" -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Учитывать файлы и каталоги, начинающиеся с '.'." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Следовать по ссылкам на файлы" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Следовать по ссылкам на каталоги" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1850,192 +1876,213 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Режим сравнивания файлов" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Бинарное сравнение" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Бинарное сравнение каждого файла (по умолчанию)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Полный анализ" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Сравнивать по дате изменения (неточно)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Считать файлы одинаковыми, если время изменения и размер совпадают.\n" +"Полезно для больших каталогов или медленных сетей." + +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" "Useful for big directories or slow networks." msgstr "" "Считать файлы одинаковыми, если время изменения и размер совпадают.\n" "Полезно для больших каталогов или медленных сетей." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Сравнивать по размеру (неточно)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Синхронизировать каталоги" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Принимать сразу новые файлы вместо объединения (небезопасно)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Сохранить резервные копии (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Региональные настройки" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Язык (требуется перезапуск)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Кодировку локали - " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "Кодировка файла A:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "Кодировка файла B:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "Кодировка файла C:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Кодировка для объединения и сохранения:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "Копировать выделение в буфер обмена автоматически" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Кодировка препроцессора:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "Действие" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration Settings" msgstr "Региональные настройки" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2043,7 +2090,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2053,19 +2120,19 @@ msgid "" "Do you want to continue or do you want to select another font." msgstr "" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Несовместимый шрифт" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Продолжить" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Выбрать другой шрифт" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "Это сбросит абсолютно все параметры, а не только текущей вкладки." @@ -2074,8 +2141,7 @@ msgid "PreprocessorCmd: " msgstr "Предварительная команда:" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" #: pdiff.cpp:264 @@ -2138,19 +2204,10 @@ msgstr "Построчное сравнение: A <-> C" msgid "All input files contain the same text, but are not binary equal." msgstr "Все входные файлы содержт одинаковый текст" -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -#, fuzzy -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Файлы B и C бинарно одинаковы.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 #, fuzzy -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"Файлы A и B бинарно одинаковы.\n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Файлы A и B бинарно одинаковы.\n" #: pdiff.cpp:530 msgid "" @@ -2159,109 +2216,55 @@ msgid "" "Continue at your own risk." msgstr "" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Стоп" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Открытие файлов..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Ошибка открытия файла" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Вырезание в буфер обмена..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Копирование в буфер обмена..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Вставка из буфера обмена..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Сохранить и продолжить" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Продолжить без сохранения" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Поиск завершён." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Поиск завершён" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "Не удалось создать каталог" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Настроить KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Каталог" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Перемещение" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "D&iff" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Объединение" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Окно" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (исходное):" @@ -2304,6 +2307,10 @@ msgstr "Вывод (необязательно):" msgid "Configure..." msgstr "Настроить..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Найти:" @@ -2376,6 +2383,14 @@ 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 "" @@ -2389,6 +2404,79 @@ msgstr "Не удалось произвести сохранение." msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Каталог" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Перемещение" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "D&iff" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Объединение" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Окно" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Файлы A и B бинарно одинаковы.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Файлы A и C бинарно одинаковы.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Файлы A и C содержат одинаковый текст. \n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Файлы B и C бинарно одинаковы.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Файлы B и C содержат одинаковый текст. \n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Отображать символ перевода каретки" + #, fuzzy #~ msgid "Diff and Merge" #~ msgstr "Сравнить и объединить" diff --git a/po/rw.po b/po/rw.po index afc7937..18a54db 100644 --- a/po/rw.po +++ b/po/rw.po @@ -15,15 +15,16 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3 3.4\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2005-05-25 18:07-0600\n" "Last-Translator: Steve Murphy \n" "Language-Team: Kinyarwanda \n" +"Language: rw\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" @@ -31,7 +32,7 @@ msgstr "" "Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien " "NSENGIYUMVA" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -39,17 +40,17 @@ msgstr "" "muvia1@yahoo.fr, ngenda_denis@yahoo.co.uk, akiberwa@yahoo.co.uk, " "ndonatienuk@yahoo.co.uk" -#: diff.cpp:246 +#: diff.cpp:247 #, fuzzy msgid "Writing clipboard data to temp file failed." msgstr "Ububikokoporora Ibyatanzwe Kuri Idosiye Byanze . " -#: diff.cpp:250 +#: diff.cpp:251 #, fuzzy msgid "From Clipboard" msgstr "Ububikokoporora" -#: diff.cpp:491 +#: diff.cpp:493 #, fuzzy msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -64,7 +65,7 @@ msgstr "" "\n" "command Yahagaritswe NONEAHA . " -#: diff.cpp:526 +#: diff.cpp:528 #, fuzzy msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -79,7 +80,7 @@ msgstr "" "\n" "Umurongo: - - command Yahagaritswe NONEAHA . " -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 #, fuzzy msgid "" "Data loss error:\n" @@ -88,17 +89,17 @@ msgstr "" "Ikosa : \n" "ni Umuntu i Umwanditsi: . \n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 #, fuzzy msgid "Severe Internal Error" msgstr "Ikosa " -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Umurongo: %1 " -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Impera" @@ -117,288 +118,292 @@ msgstr "Ihuza..." msgid "Size. " msgstr "Ingano:" -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 #, fuzzy msgid "Date & Size: " msgstr "Itariki & Igihe" -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 #, fuzzy msgid "Creating temp copy of %1 failed." msgstr "Gukoporora Bya %1 Byanze . " -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 #, fuzzy msgid "Opening %1 failed." msgstr "%1 Byanze . " -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 #, fuzzy msgid "Comparing file..." msgstr "Idosiye ... " -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, fuzzy, c-format msgid "Error reading from %1" msgstr "Ikosa Kuva: %1 " -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Izina" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Igikorwa" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Imimerere" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 #, fuzzy msgid "Unsolved" msgstr "Kidakoreshwa" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 #, fuzzy msgid "Solved" msgstr "Gikomeye" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 #, fuzzy msgid "Nonwhite" msgstr "Nta na kimwe" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Umweru" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 #, fuzzy msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "A Ububiko Gukomatanya . , Kuri Kureka i Gukomatanya na i Ububiko ? " -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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" msgstr "Urukiramende" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 #, fuzzy msgid "Continue Merging" msgstr "Gukomeza " -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 #, fuzzy msgid "Opening of directories failed:" msgstr "Bya ububiko bw'amaderese Byanze : " -#: directorymergewindow.cpp:465 +#: directorymergewindow.cpp:510 #, fuzzy -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"A \" %1 \" OYA Cyangwa ni OYA A Ububiko . \n" +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "A \" %1 \" OYA Cyangwa ni OYA A Ububiko . \n" -#: directorymergewindow.cpp:468 +#: directorymergewindow.cpp:513 #, fuzzy -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"\" %1 \" OYA Cyangwa ni OYA A Ububiko . \n" +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "\" %1 \" OYA Cyangwa ni OYA A Ububiko . \n" -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:516 #, fuzzy -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"\" %1 \" OYA Cyangwa ni OYA A Ububiko . \n" +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "\" %1 \" OYA Cyangwa ni OYA A Ububiko . \n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 #, fuzzy msgid "Directory Open Error" msgstr "Gufungura Ikosa " -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 #, fuzzy msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "Ishyika: Ububiko OYA i Nka A Cyangwa Ryari: ububiko bw'amaderese . \n" "Nanone Mbere . " -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 #, fuzzy msgid "Parameter Warning" msgstr "Kuburira bijyanye na mucapyi" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 #, fuzzy msgid "Scanning directories..." msgstr "ububiko bw'amaderese ... " -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 #, fuzzy msgid "Reading Directory A" msgstr "A " -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 #, fuzzy msgid "Reading Directory B" msgstr "Guhanga ububiko " -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 #, fuzzy msgid "Reading Directory C" msgstr "Guhanga ububiko " -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 #, fuzzy msgid "Some subdirectories were not readable in" msgstr "Ububiko bwungirije OYA in " -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 #, fuzzy msgid "Check the permissions of the subdirectories." msgstr "i Uruhushya Bya i Ububiko bwungirije . " -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Cyiteguye." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 #, fuzzy msgid "Directory Comparison Status" msgstr "Inzira y'ububiko" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 #, fuzzy msgid "Number of subdirectories:" msgstr "Bya Ububiko bwungirije : " -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 #, fuzzy msgid "Number of equal files:" msgstr "Bya bingana Idosiye : " -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 #, fuzzy msgid "Number of different files:" msgstr "Bya Idosiye : " -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 #, fuzzy msgid "Number of manual merges:" msgstr "Bya Bikorwa : " -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 #, fuzzy msgid "This affects all merge operations." msgstr "Byose Gukomatanya Ibikorwa: . " -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 #, fuzzy msgid "Changing All Merge Operations" msgstr "Ibikorerwa Ishusho" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "Komeza" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 #, fuzzy msgid "Processing " msgstr "Inonosora" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 #, fuzzy msgid "To do." msgstr "Gukora" -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 #, fuzzy msgid "Copy A to B" msgstr "A Kuri " -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 #, fuzzy msgid "Copy B to A" msgstr "Kuri A " -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 #, fuzzy msgid "Delete A" msgstr "A " -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 #, fuzzy msgid "Delete B" msgstr "Gusiba #" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 #, fuzzy msgid "Delete A & B" msgstr "A & " -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 #, fuzzy msgid "Merge to A" msgstr "Kuri A " -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 #, fuzzy msgid "Merge to B" msgstr "Kuri " -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 #, fuzzy msgid "Merge to A & B" msgstr "Kuri A & " -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 #, fuzzy msgid "Delete (if exists)" msgstr "( NIBA ) " -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Gukomatanya" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 #, fuzzy msgid "Merge (manual)" msgstr "( Bikorwa ) " -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 #, fuzzy msgid "Error: Conflicting File Types" msgstr "Ikosa : Idosiye " -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 #, fuzzy msgid "Error: Dates are equal but files are not." msgstr "Ikosa : bingana Idosiye OYA . " -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 #, fuzzy msgid "This operation is currently not possible." msgstr "Igikorwa ni OYA . " -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 #, fuzzy msgid "Operation Not Possible" msgstr "Igikorwa nticyashobotse" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 #, fuzzy msgid "" "This should never happen: \n" @@ -411,48 +416,53 @@ msgstr "" "\n" ": = Kuri iyi , Umuntu i Porogaramu Umwanditsi: . " -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 #, fuzzy msgid "Program Error" msgstr "Ikosa " -#: directorymergewindow.cpp:1899 +#: directorymergewindow.cpp:1965 #, fuzzy -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Ikosa Gukoporora . \n" +msgid "An error occurred while copying.\n" +msgstr "Ikosa Gukoporora . \n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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" msgstr "Ikosa " -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Ikosa." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Byakozwe." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 #, fuzzy msgid "Not saved." msgstr "Bidasangiwe" -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 #, fuzzy msgid "Unknown merge operation. (This must never happen!)" msgstr "Gukomatanya Igikorwa . ( Nta na rimwe ! ) " -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 #, fuzzy msgid "Unknown merge operation." msgstr "Gukomatanya Igikorwa . " -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 #, fuzzy msgid "" "The merge is about to begin.\n" @@ -471,372 +481,376 @@ msgstr "" "\n" "iyi Porogaramu beta Imimerere na ni ! Ibyashyinguwe Bya Ibyatanzwe ! " -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 #, fuzzy msgid "Starting Merge" msgstr "Gutangiza serivise" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 #, fuzzy msgid "Do It" msgstr "Akadomo" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 #, fuzzy msgid "Simulate It" msgstr "Kwigana Igaragaza" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 #, fuzzy msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "Ikintu A Ubwoko: in i ububiko bw'amaderese . Kuri . " -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 #, fuzzy msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "Amatariki Bya i Idosiye bingana i Idosiye OYA . Kuri . " -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 #, fuzzy msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "Igikorwa ni OYA Ububiko Gukomatanya ni . " -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 #, fuzzy msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Ikosa in i Iheruka Intera . \n" "Kuri Gukomeza Na: i Ikintu i Ikosa Cyangwa Kuri Gusimbuka iyi Ikintu ? " -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 #, fuzzy msgid "Continue merge after an error" msgstr "Gukomeza Gukomatanya Nyuma Ikosa " -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 #, fuzzy msgid "Continue With Last Item" msgstr "Gukomeza " -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 #, fuzzy msgid "Skip Item" msgstr "Ibigize by'ilisiti" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 #, fuzzy msgid "Skipped." msgstr "Byoherejwe ku" -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 #, fuzzy msgid "In progress..." msgstr "Aho bigeze: ... " -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 #, fuzzy msgid "Merge operation complete." msgstr "Igikorwa Byuzuye . " -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 #, fuzzy msgid "Merge Complete" msgstr "Gushyira ku gihe byarangiye" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 #, fuzzy msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "Gukomatanya Byuzuye : NIBA Na: i Ibikorwa: . " -#: directorymergewindow.cpp:2305 +#: directorymergewindow.cpp:2371 #, fuzzy -msgid "" -"An error occurred. Press OK to see detailed information.\n" +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Habayemoikosa." -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 #, fuzzy msgid "Error: While deleting %1: Creating backup failed." msgstr "Ikosa : Gusiba %1 : Inyibutsa Byanze . " -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 #, fuzzy msgid "delete directory recursively( %1 )" msgstr "Gusiba Ububiko ( %1 ) " -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 #, fuzzy msgid "delete( %1 )" msgstr "Gusiba" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 #, fuzzy msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Ikosa : Gusiba Igikorwa Byanze Kuri Soma i Ububiko . " -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 #, fuzzy msgid "Error: rmdir( %1 ) operation failed." msgstr "Ikosa : ( %1 ) Igikorwa Byanze . " -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 #, fuzzy msgid "Error: delete operation failed." msgstr "Ikosa : Gusiba Igikorwa Byanze . " -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 #, fuzzy msgid "manual merge( %1, %2, %3 -> %4)" msgstr "Bikorwa Gukomatanya ( %1 , %2 , %3 - > %4 ) " -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 #, fuzzy msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "icyitonderwa : A Bikorwa Gukomatanya i Umukoresha Gukomeza ku . " -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 #, fuzzy msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "Ikosa : Gukoporora ( %1 - > %2 ) Byanze . Ishyika: Byanze . " -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 #, fuzzy msgid "copyLink( %1 -> %2 )" msgstr "Ihuza ku %1 (%2)" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 #, fuzzy msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Ikosa : Byanze : amahuza OYA . " -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 #, fuzzy msgid "Error: copyLink failed." msgstr "Ikosa : Byanze . " -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 #, fuzzy msgid "copy( %1 -> %2 )" msgstr "Gukoporora" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 #, fuzzy msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Ikosa Guhindura izina ( %1 - > %2 ) : Gusiba Ishyika: . " -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 #, fuzzy msgid "rename( %1 -> %2 )" msgstr "Guhindura izina" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 #, fuzzy msgid "Error: Rename failed." msgstr "Ikosa : Byanze . " -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 #, fuzzy msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Ikosa Bya %1 . Gusiba Idosiye . " -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 #, fuzzy msgid "Error while creating directory." msgstr "Ikosa Kurema Ububiko . " -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 #, fuzzy msgid "Dest" msgstr "Kugogora" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 #, fuzzy msgid "Dir" msgstr "Muhamagazatelefoni" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Ubwoko" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Ingano" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 #, fuzzy msgid "Attr" msgstr "Nyuma" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 #, fuzzy msgid "Last Modification" msgstr "Iherutse guhindurwa" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 #, fuzzy msgid "Link-Destination" msgstr "Ishyika" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Idosiye..." + +#: directorymergewindow.cpp:2729 #, fuzzy msgid "not available" msgstr "Ntibonetse" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 #, fuzzy msgid "A (Dest): " msgstr "A ( ) : " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 #, fuzzy msgid "A (Base): " msgstr "A ( Base ) : " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 #, fuzzy msgid "Dest: " msgstr "Ibiro: %1" -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Seriveri y'ububiko:" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 #, fuzzy msgid "Start/Continue Directory Merge" msgstr "Gutangira /Gukomeza " -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 #, fuzzy msgid "Run Operation for Current Item" msgstr "ya: " -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 #, fuzzy msgid "Compare Selected File" msgstr "Idosiye " -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 #, fuzzy msgid "Merge Current File" msgstr "Idosiye " -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 #, fuzzy msgid "Fold All Subdirs" msgstr "Amajwi Yose" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 #, fuzzy msgid "Choose A for All Items" msgstr "A ya: " -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 #, fuzzy msgid "Choose B for All Items" msgstr "ya: " -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 #, fuzzy msgid "Choose C for All Items" msgstr "ya: " -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 #, fuzzy msgid "Auto-Choose Operation for All Items" msgstr "- ya: " -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 #, fuzzy msgid "No Operation for All Items" msgstr "ya: " -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Show Different Files" msgstr "Bya Idosiye : " -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Idosiye " -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Idosiye " -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Ntugire icyo Ukora" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 #, fuzzy msgid "Delete A && B" msgstr "A & & " -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 #, fuzzy msgid "Merge to A && B" msgstr "Kuri A & & " -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 #, fuzzy msgid "" "While trying to make a backup, deleting an older backup failed. \n" @@ -845,7 +859,7 @@ msgstr "" "Kuri Ubwoko A Inyibutsa , Gusiba Inyibutsa Byanze . \n" ": " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 #, fuzzy msgid "" "While trying to make a backup, renaming failed. \n" @@ -854,211 +868,217 @@ msgstr "" "Kuri Ubwoko A Inyibutsa , Guhindura izina Byanze . \n" ": " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, fuzzy, c-format msgid "Getting file status: %1" msgstr "Idosiye Imimerere : %1 " -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, fuzzy, c-format msgid "Reading file: %1" msgstr "Idosiye : %1 " -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, fuzzy, c-format msgid "Writing file: %1" msgstr "Idosiye : %1 " -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Ububiko bwarenzwe" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, fuzzy, c-format msgid "Making directory: %1" msgstr "Ububiko : %1 " -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, fuzzy, c-format msgid "Removing directory: %1" msgstr "Ububiko : %1 " -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, fuzzy, c-format msgid "Removing file: %1" msgstr "Idosiye : %1 " -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 #, fuzzy msgid "Creating symbolic link: %1 -> %2" msgstr "Ihuza : %1 - > %2 " -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 #, fuzzy msgid "Renaming file: %1 -> %2" msgstr "Idosiye : %1 - > %2 " -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 #, fuzzy msgid "Copying file: %1 -> %2" msgstr "Idosiye : %1 - > %2 " -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, fuzzy, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "Ikosa Idosiye Gukoporora Igikorwa : Idosiye ya: Byanze . : %1 " -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, fuzzy, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "Ikosa Idosiye Gukoporora Igikorwa : Idosiye ya: Byanze . : %1 " -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, fuzzy, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "Ikosa Idosiye Gukoporora Igikorwa : Byanze . : %1 " -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, fuzzy, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Ikosa Idosiye Gukoporora Igikorwa : Byanze . : %1 " -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 #, fuzzy msgid "Reading directory: " msgstr "Ububiko : " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, fuzzy, c-format msgid "Listing directory: %1" msgstr "Ububiko : %1 " -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 #, fuzzy msgid "Current Configuration:" msgstr "Iki cyiciro" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "Ikosa gufungura idosiye" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 #, fuzzy msgid "Option --auto used, but no output file specified." msgstr "- - Ikiyega Byakoreshejwe , Oya Ibisohoka Idosiye . " -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 #, fuzzy msgid "Option --auto ignored for directory comparison." msgstr "- - Ikiyega ya: Ububiko . " -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 #, fuzzy msgid "Saving failed." msgstr "Byanze . " -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 #, fuzzy msgid "Opening of these files failed:" msgstr "Bya Idosiye Byanze : " -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 #, fuzzy msgid "File Open Error" msgstr "Ikosa gufungura idosiye" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 #, fuzzy msgid "Opens documents for comparison..." msgstr "Inyandiko ya: ... " -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 #, fuzzy msgid "Saves the merge result. All conflicts must be solved!" msgstr "i Gukomatanya Igisubizo . ! " -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 #, fuzzy msgid "Saves the current document as..." msgstr "i KIGEZWEHO Inyandiko Nka ... " -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 #, fuzzy msgid "Quits the application" msgstr "i Porogaramu " -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 #, fuzzy msgid "Cuts the selected section and puts it to the clipboard" msgstr "i Byahiswemo Icyiciro na Kuri i Ububikokoporora " -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 #, fuzzy msgid "Copies the selected section to the clipboard" msgstr "i Byahiswemo Icyiciro Kuri i Ububikokoporora " -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 #, fuzzy msgid "Pastes the clipboard contents to actual position" msgstr "i Ububikokoporora Ibigize Kuri Ibirindiro: " -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 #, fuzzy msgid "Search for a string" msgstr "ya: A Ikurikiranyanyuguti " -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 #, fuzzy msgid "Search again for the string" msgstr "Nanone ya: i Ikurikiranyanyuguti " -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 #, fuzzy msgid "Enables/disables the toolbar" msgstr "/i Umwanyabikoresho " -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 #, fuzzy msgid "Enables/disables the statusbar" msgstr "/i Umurongomiterere " -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 #, fuzzy msgid "Configure KDiff3..." msgstr "Kugena imiterere..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 #, fuzzy msgid "Go to Current Delta" msgstr "Kuri " -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 #, fuzzy msgid "Go to First Delta" msgstr "Kuri " -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 #, fuzzy msgid "Go to Last Delta" msgstr "Kuri " -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 #, fuzzy msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "( Umweru Umwanya Ibinyuranyo Ryari: \" \" ni Yahagaritswe . ) " -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 #, fuzzy msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1067,279 +1087,287 @@ msgstr "" "( OYA Gusimbuka Umweru Umwanya Ibinyuranyo ATARIIGIHARWE Ryari: \" \" ni " "Yahagaritswe . ) " -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 #, fuzzy msgid "Go to Previous Delta" msgstr "Kuri " -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 #, fuzzy msgid "Go to Next Delta" msgstr "Kuri " -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 #, fuzzy msgid "Go to Previous Conflict" msgstr "Kuri " -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 #, fuzzy msgid "Go to Next Conflict" msgstr "Kuri " -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 #, fuzzy msgid "Go to Previous Unsolved Conflict" msgstr "Kuri " -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 #, fuzzy msgid "Go to Next Unsolved Conflict" msgstr "Kuri " -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 #, fuzzy msgid "Select Line(s) From A" msgstr "( S ) A " -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 #, fuzzy msgid "Select Line(s) From B" msgstr "( S ) " -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 #, fuzzy msgid "Select Line(s) From C" msgstr "( S ) " -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 #, fuzzy msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Kuri " -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 #, fuzzy msgid "Show Space && Tabulator Characters for Differences" msgstr "& & ya: " -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 #, fuzzy msgid "Show White Space" msgstr "Umwanya w'Umweru" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 #, fuzzy msgid "Show Line Numbers" msgstr "Kwerekana nomero z'umurongo" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 #, fuzzy msgid "Choose A Everywhere" msgstr "A " -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 #, fuzzy msgid "Choose B Everywhere" msgstr "Hitamo darayiva" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 #, fuzzy msgid "Choose C Everywhere" msgstr "Hitamo darayiva" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 #, fuzzy msgid "Choose A for All Unsolved Conflicts" msgstr "A ya: " -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 #, fuzzy msgid "Choose B for All Unsolved Conflicts" msgstr "ya: " -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 #, fuzzy msgid "Choose C for All Unsolved Conflicts" msgstr "ya: " -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 #, fuzzy msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "A ya: " -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 #, fuzzy msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "ya: " -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 #, fuzzy msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "ya: " -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 #, fuzzy msgid "Automatically Solve Simple Conflicts" msgstr "Gufunga mu buryo bwikoresha impago zidakoreshwa" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 #, fuzzy msgid "Set Deltas to Conflicts" msgstr "Kuri " -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Gufunga mu buryo bwikoresha impago zidakoreshwa" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 #, fuzzy msgid "Join Selected Diffs" msgstr "Idosiye " -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 #, fuzzy msgid "Show Window A" msgstr "A " -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 #, fuzzy msgid "Show Window B" msgstr "Kwerekana Ilisiti y'Amadirishya" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 #, fuzzy msgid "Show Window C" msgstr "Kwerekana Ilisiti y'Amadirishya" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 #, fuzzy msgid "Focus Next Window" msgstr "idirishya rikurikira" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 #, fuzzy msgid "Normal Overview" msgstr "Gahunda-Nyamwaka" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 #, fuzzy msgid "A vs. B Overview" msgstr "A . " -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 #, fuzzy msgid "A vs. C Overview" msgstr "A . " -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 #, fuzzy msgid "B vs. C Overview" msgstr "Incamake" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 #, fuzzy msgid "Focus Prev Window" msgstr "Kwerekeza ku idirishya: " -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 #, fuzzy msgid "Toggle Split Orientation" msgstr "Icyerekezo mwandiko" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 #, fuzzy msgid "The merge result hasn't been saved." msgstr "Gukomatanya Igisubizo . " -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 #, fuzzy msgid "Save && Quit" msgstr "Kubika & & " -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 #, fuzzy msgid "Quit Without Saving" msgstr "Komeka utahinduye imiterere" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 #, fuzzy msgid "Saving the merge result failed." msgstr "i Gukomatanya Igisubizo Byanze . " -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 #, fuzzy msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "A Ububiko Gukomatanya . , Kuri Kureka ? " -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 #, fuzzy msgid "Saving file..." msgstr "Idosiye ... " -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 #, fuzzy msgid "Saving file with a new filename..." msgstr "Idosiye Na: A Gishya Izina ry'idosiye: ... " -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "Tegereza..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 #, fuzzy msgid "Printing completed." msgstr "Igikorwa Byuzuye . " -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 #, fuzzy msgid "Exiting..." msgstr "Tegereza..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 #, fuzzy msgid "Toggling toolbar..." msgstr "Umwanyabikoresho ... " -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 #, fuzzy msgid "Toggle the statusbar..." msgstr "i Umurongomiterere ... " @@ -1357,8 +1385,8 @@ msgstr "" #, fuzzy msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "OYA Gushaka Inzira %s ! \n" "Kuri iyinjizaporogaramu . Soma i - Idosiye in i Inkomoko Porogaramu ya: " @@ -1453,20 +1481,19 @@ msgstr "Kuri Gufungura " msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "" -#: main.cpp:186 +#: main.cpp:191 #, fuzzy msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "+ Kuri na ! " -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 #, fuzzy msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Bya : %1 ( Bya %2 ) " @@ -1480,64 +1507,34 @@ msgstr "" "Ibisohoka Byahinduwe: . \n" "Gukomeza Amahinduka . " -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 #, fuzzy msgid "All input files are binary equal." msgstr "Iyinjiza Idosiye Nyabibiri bingana . " -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 #, fuzzy msgid "All input files contain the same text." msgstr "Iyinjiza Idosiye i Umwandiko . " -#: mergeresultwindow.cpp:801 -#, fuzzy -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"A na Nyabibiri bingana . \n" - -#: mergeresultwindow.cpp:802 -#, fuzzy -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"A na bingana Umwandiko . \n" - -#: mergeresultwindow.cpp:803 +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 #, fuzzy -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"A na Nyabibiri bingana . \n" - -#: mergeresultwindow.cpp:804 -#, fuzzy -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"A na bingana Umwandiko . \n" - -#: mergeresultwindow.cpp:805 -#, fuzzy -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"na Nyabibiri bingana . \n" +msgid "Files %1 and %2 are binary equal.\n" +msgstr "na Nyabibiri bingana . \n" -#: mergeresultwindow.cpp:806 +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 #, fuzzy -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"na bingana Umwandiko . \n" +msgid "Files %1 and %2 have equal text.\n" +msgstr "A na bingana Umwandiko . \n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 #, fuzzy msgid "Total number of conflicts: " msgstr "Umubare Bya : " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 #, fuzzy msgid "" "\n" @@ -1546,7 +1543,7 @@ msgstr "" "\n" "Bya mu buryo bwikora: : " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 #, fuzzy msgid "" "\n" @@ -1555,26 +1552,26 @@ msgstr "" "\n" "Bya : " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 #, fuzzy msgid "Conflicts" msgstr "Ishyamirana ry'ingenzi" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 #, fuzzy msgid "" msgstr "< Umurongo: > " -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 #, fuzzy msgid "" msgstr "Ishyamirana ry'ingenzi" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 #, fuzzy msgid "" "Not all conflicts are solved yet.\n" @@ -1583,12 +1580,12 @@ msgstr "" "Byose . \n" "Idosiye OYA . \n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 #, fuzzy msgid "Conflicts Left" msgstr "Guhitamo Ibumoso" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 #, fuzzy msgid "" "\n" @@ -1599,32 +1596,32 @@ msgstr "" "\n" "Inyibutsa Byanze . Idosiye OYA . " -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 #, fuzzy msgid "File Save Error" msgstr "Idosiye Kubika Ikosa " -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 #, fuzzy msgid "Error while writing." msgstr "Ikosa . " -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Ibisohoka" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 #, fuzzy msgid "[Modified]" msgstr "Byahinduwe" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 #, fuzzy msgid "Encoding for saving" msgstr "Idosiye ya: : " -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1647,6 +1644,15 @@ 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 "" @@ -1787,11 +1793,10 @@ msgstr "Isunika " #: optiondialog.cpp:697 #, fuzzy -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -": Isunika Bya i Ibanjirije Umurongo: ni Byakoreshejwe ya: A Gishya Umurongo: . " -"\n" +": Isunika Bya i Ibanjirije Umurongo: ni Byakoreshejwe ya: A Gishya " +"Umurongo: . \n" #: optiondialog.cpp:701 #, fuzzy @@ -1829,71 +1834,62 @@ msgstr "Igabanya" msgid "Diff Settings" msgstr "Iganamiterere rya musomyi" -#: optiondialog.cpp:743 -#, fuzzy -msgid "Preserve carriage return" -msgstr "Garuka " - -#: optiondialog.cpp:746 +#: optiondialog.cpp:750 #, fuzzy -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Garuka Inyuguti ' \\r ' NIBA . \n" -"Kuri Kugereranya # Idosiye Byahinduwe: . " +msgid "Treat as white space." +msgstr "/+ + Ibisobanuro nka Umweru Umwanya . " -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 #, fuzzy msgid "Ignore numbers" msgstr "Imibare " -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 #, fuzzy msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "Umubare Inyuguti Umurongo: . ( Kuri Umweru Umwanya . ) \n" "Ifashayobora Kuri Kugereranya # Idosiye Na: Bikurikije umubare Ibyatanzwe . " -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 #, fuzzy msgid "Ignore C/C++ comments" msgstr "/+ + Ibisobanuro " -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 #, fuzzy msgid "Treat C/C++ comments like white space." msgstr "/+ + Ibisobanuro nka Umweru Umwanya . " -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 #, fuzzy msgid "Ignore case" msgstr "Kwirengagiza Inshuro Imwe" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 #, fuzzy msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Ibinyuranyo nka Umweru Umwanya Amahinduka . ( ' < = > ' ) " -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 #, fuzzy msgid "Preprocessor command:" msgstr "command : " -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 #, fuzzy msgid "User defined pre-processing. (See the docs for details.)" msgstr "Byahawe imiterere mbere - Inonosora . ( i ya: Birambuye . ) " -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 #, fuzzy msgid "Line-matching preprocessor command:" msgstr "- command : " -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 #, fuzzy msgid "" "This pre-processor is only used during line matching.\n" @@ -1902,12 +1898,12 @@ msgstr "" "Byahawe imiterere mbere - ni Byakoreshejwe Umurongo: . \n" "( i ya: Birambuye . ) " -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 #, fuzzy msgid "Try hard (slower)" msgstr "Ikomeye ( ) " -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 #, fuzzy msgid "" "Enables the --minimal option for the external diff.\n" @@ -1916,12 +1912,17 @@ msgstr "" "i - - Ihitamo ya: i external . \n" "Bya Idosiye . " -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Iganamiterere rya musomyi" + +#: optiondialog.cpp:813 #, fuzzy msgid "Auto advance delay (ms):" msgstr "Gutinda ( Madamu ) : " -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 #, fuzzy msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -1930,44 +1931,39 @@ msgstr "" "in - Ubwoko i Igisubizo Bya i KIGEZWEHO Ihitamo ni \n" "ya: i Igihe , Mbere Kuri i Ibikurikira > . : 0 %S - Madamu " -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Iganamiterere rya musomyi" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 #, fuzzy msgid "White space 2-file merge default:" msgstr "Umwanya 2 - Idosiye Gukomatanya Mburabuzi : " -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 #, fuzzy msgid "Manual Choice" msgstr "Ibishushanyo by'Intoki" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 #, fuzzy msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -"i Gukomatanya Kuri mu buryo bwikora: Guhitamo Iyinjiza ya: Umweru - Umwanya - " -"Amahinduka . " +"i Gukomatanya Kuri mu buryo bwikora: Guhitamo Iyinjiza ya: Umweru - Umwanya " +"- Amahinduka . " -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 #, fuzzy msgid "White space 3-file merge default:" msgstr "Umwanya 3 - Idosiye Gukomatanya Mburabuzi : " -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1975,58 +1971,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -2036,50 +2033,71 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Bya Ububiko bwungirije : " + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 #, fuzzy msgid "Directory Merge" msgstr "Seriveri y'ububiko:" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 #, fuzzy msgid "Recursive directories" msgstr "ububiko bw'amaderese " -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 #, fuzzy msgid "Whether to analyze subdirectories or not." msgstr "Kuri Ububiko bwungirije Cyangwa OYA . " -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 #, fuzzy msgid "File pattern(s):" msgstr "Idosiye Ishusho ( S ) : " -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 #, fuzzy msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2090,12 +2108,12 @@ msgstr "" ": ' * ' na ' ? ' \n" "ku ikoresha i Mutandukanya : ' ; ' " -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 #, fuzzy msgid "File-anti-pattern(s):" msgstr "Idosiye - - Ishusho ( S ) : " -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 #, fuzzy msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2106,12 +2124,12 @@ msgstr "" ": ' * ' na ' ? ' \n" "ku ikoresha i Mutandukanya : ' ; ' " -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 #, fuzzy msgid "Dir-anti-pattern(s):" msgstr "- - Ishusho ( S ) : " -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 #, fuzzy msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2122,11 +2140,11 @@ msgstr "" ": ' * ' na ' ? ' \n" "ku ikoresha i Mutandukanya : ' " -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 #, fuzzy msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2135,27 +2153,27 @@ msgstr "" "i Kuri ku . \n" "Bya hafi \" . \" - Idosiye iyi Ububiko . " -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 #, fuzzy msgid "Find hidden files and directories" msgstr "Birahishe Idosiye na ububiko bw'amaderese " -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 #, fuzzy msgid "Finds files and directories with the hidden attribute." msgstr "Idosiye na ububiko bw'amaderese Na: i Birahishe Ikiranga: . " -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 #, fuzzy msgid "Finds files and directories starting with '.'." msgstr "Idosiye na ububiko bw'amaderese Itangira... Na: ' . ' . " -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 #, fuzzy msgid "Follow file links" msgstr "Idosiye amahuza " -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 #, fuzzy msgid "" "On: Compare the file the link points to.\n" @@ -2164,12 +2182,12 @@ msgstr "" ": i Idosiye i Ihuza Utudomo Kuri . \n" ": i amahuza . " -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 #, fuzzy msgid "Follow directory links" msgstr "Ububiko amahuza " -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 #, fuzzy msgid "" "On: Compare the directory the link points to.\n" @@ -2178,11 +2196,11 @@ msgstr "" ": i Ububiko i Ihuza Utudomo Kuri . \n" ": i amahuza . " -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -2190,26 +2208,26 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 #, fuzzy msgid "File Comparison Mode" msgstr "Idosiye " -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 #, fuzzy msgid "Binary comparison of each file. (Default)" msgstr "Bya Idosiye . ( ) " -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 #, fuzzy msgid "Full analysis" msgstr "Kwikaraga hose" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 #, fuzzy msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2218,27 +2236,46 @@ msgstr "" "A Cyuzuye na Herekana %S Sitatisitiki Ibisobanuro: in Birenga Inkingi: . \n" "( A Nyabibiri , ya: Nyabibiri Idosiye . ) " -#: optiondialog.cpp:1074 +#: optiondialog.cpp:1091 #, fuzzy -msgid "Trust the modification date (unsafe)" +msgid "Trust the size and modification date (unsafe)" msgstr "i Itariki: ( ) " -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Idosiye bingana NIBA i Itariki: na Idosiye Uburebure bingana . \n" +"ya: ububiko bw'amaderese Cyangwa Buhoro . " + +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 #, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" "Useful for big directories or slow networks." msgstr "" "Idosiye bingana NIBA i Itariki: na Idosiye Uburebure bingana . \n" "ya: ububiko bw'amaderese Cyangwa Buhoro . " -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1101 #, fuzzy msgid "Trust the size (unsafe)" msgstr "i Ingano: ( ) " -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 #, fuzzy msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2249,12 +2286,12 @@ msgstr "" "ya: ububiko bw'amaderese Cyangwa Buhoro Ryari: i Itariki: ni Byahinduwe: " "Iyimura . " -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 #, fuzzy msgid "Synchronize directories" msgstr "ububiko bw'amaderese " -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 #, fuzzy msgid "" "Offers to store files in both directories so that\n" @@ -2264,12 +2301,12 @@ msgstr "" "Kuri Idosiye in Byombi ububiko bw'amaderese ububiko bw'amaderese i . \n" "Ryari: Kabiri ububiko bw'amaderese A Ishyika: . " -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 #, fuzzy msgid "White space differences considered equal" msgstr "Umwanya Ibinyuranyo bingana " -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 #, fuzzy msgid "" "If files differ only by white space consider them equal.\n" @@ -2278,12 +2315,12 @@ msgstr "" "Idosiye ku Umweru Umwanya bingana . \n" "ni Gikora Ryari: Cyuzuye ni . " -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 #, fuzzy msgid "Copy newer instead of merging (unsafe)" msgstr "Bya ( ) " -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 #, fuzzy msgid "" "Don't look inside, just take the newer file.\n" @@ -2294,31 +2331,31 @@ msgstr "" "( iyi NIBA ! ) \n" "CYUZUYE Ryari: Kabiri ububiko bw'amaderese . " -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 #, fuzzy msgid "Backup files (.orig)" msgstr "Idosiye ( . ) " -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 #, fuzzy msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -"A Idosiye KURI ki/bishaje Idosiye , Hanyuma i ki/bishaje Na: A ' . - Umugereka: " -"Bya Kyasibwe: %S . " +"A Idosiye KURI ki/bishaje Idosiye , Hanyuma i ki/bishaje Na: A ' . - " +"Umugereka: Bya Kyasibwe: %S . " -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 #, fuzzy msgid "Regional Settings" msgstr "Amagenamiterere y'Akarere" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 #, fuzzy msgid "Language (restart required)" msgstr "( Ongera utangire Bya ngombwa ) " -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 #, fuzzy msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" @@ -2327,12 +2364,12 @@ msgstr "" "i Ururimi: Bya i - Ikurikiranyanyuguti Cyangwa \" \" . \n" "A Guhindura... Bya Ururimi: Kuri , &Kuvamo na Ongera utangire . " -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 #, fuzzy msgid "Use the same encoding for everything:" msgstr "i Imisobekere: ya: : " -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 #, fuzzy msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2341,67 +2378,67 @@ msgstr "" "iyi Kuri Guhindura... Byose ku i Itangira . \n" "iyi NIBA Igenamiterere . " -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 #, fuzzy msgid "Note: Local Encoding is " msgstr "icyitonderwa : ni " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 #, fuzzy msgid "File Encoding for A:" msgstr "Idosiye ya: A : " -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 #, fuzzy msgid "File Encoding for B:" msgstr "Idosiye ya: : " -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 #, fuzzy msgid "File Encoding for C:" msgstr "Idosiye ya: : " -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 #, fuzzy msgid "File Encoding for Merge Output and Saving:" msgstr "Idosiye ya: na : " -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "Gukoporora Ihitamo " -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 #, fuzzy msgid "File Encoding for Preprocessor Files:" msgstr "Idosiye ya: : " -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 #, fuzzy msgid "Right To Left Language" msgstr "Iburyo ku ibumoso" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 #, fuzzy msgid "" "Some languages are read from right to left.\n" @@ -2410,21 +2447,21 @@ msgstr "" "Indimi Soma Kuva: Iburyo: Kuri Ibumoso: . \n" "Igenamiterere Guhindura... i na Muhinduzi . " -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "Igikorwa" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration Settings" msgstr "Amagenamiterere y'Akarere" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2432,7 +2469,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 #, fuzzy msgid "" "You selected a variable width font.\n" @@ -2448,22 +2505,22 @@ msgstr "" "\n" "Kuri Gukomeza Cyangwa Kuri Guhitamo Imyandikire . " -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 #, fuzzy msgid "Incompatible Font" msgstr "%S Itakorana" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 #, fuzzy msgid "Continue at Own Risk" msgstr "Gukomeza Ku " -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 #, fuzzy msgid "Select Another Font" msgstr "Gutoranya imyandikire" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 #, fuzzy msgid "This resets all options. Not only those of the current topic." msgstr "Byose Amahitamo . Bya i KIGEZWEHO . " @@ -2475,10 +2532,8 @@ msgstr "Munonosora" #: pdiff.cpp:263 #, fuzzy -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"Ihitamo ( S ) Byahiswemo Guhindura... Ibyatanzwe : \n" +msgid "The following option(s) you selected might change data:\n" +msgstr "Ihitamo ( S ) Byahiswemo Guhindura... Ibyatanzwe : \n" #: pdiff.cpp:264 #, fuzzy @@ -2553,19 +2608,10 @@ msgstr ": A < - > " msgid "All input files contain the same text, but are not binary equal." msgstr "Iyinjiza Idosiye i Umwandiko . " -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -#, fuzzy -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"na Nyabibiri bingana . \n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 #, fuzzy -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"A na Nyabibiri bingana . \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "A na Nyabibiri bingana . \n" #: pdiff.cpp:530 #, fuzzy @@ -2578,117 +2624,63 @@ msgstr "" "icyitonderwa i - Gukomatanya OYA ya: Nyabibiri Ibyatanzwe . \n" "Gukomeza Ku . " -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Ntibyakunze" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 #, fuzzy msgid "Opening files..." msgstr "Mu Gufungura dosiye" -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Ikosa gufungura idosiye" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 #, fuzzy msgid "Cutting selection..." msgstr "Ihitamo ... " -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 #, fuzzy msgid "Copying selection to clipboard..." msgstr "Ihitamo Kuri Ububikokoporora ... " -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 #, fuzzy msgid "Inserting clipboard contents..." msgstr "Ububikokoporora Ibigize ... " -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 #, fuzzy msgid "Save && Continue" msgstr "Kubika & & Gukomeza " -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 #, fuzzy msgid "Continue Without Saving" msgstr "Gukomeza " -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 #, fuzzy msgid "Search complete." msgstr "Byuzuye . " -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 #, fuzzy msgid "Search Complete" msgstr "Igishushanyombonera cy'Ishakisha" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "Ikosa Kurema Ububiko . " -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, fuzzy, no-c-format -msgid "Configure KDiff3" -msgstr "Kuboneza Gucapa na KDE" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, fuzzy, no-c-format -msgid "&Directory" -msgstr "Ububiko" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, fuzzy, no-c-format -msgid "Current Item Merge Operation" -msgstr "Ibikorerwa Ishusho" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, fuzzy, no-c-format -msgid "Current Item Sync Operation" -msgstr "Iki cyiciro" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, fuzzy, no-c-format -msgid "&Movement" -msgstr "Igenda" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, fuzzy, no-c-format -msgid "D&iffview" -msgstr "Igabanya" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, fuzzy, no-c-format -msgid "&Merge" -msgstr "Gukomatanya" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "Idirishya" - #: smalldialogs.cpp:53 #, fuzzy msgid "A (Base):" @@ -2736,6 +2728,10 @@ msgstr "( Bitari ngombwa ) : " msgid "Configure..." msgstr "Kugena imiterere..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 #, fuzzy msgid "Search text:" @@ -2813,6 +2809,14 @@ 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 "" @@ -2826,6 +2830,94 @@ msgstr "Byanze . " msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "" + +#: kdiff3_part.rc:13 +#, fuzzy, no-c-format +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" +msgstr "Ububiko" + +#: kdiff3_shell.rc:30 +#, fuzzy, no-c-format +msgid "Current Item Merge Operation" +msgstr "Ibikorerwa Ishusho" + +#: kdiff3_shell.rc:38 +#, fuzzy, no-c-format +msgid "Current Item Sync Operation" +msgstr "Iki cyiciro" + +#: kdiff3_shell.rc:50 +#, fuzzy, no-c-format +msgid "&Movement" +msgstr "Igenda" + +#: kdiff3_shell.rc:61 +#, fuzzy, no-c-format +msgid "D&iffview" +msgstr "Igabanya" + +#: kdiff3_shell.rc:73 +#, fuzzy, no-c-format +msgid "&Merge" +msgstr "Gukomatanya" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "Idirishya" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#, fuzzy +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "A na Nyabibiri bingana . \n" + +#, fuzzy +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "A na Nyabibiri bingana . \n" + +#, fuzzy +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "A na bingana Umwandiko . \n" + +#, fuzzy +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "na Nyabibiri bingana . \n" + +#, fuzzy +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "na bingana Umwandiko . \n" + +#, fuzzy +#~ msgid "Preserve carriage return" +#~ msgstr "Garuka " + +#, fuzzy +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Garuka Inyuguti ' \\r ' NIBA . \n" +#~ "Kuri Kugereranya # Idosiye Byahinduwe: . " + #, fuzzy #~ msgid "Diff and Merge" #~ msgstr "Ikinyuranyo/Itandukaniro" @@ -2852,7 +2944,8 @@ msgstr "" #, fuzzy #~ msgid "Files and directories without change will not appear in the list." -#~ msgstr "na ububiko bw'amaderese Guhindura... OYA Kugaragara in i Urutonde . " +#~ msgstr "" +#~ "na ububiko bw'amaderese Guhindura... OYA Kugaragara in i Urutonde . " #, fuzzy #~ msgid "no selection" diff --git a/po/sk.po b/po/sk.po index edc8f28..e61d83e 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,37 +4,38 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2006-09-15 18:02+0200\n" "Last-Translator: Richard Fric \n" "Language-Team: Slovak \n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -43,7 +44,7 @@ msgid "" "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -52,21 +53,21 @@ msgid "" "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "" @@ -82,237 +83,244 @@ msgstr "" msgid "Size. " msgstr "" -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "" -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "" -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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 "" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "" -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -321,41 +329,46 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" +#: directorymergewindow.cpp:1965 +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:1900 directorymergewindow.cpp:2306 +#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "" -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "" -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -367,731 +380,748 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +msgid "File" +msgstr "" + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " msgstr "" -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "" -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "" -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "" -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "" -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "" -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "" -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "" -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "" @@ -1106,8 +1136,8 @@ msgstr "" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" #: main.cpp:35 @@ -1184,19 +1214,18 @@ msgstr "" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" @@ -1206,115 +1235,95 @@ msgid "" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "" -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " msgstr "" -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " msgstr "" -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1334,6 +1343,14 @@ 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 "" @@ -1453,8 +1470,7 @@ msgid "Auto indentation" msgstr "" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" #: optiondialog.cpp:701 @@ -1485,112 +1501,106 @@ msgstr "" msgid "Diff Settings" msgstr "" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." +#: optiondialog.cpp:750 +msgid "Treat as white space." msgstr "" -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1598,58 +1608,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1659,121 +1670,141 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +msgid "Max number of history entries:" +msgstr "" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "" -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1781,187 +1812,203 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -1969,7 +2016,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -1979,19 +2046,19 @@ msgid "" "Do you want to continue or do you want to select another font." msgstr "" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2000,8 +2067,7 @@ msgid "PreprocessorCmd: " msgstr "" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" #: pdiff.cpp:264 @@ -2063,14 +2129,8 @@ msgstr "" msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" #: pdiff.cpp:530 @@ -2080,108 +2140,54 @@ msgid "" "Continue at your own risk." msgstr "" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "" -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "" -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "" -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "" @@ -2224,6 +2230,10 @@ msgstr "" msgid "Configure..." msgstr "" +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "" @@ -2296,6 +2306,14 @@ 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 "" @@ -2307,3 +2325,58 @@ msgstr "" #: smalldialogs.cpp:559 msgid "Opening and closing parentheses don't match in regular expression." msgstr "" + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "" + +#: kdiff3_part.rc:13 +#, no-c-format +msgid "Configure KDiff3" +msgstr "" + +#: kdiff3_shell.rc:4 +#, no-c-format +msgid "&File" +msgstr "" + +#: kdiff3_shell.rc:7 +#, no-c-format +msgid "&Directory" +msgstr "" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "" + +#: kdiff3_shell.rc:95 +#, 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 bf7c723..b296b79 100644 --- a/po/sr.po +++ b/po/sr.po @@ -6,36 +6,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2005-02-26 19:41+0100\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Часлав Илић, Слободан Симић" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "caslav.ilic@gmx.net,simicsl@verat.net" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Уписивање података из клипборда у привремени фајл није успело." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Из клипборда" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -49,7 +50,7 @@ msgstr "" "\n" "Наредба предобраде ће сада бити искључена." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -63,7 +64,7 @@ msgstr "" "\n" "Предобрада поклапања линија ће сада бити искључена." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -71,16 +72,16 @@ msgstr "" "Грешка, губитак података:\n" "Ако је можете поновити, контактирајте аутора.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Озбиљна унутрашња грешка" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Највиша линија %1" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Крај" @@ -96,245 +97,249 @@ msgstr "Веза: " msgid "Size. " msgstr "Величина: " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Датум и величина: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Прављење привремене копије фајла %1 није успело." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Отварање фајла %1 није успело." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Упоређујем фајл..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Грешка при читању из %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Име" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Операција" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Статус" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Нерешен" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Решен" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Не-бело" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Бело" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -"Тренутно стапате директоријуме. Желите ли заиста да прекинете стапање и поново " -"скенирате директоријум?" +"Тренутно стапате директоријуме. Желите ли заиста да прекинете стапање и " +"поново скенирате директоријум?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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 "Поново скенирај" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Настави стапање" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Отварање директоријума није успело:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Дир. А „%1“ не постоји или није директоријум.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Дир. А „%1“ не постоји или није директоријум.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Дир. Б „%1“ не постоји или није директоријум.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Дир. Б „%1“ не постоји или није директоријум.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Дир. Ц „%1“ не постоји или није директоријум.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Дир. Ц „%1“ не постоји или није директоријум.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Грешка при отварању директоријума" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "Одредишни директоријум не сме бити исти као А или Б када се стапају три " "директоријума.\n" "Проверите поново пре него наставите." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Упозорење о параметрима" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Прегледам директоријуме..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Читам директоријум А" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Читам директоријум Б" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Читам директоријум Ц" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Неки поддиректоријуми нису били читљиви у" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Проверите дозволе поддиректоријума." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Спреман." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Статус поређења директоријума" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Број поддиректоријума:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Број једнаких фајлова:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Број различитих фајлова:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Број ручних стапања:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Ово утиче на све операције стапања." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Мењам све операције стапања" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Настави" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Обрађујем " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Урадити." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Копирај А у Б" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Копирај Б у А" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Обриши А" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Обриши Б" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Обриши А и Б" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Стопи у А" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Стопи у Б" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Стопи А и Б" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Обриши (ако постоји)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Стопи" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Стопи (ручно)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Грешка: Сукобљени типови фајлова" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Грешка: Датуми су једнаки али фајлови нису." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Ова операција тренутно није могућа." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Операција није могућа" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -346,42 +351,47 @@ msgstr "" "\n" "Ако знате како ово да поновите, контактирајте аутора програма." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Програмска грешка" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Дошло је до грешке у току копирања.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Дошло је до грешке у току копирања.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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 "Грешка стапања" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Грешка." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Готово." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Није снимљено." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Непозната операција стапања. (Ово никад не сме да се деси!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Непозната операција стапања." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -400,333 +410,339 @@ msgstr "" "Пазите да програм још увек има бета статус и нема НИКАКВИХ ГАРАНЦИЈА уопште! " "Направите резерву својих најважнијих података!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Почињем стапање" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Уради" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Симулирај" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -"Истакнута ставка има различит тип у различитим директоријумима. Изаберите шта " -"је чинити." +"Истакнута ставка има различит тип у различитим директоријумима. Изаберите " +"шта је чинити." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" "Датуми измене фајла су једнаки али фајлови нису. Изаберите шта је чинити." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" "Ова операција тренутно није могућа зато што је стапање директоријума у току." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Дошло је до грешке у последњем кораку.\n" "Желите ли да наставите са ставком која је изазвала грешку или желите да је " "прескочите?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Настави стапање после грешке" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Настави са последњом ставком" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Прескочи ставку" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Прескочено." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "У току..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Операција стапања је завршена." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Стапање је завршено" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Симулирано стапање је завршено: Проверите да ли се слажете са предложеним " "операцијама." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -"Дошло је до грешке. Притисните „У реду“ да бисте видели детаљне информације.\n" +"Дошло је до грешке. Притисните „У реду“ да бисте видели детаљне " +"информације.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Грешка: У току брисања %1: Прављење резерве није успело." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "обриши директоријум рекурзивно( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "обриши( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Грешка: Операција брисања директоријума није успела у току покушаја да се " "директоријум прочита." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Грешка: Операција rmdir( %1 ) није успела." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Грешка: Операција брисања није успела." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ручно стапање( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Напомена: После ручног стапања корисник би требало да настави помоћу F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Грешка: Копирање( %1 -> %2 ) није успело. Брисање постојећег одредишта није " "успело." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "копирање везе( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Грешка: Копирање везе није успело: Удаљене везе још увек нису подржане." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Грешка: Копирање везе није успело." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "копирај( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -"Грешка у току преименовања( %1 -> %2 ): Не могу да обришем постојеће одредиште." +"Грешка у току преименовања( %1 -> %2 ): Не могу да обришем постојеће " +"одредиште." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "преименуј( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Грешка: Преименовање није успело." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Грешка у току прављења директоријума %1. Не могу да обришем постојећи фајл." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "направи директоријум( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Грешка у току прављења директоријума." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Одр." -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Дир." -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Тип" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Вел." -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Атр." -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Последња измена" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Веза-одредиште" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Фајл..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "није доступно" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "А (одр.): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "А (база): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "Б (одр.): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "Ц (одр.): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Одр.: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Стапање директоријума" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Покрени/настави стапање директоријума" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Покрени операцију за текућу ставку" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Упореди изабрани фајл" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Стопи текући фајл" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Сажми све поддиректоријуме" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Рашири све поддиректоријуме" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Изабери А за све ставке" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Изабери Б за све ставке" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Изабери Ц за све ставке" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Аутоматски изабери операцију за све ставке" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Нема операције за све ставке" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Show Different Files" msgstr "Број различитих фајлова:" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Упореди изабрани фајл" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Упореди изабрани фајл" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Не ради ништа" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "А" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "Б" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "Ц" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Обриши А и Б" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Стопи у А и Б" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " @@ -734,7 +750,7 @@ msgstr "" "У току покушаја да се направи резерва, брисање старије резерве није успело.\n" "Име фајла: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -742,193 +758,200 @@ msgstr "" "У току покушаја да се направи резерва, преименовање није успело.\n" "Имена фајлова: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Добављам статус фајла: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Читам фајл: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Пишем фајл: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Нема меморије" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Правим директоријум: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Уклањам директоријум: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Уклањам фајл: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Правим симболичку везу: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Уклањам фајл: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Копирам фајл: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -"Грешка током операције копирања фајлова: Отварање фајла за читање није успело. " -"Име фајла: %1" +"Грешка током операције копирања фајлова: Отварање фајла за читање није " +"успело. Име фајла: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -"Грешка током операције копирања фајлова: Отварање фајла за писање није успело. " -"Име фајла: %1" +"Грешка током операције копирања фајлова: Отварање фајла за писање није " +"успело. Име фајла: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" "Грешка током операције копирања фајлова: Читање није успело. Име фајла: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" "Грешка током операције копирања фајлова: Писање није успело. Име фајла: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Читам директоријум: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Листам директоријум: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 #, fuzzy msgid "Current Configuration:" msgstr "Операција синх. текуће ставке" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "Грешка при отварању фајла" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Опција --auto је употребљена, али није наведен излазни фајл." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Опција --auto се игнорише за поређење директоријума." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Снимање није успело." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Отварање ових фајлова није успело:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Грешка при отварању фајла" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Отвара документе за поређење..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Снима резултат стапања. Сви сукоби морају бити разрешени!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Снима текуће документе као..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Излази из програма" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Исеца изабрану секцију и ставља је у клипборд" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Копира изабрану секцију у клипборд" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Преноси садржај клипборда на текућу позицију" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Потражи знаковни низ" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Поново потражи знаковни низ" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Укључује/искључује траку са алатима" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Укључује/искључује статусну траку" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Подеси KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Иди на текућу делту" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Иди на прву делту" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Иди на последњу делту" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -"(прескаче разлике у белим размацима када је „Прикажи беле размаке“ искључено.)" +"(прескаче разлике у белим размацима када је „Прикажи беле размаке“ " +"искључено.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -936,236 +959,244 @@ msgstr "" "(не прескаче разлике у белим размацима чак и када је „Прикажи беле размаке“ " "искључено.)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Иди на претходну делту" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Иди на следећу делту" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Иди на претходни сукоб" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Иди на следећи сукоб" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Иди на претходни нерешени сукоб" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Иди на следећи нерешени сукоб" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Изаберите линије из А" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Изаберите линије из Б" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Изаберите линије из Ц" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Аутоматски иди на следећи нерешени сукоб после избора извора" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Прикажи знакове размака и табулатора за разлике" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Прикажи беле размаке" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Прикажи бројеве линија" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Свуда изабери А" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Свуда изабери Б" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Свуда изабери Ц" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Изабери А за све нерешене сукобе" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Изабери Б за све нерешене сукобе" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Изабери Ц за све нерешене сукобе" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Изабери А за све нерешене сукобе белих размака" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Изабери Б за све нерешене сукобе белих размака" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Изабери Ц за све нерешене сукобе белих размака" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Аутоматски реши једноставне сукобе" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Постави делте на сукобе" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Аутоматски реши једноставне сукобе" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 #, fuzzy msgid "Join Selected Diffs" msgstr "Упореди изабрани фајл" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Прикажи прозор А" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Прикажи прозор Б" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Прикажи прозор Ц" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Фокусирај следећи прозор" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Нормалан преглед" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "Преглед А према Б" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "Преглед А према Ц" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "Преглед Б према Ц" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Diff прозори прелома речи" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Фокусирај претходни прозор" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Промени оријентацију раздвајања" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Подељени приказ екрана за дир. и текст" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Промени између дир. и текст. приказа" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Резултат стапања није снимљен." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Сними и изађи" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Изађи без снимања" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Снимање резултата стапања није успело." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Тренутно стапате директоријуме. Желите ли заиста да прекинете?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Снимам фајл..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Снимам фајл под новим именом..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "Излазим..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 #, fuzzy msgid "Printing completed." msgstr "Операција стапања је завршена." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Излазим..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Укључујем/искључујем траку са алатом..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Укључи/искључи статусну траку..." @@ -1180,8 +1211,8 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Нисам могао да нађем наш део!\n" "Ово се обично дешава због инсталационог проблема. Прочитајте фајл README у " @@ -1262,20 +1293,19 @@ msgstr "фајл3 за отворање" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" "+ Много хвала онима који су пријављивали грешке и допринели својим идејама!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Број преосталих нерешених сукоба: %1 (од којих су %2 бели размаци)" @@ -1287,55 +1317,31 @@ msgstr "" "Излаз је измењен.\n" "Ако наставите, ваше измене ће бити изгубљене." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Сви улазни фајлови су бинарно једнаки." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Сви улазни фајлови садрже исти текст." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Фајлови А и Б су бинарно једнаки.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Фајлови А и Б имају једнак текст.\n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Фајлови А и Ц су бинарно једнаки.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Фајлови А и Ц имају једнак текст.\n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Фајлови Б и Ц су бинарно једнаки.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +#, fuzzy +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Фајлови Б и Ц су бинарно једнаки.\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Фајлови Б и Ц имају једнак текст.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Фајлови А и Б имају једнак текст.\n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Укупан број сукоба: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1343,7 +1349,7 @@ msgstr "" "\n" "Број аутоматски решених сукоба: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1351,23 +1357,23 @@ msgstr "" "\n" "Број нерешених сукоба: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Сукоби" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "<Нема изв. линије>" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "<Сукоб у стапању (само бели размаци)>" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "<Сукоб у стапању>" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1375,11 +1381,11 @@ msgstr "" "Још увек нису решени сви сукоби.\n" "Фајл није снимљен.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Преостали сукоби" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1389,29 +1395,29 @@ msgstr "" "\n" "Прављење резерве није успело. Фајл није снимљен." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Грешка у снимању фајла" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Грешка приликом писања." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Излаз" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Измењен]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 #, fuzzy msgid "Encoding for saving" msgstr "Кодирање фајла за Ц:" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1431,6 +1437,15 @@ 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 "Фонт уређивача и раз. излаза" @@ -1556,10 +1571,8 @@ msgid "Auto indentation" msgstr "Аутоматско увлачење" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"Укључено: Увлачење претходне линије користи се за нову линију.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "Укључено: Увлачење претходне линије користи се за нову линију.\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1595,63 +1608,55 @@ msgstr "KDiff3" msgid "Diff Settings" msgstr "Поставке разлике и стапања" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Очувај CR" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Прикажи CR знакове „\\r“ ако постоје.\n" -"Помаже да се упореде фајлови који су мењани под различитим оперативним " -"системима." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Третирај C/C++ коментаре као беле размаке." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Игнориши бројеве" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -"Игнориши бројевне знакове током фазе поклапања линија. (Слично игнорисању белих " -"размака.)\n" +"Игнориши бројевне знакове током фазе поклапања линија. (Слично игнорисању " +"белих размака.)\n" "Може вам помоћи при упоређивању фајлова са нумеричким подацима." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Игнориши C/C++ коментаре" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Третирај C/C++ коментаре као беле размаке." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Занемари величину слова" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Третира разлику у величини као промене белог простора. („a“<=>„A“)" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Предобрадна наредба:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Кориснички дефинисана предобрада. (Погледајте документацију за детаље.)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Предобрадна наредба за поклапање линија:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1659,11 +1664,11 @@ msgstr "" "Предобрада се користи само током поклапања линија.\n" "(Погледајте документацију за детаље.)" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Потруди се (спорије)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1671,11 +1676,16 @@ msgstr "" "Укључује опцију --minimal за спољашње разликовање.\n" "Анализа великих фајлова ће бити много спорија." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Поставке разлике и стапања" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Застој аутоматског напредовања (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" @@ -1683,40 +1693,35 @@ msgstr "" "У режиму аутоматског напредовања резултат текућег избора приказује се \n" "наведено време, пре скока на следећи сукоб. Опсег: 0-2000 ms" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Поставке разлике и стапања" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Подразумевано стапање белих размака два фајла:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Ручни избор" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -"Дозвољава алгоритму стапања да аутоматски изабере улаз за измене само у белим " -"размацима." +"Дозвољава алгоритму стапања да аутоматски изабере улаз за измене само у " +"белим размацима." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Подразумевано стапање белих размака три фајла:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1724,58 +1729,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1785,46 +1791,67 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Број поддиректоријума:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Стапање директоријума" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Рекурзивни директоријуми" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Да ли да се анализирају поддиректоријуми." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Облици фајлова:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1834,11 +1861,11 @@ msgstr "" "Џокери: „*“ и „?“\n" "Више облика можете навести користећи раздвајач: „;“" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Антиоблици фајлова:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1848,11 +1875,11 @@ msgstr "" "Џокери: „*“ и „?“\n" "Више облика можете навести користећи раздвајач: „;“" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Антиоблици директоријума:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1862,11 +1889,11 @@ msgstr "" "Џокери: „*“ и „?“\n" "Више облика можете навести користећи раздвајач: „;“" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Користи фајл .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1874,23 +1901,23 @@ msgstr "" "Проширује антиоблик на све што би CVS игнорисао.\n" "Преко локалних фајлова „.cvsignore“ ово може бити посебно по директоријуму." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Пронађи скривене фајлове и директоријуме" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Налази фајлове и директоријуме са атрибутом скривених." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Налази фајлове и директоријуме који почињу са „.“" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Прати везе фајлова" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1898,11 +1925,11 @@ msgstr "" "Укључено: Пореди фајлове на које показују везе.\n" "Искључено: Пореди везе." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Прати везе директоријума" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1910,11 +1937,11 @@ msgstr "" "Укључено: Пореди директоријуме на које показују везе.\n" "Искључено: Пореди везе." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1922,23 +1949,23 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Режим поређења фајлова" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Бинарно поређење" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Бинарно поређење за сваки фајл. (Подразумевано)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Пуна анализа" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1946,24 +1973,47 @@ msgstr "" "Ради пуну анализу и приказује статистичке податке у додатним колонама.\n" "(Спорије него бинарно поређење, много спорије за бинарне фајлове.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Веруј датуму измене (није безбедно)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" -"Претпостави да су фајлови једнаки ако су датум измене и дужина фајла једнаки.\n" +"Претпостави да су фајлови једнаки ако су датум измене и дужина фајла " +"једнаки.\n" "Корисно за велике директоријуме или споре мреже." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Претпостави да су фајлови једнаки ако су датум измене и дужина фајла " +"једнаки.\n" +"Корисно за велике директоријуме или споре мреже." + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Веруј величини (није безбедно)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -1973,11 +2023,11 @@ msgstr "" "Корисно за велике директоријуме или споре мреже када се датум измене у току " "преузимања." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Синхронизуј директоријуме" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -1987,11 +2037,11 @@ msgstr "" "да су оба директоријума после тога иста.\n" "Ради само када се пореде два директоријума без навођења одредишта." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Разлике у белим размацима сматрају се једнаким" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -1999,11 +2049,11 @@ msgstr "" "Ако се фајлови разликују само у белим размацима, сматрају се једнаким.\n" "Ово је активно само када се изабере пуна анализа." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Копирај новији уместо стапања (није безбедно)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2013,11 +2063,11 @@ msgstr "" "(Користите ово само ако знате шта радите!)\n" "Има ефекта само када се пореде два директоријума." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Резервиши фајлове (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2025,15 +2075,15 @@ msgstr "" "Када треба снимити фајл преко старог фајла, стари фајл ће бити\n" "преименован са наставком „.orig“ уместо да буде обрисан." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Регионална подешавања" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Језик (потребно поновно покретање)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2041,11 +2091,11 @@ msgstr "" "Изаберите језик за исписе у програму или „Auto“.\n" "Да би измена језика била примењена, затворите и поново покрените KDiff3." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Користи исто кодирање за све:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." @@ -2053,60 +2103,60 @@ msgstr "" "Укључивањем овог можете променити сва кодирања променом само првог.\n" "Искључите ово ако су потребна различита поједина подешавања." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Напомна: Локално кодирање је " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "Кодирање фајла за А:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "Кодирање фајла за Б:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "Кодирање фајла за Ц:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Кодирање фајла за стопљени излаз и снимање:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "Аутоматско копирање избора" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Кодирање фајла за препроцесорке фајлове:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Језици с десна у лево" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2114,21 +2164,21 @@ msgstr "" "Неки језици се читају с десна у лево.\n" "Ово подешавање ће прилагодити томе приказивач и уређивач." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "Операција" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration Settings" msgstr "Регионална подешавања" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2136,7 +2186,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2152,19 +2222,19 @@ msgstr "" "\n" "Желите ли да наставите или ћете изабрати други фонт?" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Некомпатибилан фонт" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Наставите на сопствени ризик" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Изаберите други фонт" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "Ово ресетује све опције. Не само оне у текућој теми." @@ -2173,10 +2243,8 @@ msgid "PreprocessorCmd: " msgstr "Препроцесорка наредба: " #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"Следеће опције које сте изабрали могу изменити податке:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "Следеће опције које сте изабрали могу изменити податке:\n" #: pdiff.cpp:264 msgid "" @@ -2241,19 +2309,10 @@ msgstr "Раз.лин.: А <-> Ц" msgid "All input files contain the same text, but are not binary equal." msgstr "Сви улазни фајлови садрже исти текст." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -#, fuzzy -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Фајлови Б и Ц су бинарно једнаки.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 #, fuzzy -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"Фајлови А и Б су бинарно једнаки.\n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Фајлови А и Б су бинарно једнаки.\n" #: pdiff.cpp:530 msgid "" @@ -2265,109 +2324,55 @@ msgstr "" "Имајте на уму да KDiff3 стапање није намењено бинарним подацима.\n" "Наставите на сопствени ризик." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Прекини" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Отварам фајлове..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Грешка при отварању фајла" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Исецам изабрано..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Копирам изабрано у клипборд..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Убацујем садржај клипборда..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Сними и настави" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Настави без снимања" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Претрага је завршена." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Претрага је готова" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "Грешка у току прављења директоријума." -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Подеси KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Директоријум" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Операција стапања текуће ставке" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Операција синх. текуће ставке" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Кретање" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "D&iff приказ" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Стопи" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "П&розор" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "А (база):" @@ -2410,6 +2415,10 @@ msgstr "Излаз (опционо):" msgid "Configure..." msgstr "Подеси..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Текст за претрагу:" @@ -2482,6 +2491,14 @@ 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 "" @@ -2495,6 +2512,88 @@ msgstr "Снимање није успело." msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Директоријум" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Операција стапања текуће ставке" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Операција синх. текуће ставке" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Кретање" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "D&iff приказ" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Стопи" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "П&розор" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Фајлови А и Б су бинарно једнаки.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Фајлови А и Ц су бинарно једнаки.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Фајлови А и Ц имају једнак текст.\n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Фајлови Б и Ц су бинарно једнаки.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Фајлови Б и Ц имају једнак текст.\n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Очувај CR" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Прикажи CR знакове „\\r“ ако постоје.\n" +#~ "Помаже да се упореде фајлови који су мењани под различитим оперативним " +#~ "системима." + #, fuzzy #~ msgid "Diff and Merge" #~ msgstr "Разлика и стапање" @@ -2569,8 +2668,10 @@ msgstr "" #~ msgid "Convert to upper case" #~ msgstr "Претвори у велика слова" -#~ msgid "Turn all lower case characters to upper case on reading. (e.g.: 'a'->'A')" -#~ msgstr "Претвори све знакове малих слова у велика при читању. (нпр.: „а“->„А“)" +#~ msgid "" +#~ "Turn all lower case characters to upper case on reading. (e.g.: 'a'->'A')" +#~ msgstr "" +#~ "Претвори све знакове малих слова у велика при читању. (нпр.: „а“->„А“)" #, fuzzy #~ msgid "Convert to upper case\n" @@ -2578,9 +2679,13 @@ msgstr "" #~ msgid "" #~ "Running the external diff failed.\n" -#~ "Check if the diff works, if the program can write in the temp folder or if the disk is full.\n" -#~ "The external diff option will be disabled now and the internal diff will be used." +#~ "Check if the diff works, if the program can write in the temp folder or " +#~ "if the disk is full.\n" +#~ "The external diff option will be disabled now and the internal diff will " +#~ "be used." #~ msgstr "" #~ "Покретање спољашњег разликовања није успело.\n" -#~ "Проверите да ли то разликовање ради, да ли програм може да пише у привремени директоријум и да ли има простора на диску.\n" -#~ "Опција спољашњег разликовања ће сада бити искључена и користиће се унутрашње." +#~ "Проверите да ли то разликовање ради, да ли програм може да пише у " +#~ "привремени директоријум и да ли има простора на диску.\n" +#~ "Опција спољашњег разликовања ће сада бити искључена и користиће се " +#~ "унутрашње." diff --git a/po/sr@Latn.po b/po/sr@Latn.po index 18a7807..7bf2e54 100644 --- a/po/sr@Latn.po +++ b/po/sr@Latn.po @@ -6,36 +6,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2005-02-26 19:41+0100\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Časlav Ilić, Slobodan Simić" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "caslav.ilic@gmx.net,simicsl@verat.net" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Upisivanje podataka iz klipborda u privremeni fajl nije uspelo." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Iz klipborda" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -49,7 +50,7 @@ msgstr "" "\n" "Naredba predobrade će sada biti isključena." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -63,7 +64,7 @@ msgstr "" "\n" "Predobrada poklapanja linija će sada biti isključena." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -71,16 +72,16 @@ msgstr "" "Greška, gubitak podataka:\n" "Ako je možete ponoviti, kontaktirajte autora.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Ozbiljna unutrašnja greška" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Najviša linija %1" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Kraj" @@ -96,245 +97,249 @@ msgstr "Veza: " msgid "Size. " msgstr "Veličina: " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Datum i veličina: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Pravljenje privremene kopije fajla %1 nije uspelo." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Otvaranje fajla %1 nije uspelo." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Upoređujem fajl..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Greška pri čitanju iz %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Ime" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Operacija" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Nerešen" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Rešen" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Ne-belo" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Belo" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -"Trenutno stapate direktorijume. Želite li zaista da prekinete stapanje i ponovo " -"skenirate direktorijum?" +"Trenutno stapate direktorijume. Želite li zaista da prekinete stapanje i " +"ponovo skenirate direktorijum?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Nastavi stapanje" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Otvaranje direktorijuma nije uspelo:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir. A „%1“ ne postoji ili nije direktorijum.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Dir. A „%1“ ne postoji ili nije direktorijum.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir. B „%1“ ne postoji ili nije direktorijum.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Dir. B „%1“ ne postoji ili nije direktorijum.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir. C „%1“ ne postoji ili nije direktorijum.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Dir. C „%1“ ne postoji ili nije direktorijum.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Greška pri otvaranju direktorijuma" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "Odredišni direktorijum ne sme biti isti kao A ili B kada se stapaju tri " "direktorijuma.\n" "Proverite ponovo pre nego nastavite." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Upozorenje o parametrima" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Pregledam direktorijume..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Čitam direktorijum A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Čitam direktorijum B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Čitam direktorijum C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Neki poddirektorijumi nisu bili čitljivi u" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Proverite dozvole poddirektorijuma." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Spreman." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Status poređenja direktorijuma" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Broj poddirektorijuma:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Broj jednakih fajlova:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Broj različitih fajlova:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Broj ručnih stapanja:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Ovo utiče na sve operacije stapanja." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Menjam sve operacije stapanja" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Nastavi" -#: directorymergewindow.cpp:1169 +#: 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 " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Uraditi." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Kopiraj A u B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Kopiraj B u A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Obriši A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Obriši B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Obriši A i B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Stopi u A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Stopi u B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Stopi A i B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Obriši (ako postoji)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Stopi" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Stopi (ručno)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Greška: Sukobljeni tipovi fajlova" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Greška: Datumi su jednaki ali fajlovi nisu." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Ova operacija trenutno nije moguća." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Operacija nije moguća" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -346,42 +351,47 @@ msgstr "" "\n" "Ako znate kako ovo da ponovite, kontaktirajte autora programa." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Programska greška" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Došlo je do greške u toku kopiranja.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Došlo je do greške u toku kopiranja.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Greška." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Gotovo." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Nije snimljeno." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Nepoznata operacija stapanja. (Ovo nikad ne sme da se desi!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Nepoznata operacija stapanja." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -400,342 +410,349 @@ msgstr "" "Pazite da program još uvek ima beta status i nema NIKAKVIH GARANCIJA uopšte! " "Napravite rezervu svojih najvažnijih podataka!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Počinjem stapanje" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Uradi" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Simuliraj" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -"Istaknuta stavka ima različit tip u različitim direktorijumima. Izaberite šta " -"je činiti." +"Istaknuta stavka ima različit tip u različitim direktorijumima. Izaberite " +"šta je činiti." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" "Datumi izmene fajla su jednaki ali fajlovi nisu. Izaberite šta je činiti." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" "Ova operacija trenutno nije moguća zato što je stapanje direktorijuma u toku." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Došlo je do greške u poslednjem koraku.\n" "Želite li da nastavite sa stavkom koja je izazvala grešku ili želite da je " "preskočite?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Nastavi stapanje posle greške" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Nastavi sa poslednjom stavkom" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Preskoči stavku" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Preskočeno." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "U toku..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Operacija stapanja je završena." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Stapanje je završeno" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Simulirano stapanje je završeno: Proverite da li se slažete sa predloženim " "operacijama." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -"Došlo je do greške. Pritisnite „U redu“ da biste videli detaljne informacije.\n" +"Došlo je do greške. Pritisnite „U redu“ da biste videli detaljne " +"informacije.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Greška: U toku brisanja %1: Pravljenje rezerve nije uspelo." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "obriši direktorijum rekurzivno( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "obriši( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Greška: Operacija brisanja direktorijuma nije uspela u toku pokušaja da se " "direktorijum pročita." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Greška: Operacija rmdir( %1 ) nije uspela." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Greška: Operacija brisanja nije uspela." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ručno stapanje( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -" Napomena: Posle ručnog stapanja korisnik bi trebalo da nastavi pomoću F7." +" Napomena: Posle ručnog stapanja korisnik bi trebalo da nastavi pomoću " +"F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -"Greška: Kopiranje( %1 -> %2 ) nije uspelo. Brisanje postojećeg odredišta nije " -"uspelo." +"Greška: Kopiranje( %1 -> %2 ) nije uspelo. Brisanje postojećeg odredišta " +"nije uspelo." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "kopiranje veze( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Greška: Kopiranje veze nije uspelo: Udaljene veze još uvek nisu podržane." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Greška: Kopiranje veze nije uspelo." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "kopiraj( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Greška u toku preimenovanja( %1 -> %2 ): Ne mogu da obrišem postojeće " "odredište." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "preimenuj( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Greška: Preimenovanje nije uspelo." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Greška u toku pravljenja direktorijuma %1. Ne mogu da obrišem postojeći fajl." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "napravi direktorijum( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Greška u toku pravljenja direktorijuma." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Odr." -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Dir." -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Tip" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Vel." -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Atr." -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Poslednja izmena" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Veza-odredište" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Fajl..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "nije dostupno" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (odr.): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (baza): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (odr.): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (odr.): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Odr.: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Stapanje direktorijuma" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Pokreni/nastavi stapanje direktorijuma" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Pokreni operaciju za tekuću stavku" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Uporedi izabrani fajl" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Stopi tekući fajl" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Sažmi sve poddirektorijume" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Raširi sve poddirektorijume" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Izaberi A za sve stavke" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Izaberi B za sve stavke" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Izaberi C za sve stavke" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Automatski izaberi operaciju za sve stavke" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Nema operacije za sve stavke" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Show Different Files" msgstr "Broj različitih fajlova:" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Uporedi izabrani fajl" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Uporedi izabrani fajl" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Ne radi ništa" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Obriši A i B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Stopi u A i B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -"U toku pokušaja da se napravi rezerva, brisanje starije rezerve nije uspelo.\n" +"U toku pokušaja da se napravi rezerva, brisanje starije rezerve nije " +"uspelo.\n" "Ime fajla: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -743,193 +760,200 @@ msgstr "" "U toku pokušaja da se napravi rezerva, preimenovanje nije uspelo.\n" "Imena fajlova: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Dobavljam status fajla: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Čitam fajl: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Pišem fajl: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Nema memorije" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Pravim direktorijum: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Uklanjam direktorijum: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Uklanjam fajl: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Pravim simboličku vezu: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Uklanjam fajl: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Kopiram fajl: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" "Greška tokom operacije kopiranja fajlova: Otvaranje fajla za čitanje nije " "uspelo. Ime fajla: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" "Greška tokom operacije kopiranja fajlova: Otvaranje fajla za pisanje nije " "uspelo. Ime fajla: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" "Greška tokom operacije kopiranja fajlova: Čitanje nije uspelo. Ime fajla: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" "Greška tokom operacije kopiranja fajlova: Pisanje nije uspelo. Ime fajla: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Čitam direktorijum: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Listam direktorijum: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 #, fuzzy msgid "Current Configuration:" msgstr "Operacija sinh. tekuće stavke" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "Greška pri otvaranju fajla" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Opcija --auto je upotrebljena, ali nije naveden izlazni fajl." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Opcija --auto se ignoriše za poređenje direktorijuma." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Snimanje nije uspelo." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Otvaranje ovih fajlova nije uspelo:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Greška pri otvaranju fajla" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Otvara dokumente za poređenje..." -#: kdiff3.cpp:423 +#: 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!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Snima tekuće dokumente kao..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Izlazi iz programa" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Iseca izabranu sekciju i stavlja je u klipbord" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Kopira izabranu sekciju u klipbord" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Prenosi sadržaj klipborda na tekuću poziciju" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Potraži znakovni niz" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Ponovo potraži znakovni niz" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Uključuje/isključuje traku sa alatima" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Uključuje/isključuje statusnu traku" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Podesi KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Idi na tekuću deltu" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Idi na prvu deltu" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Idi na poslednju deltu" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -"(preskače razlike u belim razmacima kada je „Prikaži bele razmake“ isključeno.)" +"(preskače razlike u belim razmacima kada je „Prikaži bele razmake“ " +"isključeno.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -937,236 +961,244 @@ msgstr "" "(ne preskače razlike u belim razmacima čak i kada je „Prikaži bele razmake“ " "isključeno.)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Idi na prethodnu deltu" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Idi na sledeću deltu" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Idi na prethodni sukob" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Idi na sledeći sukob" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Idi na prethodni nerešeni sukob" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Idi na sledeći nerešeni sukob" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Izaberite linije iz A" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Izaberite linije iz B" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Izaberite linije iz C" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Automatski idi na sledeći nerešeni sukob posle izbora izvora" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Prikaži znakove razmaka i tabulatora za razlike" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Prikaži bele razmake" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Prikaži brojeve linija" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Svuda izaberi A" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Svuda izaberi B" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Svuda izaberi C" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Izaberi A za sve nerešene sukobe" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Izaberi B za sve nerešene sukobe" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Izaberi C za sve nerešene sukobe" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Izaberi A za sve nerešene sukobe belih razmaka" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Izaberi B za sve nerešene sukobe belih razmaka" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Izaberi C za sve nerešene sukobe belih razmaka" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Automatski reši jednostavne sukobe" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Postavi delte na sukobe" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Automatski reši jednostavne sukobe" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 #, fuzzy msgid "Join Selected Diffs" msgstr "Uporedi izabrani fajl" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Prikaži prozor A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Prikaži prozor B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Prikaži prozor C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Fokusiraj sledeći prozor" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Normalan pregled" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "Pregled A prema B" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "Pregled A prema C" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "Pregled B prema C" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Diff prozori preloma reči" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Fokusiraj prethodni prozor" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Promeni orijentaciju razdvajanja" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Podeljeni prikaz ekrana za dir. i tekst" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Promeni između dir. i tekst. prikaza" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Rezultat stapanja nije snimljen." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Snimi i izađi" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Izađi bez snimanja" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Snimanje rezultata stapanja nije uspelo." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 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:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Snimam fajl..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Snimam fajl pod novim imenom..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "Izlazim..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 #, fuzzy msgid "Printing completed." msgstr "Operacija stapanja je završena." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Izlazim..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Uključujem/isključujem traku sa alatom..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Uključi/isključi statusnu traku..." @@ -1181,8 +1213,8 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Nisam mogao da nađem naš deo!\n" "Ovo se obično dešava zbog instalacionog problema. Pročitajte fajl README u " @@ -1263,20 +1295,19 @@ msgstr "fajl3 za otvoranje" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" "+ Mnogo hvala onima koji su prijavljivali greške i doprineli svojim idejama!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Broj preostalih nerešenih sukoba: %1 (od kojih su %2 beli razmaci)" @@ -1288,55 +1319,31 @@ msgstr "" "Izlaz je izmenjen.\n" "Ako nastavite, vaše izmene će biti izgubljene." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Svi ulazni fajlovi su binarno jednaki." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Svi ulazni fajlovi sadrže isti tekst." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Fajlovi A i B su binarno jednaki.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Fajlovi A i B imaju jednak tekst.\n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Fajlovi A i C su binarno jednaki.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Fajlovi A i C imaju jednak tekst.\n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Fajlovi B i C su binarno jednaki.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +#, fuzzy +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Fajlovi B i C su binarno jednaki.\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Fajlovi B i C imaju jednak tekst.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Fajlovi A i B imaju jednak tekst.\n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Ukupan broj sukoba: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1344,7 +1351,7 @@ msgstr "" "\n" "Broj automatski rešenih sukoba: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1352,23 +1359,23 @@ msgstr "" "\n" "Broj nerešenih sukoba: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Sukobi" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1376,11 +1383,11 @@ msgstr "" "Još uvek nisu rešeni svi sukobi.\n" "Fajl nije snimljen.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Preostali sukobi" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1390,29 +1397,29 @@ msgstr "" "\n" "Pravljenje rezerve nije uspelo. Fajl nije snimljen." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Greška u snimanju fajla" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Greška prilikom pisanja." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Izlaz" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Izmenjen]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 #, fuzzy msgid "Encoding for saving" msgstr "Kodiranje fajla za C:" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1432,6 +1439,15 @@ 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" @@ -1557,10 +1573,8 @@ msgid "Auto indentation" msgstr "Automatsko uvlačenje" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"Uključeno: Uvlačenje prethodne linije koristi se za novu liniju.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "Uključeno: Uvlačenje prethodne linije koristi se za novu liniju.\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1596,63 +1610,55 @@ msgstr "KDiff3" msgid "Diff Settings" msgstr "Postavke razlike i stapanja" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Očuvaj CR" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Prikaži CR znakove „\\r“ ako postoje.\n" -"Pomaže da se uporede fajlovi koji su menjani pod različitim operativnim " -"sistemima." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Tretiraj C/C++ komentare kao bele razmake." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Ignoriši brojeve" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "Ignoriši brojevne znakove tokom faze poklapanja linija. (Slično ignorisanju " "belih razmaka.)\n" "Može vam pomoći pri upoređivanju fajlova sa numeričkim podacima." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Ignoriši C/C++ komentare" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Tretiraj C/C++ komentare kao bele razmake." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Zanemari veličinu slova" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Tretira razliku u veličini kao promene belog prostora. („a“<=>„A“)" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Predobradna naredba:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Korisnički definisana predobrada. (Pogledajte dokumentaciju za detalje.)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Predobradna naredba za poklapanje linija:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1660,11 +1666,11 @@ msgstr "" "Predobrada se koristi samo tokom poklapanja linija.\n" "(Pogledajte dokumentaciju za detalje.)" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Potrudi se (sporije)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1672,11 +1678,16 @@ msgstr "" "Uključuje opciju --minimal za spoljašnje razlikovanje.\n" "Analiza velikih fajlova će biti mnogo sporija." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Postavke razlike i stapanja" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Zastoj automatskog napredovanja (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" @@ -1684,40 +1695,35 @@ msgstr "" "U režimu automatskog napredovanja rezultat tekućeg izbora prikazuje se \n" "navedeno vreme, pre skoka na sledeći sukob. Opseg: 0-2000 ms" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Postavke razlike i stapanja" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Podrazumevano stapanje belih razmaka dva fajla:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Ručni izbor" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -"Dozvoljava algoritmu stapanja da automatski izabere ulaz za izmene samo u belim " -"razmacima." +"Dozvoljava algoritmu stapanja da automatski izabere ulaz za izmene samo u " +"belim razmacima." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Podrazumevano stapanje belih razmaka tri fajla:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1725,58 +1731,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1786,46 +1793,67 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Broj poddirektorijuma:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Stapanje direktorijuma" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Rekurzivni direktorijumi" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Da li da se analiziraju poddirektorijumi." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Oblici fajlova:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1835,11 +1863,11 @@ msgstr "" "Džokeri: „*“ i „?“\n" "Više oblika možete navesti koristeći razdvajač: „;“" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Antioblici fajlova:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1849,11 +1877,11 @@ msgstr "" "Džokeri: „*“ i „?“\n" "Više oblika možete navesti koristeći razdvajač: „;“" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Antioblici direktorijuma:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1863,11 +1891,11 @@ msgstr "" "Džokeri: „*“ i „?“\n" "Više oblika možete navesti koristeći razdvajač: „;“" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Koristi fajl .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1875,23 +1903,23 @@ msgstr "" "Proširuje antioblik na sve što bi CVS ignorisao.\n" "Preko lokalnih fajlova „.cvsignore“ ovo može biti posebno po direktorijumu." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Pronađi skrivene fajlove i direktorijume" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Nalazi fajlove i direktorijume sa atributom skrivenih." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Nalazi fajlove i direktorijume koji počinju sa „.“" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Prati veze fajlova" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1899,11 +1927,11 @@ msgstr "" "Uključeno: Poredi fajlove na koje pokazuju veze.\n" "Isključeno: Poredi veze." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Prati veze direktorijuma" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1911,11 +1939,11 @@ msgstr "" "Uključeno: Poredi direktorijume na koje pokazuju veze.\n" "Isključeno: Poredi veze." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1923,23 +1951,23 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Režim poređenja fajlova" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Binarno poređenje" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Binarno poređenje za svaki fajl. (Podrazumevano)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Puna analiza" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1947,24 +1975,47 @@ msgstr "" "Radi punu analizu i prikazuje statističke podatke u dodatnim kolonama.\n" "(Sporije nego binarno poređenje, mnogo sporije za binarne fajlove.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Veruj datumu izmene (nije bezbedno)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" -"Pretpostavi da su fajlovi jednaki ako su datum izmene i dužina fajla jednaki.\n" +"Pretpostavi da su fajlovi jednaki ako su datum izmene i dužina fajla " +"jednaki.\n" "Korisno za velike direktorijume ili spore mreže." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Pretpostavi da su fajlovi jednaki ako su datum izmene i dužina fajla " +"jednaki.\n" +"Korisno za velike direktorijume ili spore mreže." + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Veruj veličini (nije bezbedno)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -1974,11 +2025,11 @@ msgstr "" "Korisno za velike direktorijume ili spore mreže kada se datum izmene u toku " "preuzimanja." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Sinhronizuj direktorijume" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -1988,11 +2039,11 @@ msgstr "" "da su oba direktorijuma posle toga ista.\n" "Radi samo kada se porede dva direktorijuma bez navođenja odredišta." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Razlike u belim razmacima smatraju se jednakim" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -2000,11 +2051,11 @@ msgstr "" "Ako se fajlovi razlikuju samo u belim razmacima, smatraju se jednakim.\n" "Ovo je aktivno samo kada se izabere puna analiza." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Kopiraj noviji umesto stapanja (nije bezbedno)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2014,11 +2065,11 @@ msgstr "" "(Koristite ovo samo ako znate šta radite!)\n" "Ima efekta samo kada se porede dva direktorijuma." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Rezerviši fajlove (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2026,15 +2077,15 @@ msgstr "" "Kada treba snimiti fajl preko starog fajla, stari fajl će biti\n" "preimenovan sa nastavkom „.orig“ umesto da bude obrisan." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Regionalna podešavanja" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Jezik (potrebno ponovno pokretanje)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2042,11 +2093,11 @@ msgstr "" "Izaberite jezik za ispise u programu ili „Auto“.\n" "Da bi izmena jezika bila primenjena, zatvorite i ponovo pokrenite KDiff3." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Koristi isto kodiranje za sve:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." @@ -2054,60 +2105,60 @@ msgstr "" "Uključivanjem ovog možete promeniti sva kodiranja promenom samo prvog.\n" "Isključite ovo ako su potrebna različita pojedina podešavanja." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Napomna: Lokalno kodiranje je " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "Kodiranje fajla za A:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "Kodiranje fajla za B:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "Kodiranje fajla za C:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Kodiranje fajla za stopljeni izlaz i snimanje:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "Automatsko kopiranje izbora" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Kodiranje fajla za preprocesorke fajlove:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Jezici s desna u levo" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2115,21 +2166,21 @@ msgstr "" "Neki jezici se čitaju s desna u levo.\n" "Ovo podešavanje će prilagoditi tome prikazivač i uređivač." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "Operacija" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration Settings" msgstr "Regionalna podešavanja" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2137,7 +2188,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2153,19 +2224,19 @@ msgstr "" "\n" "Želite li da nastavite ili ćete izabrati drugi font?" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Nekompatibilan font" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Nastavite na sopstveni rizik" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Izaberite drugi font" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "Ovo resetuje sve opcije. Ne samo one u tekućoj temi." @@ -2174,10 +2245,8 @@ msgid "PreprocessorCmd: " msgstr "Preprocesorka naredba: " #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"Sledeće opcije koje ste izabrali mogu izmeniti podatke:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "Sledeće opcije koje ste izabrali mogu izmeniti podatke:\n" #: pdiff.cpp:264 msgid "" @@ -2242,19 +2311,10 @@ msgstr "Raz.lin.: A <-> C" msgid "All input files contain the same text, but are not binary equal." msgstr "Svi ulazni fajlovi sadrže isti tekst." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -#, fuzzy -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Fajlovi B i C su binarno jednaki.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 #, fuzzy -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"Fajlovi A i B su binarno jednaki.\n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Fajlovi A i B su binarno jednaki.\n" #: pdiff.cpp:530 msgid "" @@ -2266,109 +2326,55 @@ msgstr "" "Imajte na umu da KDiff3 stapanje nije namenjeno binarnim podacima.\n" "Nastavite na sopstveni rizik." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Prekini" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Otvaram fajlove..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Greška pri otvaranju fajla" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Isecam izabrano..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Kopiram izabrano u klipbord..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Ubacujem sadržaj klipborda..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Snimi i nastavi" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Nastavi bez snimanja" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Pretraga je završena." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Pretraga je gotova" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "Greška u toku pravljenja direktorijuma." -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Podesi KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Direktorijum" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Operacija stapanja tekuće stavke" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Operacija sinh. tekuće stavke" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Kretanje" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "D&iff prikaz" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Stopi" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "P&rozor" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (baza):" @@ -2411,6 +2417,10 @@ msgstr "Izlaz (opciono):" msgid "Configure..." msgstr "Podesi..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Tekst za pretragu:" @@ -2483,6 +2493,14 @@ 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 "" @@ -2496,6 +2514,88 @@ msgstr "Snimanje nije uspelo." msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Direktorijum" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Operacija stapanja tekuće stavke" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Operacija sinh. tekuće stavke" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Kretanje" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "D&iff prikaz" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Stopi" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "P&rozor" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Fajlovi A i B su binarno jednaki.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Fajlovi A i C su binarno jednaki.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Fajlovi A i C imaju jednak tekst.\n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Fajlovi B i C su binarno jednaki.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Fajlovi B i C imaju jednak tekst.\n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Očuvaj CR" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Prikaži CR znakove „\\r“ ako postoje.\n" +#~ "Pomaže da se uporede fajlovi koji su menjani pod različitim operativnim " +#~ "sistemima." + #, fuzzy #~ msgid "Diff and Merge" #~ msgstr "Razlika i stapanje" @@ -2570,8 +2670,10 @@ msgstr "" #~ msgid "Convert to upper case" #~ msgstr "Pretvori u velika slova" -#~ msgid "Turn all lower case characters to upper case on reading. (e.g.: 'a'->'A')" -#~ msgstr "Pretvori sve znakove malih slova u velika pri čitanju. (npr.: „a“->„A“)" +#~ msgid "" +#~ "Turn all lower case characters to upper case on reading. (e.g.: 'a'->'A')" +#~ msgstr "" +#~ "Pretvori sve znakove malih slova u velika pri čitanju. (npr.: „a“->„A“)" #, fuzzy #~ msgid "Convert to upper case\n" @@ -2579,9 +2681,13 @@ msgstr "" #~ msgid "" #~ "Running the external diff failed.\n" -#~ "Check if the diff works, if the program can write in the temp folder or if the disk is full.\n" -#~ "The external diff option will be disabled now and the internal diff will be used." +#~ "Check if the diff works, if the program can write in the temp folder or " +#~ "if the disk is full.\n" +#~ "The external diff option will be disabled now and the internal diff will " +#~ "be used." #~ msgstr "" #~ "Pokretanje spoljašnjeg razlikovanja nije uspelo.\n" -#~ "Proverite da li to razlikovanje radi, da li program može da piše u privremeni direktorijum i da li ima prostora na disku.\n" -#~ "Opcija spoljašnjeg razlikovanja će sada biti isključena i koristiće se unutrašnje." +#~ "Proverite da li to razlikovanje radi, da li program može da piše u " +#~ "privremeni direktorijum i da li ima prostora na disku.\n" +#~ "Opcija spoljašnjeg razlikovanja će sada biti isključena i koristiće se " +#~ "unutrašnje." diff --git a/po/sv.po b/po/sv.po index 5dad24e..1f01cab 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,36 +5,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2006-11-05 16:50+0100\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Stefan Asserhäll" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "stefan.asserhall@comhem.se" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Skrivning av klippbordsdata till tillfällig fil misslyckades." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Från klippbord" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -48,7 +49,7 @@ msgstr "" "\n" "Preprocessingkommandot inaktiveras nu." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -56,13 +57,14 @@ msgid "" "\n" "The line-matching-preprocessing command will be disabled now." msgstr "" -"Preprocessingen för radmatchning misslyckades möjligen. Kontrollera kommandot:\n" +"Preprocessingen för radmatchning misslyckades möjligen. Kontrollera " +"kommandot:\n" "\n" " %1\n" "\n" "Preprocessingen för radmatchning inaktiveras nu." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -70,15 +72,15 @@ msgstr "" "Dataförlustfel:\n" "Om det går att upprepa, kontakta upphovsmannen.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Allvarligt internt fel" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "Övre rad" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Slut" @@ -94,244 +96,249 @@ msgstr "Länk: " msgid "Size. " msgstr "Storlek: " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Datum och storlek: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Att skapa tillfällig kopia av %1 misslyckades." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Öppna %1 misslyckades." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Jämför fil..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Fel vid läsning från %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Namn" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Åtgärd" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Olöst" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Löst" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Inte blank" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Blank" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" 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?" +"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:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Fortsätt sammanfoga" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Öppna katalogerna misslyckades:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Katalog A \"%1\" finns inte eller är inte en katalog.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Katalog A \"%1\" finns inte eller är inte en katalog.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Katalog B \"%1\" finns inte eller är inte en katalog.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Katalog B \"%1\" finns inte eller är inte en katalog.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Katalog C \"%1\" finns inte eller är inte en katalog.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Katalog C \"%1\" finns inte eller är inte en katalog.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Fel vid öppna katalog" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -"Målkatalogen får inte vara samma som A eller B när tre kataloger sammanfogas.\n" +"Målkatalogen får inte vara samma som A eller B när tre kataloger " +"sammanfogas.\n" "Kontrollera igen innan du fortsätter." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Parametervarning" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Söker i kataloger..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Läser katalog A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Läser katalog B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Läser katalog C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Vissa underkataloger kunde inte läsas i" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Kontrollera rättigheter för underkatalogerna." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Klar." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Status för katalogjämförelse" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Antal underkataloger:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Antal likadana filer:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Antal olika filer:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Antal manuella sammanfogningar:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Det här påverkar alla sammanfogningsåtgärder." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Ändra alla sammanfogningsåtgärder" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "F&ortsätt" -#: directorymergewindow.cpp:1169 +#: 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 " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Att göra." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Kopiera A till B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Kopiera B till A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Ta bort A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Ta bort B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Ta bort A och B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Sammanfoga till A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Sammanfoga till B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Sammanfoga till A och B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Ta bort (om den finns)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Sammanfoga" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Sammanfoga (manuellt)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Fel: Konflikt i filtyper" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Fel: Datum är lika men filerna är det inte." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Den här åtgärden är för närvarande inte möjlig att utföra." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Åtgärd inte möjlig" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -345,42 +352,47 @@ msgstr "" "\n" "Om du vet hur du kan upprepa detta, kontakta programmets upphovsman." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Programfel" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Ett fel uppstod vid kopiering.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Ett fel uppstod vid kopiering.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Fel." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Klar." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Inte sparad." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Okänd sammanfogningsåtgärd. (Det här får aldrig inträffa!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Okänd sammanfogningsåtgärd." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -397,330 +409,334 @@ msgstr "" "Genom att välja \"Simulera det\" får du reda på vad som skulle hända.\n" "\n" "Var medveten om att det här programmet fortfarande har beta-status, och det " -"finns INGA GARANTIER överhuvudtaget! Gör säkerhetskopior av viktig information!" +"finns INGA GARANTIER överhuvudtaget! Gör säkerhetskopior av viktig " +"information!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Startar sammanfogning" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Gör det" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Simulera det" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -"Det markerade objektet har olika typ i de olika katalogerna. Välj vad du vill " -"göra." +"Det markerade objektet har olika typ i de olika katalogerna. Välj vad du " +"vill göra." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -"Ändringsdatum för filerna är samma, men filerna är det inte. Välj vad du vill " -"göra." +"Ändringsdatum för filerna är samma, men filerna är det inte. Välj vad du " +"vill göra." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" "Den här åtgärden är för närvarande inte möjlig eftersom katalogsammanfogning " "för närvarande kör." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Ett fel uppstod under föregående steg.\n" "Vill du fortsätta med objektet som orsakade felet, eller vill du hoppa över " "objektet?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Fortsätt sammanfoga efter ett fel" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Fortsätt med sista objekt" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Hoppa över objekt" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Överhoppad." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "Pågår..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Sammanfogningsåtgärd färdig." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Sammanfogning färdig" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -"Simulerad sammanfogning färdig. Kontrollera om du håller med om de föreslagna " -"åtgärderna." +"Simulerad sammanfogning färdig. Kontrollera om du håller med om de " +"föreslagna åtgärderna." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Ett fel uppstod. Tryck på Ok för att se detaljerad information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Ett fel uppstod. Tryck på Ok för att se detaljerad information.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Fel: Vid borttagning av %1: Misslyckades skapa säkerhetskopia." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "Ta bort katalog rekursivt (%1)" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "Ta bort (%1)" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Fel: Borttagningsåtgärd för katalog misslyckades när katalogen skulle läsas." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Fel: Åtgärden rmdir (%1) misslyckades." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Fel: Borttagningsåtgärden misslyckades." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "Manuell sammanfogning (%1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -" Observera: Efter en manuell sammanfogning bör användaren fortsätta genom " -"att trycka på F7." +" Observera: Efter en manuell sammanfogning bör användaren fortsätta " +"genom att trycka på F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Fel: Kopiering (%1 -> %2) misslyckades. Borttagning av befintlig fil " "misslyckades." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "Kopiera länk (%1 -> %2)" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Fel: Kopiera länk misslyckades: Fjärrlänkar stöds inte ännu." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Fel: Kopiera länk misslyckades." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "Kopiera (%1 -> %2)" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Fel vid namnbyte (%1 -> %2): Kan inte ta bort befintlig fil." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "Byt namn (%1 -> %2)" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Fel: Namnbyte misslyckades." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Fel när katalogen %1 skulle skapas: Kan inte ta bort befintlig fil." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "Skapa katalog (%1)" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Fel vid skapa katalog." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Mål" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Katalog" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Typ" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Storlek" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Egenskap" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Senast ändrad" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Länkmål" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Fil..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "Ej tillgänglig" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (mål): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (bas): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (mål): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (mål): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Mål: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "Spara tillstånd för katalogsammanfogning som..." -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Starta eller fortsätt katalogsammanfogning" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Utför åtgärd för aktuellt objekt" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Jämför markerade filer" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Sammanfoga markerade filer" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Dra ihop alla underkataloger" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Expandera alla underkataloger" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Välj A för alla objekt" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Välj B för alla objekt" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Välj C för alla objekt" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Välj automatiskt åtgärd för alla objekt" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Ingen åtgärd för något objekt" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "Visa identiska filer" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 msgid "Show Different Files" msgstr "Visa olika filer" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "Visa bara filer i A" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "Visa bara filer i B" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "Visa bara filer i C" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "Jämför explicit markerade filer" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "Sammanfoga explicit markerade filer" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Gör ingenting" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Ta bort A och B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Sammanfoga till A och B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " @@ -729,7 +745,7 @@ msgstr "" "säkerhetskopia.\n" "Filnamn: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -737,188 +753,196 @@ msgstr "" "Vid försök att skapa en säkerhetskopia, misslyckades namnbyte.\n" "Filnamn: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Hämtar filstatus: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Läser fil: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Skriver fil: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Slut på minne" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Skapar katalog: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Tar bort katalog: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Tar bort fil: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Skapar symbolisk länk: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Byter namn på fil: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Kopierar fil: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -"Fel under filkopieringsåtgärd: Öppna fil för läsning misslyckades. Filnamn: %1" +"Fel under filkopieringsåtgärd: Öppna fil för läsning misslyckades. Filnamn: " +"%1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" -msgstr "" -"Fel under filkopieringsåtgärd: Öppna fil för skrivning misslyckades. Filnamn: " +"Error during file copy operation: Opening file for writing failed. Filename: " "%1" +msgstr "" +"Fel under filkopieringsåtgärd: Öppna fil för skrivning misslyckades. " +"Filnamn: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "Fel under filkopieringsåtgärd: Läsning misslyckades. Filnamn: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Fel under filkopieringsåtgärd: Skrivning misslyckades. Filnamn: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Läser katalog: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Listar katalog: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "Aktuell inställning:" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 msgid "Config Option Error:" msgstr "Fel i inställningsalternativ:" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Väljaren --auto användes, men ingen utdatafil angavs." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Väljaren --auto ignoreras för katalogjämförelse." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Misslyckades spara." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Misslyckades öppna följande filer:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Fel vid öppna fil" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Öppnar dokument för jämförelse..." -#: kdiff3.cpp:423 +#: 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." -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Sparar aktuellt dokument som..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "Skriv ut skillnaderna" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Avslutar programmet" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Klipper ut markerad del och flyttar den till klippbordet" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Kopierar markerad del till klippbordet" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Klistrar in klippbordets innehåll på aktuell position" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "Markera allting i nuvarande fönster" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Sök efter en sträng" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Sök efter strängen igen" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Aktiverar/inaktiverar verktygsraden" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Aktiverar/inaktiverar statusraden" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Anpassa Kdiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Gå till aktuell skillnad" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Gå till första skillnad" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Gå till sista skillnad" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -"(Hoppar över skillnader i blanktecken när \"Visa blanktecken\" är inaktiverat.)" +"(Hoppar över skillnader i blanktecken när \"Visa blanktecken\" är " +"inaktiverat.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -926,234 +950,242 @@ msgstr "" "(Hoppar inte över skillnader i blanktecken även när \"Visa blanktecken\" är " "inaktiverat.)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Gå till föregående skillnad" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Gå till nästa skillnad" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Gå till föregående konflikt" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Gå till nästa konflikt" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Gå till föregående olösta konflikt" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Gå till nästa olösta konflikt" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Välj rad(er) från A" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Välj rad(er) från B" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Välj rad(er) från C" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Gå automatiskt till nästa olösta konflikt efter val av källa" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Visa mellanslag och tabulatortecken i jämförelse" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Visa blanktecken" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Visa radnummer" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Välj A överallt" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Välj B överallt" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Välj C överallt" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Välj A för alla olösta konflikter" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Välj B för alla olösta konflikter" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Välj C för alla olösta konflikter" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Välj A för olösta konflikter med blanktecken" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Välj B för olösta konflikter med blanktecken" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Välj C för olösta konflikter med blanktecken" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Lös automatiskt enkla konflikter" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Ändra skillnader till konflikter" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "Kör automatisk sammanfogning med reguljärt uttryck" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "Lös automatiskt historikkonflikter" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "Dela jämförelse vid markering" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 msgid "Join Selected Diffs" msgstr "Foga ihop markerade jämförelser" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Visa fönster A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Visa fönster B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Visa fönster C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Fokus till nästa fönster" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Normal översikt" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "A mot B-översikt" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "A mot C-översikt" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "B mot C-översikt" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Radbryt skillnadsfönster" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "Lägg till manuell justering av jämförelse" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "Rensa alla manuella justeringar av jämförelse" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Fokus till föregående fönster" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Byt delningsorientering" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Delad skärmvy för kataloger och text" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Byt mellan katalog och textvy" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Sammanfogningsresultatet har inte sparats." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Spara och avsluta" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Avsluta utan att spara" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Misslyckades spara sammanfogningsresultatet." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -"Du håller för närvarande på med en katalogsammanfogning. Är du säker på att du " -"vill avbryta?" +"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:625 +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Sparar fil..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Sparar fil med ett nytt namn..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 msgid "Printing..." msgstr "Skriver ut..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "Utskrift avbruten." -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "Markering" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 msgid "Printing completed." msgstr "Utskrift färdig." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Avslutar..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Växlar verktygsrad..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Växla statusraden..." @@ -1168,8 +1200,8 @@ msgstr "Kdiff3-del" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Kunde inte hitta insticksprogram.\n" "Detta hänter oftast beroende på ett installationsproblem. Läs filen README i " @@ -1198,8 +1230,8 @@ msgstr "Utdatafil, igen. (för att fungera med vissa verktyg.)" #: main.cpp:46 msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -"Inget grafiskt gränssnitt om alla konflikter kan lösas automatiskt (kräver -o " -"fil)" +"Inget grafiskt gränssnitt om alla konflikter kan lösas automatiskt (kräver -" +"o fil)" #: main.cpp:47 msgid "Don't solve conflicts automatically. (For compatibility...)" @@ -1255,19 +1287,18 @@ msgstr "Fil 3 att öppna" msgid "Ignored. (User defined.)" msgstr "Ignoreras. (användardefinierad)" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "Kdiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "Samt stort tack till de som rapporterade fel och bidrog med idéer!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Antal återstående olösta konflikter: %1 (av vilka %2 är blanktecken)" @@ -1279,55 +1310,30 @@ msgstr "" "Utdata har ändrats.\n" "Om du fortsätter kommer dina ändringar att gå förlorade." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "Alla indatafiler är binärt lika." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Alla indatafiler innehåller samma text." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Filerna A och B är binärt lika.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Filerna %1 och %2 är binärt likadana.\n" -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Filerna A och B innehåller samma text.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Filerna A och B innehåller samma text.\n" -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Filerna A och C är binärt lika.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Filerna A och C innehåller samma text.\n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Filerna B och C är binärt lika.\n" - -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Filerna B och C innehåller samma text.\n" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Totalt antal konflikter: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1335,7 +1341,7 @@ msgstr "" "\n" "Antal automatiskt lösta konflikter: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1343,23 +1349,23 @@ msgstr "" "\n" "Antal olösta konflikter: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Konflikter" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1367,11 +1373,11 @@ msgstr "" "Alla konflikter har inte lösts ännu.\n" "Filen sparas inte.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Konflikter kvar" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1381,28 +1387,28 @@ msgstr "" "\n" "Misslyckades skapa säkerhetskopia. Filen sparades inte." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Fel vid spara fil" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Fel vid skrivning." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Utmatning" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Ändrad]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "Kodning för att spara" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "Kodare från" @@ -1422,6 +1428,15 @@ 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" @@ -1545,10 +1560,8 @@ msgid "Auto indentation" msgstr "Automatisk indentering" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"På: Indentering av föregående rad används för en ny rad.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "På: Indentering av föregående rad används för en ny rad.\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1582,61 +1595,54 @@ msgstr "Jämför" msgid "Diff Settings" msgstr "Inställningar av jämför" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Behåll returtecken" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Visa returtecken '\\r' om de finns.\n" -"Hjälper till att jämföra filer som ändrats med olika operativsystem." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Behandla C/C++ kommentarer som blanktecken." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Ignorera siffror" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "Ignorera siffror när rader matchas. (Liknar ignorera blanktecken.)\n" "Kan hjälpa till att jämföra filer med numerisk data." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Ignorera C/C++ kommentarer" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Behandla C/C++ kommentarer som blanktecken." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Ignorera skiftläge" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Behandla skiftlägesskillnader som blankteckenskillnader. ('a' <=> 'A')" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Preprocessorkommando:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Användardefinierad förbehandling (Se dokumentationen för detaljinformation.)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Preprocessorkommando för radmatchning:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1644,11 +1650,11 @@ msgstr "" "Den här preprocessorn används bara under radmatchning.\n" "(Se dokumentationen för detaljinformation.)" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Var noggrann (långsammare)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1656,52 +1662,52 @@ msgstr "" "Aktiverar väljaren --minimal för det externa verktyget diff.\n" "Analys av stora filer blir mycket långsammare." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +msgid "Merge Settings" +msgstr "Inställningar av sammanfoga" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Fördröjning vid automatisk fortsättning (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" "Vid läget automatisk fortsättning, visas resultatet av aktuell markering\n" -"under den angivna tiden, innan det går vidare till nästa konflikt. Intervall: " -"0-2000 ms." +"under den angivna tiden, innan det går vidare till nästa konflikt. " +"Intervall: 0-2000 ms." -#: optiondialog.cpp:809 -msgid "Merge Settings" -msgstr "Inställningar av sammanfoga" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "Standardvärde för sammanfogning av blanktecken med två filer:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Manuellt val" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -"Tillåt att sammanfogningsalgoritmen automatiskt väljer indata för ändringar av " -"bara blanktecken." +"Tillåt att sammanfogningsalgoritmen automatiskt väljer indata för ändringar " +"av bara blanktecken." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "Standardvärde för sammanfogning av blanktecken med tre filer:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "Automatisk sammanfogning med reguljärt uttryck" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "Reguljärt uttryck för automatisk sammanfogning:" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1712,12 +1718,12 @@ msgstr "" "När en rad med en konflikt matchar det reguljära uttrycket väljes -C\n" "om tillgängligt, annars väljes B." -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" "Kör automatisk sammanfogning med reguljärt uttryck när sammanfogning startar" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" @@ -1725,15 +1731,15 @@ msgstr "" "Kör automatisk sammanfogning med reguljärt\n" "uttryck omedelbart när en sammanfogning startar.\n" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "Sammanfogning enligt versionshanteringshistorik" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "Reguljärt uttryck för historikens början:" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" @@ -1743,39 +1749,41 @@ msgstr "" "Oftast innehåller raden nyckelordet \"$Log$\".\n" "Standardvärde: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "Reguljärt uttryck för historikpostens början:" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" "En av versionshanteringens historikposter består av flera rader.\n" -"Ange det reguljära uttrycket för att detektera första raden (utan den inledande " -"kommentaren).\n" +"Ange det reguljära uttrycket för att detektera första raden (utan den " +"inledande kommentaren).\n" "Använd parenteser för att gruppera nycklarna du vill använda för sortering.\n" -"Om det lämnas tomt, antar Kdiff3 att tomma rader skiljer historikposterna åt.\n" +"Om det lämnas tomt, antar Kdiff3 att tomma rader skiljer historikposterna " +"åt.\n" "Se dokumentationen för detaljinformation." -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "Sortering av historiksammanfogning" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "Sortera versionshanteringshistoriken med en nyckel." -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "Sorteringsnycklarnas ordning från historikpostens början:" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1793,26 +1801,35 @@ msgstr "" "Om det lämnas tomt, görs ingen sortering.\n" "Se dokumentationen för detaljinformation." -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" "Sammanfogning enligt versionshanteringshistorik när sammanfogning startar" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" "Kör automatisk sammanfogning enligt versionshanteringshistorik när " "sammanfogning startar." -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Antal underkataloger:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "Prova dina reguljära uttryck" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "Ej relevant sammanfogningskommando:" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" @@ -1822,23 +1839,35 @@ msgstr "" "när inga andra relevanta ändringar detekterades.\n" "Anropas med parametrarna: filnamn1 filnamn2 filnamn3" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Katalogsammanfogning" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Rekursiva kataloger" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Om underkataloger ska analyseras eller inte." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Mönster för filer:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1848,11 +1877,11 @@ msgstr "" "Jokertecken: '*' och '?'\n" "Flera mönster kan anges genom att använda skiljetecknet ';'" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "Undantagsmönster för filer:" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1862,11 +1891,11 @@ msgstr "" "Jokertecken: '*' och '?'\n" "Flera mönster kan anges genom att använda skiljetecknet ';'" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Undantagsmönster för kataloger:" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1876,11 +1905,11 @@ msgstr "" "Jokertecken: '*' och '?'\n" "Flera mönster kan anges genom att använda skiljetecknet ';'" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Använd .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1888,23 +1917,23 @@ msgstr "" "Utökar undantagsmönster med allt som skulle ignoreras av CVS.\n" "Med lokala \".cvsignore\" filer, kan det här vara katalogspecifikt." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Sök efter gömda filer och kataloger" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Söker efter filer och kataloger med egenskapen gömd." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Söker efter filer och kataloger som börjar med '.'." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Följ fillänkar" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1912,11 +1941,11 @@ msgstr "" "På: Jämför filen som länken pekar på.\n" "Av: Jämför länkarna." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Följ kataloglänkar" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1924,11 +1953,11 @@ msgstr "" "På: Jämför katalogen som länken pekar på.\n" "Av: Jämför länkarna." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "Skiftlägeskänslig filnamnsjämförelse" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1936,26 +1965,26 @@ msgid "" "off, otherwise on.)" msgstr "" "Katalogjämförelsen jämför filer eller kataloger när deras namn matchar.\n" -"Ange alternativet om namnens skiftläge måste matcha. (Normalvärdet för Windows " -"är av, annars på.)" +"Ange alternativet om namnens skiftläge måste matcha. (Normalvärdet för " +"Windows är av, annars på.)" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "Filjämförelseläge" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Binär jämförelse" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Binär jämförelse av varje fil. (Standardvärde)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Fullständig analys" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1963,24 +1992,45 @@ msgstr "" "Gör en fullständig analys och visa statistisk information i extra kolumner.\n" "(Långsammare än binär jämförelse, mycket långsammare för binärfiler.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Lita på ändringsdatum (inte säkert)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Antar att filer är lika om ändringsdatum och fillängden är lika.\n" +"Användbar för stora kataloger eller långsamma nätverk." + +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" "Useful for big directories or slow networks." msgstr "" "Antar att filer är lika om ändringsdatum och fillängden är lika.\n" "Användbar för stora kataloger eller långsamma nätverk." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Lita på storleken (inte säkert)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -1990,11 +2040,11 @@ msgstr "" "Användbar för stora kataloger eller långsamma nätverk när datum ändras under " "nerladdning." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Synkronisera kataloger" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -2004,11 +2054,11 @@ msgstr "" "blir likadana efteråt. Fungerar bara när två kataloger\n" "jämförs och ingen målkatalog anges." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "Skillnader i blanktecken anses lika" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -2016,11 +2066,11 @@ msgstr "" "Om filer bara skiljer sig med blanktecken, anse dem lika.\n" "Det här är bara aktiverat när fullständig analys väljes." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Kopiera nyare istället för att sammanfoga (inte säkert)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2030,11 +2080,11 @@ msgstr "" "(Använd bara det här om du vet vad du gör!)\n" "Har bara någon effekt när två kataloger jämförs." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Säkerhetskopior (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2042,15 +2092,15 @@ msgstr "" "När en fil skulle sparas och en gammal fil redan finns, kommer den\n" "gamla filen att döpas om med filändelsen '.orig' istället för att tas bort." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Regionsinställningar" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Språk (omstart krävs)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2058,11 +2108,11 @@ msgstr "" "Välj språk för strängarna i det grafiska gränssnittet eller \"Automatisk\".\n" "För att språkbytet ska ske, avsluta och starta om Kdiff3." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Använd samma kodning för allt:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." @@ -2071,48 +2121,49 @@ msgstr "" "första.\n" "Inaktivera det om olika individuella inställningar behövs." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Observera: Lokal kodning är " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "Filkodning för A:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" "Om aktiverad detekteras Unicode-kodning (UTF-16 eller UTF-8).\n" -"Om filens kodning inte kan detekteras, används den valda kodningen som reserv.\n" +"Om filens kodning inte kan detekteras, används den valda kodningen som " +"reserv.\n" "(Detektering av Unicode beror på den första byten i en fil - " "byteordningsmarkören \"BOM\".)" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "Detektera automatiskt Unicode" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "Filkodning för B:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "Filkodning för C:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "Filkodning för sammanfogad utdata och vid spara:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "Automatiskt markering" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " @@ -2122,15 +2173,15 @@ msgstr "" "I tvetydiga fall ombedes användaren att välja kodning för att spara med en " "dialogruta." -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "Filkodning för preprocessorfiler:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Språk som läses från höger till vänster" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2138,19 +2189,19 @@ msgstr "" "Vissa språk läses från höger till vänster.\n" "Inställningen ändrar visningen och editorn på motsvarande sätt." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "Integrering" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "Integreringsinställningar" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "Kommandoradsväljare att ignorera:" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2162,7 +2213,27 @@ msgstr "" "Flera värden kan anges om de åtskiljs av ';'\n" "Detta undertrycker felmeddelandet \"Okänd väljare\"." -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2178,19 +2249,19 @@ msgstr "" "\n" "Vill du fortsätta, eller vill du välja ett annat teckensnitt?" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Olämpligt teckensnitt" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Fortsätt på egen risk" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Välj ett annat teckensnitt" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "Det här återställer alla alternativ, inte bara de i nuvarande ämne." @@ -2199,10 +2270,8 @@ msgid "PreprocessorCmd: " msgstr "Preprocessorkommando: " #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"Följande alternativ du valde kan ändra data:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "Följande alternativ du valde kan ändra data:\n" #: pdiff.cpp:264 msgid "" @@ -2212,7 +2281,8 @@ msgid "" msgstr "" "\n" "Troligen är det inte önskvärt under en sammanfogning.\n" -"Vill du inaktivera inställningarna eller fortsätta med inställningarna aktiva?" +"Vill du inaktivera inställningarna eller fortsätta med inställningarna " +"aktiva?" #: pdiff.cpp:266 msgid "Option Unsafe for Merging" @@ -2266,17 +2336,9 @@ msgstr "Radjämförelse: A <-> C" msgid "All input files contain the same text, but are not binary equal." msgstr "Alla indatafiler innehåller samma text, men är inte binärt likadana." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Filerna %1 och %2 är binärt likadana.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"Filerna %1 och %2 har samma text, men är inte binärt likadana.\n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Filerna %1 och %2 har samma text, men är inte binärt likadana.\n" #: pdiff.cpp:530 msgid "" @@ -2288,108 +2350,54 @@ msgstr "" "Observera att Kdiff3:s sammanfogning inte är avsedd för binärdata.\n" "Fortsätt på egen risk." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Avbryt" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Öppnar filer..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Fel när filen öppnades" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Klipper ut markering..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Kopierar markering till klippbord..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Infogar klippbordets innehåll..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Spara och fortsätt" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Fortsätt utan att spara" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Sökning färdig." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Sökning färdig" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "Ingenting är markerad i något indatafönster med jämförelse." -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Error while adding manual diff range" msgstr "Fel vid tillägg av manuellt jämförelseintervall" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&Kdiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Anpassa Kdiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Katalog" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Sammanfogningsåtgärd för aktuellt objekt" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Synkroniseringsåtgärd för aktuellt objekt" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Förflyttning" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "&Jämförelsevy" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "Sa&mmanfoga" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "Fö&nster" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (bas):" @@ -2432,6 +2440,10 @@ msgstr "Utmatning (valfri):" msgid "Configure..." msgstr "Anpassa..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Söktext:" @@ -2510,6 +2522,14 @@ 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." @@ -2521,3 +2541,84 @@ msgstr "Matchning misslyckades." #: smalldialogs.cpp:559 msgid "Opening and closing parentheses don't match in regular expression." msgstr "Inledande och avslutande parenteser matchar inte i reguljärt uttryck." + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&Kdiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Katalog" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Sammanfogningsåtgärd för aktuellt objekt" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Synkroniseringsåtgärd för aktuellt objekt" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Förflyttning" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "&Jämförelsevy" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "Sa&mmanfoga" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "Fö&nster" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Filerna A och B är binärt lika.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Filerna A och C är binärt lika.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Filerna A och C innehåller samma text.\n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Filerna B och C är binärt lika.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Filerna B och C innehåller samma text.\n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Behåll returtecken" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Visa returtecken '\\r' om de finns.\n" +#~ "Hjälper till att jämföra filer som ändrats med olika operativsystem." diff --git a/po/ta.po b/po/ta.po index d7b23f9..c9fa8de 100644 --- a/po/ta.po +++ b/po/ta.po @@ -24,35 +24,36 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2004-08-24 04:28+0530\n" "Last-Translator: I. Felix \n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "prem" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "prem4ever_1983@yahoo.com" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "க்ளிப்போர்டின் எழுத்தின் தரத்தில் உள்ள டெம்ப் கோப்பு தவறு." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "கிளிப் போர்டிலிருந்து." -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -66,7 +67,7 @@ msgstr "" "\n" "முன்செயலிகள் கட்டளையை இப்பொழுதே முடக்கு," -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -80,7 +81,7 @@ msgstr "" "\n" "வரிசெல்களின் கட்டளையை இப்பொழுதே முடக்கு," -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -88,16 +89,16 @@ msgstr "" "தகவல் தவறானது.\n" "மீண்டும் உற்பத்தியானால் ஆசிரியரை அணுகவும்.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "கடுமையான உள்சார்ந்த தவறு." -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "மேல் வரி %1." -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "முடிவு" @@ -113,248 +114,250 @@ msgstr "இணைப்பு." msgid "Size. " msgstr "அளவு." -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "தேதி மற்றும் அளவு." -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "வார்ப்புரு படியெடு உருவாக்குவது %1 இயலவில்லை." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "திறப்பதற்கு %1 இயலவில்லை." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 #, fuzzy msgid "Comparing file..." msgstr "கோப்பினை ஒப்பிடுகிறது...." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "%1னிலிருந்து படிக்கும் பிழை" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "பெயர்." -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "இயக்கம்." -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "நிலை." -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Unsolved" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Solved" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Nonwhite" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "White" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"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:320 directorymergewindow.cpp:2868 +#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "மறுவருடல்" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "தொடர்ந்து ஒன்றாக சேர்." -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "அடைவு திறக்க இயலவில்லை:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"அடைவு எ \"%1\" இல்லை அல்லது அது ஒரு அடைவு இல்லை.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "அடைவு எ \"%1\" இல்லை அல்லது அது ஒரு அடைவு இல்லை.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"அடைவு B \"%1\" உபயோகத்தில் இல்லை (அ) அது ஒரு அடைவே அல்ல.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "அடைவு B \"%1\" உபயோகத்தில் இல்லை (அ) அது ஒரு அடைவே அல்ல.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"அடைவு C \"%1\" உபயோகத்தில் இல்லை (அ) அது ஒரு அடைவே அல்ல.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "அடைவு C \"%1\" உபயோகத்தில் இல்லை (அ) அது ஒரு அடைவே அல்ல.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "திறந்த தகவல் தளம் தவறு." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -"மூன்று அடைவுகள் ஒன்று சேரும் பொழுது, சேரும் அடைவு A (அ) B போன்று இருக்கக் " -"கூடாது.\n" +"மூன்று அடைவுகள் ஒன்று சேரும் பொழுது, சேரும் அடைவு A (அ) B போன்று இருக்கக் கூடாது.\n" "தொடர்வதற்கு முன் மீண்டும் சரிபார்க்கவும்." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "அளவுருக்கள் எச்சிரிகை." -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 #, fuzzy msgid "Scanning directories..." msgstr "Scanning directories ..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "தகவல் தளம் 'ஏ'வை படிக்கவும்." -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "தகவல் தளம் 'பி'ஐ படிக்கவும்." -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "தகவல் தளம் 'சி'ஐ படிக்கவும்." -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "சில துணை அடைவுகளை படிக்க இயலவில்லை" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "துணை அடைவுகளின் அனுமதிகளை சரிபார்க்கவும்." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "தயார்." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "அடைவு ஒப்பிடும் நிலை" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "உப அடைவுகளின் எண்ணிக்கை:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "சம கோப்புகளின் எண்ணிக்கை:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "வேறு விதமான கோப்புகளின் எண்ணிக்கை:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "கைமுறை ஒன்று சேர்க்கையின் எண்ணிக்கை:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "இது அனைத்து ஒன்றுசேர் இயக்கங்களை பாதிக்கிறது." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "அனைத்து ஒன்றுசேர் இயக்கங்களை மாற்றிக்கொண்டிருக்கிறது" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "தொடர்தல்" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "செயலாக்குதல்" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "அதை செய்." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr " A to B படியெடு" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "படியெடு B to A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr " A ஐ நீக்கு" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "B ஐ நீக்கு" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "A & Bஐ நீக்கு " -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr " A ஐ ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr " 'பி' ஐ ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "A & B ஐ ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "நீக்கு." -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "பிழை: குழப்ப கோப்பு வகைகள்" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "பிழை: தேதிகள் சமம் ஆனால் கோப்புகள் இல்லை." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "இந்த இயக்கம் தற்போது சாத்தியமில்லை." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "இயக்கம் சாதியமில்லை" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -368,42 +371,47 @@ msgstr "" "\n" "இதை மறு ஆக்கம் செய்ய தெரிந்தால், நிரல் எழுதியவரை அணுகவும்." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "நிரல் பிழை" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"நகலெடுக்கும்போது பிழை ஏற்பட்டுள்ளது.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "நகலெடுக்கும்போது பிழை ஏற்பட்டுள்ளது.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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 "ஒன்றுசேர் பிழை" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "பிழை." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "முடிந்த." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "கோப்பு" -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "தெரியாத ஒன்றுசேர் இயக்கம்.( இது ஒருபோதும் நிகழக்கூடாது)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "தெரியாத ஒன்றுசேர் இயக்கம்." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -416,351 +424,348 @@ msgid "" msgstr "" "ஒன்றுசேர்ப்பு தொடங்கப்பட உள்ளது.\n" "\n" -"நீங்கள் நெறிமுறைகளைப் படித்து என்ன செய்கிறீர்கள் என்பதை அறிந்தால், \"இதை " -"செய்க\" என்பதை தேர்ந்தெடுக்க.\n" +"நீங்கள் நெறிமுறைகளைப் படித்து என்ன செய்கிறீர்கள் என்பதை அறிந்தால், \"இதை செய்க\" என்பதை " +"தேர்ந்தெடுக்க.\n" "\"இதை போன்று நட\" என்பதை தேர்வு செய்தால் நிகழவிருப்பதை கூரும்.\n" "\n" -"இந்த நிரல் இன்னும் பீடா நிலையில் தான் உள்ளது என்பதை கவனத்தில் கொள்க; மேலும் " -"இதற்கு எந்தவித உத்திரவாதமும் கிடையாது! தங்களது இன்றியமையாத தகவல்களுக்கு பின்னணி " +"இந்த நிரல் இன்னும் பீடா நிலையில் தான் உள்ளது என்பதை கவனத்தில் கொள்க; மேலும் இதற்கு எந்தவித " +"உத்திரவாதமும் கிடையாது! தங்களது இன்றியமையாத தகவல்களுக்கு பின்னணி " "அமைக்க! " -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "ஒன்று சேர்ப்பைத் துவக்குதல்" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "இதை செய்க" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "இதை போன்று நட" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" "பலவிதமான அடைவுகளில் பலவகையாக தனிப்படுத்தப்பட்ட விவரம் உள்ளது. எதை செய்வதென்பதை " "தேர்ந்தெடுக்க." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -"கோப்புகளின் திருத்திய தேதிகள் ஒன்றாக உள்ளது, ஆனால் கோப்புகள் இல்லை. எதை " -"செய்வதென்பதை தேர்ந்தெடுக்க. " +"கோப்புகளின் திருத்திய தேதிகள் ஒன்றாக உள்ளது, ஆனால் கோப்புகள் இல்லை. எதை செய்வதென்பதை " +"தேர்ந்தெடுக்க. " -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" "இந்த செயற்பாடு தற்போது சாத்தியமில்லை ஏனென்றால் அடைவு ஒற்றினை தற்போது " "இயங்கிக்கொண்டிருக்கின்றது" -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "கடைசி அடியில் பிழை இருந்தது.\n" "இந்த பிழையை ஏற்படுத்திய விவரத்துடன் தொடர விரும்புகிறீர்களா அல்லது அதை தவிர்க்க " "விரும்புகிறீர்களா?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "பிழைக்குப் பிறகு ஒன்று சேர்த்தலை தொடர்க" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "கடைசி விவரத்துடன் தொடர்க" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "விவரத்தை தவிர்க்க" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "தவிர்த்தது." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "செயல்பாட்டில் உள்ளது..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "ஒன்றுசேர் இயக்கம் முடிந்தது" -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "ஒன்றுசேர்ப்பு முடிந்தது" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -"போலியான ஒன்றுசேர்ப்பு முடிந்தது: முன்மொழிந்த இயக்கங்களுடன் நீங்கள் " -"ஒத்துப்போகிறீர்களா என்பதை சரிபார்க்கவும்." +"போலியான ஒன்றுசேர்ப்பு முடிந்தது: முன்மொழிந்த இயக்கங்களுடன் நீங்கள் ஒத்துப்போகிறீர்களா என்பதை " +"சரிபார்க்கவும்." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"பிழை ஏற்பட்டுள்ளது. விரிவான விவரங்களுக்கு சரி என்பதை அழுத்துக.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "பிழை ஏற்பட்டுள்ளது. விரிவான விவரங்களுக்கு சரி என்பதை அழுத்துக.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "பிழை: %1 நீக்கும்போது: பின்னணி உருவாக்கம் தோல்வியடைந்தது." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "அடைவு சூழ்நிலை நீக்கு நீக்கு(%1)" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "நீக்கு( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "பிழை: அடைவை படிக்கும்போது நீக்க இயலவில்லை." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr " rmdir( %1 } பிழை: இயக்க இயலவில்லை" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "பிழை: நீக்கும் இயக்கம் தோல்வியடைந்தது." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "கைமுறை ஒன்றினை(%1, %2,%3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." -msgstr "" -"குறிப்பு: கையேடு ஒன்றினையின் பிறகு உபயோகிப்பவர் F7 வழியாக தொடர வேண்டும்." +msgstr "குறிப்பு: கையேடு ஒன்றினையின் பிறகு உபயோகிப்பவர் F7 வழியாக தொடர வேண்டும்." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -msgstr "" -"பிழை:நகல்( %1 -> %2 ) தோல்வி அடைந்தது. இருக்கும் சேரிடம் நீக்கம் தோல்வி " -"அடைந்தது" +msgstr "பிழை:நகல்( %1 -> %2 ) தோல்வி அடைந்தது. இருக்கும் சேரிடம் நீக்கம் தோல்வி அடைந்தது" -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "நகல் இணை( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." -msgstr "" -"பிழை:தொடர்புப் படியெடு தோல்வியடைந்தது: தூரத் தொடர்பு இன்னும் ஆதரிக்கப்படவில்லை" +msgstr "பிழை:தொடர்புப் படியெடு தோல்வியடைந்தது: தூரத் தொடர்பு இன்னும் ஆதரிக்கப்படவில்லை" -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "பிழை: நகல் இணை தோல்வியடைந்தது." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "நகல்( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "" -"மறுபெயரிடும் போது பிழை( %1 -> %2 ): தற்போதுள்ள சேருமிடத்தை நீக்க இயலாது." +msgstr "மறுபெயரிடும் போது பிழை( %1 -> %2 ): தற்போதுள்ள சேருமிடத்தை நீக்க இயலாது." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "மறுபெயர்( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "பிழை: மறுபெயர் தோல்வி அடைந்தது." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "%1அடைவை உருவாக்கும் போது பிழை: தற்போதைய கோப்பினை நீக்க இயலாது." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "( %1 )அடைவை உருவாக்கு" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "அடைவை உருவாக்கும் போது பிழை" -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "சேருமிடம்" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "அடைவு" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "விதம்" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "அளவு" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "தன்மை" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "கடைசி திருத்தம்" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "இணை-சேருமிடம்" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "கோப்பு" + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "கிடைக்கவில்லை" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (சேருமிடம்): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (அடித்தளம்):" -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (சேருமிடம்): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (சேருமிடம்):" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "சேருமிடம்: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 #, fuzzy msgid "Save Directory Merge State As..." msgstr "அடைவுச் சேர்க்கை" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "அடைவை சேர்க்கத் துவங்கு" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "நிகழ் உருப்படிக்காக செயற்பாடு இயங்கு" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "தேர்ந்தெடுத்த கோப்பினை ஒப்பிடு" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "தற்போதைய கோப்பினை ஒன்றுசேர்" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "அனைத்து உபஅடைவுகளையும் மடி" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "அனைத்து உபஅடைவுகளையும் பிரி" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "எல்லா விவரங்களுக்கும் Aவைத் தேர்ந்தெடு" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "எல்லா விவரங்களுக்கும் Bவைத் தேர்ந்தெடு" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "எல்லா விவரங்களுக்கும் Cவைத் தேர்ந்தெடு" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "எல்லா விவரங்களுக்கும் தானியக்கத்தேர்வு" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "எல்லா விவரங்களுக்கும் இயக்கமில்லை" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Show Different Files" msgstr "வேறு விதமான கோப்புகளின் எண்ணிக்கை:" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "தேர்ந்தெடுத்த கோப்பினை ஒப்பிடு" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "தேர்ந்தெடுத்த கோப்பினை ஒப்பிடு" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "ஒன்றும் செய்யாதே" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 #, fuzzy msgid "Delete A && B" msgstr "A & Bஐ நீக்கு " -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 #, fuzzy msgid "Merge to A && B" msgstr "A & B ஐ ஒன்றாகச் சேர்." -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -"ஒரு பின்கோப்பினை உருவாக்க முயற்சிக்கும்போது, பழைய பின்கோப்பினை நீக்க " -"முடியவில்லை.\n" +"ஒரு பின்கோப்பினை உருவாக்க முயற்சிக்கும்போது, பழைய பின்கோப்பினை நீக்க முடியவில்லை.\n" "கோப்புப் பெயர்கள்:" -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -768,439 +773,446 @@ msgstr "" "ஒரு பின்கோப்பினை உருவாக்க முயற்சிக்கும் போது, பெயர் மாற்றம் செய்யப்படவில்லை.\n" "கோப்புப் பெயர்கள்:" -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "கோப்பு நிலைமை வாங்கு: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "கோப்புகளை படித்தல்: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "எழுதும் கோப்பு: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "நினைவில் இல்லை" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "அடைவு அமை: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "அடைவு அகற்று: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "அழித்தல் கோப்பு:%1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "குறியீட்டு இணைப்பு உருவாக்குதல்: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "மறுபெயர்:( %1 -> %2 )" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "கோப்பு நகலெடுத்தல்: %1 -> %2 " -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -"கோப்புப் படிவின் போது பிழை ஏற்பட்டுள்ளது. படிப்பதற்கான கோப்புத் " -"திறக்கப்படவில்லை.கோப்பின் பெயர்:%1" +"கோப்புப் படிவின் போது பிழை ஏற்பட்டுள்ளது. படிப்பதற்கான கோப்புத் திறக்கப்படவில்லை.கோப்பின் " +"பெயர்:%1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -"கோப்புப் படிவின் போது பிழை ஏற்பட்டுள்ளது. எழுதுவதற்கான கோப்புத் " -"திறக்கப்படவில்லை. கோப்பின் பெயர்:%1" +"கோப்புப் படிவின் போது பிழை ஏற்பட்டுள்ளது. எழுதுவதற்கான கோப்புத் திறக்கப்படவில்லை. கோப்பின் " +"பெயர்:%1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" -"கோப்புப் படிவின் போது பிழை ஏற்பட்டுள்ளது கோப்பினை படிக்க இயலவில்லை.கோப்பின் " -"பெயர்:%1" +"கோப்புப் படிவின் போது பிழை ஏற்பட்டுள்ளது கோப்பினை படிக்க இயலவில்லை.கோப்பின் பெயர்:%1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" -msgstr "" -"கோப்புப் படிவின்போது பிழை ஏற்பட்டுள்ளது. கோப்பில் எழுத இயலவில்லை.கோப்பின் " -"பெயர்:%1" +msgstr "கோப்புப் படிவின்போது பிழை ஏற்பட்டுள்ளது. கோப்பில் எழுத இயலவில்லை.கோப்பின் பெயர்:%1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "அடைவை படித்தல்:" -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "அடைவை பட்டியலிடல்: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 #, fuzzy msgid "Current Configuration:" msgstr "நடப்பு உருப்படி இசைவு செயற்பாடு" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "கோப்பு திறப்பில் பிழை" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." -msgstr "" -"தேர்வு தானே உபயோகிக்கப்பட்டுள்ளது ஆனால் வெளியீட்டுக் கோப்பு குறிப்பிடப்படவில்லை" +msgstr "தேர்வு தானே உபயோகிக்கப்பட்டுள்ளது ஆனால் வெளியீட்டுக் கோப்பு குறிப்பிடப்படவில்லை" -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "அடைவு ஒப்பீட்டுக்காக தேர்வு தானே மறுக்கப்பட்டுள்ளது" -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "சேகரிப்பு தோல்வியடைந்தது." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "இந்த கோப்புகளின் திறப்பு தோல்வியடைந்தது:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "கோப்பு திறப்பில் பிழை" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "ஒப்பிடுதலுக்கு ஆவணங்களைத் திறக்க..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "ஒன்றுசேர் முடிவை சேகரி. அனைத்து குழப்பங்களும் தீர வேண்டும்." -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "தற்போதைய ஆவணத்தை ....வாக சேமி " -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "பயன்பாட்டை முறிக்க" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "தேர்வு செய்த பகுதியை எடுத்து கிளிப்போர்டில் செலுத்துகிறது" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "தேர்வு செய்த பகுதியை கிளிப் போர்டை படி செய்கிறது." -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "கிளிப்போர்டின் உள்ளடக்கங்களை உரிய இடத்தில் சேர்க்கிறது" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "தொடர்ச்சிகளை தேடு" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "சரத்தை மீண்டும் தேடு" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "கருவிப்பட்டியை செயல்படுத்து/நீக்கு" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "நிலைப்பட்டியை செயல்படுத்து/நீக்கு " -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "KDiff3யை அமை" -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "தற்போதைய டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "முதல் டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "கடைசி டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "முந்தைய டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "அடுத்த டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "முந்தைய குழப்பத்திற்குச் செல்க" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "அடுத்த குழப்பத்திற்குச் செல்க" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "முந்தைய தீர்க்காத குழப்பத்திற்குச் செல்க" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "அடுத்த தீர்க்காத குழப்பத்திற்குச் செல்க" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Aவிலிருந்து வரி(களை) தேர்ந்தெடு" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Bவிலிருந்து வரி(களை) தேர்ந்தெடு" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Cவிலிருந்து வரி(களை) தேர்ந்தெடு" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" -msgstr "" -"மூலத்தை தேர்வு செய்த பிறகு தானாகவே அடுத்த தீர்க்கப்படாத குழப்பதற்கு செல் " +msgstr "மூலத்தை தேர்வு செய்த பிறகு தானாகவே அடுத்த தீர்க்கப்படாத குழப்பதற்கு செல் " -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "இடைவெளியை காட்டி மற்றும் வேறுபாட்டிற்காக பட்டியலிடுவான் எழுத்துக்கள்" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "வெள்ளை இடத்தை காட்டும்" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "வரி எண்களை காட்டு" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "எல்லா இடத்திலும் Aவைத் தேர்ந்தெடு" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "எல்லா இடத்திலும் Bவைத் தேர்ந்தெடு" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "எல்லா இடத்திலும் Cவைத் தேர்ந்தெடு" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 #, fuzzy msgid "Choose A for All Unsolved Conflicts" msgstr "அனைத்து தீர்வற்ற முரணிற்கு A-வை தேர்ந்தெடுக்கவும்" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 #, fuzzy msgid "Choose B for All Unsolved Conflicts" msgstr "அனைத்து தீர்வற்ற முரணிற்கு B-யை தேர்ந்தெடுக்கவும்" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 #, fuzzy msgid "Choose C for All Unsolved Conflicts" msgstr "அனைத்து தீர்வற்ற முரணிற்கு C-யை தேர்ந்தெடுக்கவும்" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 #, fuzzy msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "அனைத்து தீர்வற்ற வெள்ளை இடம் முரணிற்கு A-வை தேர்ந்தெடுக்கவும்" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 #, fuzzy msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "அனைத்து தீர்வற்ற வெள்ளை இடம் முரணிற்கு B-யை தேர்ந்தெடுக்கவும்" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 #, fuzzy msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "அனைத்து தீர்வற்ற வெள்ளை இடம் முரணிற்கு C-யை தேர்ந்தெடுக்கவும்" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "தானாகவே எளிய குழப்பங்களை தீர்க்க." -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr " Delta வை குழப்பத்திற்கு அமை" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "தானாகவே எளிய குழப்பங்களை தீர்க்க." -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 #, fuzzy msgid "Join Selected Diffs" msgstr "தேர்ந்தெடுத்த கோப்பினை ஒப்பிடு" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "A சாளரத்தைக் காட்டு" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "B சாளரத்தைக் காட்டு" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "C சாளரத்தைக் காட்டு" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "அடுத்த சாளரத்தை நோக்கு" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Normal Overview" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "A vs. B Overview" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "A vs. C Overview" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "B vs. C Overview" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Word Wrap Diff Windows" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "முந்தைய சாளரத்தை நோக்கு" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "பிரிப்பு திசையை மாற்று" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "அடைவு மற்றும் உரையின் பிளவின் திரைப்பார்வை" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "அடைவுக்கும் உரை பார்வைக்கும் இடையே மாற்றுக" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "ஒன்று சேர் முடிவு சேகரிக்கப்படவில்லை." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "சேகரித்து முடி" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "சேகரிக்காமல் மூடு" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "ஒன்றுசேர் முடிவை சேகரித்தல் தோல்வியடைந்தது." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" +msgstr "நீங்கள் தற்போது அடைவுகளை சேர்த்துக் கொண்டிருக்கிறீர்கள். நிறுத்த விரும்புகிறீர்களா?" + +#: kdiff3.cpp:622 +msgid "Quit" msgstr "" -"நீங்கள் தற்போது அடைவுகளை சேர்த்துக் கொண்டிருக்கிறீர்கள். நிறுத்த " -"விரும்புகிறீர்களா?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "கோப்பு சேகரித்தல்..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "புதிய கோப்புப்பெயருடன் கோப்பினை சேகரித்தல்..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "வெளியேறுதல்..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 #, fuzzy msgid "Printing completed." msgstr "ஒன்றுசேர் இயக்கம் முடிந்தது" -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "வெளியேறுதல்..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "கருவிப்பட்டி மாற்றப்படுகறது" -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "நிலைப்பட்டியை மாற்று" @@ -1215,12 +1227,11 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "உங்கள் பகுதியை காணவில்லை.\n" -"நிறுவும் போது இப்படிப்பட்ட பிரச்சனை ஏற்படும் விவரங்களுக்கு README தொகுப்பைப் " -"படிக்கவும்" +"நிறுவும் போது இப்படிப்பட்ட பிரச்சனை ஏற்படும் விவரங்களுக்கு README தொகுப்பைப் படிக்கவும்" #: main.cpp:35 msgid "Tool for Comparison and Merge of Files and Directories" @@ -1298,19 +1309,18 @@ msgstr "கோப்பு 3ன்றை திற" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "+ Many thanks to those who reported bugs and contributed ideas!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 #, fuzzy msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "இன்னும் தீர்க்கப்படாத குழப்பங்களின் எண்ணிகை: %1" @@ -1319,58 +1329,33 @@ msgstr "இன்னும் தீர்க்கப்படாத குழ msgid "" "The output has been modified.\n" "If you continue your changes will be lost." -msgstr "" -"வெளீயிடு மாற்றப்பட்டுள்ளது. நீங்கள் தொடர்ந்தால் மாற்றங்களை இழந்து விடுவீர்கள்" +msgstr "வெளீயிடு மாற்றப்பட்டுள்ளது. நீங்கள் தொடர்ந்தால் மாற்றங்களை இழந்து விடுவீர்கள்" -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "அனைத்து உள்ளிடு கோப்புகளும் இருநிலை சமம்" -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "அனைத்து உள்ளீட்டுக் கோப்புகளும் ஒரே உரையைக் கொண்டன." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"கோப்புகள் A மற்றும் B இருநிலை சமம் உடையன.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"கோப்புகள் A மற்றும் B சம உரை உடையன.\n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"கோப்புகள் A மற்றும் C இருநிலை சமம் உடையன.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"கோப்புகள் A மற்றும் C சம உரை உடையன.\n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"கோப்புகள் B மற்றும் C இருநிலை சமம் உடையன.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +#, fuzzy +msgid "Files %1 and %2 are binary equal.\n" +msgstr "கோப்புகள் B மற்றும் C இருநிலை சமம் உடையன.\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"கோப்புகள் B மற்றும் C சம உரை உடையன.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "கோப்புகள் A மற்றும் B சம உரை உடையன.\n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "மொத்த குழப்பங்களின் எண்ணிக்கை:" -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1378,7 +1363,7 @@ msgstr "" "\n" "தாமாகவே தீர்ந்த குழப்பங்களின் எண்ணிக்கை" -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1386,24 +1371,24 @@ msgstr "" "\n" "தீர்க்கப்படாத குழப்பங்களின் எண்ணிக்கை" -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "குழப்பங்கள்" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 #, fuzzy msgid "" msgstr "<ஒன்றுசேர் குழப்பம்>" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "<ஒன்றுசேர் குழப்பம்>" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1411,39 +1396,39 @@ msgstr "" "அனைத்து குழப்பங்களும் இன்னும் தீரவில்லை.\n" "கோப்பினை சேமிக்கவில்லை \n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "குழப்பமான இடது" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "கோப்பின சேமிப்பு பிழை" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "எழுதும் பொழுது பிழை" -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr " வெளியீடு" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[திருத்தப்பட்டது]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1463,6 +1448,15 @@ 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 "திருத்துபவரும் வித்தியாசமான வெளியீட்டு எழுத்துக்களும்" @@ -1589,10 +1583,8 @@ msgid "Auto indentation" msgstr "தானியக்க உள்ளடக்கம்" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"முந்தைய வரியில் பயன்படுத்தப்பட்ட நகர்ப்பு புதிய வரியிலும் பயன்படுத்தப்படுகிறது\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "முந்தைய வரியில் பயன்படுத்தப்பட்ட நகர்ப்பு புதிய வரியிலும் பயன்படுத்தப்படுகிறது\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1617,8 +1609,8 @@ msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -"கோட்டின் முடிவை அமைத்து தொகுப்புக்கோப்பில் சேமிDOS/விண்டோஸ்: " -"CR+LF;யுனிக்ஸ்:மற்றும் CR=0D, LF=0A" +"கோட்டின் முடிவை அமைத்து தொகுப்புக்கோப்பில் சேமிDOS/விண்டோஸ்: CR+LF;யுனிக்ஸ்:மற்றும் " +"CR=0D, LF=0A" #: optiondialog.cpp:732 #, fuzzy @@ -1630,67 +1622,62 @@ msgstr "KDiff3" msgid "Diff Settings" msgstr "வேறுபாடு & சேர்த்திடு அமைப்புகள்" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr " carriage return யை பராமரி" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "carriage return எழுத்துக்களை காட்டு" +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "C/C++ குறிப்புரைகளை வெள்ளை இடம் போல உபசரி." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "சொற்களை தவிர்" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "வரி பொருத்துதலின் போது எண் எழுத்துக்களை நிராகரி." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 #, fuzzy msgid "Ignore C/C++ comments" msgstr "C/C++ குறிப்புரைகளை புறக்கணி" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "C/C++ குறிப்புரைகளை வெள்ளை இடம் போல உபசரி." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Ignore case" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Treat case differences like white space changes. ('a'<=>'A')" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "முன் செயலாக்க கட்டளை" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "உபயோகிப்பாளரால் அறுதியிடப்பட்ட முன்-செயலாக்கி" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "வரி-பொருத்து முன்-செயலாக்கி கட்டளை" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "முன்-செயலாக்கி வரி-பொருத்துதலின் போது பயன்ப்படுத்தப்படுகிறது" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "கடினமாக முயற்சி(மெதுவாக)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1698,11 +1685,16 @@ msgstr "" "வெளி வேற்றுமைக்கான --குறைந்த விருப்பத்தை செயல்படுத்துகிறது.\n" "பெரிய கோப்புகளின் பகுப்பாய்வு மெதுவாக இருக்கும்." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "வேறுபாடு & சேர்த்திடு அமைப்புகள்" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "தானாக முன்னேறிய தாமதம் (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" @@ -1710,41 +1702,36 @@ msgstr "" "தற்போதைய தேர்ந்தெடுப்பின் முடிவை தானாக - முன்னேறும் அமைப்பில்.\n" "குறிப்பிட்ட கால இடைவெளியில், அடுத்த சிக்கலுக்கு முன் தெரிந்துகொள்ளலாம்." -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "வேறுபாடு & சேர்த்திடு அமைப்புகள்" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "வெள்ளை இடம் 2-கோப்பு ஒன்றிணை முன்னிருப்பு:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 #, fuzzy msgid "Manual Choice" msgstr "கையேடு விருப்பம்" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -"வெள்ளை-இடம்-மாற்றங்களுக்காக தானாக தேர்ந்தெடுக்கும் உள்ளீட்டிற்க்கு ஒன்றிணை " -"படிமுறையை அனுமதிக்கும்." +"வெள்ளை-இடம்-மாற்றங்களுக்காக தானாக தேர்ந்தெடுக்கும் உள்ளீட்டிற்க்கு ஒன்றிணை படிமுறையை " +"அனுமதிக்கும்." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "வெள்ளை இடம் 3-கோப்பு ஒன்றிணை முன்னிருப்பு:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1752,58 +1739,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1813,46 +1801,67 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "உப அடைவுகளின் எண்ணிக்கை:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "அடைவுச் சேர்க்கை" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "திரும்ப நிகழும் அடைவுகள்" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "உபஅடைவுகளை பரிசோதிக்க வேண்டுமா?" -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "கோப்பு வடிவங்கள்:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1861,11 +1870,11 @@ msgstr "" "பரிசோதனையிலிருந்து வெளியேற்றப்பட வேண்டிய கோப்புகளின் வடிவங்கள்.Wildcards ';' " "உபயோகித்து பல்வேறு வடிவங்களை குறிப்பிடலாம்" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "வடிவற்ற கோப்பு" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1874,11 +1883,11 @@ msgstr "" "பரிசோதனையிலிருந்து வெளியேற்றப்பட வேண்டிய கோப்புகளின் வடிவங்கள்.Wildcards ';' " "உபயோகித்து பல்வேறு வடிவங்களை குறிப்பிடலாம்" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "வடிவற்ற அடைவு" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1887,11 +1896,11 @@ msgstr "" "பரிசோதனையிலிருந்து வெளியேற்றப்பட வேண்டிய கோப்புகளின் வடிவங்கள்.Wildcards ';' " "உபயோகித்து பல்வேறு வடிவங்களை குறிப்பிடலாம்" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr ".cvsignore உபயோகி" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1899,23 +1908,23 @@ msgstr "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "மறைந்த கோப்புகளையும் அடைவுகளையும் தேடு" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "கோப்புகளையும் அடைவுகளையும் மறைந்த குணங்களுடன் தேர்ந்தெடு " -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "'.'. தொடங்கும் கோப்புகளும் அடைவுகளும் தேடு" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "கோப்பு இணைப்பை பின்பற்று" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1923,21 +1932,21 @@ msgstr "" "கோப்பினை இணைப்பு குறியோடு ஒப்பிடு.\n" " இணைப்பை ஒப்பிடு" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "அடைவை இணைப்பை பின்பற்று" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "On:அடைவை இணைப்பு குறியோடு ஒப்பிடுOff இணைப்பை ஒப்பிடு" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1945,25 +1954,25 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "File Comparison Mode" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 #, fuzzy msgid "Binary comparison" msgstr "Binary Comparison" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Binary comparison of each file. (Default)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 #, fuzzy msgid "Full analysis" msgstr "Full Analysis" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1971,184 +1980,203 @@ msgstr "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "மாற்றிய தேதியை நம்பு(பாதுகாப்பில்லை)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" -"மாற்றிய தேதியும் கோப்பு நீளமும் சமமாக இருந்தால் எல்லா கோப்புகளும் சமம் என " -"எண்ணலாம். இது பெரிய அடைவுகளுக்கு அல்லது மெதுவான இணைப்புகளுக்கு உதவும்" +"மாற்றிய தேதியும் கோப்பு நீளமும் சமமாக இருந்தால் எல்லா கோப்புகளும் சமம் என எண்ணலாம். இது " +"பெரிய அடைவுகளுக்கு அல்லது மெதுவான இணைப்புகளுக்கு உதவும்" + +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1097 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"மாற்றிய தேதியும் கோப்பு நீளமும் சமமாக இருந்தால் எல்லா கோப்புகளும் சமம் என எண்ணலாம். இது " +"பெரிய அடைவுகளுக்கு அல்லது மெதுவான இணைப்புகளுக்கு உதவும்" + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "அளவை உறுதிபடுத்து(பாதுகாப்பில்லை)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" -"மாற்றிய தேதியும் கோப்பு நீளமும் சமமாக இருந்தால் எல்லா கோப்புகளும் சமம் என " -"எண்ணலாம். இது பெரிய அடைவுகளுக்கு அல்லது மெதுவான இணைப்புகளுக்கு உதவும்." +"மாற்றிய தேதியும் கோப்பு நீளமும் சமமாக இருந்தால் எல்லா கோப்புகளும் சமம் என எண்ணலாம். இது " +"பெரிய அடைவுகளுக்கு அல்லது மெதுவான இணைப்புகளுக்கு உதவும்." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "ஒத்தியக்கு அடைவை" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -"இரண்டு அடைவிலும் கோப்புகளை சேமிப்பதற்கு அனுமதிப்பதால், இரண்டு அடைவுகளும் " -"பின்னர் ஒன்றாகவே இருக்கும் .இரண்டு அடைவுகளையும் சேருமிடம் குறிப்பிடாமல் " -"ஒத்திடும் பொழுதுதான் வேலை செய்யும்." +"இரண்டு அடைவிலும் கோப்புகளை சேமிப்பதற்கு அனுமதிப்பதால், இரண்டு அடைவுகளும் பின்னர் " +"ஒன்றாகவே இருக்கும் .இரண்டு அடைவுகளையும் சேருமிடம் குறிப்பிடாமல் ஒத்திடும் பொழுதுதான் " +"வேலை செய்யும்." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 #, fuzzy msgid "White space differences considered equal" msgstr "வெள்ளை இடம் 3-கோப்பு ஒன்றிணை முன்னிருப்பு:" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "ஒன்றாக சேர்ப்பதற்கு பதிலாக புதியவரை பதியெடு(பாதுகாப்பில்லை)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -"உள்ளே பார்க்காதே புதிய கோப்பினை மட்டும் எடு.(நீ செய்வது என்ன என்று தெரிந்தால் " -"மட்டுமே இதை உபயோகப்படுத்து) இரண்டு அடைவுகளை ஒத்திடும் போது மட்டுமே விளைவுகள் " -"ஏற்படும்" +"உள்ளே பார்க்காதே புதிய கோப்பினை மட்டும் எடு.(நீ செய்வது என்ன என்று தெரிந்தால் மட்டுமே இதை " +"உபயோகப்படுத்து) இரண்டு அடைவுகளை ஒத்திடும் போது மட்டுமே விளைவுகள் ஏற்படும்" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "பின்சேமிப்பு கோப்புகள்(.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -"பழைய கோப்பில் ஒரு கோப்பினை சேமிக்கும் பொழுது, பழைய கோப்பில் மூல நீட்டுதலுடன் " -"பெயர் மாறும், நீக்கபடுவதற்கு பதிலாக. " +"பழைய கோப்பில் ஒரு கோப்பினை சேமிக்கும் பொழுது, பழைய கோப்பில் மூல நீட்டுதலுடன் பெயர் " +"மாறும், நீக்கபடுவதற்கு பதிலாக. " -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "இதர அமைப்புகளை உள்ளடக்கியது" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "மொழி " -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -"கீழ்கண்ட மொழிகளில் GUI- எழுத்துக்களைத் தேர்ந்தெடு மொழிகளை மாற்ற KDiff3யை " -"தேர்ந்தெடு" +"கீழ்கண்ட மொழிகளில் GUI- எழுத்துக்களைத் தேர்ந்தெடு மொழிகளை மாற்ற KDiff3யை தேர்ந்தெடு" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 #, fuzzy msgid "Note: Local Encoding is " msgstr "லொகல் குறிமுறையாக்கம் உபயோகி" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "தானாகவே தேர்ந்தெடுக்கப்பட்ட படிவு" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "இயக்கம்." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration Settings" msgstr "இதர அமைப்புகளை உள்ளடக்கியது" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2156,7 +2184,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2166,36 +2214,33 @@ msgid "" "Do you want to continue or do you want to select another font." msgstr "" "நீங்கள் மாற்றக்கூடிய அகல எழுத்துருவை தேர்தெடுத்துள்ளீர்கள்\n" -"இதற்கு காரணம் இந்த நிரல் மாற்றக் கூடிய அகலமான எழுத்துருவை கையாளாது. " -"திருத்தங்கள் செய்யும் பொழுதுப் பிரச்சனைகளை சந்தித்ருக்கலாம், சரியாக நீங்கள் " -"தொடர வேண்டுமா அல்லது, வேறு எழுத்துருவை தேர்ந்தெடுக்கிறீர்களா." +"இதற்கு காரணம் இந்த நிரல் மாற்றக் கூடிய அகலமான எழுத்துருவை கையாளாது. திருத்தங்கள் " +"செய்யும் பொழுதுப் பிரச்சனைகளை சந்தித்ருக்கலாம், சரியாக நீங்கள் தொடர வேண்டுமா அல்லது, வேறு " +"எழுத்துருவை தேர்ந்தெடுக்கிறீர்களா." -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "கச்சிதமில்லாத எழுத்துரு" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "உங்களுடைய சொந்த ஆபத்தில் தொடரவும்" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "மற்றொரு எழுத்துருவை தேர்தெடு" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." -msgstr "" -"இது அனைத்து தேர்வுகளையும் மாற்றியமைக்கும். தற்பொழுதுள்ள தலைப்பு மட்டுமல்ல" +msgstr "இது அனைத்து தேர்வுகளையும் மாற்றியமைக்கும். தற்பொழுதுள்ள தலைப்பு மட்டுமல்ல" #: pdiff.cpp:258 msgid "PreprocessorCmd: " msgstr "முன் செயலாக்க கட்டளை:" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"கீழ்கண்ட தேர்வுகளில் தரவை தேர்வுசெய்:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "கீழ்கண்ட தேர்வுகளில் தரவை தேர்வுசெய்:\n" #: pdiff.cpp:264 msgid "" @@ -2263,19 +2308,10 @@ msgstr "வரி வித்தியாசம் : A <-> C" msgid "All input files contain the same text, but are not binary equal." msgstr "அனைத்து உள்ளீட்டுக் கோப்புகளும் ஒரே உரையைக் கொண்டன." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -#, fuzzy -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"கோப்புகள் B மற்றும் C இருநிலை சமம் உடையன.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 #, fuzzy -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"கோப்புகள் A மற்றும் B இருநிலை சமம் உடையன.\n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "கோப்புகள் A மற்றும் B இருநிலை சமம் உடையன.\n" #: pdiff.cpp:530 msgid "" @@ -2287,109 +2323,55 @@ msgstr "" "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "விடுதல்" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "திறந்த கோப்புகள்" -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "கோப்பு திறப்பு பிழை" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "வெட்டுதலை தேர்ந்தெடு" -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "தேர்ந்தெடுக்கப்பட்டதை கிளிப்போர்டிற்கு நகலெடுக்க" -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "கிளிப்போர்டு உள்ளடக்கத்தை சொருகு" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "சேமி தொடரு" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "சேமிக்காமல் தொடரு" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "தேடல் முடிவடைந்தது" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "தேடல் முடிவடைந்தது" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "அடைவை உருவாக்கும் போது பிழை" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "அமை KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "அடைவு" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "நடப்பு உருப்படி ஒற்றிணை செயற்பாடு " - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "நடப்பு உருப்படி இசைவு செயற்பாடு" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "நகர்த்துவது " - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "வித்தியாச பார்வை" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "ஒன்றாகச்சேர்" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "சாளரங்கள்" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (அடிப்படை)" @@ -2432,6 +2414,10 @@ msgstr "வெளீயிடு (விருப்பங்கள்)" msgid "Configure..." msgstr "அமை" +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 #, fuzzy msgid "Search text:" @@ -2505,6 +2491,14 @@ 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 "" @@ -2518,6 +2512,85 @@ msgstr "சேகரிப்பு தோல்வியடைந்தது." msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "அடைவு" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "நடப்பு உருப்படி ஒற்றிணை செயற்பாடு " + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "நடப்பு உருப்படி இசைவு செயற்பாடு" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "நகர்த்துவது " + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "வித்தியாச பார்வை" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "ஒன்றாகச்சேர்" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "சாளரங்கள்" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "கோப்புகள் A மற்றும் B இருநிலை சமம் உடையன.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "கோப்புகள் A மற்றும் C இருநிலை சமம் உடையன.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "கோப்புகள் A மற்றும் C சம உரை உடையன.\n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "கோப்புகள் B மற்றும் C இருநிலை சமம் உடையன.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "கோப்புகள் B மற்றும் C சம உரை உடையன.\n" + +#~ msgid "Preserve carriage return" +#~ msgstr " carriage return யை பராமரி" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "carriage return எழுத்துக்களை காட்டு" + #, fuzzy #~ msgid "Diff and Merge" #~ msgstr "வேறுபாடு & சேர்த்திடு" diff --git a/po/tg.po b/po/tg.po index 4540f3e..7461631 100644 --- a/po/tg.po +++ b/po/tg.po @@ -10,16 +10,17 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2005-09-17 13:29+0500\n" "Last-Translator: Victor Ibragimov \n" "Language-Team: Tajik\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" @@ -27,21 +28,21 @@ msgstr "" "Tajik KDE Teams: Марина Колючева, Виктор Ибрагимов, Курбанова Гулноз Акмал " "Ватаншоев, Эркинҷон Пулатов, Довудӣ Гулшод" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "youth_opportunities@tajik.net erkin_pulatov@mail.ru" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Дар силули мухобиротӣ навиштани таърих ва суръати файл." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Аз буфери иваз" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -55,7 +56,7 @@ msgstr "" "\n" "Фармони пеш-коркардкуни ҳоло аз кор мемонад." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -70,7 +71,7 @@ msgstr "" "\n" "Хати-ҷамъ кунии- пешкоркардкунии фармон ҳоло аз кор мемонад." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -78,16 +79,16 @@ msgstr "" "Маълумотҳои гумкарда:\n" "Агар ин зиёд карда шавад илтимос бо муаллиф алоқа кунед.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Хатогии даруни" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Сатри яккум%1" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Охир" @@ -103,247 +104,252 @@ msgstr "Алоқа: " msgid "Size. " msgstr "Андоза. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Таърихи рӯз ва андоза: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Наметавонам нусхаи яквақтаро эҷод кунам %1." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Кушодан %1 нашуд." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 #, fuzzy msgid "Comparing file..." msgstr "Нигоҳ доштани файл ..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Хатогӣ дар вақти хониш аз %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Ном" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Амал" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Вазъият" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Иҷозат дода нашуд" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Иҷозат дода шуда" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Сиёҳ" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Сафед" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -"Ҳоло барнома дар тартиби якҷошавии каталогҳо кор мекунад. Оё шумо дар ҳақиқат " -"мехоҳед, ки ҳамаи тағйиротҳоро нест кунед ва таркиби каталогро ан нав кунед?" +"Ҳоло барнома дар тартиби якҷошавии каталогҳо кор мекунад. Оё шумо дар " +"ҳақиқат мехоҳед, ки ҳамаи тағйиротҳоро нест кунед ва таркиби каталогро ан " +"нав кунед?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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 "Дигар кардан" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Давом додан" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Наметавонам каталогҳоро кушоям:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Каталоги А \"%1\" вуҷуд надорад.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Каталоги А \"%1\" вуҷуд надорад.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Каталоги В \"%1\" вуҷуд надорад.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Каталоги В \"%1\" вуҷуд надорад.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Каталоги C \"%1\" вуҷуд надорад.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Каталоги C \"%1\" вуҷуд надорад.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Хатогӣ дар вақти хониши каталог" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "Директорияи муаёянкуни бояд бошад мисли А ё В вақте,ки се директорияҳо якҷо " "шуданд.\n" "Санҷед бори дигар пеш аз давомкуни." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Параметри нодуруст" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 #, fuzzy msgid "Scanning directories..." msgstr "Мушоҳидакунии каталогҳо..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Хониши каталоги А" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Хониши каталоги В" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Хониши каталоги С" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Наметавонам баъзе зеркаталогҳоро хонам дар" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Ҳуқуқҳои ин каталогҳоро тафтиш кунед." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Тайёр аст." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Ҳолати муқоисакунии каталогҳо" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Миқдори зеркаталогҳо:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Миқдори файлҳои якхела:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Миқдори файлҳои ҳархела:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Миқдори якҷошавии дастӣ:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Ин ба ҳамаи якҷошавӣ таъсир мерасонад." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Тағйироти ҳамаи якҷошавиҳо" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Давом додан" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Коркард " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Кардан." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Нусха кардан А ба В" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Нусха кардан В ба А" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Нест кардани А" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Нест кардани В" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Нест кардани А ва В" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Пайваст кардан ба A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Пайваст кардан ба В" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Пайваст кардан ба A & В" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Нест кардан (агар вуҷуд дорад)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Пайваст кардан" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Пайваст кардан (дастӣ)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Хатогӣ: Якҷоянашавандаи шакли файлҳо" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Хатогӣ: Вақт мувофиқ аст, лекин файлҳо нет." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Ҳоло номумкин аст." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Пайваст кардан" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -354,42 +360,47 @@ msgstr "" "mergeResultSaved: m_pMFI=0\n" "Агар шумо сабабро донед, ба муаллиф муроҷиат кунед." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Хатогии барнома" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Хатогии нусхакунӣ.\n" +#: directorymergewindow.cpp:1965 +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:1900 directorymergewindow.cpp:2306 +#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Хатогии якҷояшавӣ" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Хатогӣ." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Тайёр аст." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Захира нашуд." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Пайвастшавии номаълум" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Пайвастшавии номаълум." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -407,330 +418,332 @@ msgstr "" "\n" "Мо малиҳат медиҳем, ки доимо пеш аз якҷояшавӣ нусхаҳои захиравиро кунед!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Оғози якҷояшавӣ" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Ҳал кардан" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Моделсозӣ" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -"Файли интихобшуда дар ҳар каталог шкли гуногун дорад. Чӣ кор карданро интихоб " -"кунед." +"Файли интихобшуда дар ҳар каталог шкли гуногун дорад. Чӣ кор карданро " +"интихоб кунед." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -"Маълумотҳои охирини тағйироти файлҳо якхела ҳастанд, вале таркиб нест. Чӣ кор " -"карданро интихоб кунед." +"Маълумотҳои охирини тағйироти файлҳо якхела ҳастанд, вале таркиб нест. Чӣ " +"кор карданро интихоб кунед." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "Ҳоло якҷояшавии каталогҳо ҳал карда мешавад." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Дар этапи ҷорӣ хатогие ба амал омад.\n" "Давом додан ё сар додан?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Давом додан баъди хатогӣ" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Давом додан" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Сар додан" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Са дода шуд." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "Кор рафта истодааст..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Якҷояшавӣ ба анҷом расид." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Якҷояшавӣ ба анҷом расид" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "Якҷояшавӣ ба анҷом расид. Оё шумо бо тағйиротҳои додашуда розӣ ҳастед?" -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Хатогӣ ба амал омад. Барои ахбороти илова OK-ро пахш кунед.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Хатогӣ ба амал омад. Барои ахбороти илова OK-ро пахш кунед.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Хатогӣ: Наметавонам нусхаи захираро эҷод кунам %1." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "нест кардани каталог рекурсивӣ( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "нест кардан( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Хатогӣ: наметавонам каталогро нест кунам." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Хатогӣ: хатогии rmdir( %1 )." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Хатогӣ: наметавонам нест кунам." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "якҷояшавии дастӣ( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " Қайд: Баъди анҷоми якҷояшавии дастӣ F7-ро пахш кунед." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Хатогӣ: наметавонам( %1 -> %2 ) нусха кунам. Нест кардани муайяни вуҷулшуда " "муяссар карда нашуд." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "бадарғаи нишонавӣ( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Хатогӣ: Бадарғаҳои нестшуда пуштибонӣ карда намешаванд." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Хатогӣ: наметавонам бадарғаро эҷод кунам." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "нусха кардани ( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -"Хатогӣ дар вақти тағйири ном( %1 -> %2 ): Наметавонам муайяни вуҷудшударо нест " -"кунам." +"Хатогӣ дар вақти тағйири ном( %1 -> %2 ): Наметавонам муайяни вуҷудшударо " +"нест кунам." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "тағйири ном( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Хатогӣ: Наметавонам тағйири номро кунам." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Хатогӣ дар вақти эҷод кардани каталоги %1. Файли вуҷудшуда нест карда " "намешавад." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "эҷоди каталог( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Хатогӣ дар вақти эҷод кардани каталог." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Муайяншуда" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Каталог" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Шакл" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Андоза" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Хусусиятҳо" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Тағйироти охирон" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Бадарғаи-объект" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +msgid "File" +msgstr "" + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "дастрас нест" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (муайяншуда): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (баромад): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (муайяншуда): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (муайяншуда): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Муаяйншуда: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Хатогӣ дар вақти хониши каталог" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Сар кардан/давом додани якҷояшаии каталогҳо" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Ба кор даровардан барои нуқтаи ҷорӣ" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Муқоисаи файли интихобшуда" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Якҷоя кардани файли ҷорӣ" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Дохили ҳамаи зеркаталогҳо" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Дохилнашудаи ҳамаи зеркаталогҳо" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Интихоби A барои ҳама" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Интихоби B барои ҳама" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Интихоби C барои ҳама" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Худ-интихобкунии шакли амал барои ҳама" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Гирифтани амалҳо барои ҳама" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Show Different Files" msgstr "Миқдори файлҳои ҳархела:" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Муқоисаи файли интихобшуда" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Муқоисаи файли интихобшуда" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Ягон чиз" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 #, fuzzy msgid "Delete A && B" msgstr "Нест кардани А ва В" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 #, fuzzy msgid "Merge to A && B" msgstr "Пайваст кардан ба A & В" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " @@ -738,7 +751,7 @@ msgstr "" "Наметавонам нусхаи кӯҳнаи захираро нест кунам. \n" "Номи файл: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -746,434 +759,448 @@ msgstr "" "Наметавонам номгузориро ҳал кунам. \n" "Номи файлҳо: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Гирифтани ҳолати файл: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Хониши файл: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Навишти файл: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Аз хотира" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Эҷоди каталогҳо : %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Дур кардани директория: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Дур кардани файл: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Сохтани пайвасти рамзӣ: %1-> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Аз нав номгузории файл: %1-> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Нусха бардошатани: %1-> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -"Хато дар вақти амалиёти нусхабардории файл: Кушодани файл барои хондан " -"нашуд.Номи Файл: %1" +"Хато дар вақти амалиёти нусхабардории файл: Кушодани файл барои хондан нашуд." +"Номи Файл: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -"Хато дар вақти амалиёти нусхабардории файл: Кушодани файл барои хондан " -"нашуд.Номи Файл: %1" +"Хато дар вақти амалиёти нусхабардории файл: Кушодани файл барои хондан нашуд." +"Номи Файл: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" "Хато дар вақти амалиёти нусхабардории файл: Хондани нашуд.Номи Файл: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" "Хато дар вақти амалиёти нусхабардории файл: Навиштан нашуд.Номи Файл: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Хондани директория: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Нигоҳ кардани директория: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 #, fuzzy msgid "Current Configuration:" msgstr "Тағйироти ҳамаи якҷошавиҳо" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "Хатогӣ дар кушодани файл" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Интихоб --худ истифода шуда, аммо ягон файли хуруҷ муайян карда нашуд." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Интихоб --худ аҳамият надиҳи барои муқоисаи директория." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Нигоҳ куни нашуд." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Кушодани ин файлҳо нашуд:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Хатогӣ дар кушодани файл" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Мекушояд документҳоро барои муқоиса..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Нигоҳ медорад натиҷаи якҷошавиро. Ҳамаи ҷанҷолҳо бояд ҳал карда шаванд!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Нигоҳ медорад документи ҷориро мисли..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Маҳкам мекунад аризаро" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Мебурад қисми интихоб карда шударо ва меандозад онро ба клипборд" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Нусха мебардорад қисми интихоб карда шударо ба клипборд" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Мечаспонад таркиботҳои клибордро ба ҷойгиршавии амалӣ" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Ковтукови ришта" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Бори дигар ковтуков барои ришта" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Пайраҳаи асбоби фаъол/ғайри фаъолро созед" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Пайраҳаи ҳолати фаъол/ғайри фаъолро созед" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Танзимоти KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Равед ба Делтаи Ҷори" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Равед ба Делтаи Аввала" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Равед ба Делтаи Охирон" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Равед ба Делтаи Пешангӣ" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Равед ба Делтаи Дар пеш интизор" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Равед ба Ҷанҷоли Пешангӣ" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Равед ба Ҷанҷоли Дар пеш интизор " -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Равед ба Ҷанҷоли Пешангии Ҳалнашуда" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Равед ба Ҷанҷоли Дар пеш интизори Ҳалнашуда" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Интихоб кунед Рах(ҳо)-ро Аз А" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Интихоб кунед Рах(ҳо)-ро Аз В" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Интихоб кунед Рах(ҳо)-ро Аз С" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Зуд равед ба ҷанҷоли пешангии ҳалнашуда баъди интихоби сарчашма" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Нишон диҳед фосиларо && Феълҳои табулятори барои гуногуниҳо" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Нишон диҳед фосиларо" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Нишон диҳед рахи рақамҳоро" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Интихоб кунед А-ро дар ҳамаҷой" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Интихоб кунед В-ро дар ҳамаҷой" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Интихоб кунед В-ро дар ҳамаҷой" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 #, fuzzy msgid "Choose A for All Unsolved Conflicts" msgstr "Интихоб кунед А-ро барои ҳамаи ҷанҷолҳои ҳалнашуда" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 #, fuzzy msgid "Choose B for All Unsolved Conflicts" msgstr "Интихоб кунед В-ро барои ҳамаи ҷанҷолҳои ҳалнашуда" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 #, fuzzy msgid "Choose C for All Unsolved Conflicts" msgstr "Интихоб кунед С-ро барои ҳамаи ҷанҷолҳои ҳалнашуда" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 #, fuzzy msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Интихоб кунед А-ро барои фосилаи ҳамаи ҷанҷолҳои ҳалнашуда" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 #, fuzzy msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Интихоб кунед В-ро барои фосилаи ҳамаи ҷанҷолҳои ҳалнашуда" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 #, fuzzy msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Интихоб кунед С-ро барои фосилаи ҳамаи ҷанҷолҳои ҳалнашуда" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Зуд ҳал мекунад ҷанҷолҳои оддиро" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Танзим кунед делтаҳоро ба ҷанҷолҳо" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Зуд ҳал мекунад ҷанҷолҳои оддиро" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 #, fuzzy msgid "Join Selected Diffs" msgstr "Муқоисаи файли интихобшуда" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Нишон диҳед Тирезаи А-ро" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Нишон диҳед Тирезаи В-ро" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Нишон диҳед Тирезаи С-ро" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Активация кардани дигар тиреза" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Оддӣ аз назар гузарондан" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "Аз назар гузарондани A vs. B " -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "Аз назар гузарондани A vs. C" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "Аз назар гузарондани B vs. C" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Калимаи печидаи тирезаҳои гуногун" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Активация кардани тирезаи гузашта" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Дигаркунӣ ва тақсимкунии ҷои исти худ" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "аппп" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Дигаркунӣ байни феҳристҳо && намоиши матн" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Натиҷаи иттиҳодия нигоҳ надоштагӣ." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Нигоҳ доштан && баромадан" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Бе нигоҳдорӣ баромадан" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Натиҷаи якҷоя кардан,нигоҳ дошта нашуд." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Якҷояшавии каталогро нигоҳ дорем.Оё,шумо дилпур мехоҳед, баровардан?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Нигоҳ доштани файл..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Бо номи нав нигоҳ доштани файл..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "Баромад..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 #, fuzzy msgid "Printing completed." msgstr "Якҷояшавӣ ба анҷом расид." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Баромад..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Тасвир кардан/панели асбобҳои пинҳонӣ..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Тасвир кардан/вазъияти панели пинҳонӣ..." @@ -1188,8 +1215,8 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Қисми мо ёфт нашуд!\n" "Ин масъала одатан дар вақти аниқ рӯй медиҳад.Файли README-ро хонед, ҷой ва " @@ -1271,19 +1298,18 @@ msgstr "" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, fuzzy, no-c-format msgid "KDiff3" msgstr "KDiff3Part" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" @@ -1293,121 +1319,101 @@ msgid "" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "" -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 #, fuzzy msgid "" "\n" "Nr of automatically solved conflicts: " msgstr "Зуд ҳал мекунад ҷанҷолҳои оддиро" -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 #, fuzzy msgid "" "\n" "Nr of unsolved conflicts: " msgstr "Равед ба Ҷанҷоли Дар пеш интизори Ҳалнашуда" -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 #, fuzzy msgid "" msgstr "Якҷояшавӣ ба анҷом расид" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 #, fuzzy msgid "" msgstr "Якҷояшавӣ ба анҷом расид" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 #, fuzzy msgid "File Save Error" msgstr "Хатогӣ дар кушодани файл" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 #, fuzzy msgid "Error while writing." msgstr "Хатогӣ дар вақти эҷод кардани каталог." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1427,6 +1433,15 @@ 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 "" @@ -1547,8 +1562,7 @@ msgid "Auto indentation" msgstr "" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" #: optiondialog.cpp:701 @@ -1581,113 +1595,107 @@ msgstr "KDiff3Part" msgid "Diff Settings" msgstr "Воситаи муқоиса ва якҷоя кардан" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." +#: optiondialog.cpp:750 +msgid "Treat as white space." msgstr "" -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Воситаи муқоиса ва якҷоя кардан" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Воситаи муқоиса ва якҷоя кардан" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1695,58 +1703,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1756,124 +1765,145 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Миқдори зеркаталогҳо:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 #, fuzzy msgid "Directory Merge" msgstr "Хатогӣ дар вақти хониши каталог" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 #, fuzzy msgid "Recursive directories" msgstr "Мушоҳидакунии каталогҳо..." -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 #, fuzzy msgid "Whether to analyze subdirectories or not." msgstr "Ҳуқуқҳои ин каталогҳоро тафтиш кунед." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "" -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1881,190 +1911,206 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 #, fuzzy msgid "Binary comparison" msgstr "Ҳолати муқоисакунии каталогҳо" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +msgid "Trust the size and modification date (unsafe)" +msgstr "" + +#: optiondialog.cpp:1092 +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" + +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" msgstr "" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1097 msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 #, fuzzy msgid "Synchronize directories" msgstr "Мушоҳидакунии каталогҳо..." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "Амал" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2072,7 +2118,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2082,20 +2148,20 @@ msgid "" "Do you want to continue or do you want to select another font." msgstr "" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 #, fuzzy msgid "Select Another Font" msgstr "Интихоб кунед Рах(ҳо)-ро Аз С" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2104,8 +2170,7 @@ msgid "PreprocessorCmd: " msgstr "" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" #: pdiff.cpp:264 @@ -2167,14 +2232,8 @@ msgstr "" msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" #: pdiff.cpp:530 @@ -2184,116 +2243,62 @@ msgid "" "Continue at your own risk." msgstr "" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 #, fuzzy msgid "Opening files..." msgstr "Кушодан %1 нашуд." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 #, fuzzy msgid "File open error" msgstr "Хатогӣ дар кушодани файл" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "" -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 #, fuzzy msgid "Copying selection to clipboard..." msgstr "Нусха мебардорад қисми интихоб карда шударо ба клипборд" -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 #, fuzzy msgid "Save && Continue" msgstr "Нигоҳ доштан && баромадан" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 #, fuzzy msgid "Continue Without Saving" msgstr "Бе нигоҳдорӣ баромадан" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 #, fuzzy msgid "Search complete." msgstr "Ҷустуҷу дар ҷамъбаст" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 #, fuzzy msgid "Search Complete" msgstr "Якҷояшавӣ ба анҷом расид" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "Хатогӣ дар вақти эҷод кардани каталог." -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, fuzzy, no-c-format -msgid "&KDiff3" -msgstr "KDiff3Part" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, fuzzy, no-c-format -msgid "Configure KDiff3" -msgstr "Танзимоти KDiff3..." - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, fuzzy, no-c-format -msgid "&Directory" -msgstr "Хониши каталоги А" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, fuzzy, no-c-format -msgid "Current Item Merge Operation" -msgstr "Тағйироти ҳамаи якҷошавиҳо" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, fuzzy, no-c-format -msgid "&Merge" -msgstr "Пайваст кардан" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, fuzzy, no-c-format -msgid "&Window" -msgstr "Нишон диҳед Тирезаи С-ро" - #: smalldialogs.cpp:53 #, fuzzy msgid "A (Base):" @@ -2339,6 +2344,10 @@ msgstr "" msgid "Configure..." msgstr "Танзимоти KDiff3..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 #, fuzzy msgid "Search text:" @@ -2412,6 +2421,14 @@ 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 "" @@ -2425,6 +2442,61 @@ msgstr "Нигоҳ куни нашуд." msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, fuzzy, no-c-format +msgid "&KDiff3" +msgstr "KDiff3Part" + +#: kdiff3_part.rc:13 +#, fuzzy, no-c-format +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" +msgstr "Хониши каталоги А" + +#: kdiff3_shell.rc:30 +#, fuzzy, no-c-format +msgid "Current Item Merge Operation" +msgstr "Тағйироти ҳамаи якҷошавиҳо" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "" + +#: kdiff3_shell.rc:73 +#, fuzzy, no-c-format +msgid "&Merge" +msgstr "Пайваст кардан" + +#: kdiff3_shell.rc:95 +#, fuzzy, no-c-format +msgid "&Window" +msgstr "Нишон диҳед Тирезаи С-ро" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + #, fuzzy #~ msgid "Diff and Merge" #~ msgstr "Воситаи муқоиса ва якҷоя кардан" @@ -2443,8 +2515,10 @@ msgstr "" #, fuzzy #~ msgid "Has no effect. For compatibility with certain tools." -#~ msgstr "Эзоҳ додани маълумоти файл.Барои мутобиқ будан бо асбобҳои муқаррар- шуда." +#~ msgstr "" +#~ "Эзоҳ додани маълумоти файл.Барои мутобиқ будан бо асбобҳои муқаррар- шуда." #, fuzzy #~ msgid "For compatibility with certain tools." -#~ msgstr "Эзоҳ додани маълумоти файл.Барои мутобиқ будан бо асбобҳои муқаррар- шуда." +#~ msgstr "" +#~ "Эзоҳ додани маълумоти файл.Барои мутобиқ будан бо асбобҳои муқаррар- шуда." diff --git a/po/tr.po b/po/tr.po index 6584dd7..2873dfd 100644 --- a/po/tr.po +++ b/po/tr.po @@ -11,36 +11,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2005-07-12 10:50+0300\n" "Last-Translator: Alper Sen \n" "Language-Team: Türkçe \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Görkem Çetin Engin ÇAĞATAY Alper Şen" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "gorkem@kde.org engincagatay@yahoo.com aalpersen@gmail.com" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Geçici dosyaya pano verisi yazma başarısız." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "Panodan" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -54,7 +55,7 @@ msgstr "" "\n" "Önişleme komutu artık devre dışı bırakılacak." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -68,7 +69,7 @@ msgstr "" "\n" "Satır-eşleme-önişleme komutu devre dışı bırakılacak." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -76,16 +77,16 @@ msgstr "" "Veri kaybı hatası:\n" "Bu durum tekrarlanabilir bir durumsa lütfen yazarla iletişim kurun.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Ciddi Dahili Hata" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Üst satır %1" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Son" @@ -101,244 +102,248 @@ msgstr "Bağ: " msgid "Size. " msgstr "Boyut. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Tarih & Boyut: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "%1 dosyasının geçici kopyasının oluşturulmasında hata oluştu." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "%1 açılamadı." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Dosya karşılaştırılıyor..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "%1 konumundan okunamıyor" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "İsim" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "İşlem" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Durum" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Çözülmemiş" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Çözülmüş" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Beyaz değil" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Beyaz" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -"Şu anda bir dizin birleştirmesi yapıyorsunuz. Birleştirmeden çıkmak ve dizini " -"yeniden taramak istediğinizden emin misiniz?" +"Şu anda bir dizin birleştirmesi yapıyorsunuz. Birleştirmeden çıkmak ve " +"dizini yeniden taramak istediğinizden emin misiniz?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Birleştirmeye Devam Et" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Dizinler açılamadı:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"A Dizini \"%1\" mevcut değil ya da bu bir dizin değil.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "A Dizini \"%1\" mevcut değil ya da bu bir dizin değil.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"B Dizini \"%1\" mevcut değil ya da bu bir dizin değil.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "B Dizini \"%1\" mevcut değil ya da bu bir dizin değil.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"C Dizini \"%1\" mevcut değil ya da bu bir dizin değil.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "C Dizini \"%1\" mevcut değil ya da bu bir dizin değil.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Dizin Açma Hatası" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "3 dizin birleştirilirken hedef dizin A ya da B ile aynı olmamalıdır.\n" "Devam etmeden önce kontrol ediniz." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Parametre Uyarısı" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Dizinler taranıyor..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "A Dizini Okunuyor" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "B Dizini Okunuyor" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "C Dizini Okunuyor" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Bazı altdizinler okunabilir değildi" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Altdizinlerin izinlerini kontrol ediniz." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Hazır." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Dizin Karşılaştırma Durumu" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Altdizinlerin sayısı:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Eşit dosyaların sayısı:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Farklı dosyaların sayısı:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "El ile birleştirmelerin sayısı:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "Bu, tüm birleştirme işlemlerini etkiler." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Tüm Birleştirme İşlemleri Değiştiriliyor" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "D&evam Et" -#: directorymergewindow.cpp:1169 +#: 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" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "Yapılacak." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "A'yı B'ye kopyala" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "B'yi A'ya kopyala" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "A'yı Sil" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "B'yi Sil" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "A ve B'yi Sil" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "A ile Birleştir" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "B ile Birleştir" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "A ve B ile Birleştir" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "(varsa) Sil" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Birleştir" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Birleştir (el ile)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Hata: Çakışan Dosya Türleri" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Hata: Tarihler aynı fakat dosyalar aynı değil." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "Bu işlem şu anda yapılabilir değil." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "İşlem Yapılabilir Değil" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -353,42 +358,47 @@ msgstr "" "Bu durumun nasıl tekrarlanacağını biliyorsanız, lütfen uygulamanın yazarıyla " "iletişime geçin." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Uygulama Hatası" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Koplayanırken hata oluştu.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "Koplayanırken hata oluştu.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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ı" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Hata." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Tamamlandı." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Kaydedilmedi." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Bilinmeyen birleştirme işlemi. (Bu, hiçbir zaman oluşmamalı!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Bilinmeyen birleştirme işlemi." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -404,332 +414,335 @@ msgstr "" "Açıklamaları okuduysanız ve ne yaptığınızı biliyorsanız \"Yap\"ı seçin.\n" "\"Dene\"yi seçmek size ne olabileceğini gösterir.\n" "\n" -"Bu uygulama hala beta durumundadır ve ne olursa olsun hiçbir GARANTİSİ YOKTUR! " -"Önemli verilerinizin yedeğini alın!!" +"Bu uygulama hala beta durumundadır ve ne olursa olsun hiçbir GARANTİSİ " +"YOKTUR! Önemli verilerinizin yedeğini alın!!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Birleştirme Başlıyor" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Yap" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Dene" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" "Renklendirilmiş nesne, değişik dizinlerde değişik dosya türüne sahip. Ne " "yapılacağını seçiniz." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" "Dosyaların değiştirilme tarihleri aynı fakat dosyalar aynı değil. Ne " "yapılacağını seçiniz." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 #, fuzzy msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "Bu işlem şu anda yapılamıyor, çünkü birleştirme hala devam ediyor." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Son adımda bir hata oluştu.\n" "Hata oluşturan nesne ile devam etmek mi yoksa bu nesneyi atlamak mı " "istiyorsunuz?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Bir hatadan sonra birleştirmeye devam et" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Son Nesne ile Devam Et" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Nesneyi Atla" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Atlandı" -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "Uygulanıyor..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Birleştirme işlemi tamamlandı." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Birleştirme Tamamlandı" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"Bir hata oluştu. Detaylı bilgi görmek için TAMAM'a basınız.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "Bir hata oluştu. Detaylı bilgi görmek için TAMAM'a basınız.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Hata: %1 silinirken oluştu: Yedek alınamadı." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "sil( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Hata: dizin okunmaya çalışırken dizini silme işlemi başarısız oldu." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Hata: rmdir( %1 ) işlemi başarısız oldu." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Hata: silme işlemi başarısız oldu." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "el ile birleştir( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 #, fuzzy msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Not: El ile birleştirmeden sonra kullanıcı F7 ile devam etmelidir." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Hata: kopyala( %1 -> %2) başarısız oldu. Mevcut hedefin silinmesi başarısız " "oldu." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "BağıKopyala( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Hata: BağıKopyala başarısız oldu: Uzak bağlar henüz desteklenmiyor." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Hata: BağıKopyala başarısız oldu." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "kopyala( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Yeniden isimlendirilirken ( %1 -> %2 ) hata oluştu: Mevcut hedef silinemiyor." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "yeniden isimlendir( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Hata: Yeniden isimlendirme başarısız oldu." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "%1 klasörü oluşturulurken hata: Mevcut dosya silinemiyor." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "dizin oluştur( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Dizin oluşturulması sırasında hata oluştu." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Hedef" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Dizin" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Tür" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Boyut" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Özellikler" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Son Değiştirme" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Bağ-Hedefi" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Dosya..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "mümkün değil" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (Hedef):" -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (Temel): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (Hedef): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (Hedef): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Hedef: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Dizin Birleştirmesi" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Dizin Birleştirmesini Başlat/Devam Et" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Mevcut Nesne için İşlem Başlat" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Seçili Dosyayı Karşılaştır" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Mevcut Dosyayı Birleştir" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Tüm Alt Dizinleri Kapat" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Tüm Alt Dizinleri Aç" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Tüm Nesneler için A'yı Seç" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Tüm Nesneler için B'yi Seç" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Tüm Nesneler için C'yi Seç" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Tüm Nesneler için Atomatik-Seçim İşlemi" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "Tüm Nesneler için Hiçbir Seçim" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Show Different Files" msgstr "Farklı dosyaların sayısı:" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Seçili Dosyayı Karşılaştır" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Seçili Dosyayı Karşılaştır" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Bir Şey Yapma" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "A && B'yi Sil" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "A && B ile Birleştir" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " @@ -737,7 +750,7 @@ msgstr "" "Yedekleme yapılırken, eski bir yedeğin silinmesi başarısız oldu.\n" "Dosya adı: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -745,435 +758,449 @@ msgstr "" "Yedekleme yapılırken, yeniden isimlendirme başarısız oldu.\n" "Dosya adları: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Dosya durumu okunuyor: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Dosya okunuyor: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Dosya yazılıyor: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Hafıza yetersizliği" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Dizin oluşturuluyor: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Dizin siliniyor: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Dosya siliniyor: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Sembolik bağ oluşturuluyor: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Dosya yeniden isimlendiriliyor: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Dosya kopyalanıyor: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" "Dosya kopyalanırken hata oluştu: Dosya okunmak için açılamadı. Dosya adı: %1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" "Dosya kopyalanırken hata oluştu: Dosya yazılmak için açılamadı. Dosya adı: %1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "Dosya kopyalanırken hata oluştu: Okunamadı. Dosya adı: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Dosya kopyalanırken hata oluştu: Yazılamadı. Dosya adı: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Okuma dizini: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Listeleme dizini: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "Dosya Açma Hatası" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "--auto seçeneği kullanıldı, fakat çıktı dosyası belirtilmedi." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "--auto seçeneği dizin karşılaştırmasını reddetti." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Kaydetme başarısız oldu." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Şu dosyaların açılması başarısız oldu:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "Dosya Açma Hatası" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Karşılaştırmak için belge açar..." -#: kdiff3.cpp:423 +#: 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!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Mevcut belgeyi farklı kaydeder..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Uygulamadan çıkar" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Seçili bölümü keser ve panoya koyar" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Seçili bölümü panoya kopyalar" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Pano içeriklerini mevcut alana yapıştırır" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Bir satırı ara" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Satırı tekrar ara" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Araç çubuğunu açar/kapatır" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Durum çubuğunu açar/kapatır" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "KDiff3 Uygulamasını Yapılandır..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Mevcut Delta'ya Git" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "İlk Delta'ya Git" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Son Delta'ya Git" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -"(\"Boşluk Karakterini Göster\" seçeneği kapalı iken boşluk farklarını göz ardı " -"eder.)" +"(\"Boşluk Karakterini Göster\" seçeneği kapalı iken boşluk farklarını göz " +"ardı eder.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -"(\"Boşluk Karakterini Göster\" seçeneği kapalı iken boşluk farklarını göz ardı " -"etmez.)" +"(\"Boşluk Karakterini Göster\" seçeneği kapalı iken boşluk farklarını göz " +"ardı etmez.)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Önceki Delta'ya Git" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Sonraki Delta'ya Git" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Bir Önceki Çakışmaya Git" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Bir Sonraki Çakışmaya Git" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Bir Önceki Çözülmeyen Çakışmaya Git" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Bir Sonraki Çözülmeyen Çakışmaya Git" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "A'dan Satır(lar) Seç" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "B'den Satır(lar) Seç" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "C'den Satır(lar) Seç" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Kaynak Seçiminden Sonra Otomatik Olarak Bir Sonraki Çözülmeyen Çakışmaya Git" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Farklar için Boşluk && Sekme Karakterlerini Göster" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Boşluğu Göster" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Satır Numaralarını Göster" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "A'yı Heryerde Seç" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "B'yi Heryerde Seç" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "C'yi Heryerde Seç" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 #, fuzzy msgid "Choose A for All Unsolved Conflicts" msgstr "A'yı Tüm Çözülmemiş Çakışmalar için Seç" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 #, fuzzy msgid "Choose B for All Unsolved Conflicts" msgstr "B'yi Tüm Çözülmemiş Çakışmalar için Seç" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 #, fuzzy msgid "Choose C for All Unsolved Conflicts" msgstr "C'yi Tüm Çözülmemiş Çakışmalar için Seç" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 #, fuzzy msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "A'yı Tüm Çözülmemiş Çakışmalar için Seç" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 #, fuzzy msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "B'yi Tüm Çözülmemiş Çakışmalar için Seç" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 #, fuzzy msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "C'yi Tüm Çözülmemiş Çakışmalar için Seç" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Basit Çakışmaları Otomatik Olarak Çöz" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Basit Çakışmaları Otomatik Olarak Çöz" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 #, fuzzy msgid "Join Selected Diffs" msgstr "Seçili Dosyayı Karşılaştır" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "A Penceresini Göster" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "B Penceresini Göster" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "C Penceresini Göster" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Bir Sonraki Pencereye Odaklan" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Normal Öngörünüm" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "A - B Karşılaştırılması Öngörünümü" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "A - C Karşılaştırılması Öngörünümü" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "B - C Karşılaştırılması Öngörünümü" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Bir Önceki Pencereye Odaklan" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "Birleştirme sonucu kaydedilmedi." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Kaydet ve Çık" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Kaydetmeden Çık" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Birleştirme sonucunun kaydedilmesi başarısız oldu." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Şu anda bir dizin birleştirmesi gerçekleştiriyorsunuz. Çıkmak istediğinizden " "emin misiniz?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Dosya kaydediliyor..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Dosya yeni bir isimle kaydediliyor..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "Çıkılıyor..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 #, fuzzy msgid "Printing completed." msgstr "Birleştirme işlemi tamamlandı." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Çıkılıyor..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "" -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "" @@ -1188,8 +1215,8 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" #: main.cpp:35 @@ -1267,19 +1294,18 @@ msgstr "" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 #, fuzzy msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" @@ -1294,52 +1320,31 @@ msgstr "" "Çıktı üzerinde değişiklik yapıldı.\n" "Devam ederseniz değişiklikleri kaybedeceksiniz." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "Tüm girdi dosyaları aynı metni içeriyor." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"A ve B dosyaları aynı metne sahip. \n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"A ve C dosyaları aynı metne sahip. \n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +#, fuzzy +msgid "Files %1 and %2 are binary equal.\n" +msgstr "B ve C dosyaları aynı metne sahip. \n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"B ve C dosyaları aynı metne sahip. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "A ve B dosyaları aynı metne sahip. \n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Toplam çakışma sayısı: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1347,7 +1352,7 @@ msgstr "" "\n" "Otomatik çözülen çakışmaların sayısı: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1355,24 +1360,24 @@ msgstr "" "\n" "Çözülmeyen çakışmaların sayısı: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Çakışmalar" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 #, fuzzy msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1380,39 +1385,39 @@ msgstr "" "Daha tüm çakışmalar çözülmedi.\n" "Dosya kaydedilmedi.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Çakışmalar Var" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "Dosya Kaydetme Hatası" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Yazılırken hata oluştu." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Değişiklik Yapıldı]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 msgid "Encoding for saving" msgstr "" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1432,6 +1437,15 @@ 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" @@ -1553,8 +1567,7 @@ msgid "Auto indentation" msgstr "" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" #: optiondialog.cpp:701 @@ -1587,115 +1600,110 @@ msgstr "KDiff3" msgid "Diff Settings" msgstr "Karşılaştırma ve Birleştirme Ayarları" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "C/C++ yorumlarına boşluk olarak davran." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 #, fuzzy msgid "Ignore C/C++ comments" msgstr "C/C++ Yorumlarını Yoksay" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "C/C++ yorumlarına boşluk olarak davran." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Karşılaştırma ve Birleştirme Ayarları" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Karşılaştırma ve Birleştirme Ayarları" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 #, fuzzy msgid "Manual Choice" msgstr "El ile seçim" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1703,58 +1711,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1764,101 +1773,122 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Altdizinlerin sayısı:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Dizin Birleştirmesi" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Altdizinlerin analiz edilip edilmeyeceği." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "Dosya Türleri:" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr ".cvsignore kullan" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Gizli dosya ve dizinleri bul" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Gizli özelliğine sahip tüm dosya ve dizinleri bulur." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "'.' ile başlayan dosya ve dizinleri bulur." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Dosya bağlarını takip et" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1866,11 +1896,11 @@ msgstr "" "Açık: Bağın işaret ettiği dosyayı karşılaştır.\n" "Kapalı: Bağları karşılaştır." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Dizin bağlarını takip et" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1878,11 +1908,11 @@ msgstr "" "Açık: Bağın işaret ettiğin dizini karşılaştır.\n" "Kapalı: Bağları karşılaştır." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1890,83 +1920,105 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 #, fuzzy msgid "Binary comparison" msgstr "Dizin Karşılaştırması Durumu" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Değiştirme tarihine güven (güvenilir değil)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Değiştirilme tarihleri ve dosya uzunluklukları aynıysa dosyaların aynı " +"olduğunu varsay.\n" +"Büyük dizinler ve yavaş ağlar için kullanışlıdır." + +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" "Useful for big directories or slow networks." msgstr "" -"Değiştirilme tarihleri ve dosya uzunluklukları aynıysa dosyaların aynı olduğunu " -"varsay.\n" +"Değiştirilme tarihleri ve dosya uzunluklukları aynıysa dosyaların aynı " +"olduğunu varsay.\n" "Büyük dizinler ve yavaş ağlar için kullanışlıdır." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Boyuta güven (güvenilir değil)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" "Dosya uzunlukları eşitse dosyaların aynı olduğunu varsay.\n" -"Tarih, indirme sırasında değiştirildiğinde büyük dizinler ve yavaş ağlar için " -"kullanışlıdır." +"Tarih, indirme sırasında değiştirildiğinde büyük dizinler ve yavaş ağlar " +"için kullanışlıdır." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Birleştirmek yerine daha yeni olanı kopyala (güvenli değil)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -1976,11 +2028,11 @@ msgstr "" "(Bu seçeneği sadece ne yaptığınızı biliyorsanız kullanın!)\n" "Sadece iki dizini karşılaştırırken etkilidir." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Dosyaları yedekle (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -1988,102 +2040,102 @@ msgstr "" "Bir dosya eski bir dosyanın üzerine kaydedileceği zaman,\n" "eski dosya silinmek yerine '.orig' uzantısıyla kaydedilir." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 msgid "Auto Select" msgstr "" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "İşlem" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2091,7 +2143,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2101,19 +2173,19 @@ msgid "" "Do you want to continue or do you want to select another font." msgstr "" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Uyumsuz Yazıtipi" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Riski Göze Alarak Devam Et" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Başka Bir Yazıtipi Seç" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "Bu, sadece bu bölümdekileri değil, tüm seçenekleri sıfırlar." @@ -2122,8 +2194,7 @@ msgid "PreprocessorCmd: " msgstr "" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" #: pdiff.cpp:264 @@ -2186,19 +2257,10 @@ msgstr "" msgid "All input files contain the same text, but are not binary equal." msgstr "Tüm girdi dosyaları aynı metni içeriyor." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -#, fuzzy -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"B ve C dosyaları aynı metne sahip. \n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 #, fuzzy -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"A ve B dosyaları aynı metne sahip. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "A ve B dosyaları aynı metne sahip. \n" #: pdiff.cpp:530 msgid "" @@ -2207,109 +2269,55 @@ msgid "" "Continue at your own risk." msgstr "" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Çık" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "" -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Dosya açma hatası" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "" -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "" -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Kaydet ve Devam Et" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Kaydetmeden Devam Et" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Arama tamamlandı." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Arama Tamamlandı" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "Dizin oluşturulması sırasında hata oluştu." -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "KDiff3 Uygulamasını Yapılandır" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Dizin" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Hareket" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, fuzzy, no-c-format -msgid "D&iffview" -msgstr "KDiff3" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Birleştir" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Pencere" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "" @@ -2352,6 +2360,10 @@ 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:" @@ -2425,6 +2437,14 @@ 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 "" @@ -2438,6 +2458,67 @@ msgstr "Kaydetme başarısız oldu." msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Dizin" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Hareket" + +#: kdiff3_shell.rc:61 +#, fuzzy, no-c-format +msgid "D&iffview" +msgstr "KDiff3" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Birleştir" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Pencere" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "A ve C dosyaları aynı metne sahip. \n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "B ve C dosyaları aynı metne sahip. \n" + #, fuzzy #~ msgid "Diff and Merge" #~ msgstr "Karşılaştırma ve Birleştirme" diff --git a/po/uk.po b/po/uk.po index a792fc6..94caa5a 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4,38 +4,39 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2006-06-14 23:20-0700\n" "Last-Translator: Ivan Petrouchtchak \n" "Language-Team: Ukrainian \n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.2\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>" -"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Іван Петрущак" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "ivanpetrouchtchak@yahoo.com" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Помилка запису даних кишені у тимчасовий файл." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "З кишені" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -44,7 +45,7 @@ msgid "" "The preprocessing command will be disabled now." msgstr "" -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -53,21 +54,21 @@ msgid "" "The line-matching-preprocessing command will be disabled now." msgstr "" -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" msgstr "" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Критична внутрішня помилка" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 msgid "Top line" msgstr "Верхній рядок" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Кінець" @@ -83,132 +84,130 @@ msgstr "Посилання: " msgid "Size. " msgstr "Розмір. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Дата і розмір: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Помилка створення тимчасової копії %1." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Помилка відкриття %1." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Порівняння файла..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Помилка читання з %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Назва" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Дія" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Стан" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Не розв'язано" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Розв'язано" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Не-білий" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Білий" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 #, fuzzy msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -"Ви дійсно хочете цілковито відновити Pilot з резервної копії (%1" -")? Ця дія приведе до повного стирання даних на Pilot." +"Ви дійсно хочете цілковито відновити Pilot з резервної копії (%1)? Ця дія приведе до повного стирання даних на Pilot." -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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 "Пересканувати" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Продовжити об'єднання" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Помилка відкриття каталогів:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Каталог А \"%1\" не існує або це не каталог.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Каталог А \"%1\" не існує або це не каталог.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Каталог В \"%1\" не існує або це не каталог.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Каталог В \"%1\" не існує або це не каталог.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Каталог С \"%1\" не існує або це не каталог.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Каталог С \"%1\" не існує або це не каталог.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Помилка відкриття каталогу" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 #, fuzzy msgid "Parameter Warning" -msgstr "" -" Параметр %1 %2=\"%3\"\n" +msgstr " Параметр %1 %2=\"%3\"\n" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Сканування каталогів..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Читання каталогу A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Читання каталогу B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Читання каталогу C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 #, fuzzy msgid "Check the permissions of the subdirectories." msgstr "" @@ -217,134 +216,138 @@ msgstr "" " не можливо записати;\n" "перевірте, будь ласка, права доступу." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Готове." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Стан порівняння каталогів" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Кількість підкаталогів:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 #, fuzzy msgid "Number of equal files:" msgstr "&Кількість wav файлів для одночасного кодування:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 #, fuzzy msgid "Number of different files:" msgstr "&Кількість недавніх файлів у списку:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 #, fuzzy msgid "Number of manual merges:" -msgstr "" -"Кількість фраз: %1\n" +msgstr "Кількість фраз: %1\n" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 #, fuzzy msgid "C&ontinue" msgstr "Пр&одовжити" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 #, fuzzy msgid "Processing " msgstr "Пакетна обробка" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 #, fuzzy msgid "Copy A to B" msgstr "%1: скопіювати у проект" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 #, fuzzy msgid "Copy B to A" msgstr "%1: скопіювати у проект" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 #, fuzzy msgid "Delete A" msgstr "&Видалити рахунок" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 #, fuzzy msgid "Delete B" msgstr "Витерти кни&гу" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 #, fuzzy msgid "Delete A & B" msgstr "&Видалити рахунок" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 #, fuzzy msgid "Merge to A" msgstr "Виберіть яке зображення додати" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 #, fuzzy msgid "Merge to B" msgstr "Штамп для запису" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 #, fuzzy msgid "Delete (if exists)" msgstr "Видалити всі існуючі застарілі нагадування." -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 #, fuzzy msgid "Merge" msgstr "Об'єднати" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 #, fuzzy msgid "This operation is currently not possible." msgstr "" "Ця програма в даний час працює в автономному режимі. Хочете з'єднатись?" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 #, fuzzy msgid "Operation Not Possible" msgstr "Зворотне трасування неможливе" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -353,51 +356,54 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 #, fuzzy msgid "Program Error" msgstr "Помилка програми" -#: directorymergewindow.cpp:1899 +#: directorymergewindow.cpp:1965 #, fuzzy -msgid "" -"An error occurred while copying.\n" +msgid "An error occurred while copying.\n" msgstr "" -"" -"

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

" -"

%1" -"

" +"

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

%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:1900 directorymergewindow.cpp:2306 +#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 #, fuzzy msgid "Merge Error" msgstr "&Сховати помилки" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 #, fuzzy msgid "Error." msgstr "Помилка." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 #, fuzzy msgid "Done." msgstr "Завершено." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 #, fuzzy msgid "Not saved." msgstr "Файл не збережено." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -409,7 +415,7 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 #, fuzzy msgid "Starting Merge" msgstr "" @@ -417,827 +423,846 @@ msgstr "" "Запуск таблиці стилів\n" "\n" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 #, fuzzy msgid "Do It" msgstr "Зробити це" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 #, fuzzy msgid "Simulate It" msgstr "Симулювати помилку" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 #, fuzzy msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -"Типово GnuPG використовує файл ~/.gnupg/policies.txt для перевірки чи дозволені " -"правила сертифікатів. Якщо цей параметр ввімкнено, правила не перевіряються." +"Типово GnuPG використовує файл ~/.gnupg/policies.txt для перевірки чи " +"дозволені правила сертифікатів. Якщо цей параметр ввімкнено, правила не " +"перевіряються." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 #, fuzzy msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -"Програму інфрачервоного дистанційного керування не запущено. Без неї цей модуль " -"конфігурації не працюватиме правильно. Хочете її зараз запустити?" +"Програму інфрачервоного дистанційного керування не запущено. Без неї цей " +"модуль конфігурації не працюватиме правильно. Хочете її зараз запустити?" -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 #, fuzzy msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Цей документ було створено за допомогою OpenOffice.org версії \"%1\". Цей " "фільтр написано для версії 1.0. Читання цього файла може спричинити хаотичну " "поведінку, крах або неправильне відображення даних. Хочете продовжити " "перетворення документа?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 #, fuzzy msgid "Skip Item" msgstr "Кинути елемент" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 #, fuzzy msgid "Skipped." msgstr "Пропущено %1." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 #, fuzzy msgid "In progress..." msgstr "Відбувається резервування..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 #, fuzzy msgid "Merge operation complete." msgstr "Запитану дію не може бути завершено." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 #, fuzzy msgid "Merge Complete" msgstr "Пере&микнути відображення завершених завдань" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 #, fuzzy msgid "delete directory recursively( %1 )" msgstr "Увімкнути/вимкнути рекурсивне додавання каталогів у список композицій." -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 #, fuzzy msgid "Error: delete operation failed." msgstr "Дія видалення зазнала невдачі." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 #, fuzzy msgid "Error: copyLink failed." msgstr "" "Виклик \"stat\" на %1 зазнав невдачі.\n" "Помилка: %2" -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 #, fuzzy msgid "Error: Rename failed." msgstr "" "Виклик \"stat\" на %1 зазнав невдачі.\n" "Помилка: %2" -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 #, fuzzy msgid "Error while creating directory." msgstr "Помилка створення файла %1:
%2" -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 #, fuzzy msgid "Dir" msgstr "Каталог" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 #, fuzzy msgid "Type" msgstr "Тип" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 #, fuzzy msgid "Size" msgstr "Розмір" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 #, fuzzy msgid "Last Modification" msgstr "Час останньої модифікації" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 #, fuzzy msgid "Link-Destination" msgstr "Сховати місце призначення &посилання" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Файл..." + +#: directorymergewindow.cpp:2729 #, fuzzy msgid "not available" msgstr "не доступне" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 #, fuzzy msgid "Dest: " msgstr "Схід-захід:" -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 #, fuzzy msgid "Run Operation for Current Item" msgstr "Припинити поточну дію" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 #, fuzzy msgid "Compare Selected File" msgstr "&Видалити вибрані файли" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 #, fuzzy msgid "Merge Current File" msgstr "Перезавантажити поточний файл з диска" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 #, fuzzy msgid "Show Identical Files" msgstr "Вихідний файл та файл призначення співпадають" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Show Different Files" msgstr "Зберегти в інший файл" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 #, fuzzy msgid "Show Files only in A" msgstr "Відображати файли, що закінчуються на: " -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 #, fuzzy msgid "Show Files only in B" msgstr "Відображати файли, що закінчуються на: " -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 #, fuzzy msgid "Show Files only in C" msgstr "Відображати файли, що закінчуються на: " -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 #, fuzzy msgid "Do Nothing" msgstr "Нічого не робити" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 #, fuzzy msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 #, fuzzy msgid "B" msgstr "Б" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 #, fuzzy msgid "C" msgstr "Сі" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 #, fuzzy msgid "Delete A && B" msgstr "&Видалити рахунок" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " msgstr "" -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " msgstr "" -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, fuzzy, c-format msgid "Getting file status: %1" msgstr "Дізнатись про віддалений стан наступних файлів:" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, fuzzy, c-format msgid "Reading file: %1" msgstr "Помилка при розборі файла: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, fuzzy, c-format msgid "Writing file: %1" msgstr "Помилка при розборі файла: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 #, fuzzy msgid "Out of memory" msgstr "Не вистачає пам'яті" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, fuzzy, c-format msgid "Making directory: %1" msgstr "Каталог резервних копій: %1." -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, fuzzy, c-format msgid "Removing directory: %1" msgstr "Каталог резервних копій: %1." -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, fuzzy, c-format msgid "Removing file: %1" msgstr "Видалення двійкового файла %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 #, fuzzy msgid "Creating symbolic link: %1 -> %2" msgstr "Віддалена машина не підтримує створення символічних посилань." -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 #, fuzzy msgid "Renaming file: %1 -> %2" msgstr "Перейменування файлів..." -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 #, fuzzy msgid "Copying file: %1 -> %2" msgstr "Копіювання файлів у межах %1 не підтримується." -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 #, fuzzy msgid "Reading directory: " msgstr "Читання структури каталогів" -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, fuzzy, c-format msgid "Listing directory: %1" msgstr "Вільне місце в каталозі призначення: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 #, fuzzy msgid "Current Configuration:" msgstr "Comment=Конфігурація клієнта Citrix ICA" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "Помилка конфігурації CUPS" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 #, fuzzy msgid "Saving failed." msgstr "Не вдалось зберегти об'єкт \"%1\"." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 #, fuzzy msgid "Opening of these files failed:" msgstr "Виникла помилка при аналізі файла результатів ОРС:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 #, fuzzy msgid "File Open Error" msgstr "Помилка відкриття файла" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 #, fuzzy msgid "Opens documents for comparison..." msgstr "Кількість речень, слів та літер в документі" -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 #, fuzzy msgid "Saves the current document as..." msgstr "Зберігає документ як..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 #, fuzzy msgid "Print the differences" msgstr "Немає відмінності від сховища." -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 #, fuzzy msgid "Quits the application" msgstr "Зупиняє програму" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 #, fuzzy msgid "Cuts the selected section and puts it to the clipboard" msgstr "Вирізає вибране та кладе його у кишеню" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 #, fuzzy msgid "Copies the selected section to the clipboard" msgstr "Копіює вибране до кишені" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 #, fuzzy msgid "Pastes the clipboard contents to actual position" msgstr "Вставляє зміст кишені в поточну позицію" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 #, fuzzy msgid "Search for a string" msgstr "Шукати рядок" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 #, fuzzy msgid "Search again for the string" msgstr "Розглядати рядок пошуку як формальний вираз" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 #, fuzzy msgid "Enables/disables the toolbar" msgstr "Вмикає/вимикає пенал" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 #, fuzzy msgid "Enables/disables the statusbar" msgstr "Вмикає/вимикає смужку стану" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 #, fuzzy msgid "Configure KDiff3..." msgstr "Налаштувати KDat..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 #, fuzzy msgid "Go to Current Delta" msgstr "Всі &до поточної стільниці" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 #, fuzzy msgid "Go to Previous Delta" msgstr "Перейти до попереднього сеансу" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 #, fuzzy msgid "Go to Next Delta" msgstr "Перейти до наступного сеансу" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 #, fuzzy msgid "Go to Previous Conflict" msgstr "&Повернутися до попередньої конфігурації" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 #, fuzzy msgid "Go to Next Conflict" msgstr "Перейти до наступного сеансу" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 #, fuzzy msgid "Select Line(s) From A" msgstr "Виберіть сервер зі списку..." -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 #, fuzzy msgid "Select Line(s) From B" msgstr "Виберіть сервер зі списку..." -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 #, fuzzy msgid "Select Line(s) From C" msgstr "Виберіть сервер зі списку..." -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 #, fuzzy msgid "Show Line Numbers" msgstr "Разом з номерами рядків" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 #, fuzzy msgid "Set Deltas to Conflicts" msgstr "Застосувати до всіх конфліктів даної синхронізації" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 #, fuzzy msgid "Run Regular Expression Auto Merge" msgstr "Формальні вирази для назв файлів" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 #, fuzzy msgid "Join Selected Diffs" msgstr "&Відкрити вибрану таблицю/запит" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 #, fuzzy msgid "Show Window A" msgstr "Показувати всі &вікна" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 #, fuzzy msgid "Show Window B" msgstr "Показувати всі &вікна" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 #, fuzzy msgid "Show Window C" msgstr "Створене нове вікно" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 #, fuzzy msgid "Focus Next Window" msgstr "Фокус до наступної статті" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 #, fuzzy msgid "Normal Overview" msgstr "Перегляд &флоту" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 #, fuzzy msgid "Toggle Split Orientation" msgstr "&Орієнтація розбиття" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 #, fuzzy msgid "Save && Quit" msgstr "Зберегти і з'&єднатись" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 #, fuzzy msgid "Saving the merge result failed." msgstr "Помилка збереження результатів %1." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 #, fuzzy msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -"Ви в даний час приймаєте участь у грі. Ви дійсно хочете закрити Atlantik? Якщо " -"ви вийдете з гри, ви програли." +"Ви в даний час приймаєте участь у грі. Ви дійсно хочете закрити Atlantik? " +"Якщо ви вийдете з гри, ви програли." + +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:644 #, fuzzy msgid "Saving file..." msgstr "Збереження файла..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 #, fuzzy msgid "Saving file with a new filename..." msgstr "Зберігаю файл з новим ім'ям..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "Друкую..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 #, fuzzy msgid "Printing aborted." msgstr "Друк перервано" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 #, fuzzy msgid "Selection" msgstr "Вибір" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 #, fuzzy msgid "Printing completed." msgstr "Друк закінчено." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 #, fuzzy msgid "Exiting..." msgstr "Вихід..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 #, fuzzy msgid "Toggling toolbar..." msgstr "Перемикаю пенал..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 #, fuzzy msgid "Toggle the statusbar..." msgstr "Перемикаю смужку стану..." @@ -1253,8 +1278,8 @@ msgstr "" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" #: main.cpp:35 @@ -1334,19 +1359,18 @@ msgstr "Відкрити файл документа" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, fuzzy, no-c-format msgid "KDiff3" msgstr "Diff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" @@ -1359,125 +1383,105 @@ msgstr "" "Поточний документ було змінено на диску і містить незбережені зміни.\n" "Якщо ви його перезавантажите, всі зміни буде втрачено." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 #, fuzzy msgid "All input files are binary equal." msgstr "Здається, всі файли однакові." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" - -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 #, fuzzy msgid "Total number of conflicts: " msgstr "Друкувати деякі контакти." -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " msgstr "" -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 #, fuzzy msgid "" "\n" "Nr of unsolved conflicts: " msgstr "Розв'язано конфлікт для %1." -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 #, fuzzy msgid "Conflicts" msgstr "Конфлікти" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" msgstr "" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 #, fuzzy msgid "Conflicts Left" msgstr "Конфлікти й дублікати" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 #, fuzzy msgid "File Save Error" msgstr "Помилка збереження діаграми." -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 #, fuzzy msgid "Error while writing." msgstr "Помилка перетворення тексту %1." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 #, fuzzy msgid "Output" msgstr "Вивід" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 #, fuzzy msgid "[Modified]" msgstr "З&мінено" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 #, fuzzy msgid "Encoding for saving" msgstr "Попередження про кодування" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1499,6 +1503,15 @@ 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 "" @@ -1635,8 +1648,7 @@ msgid "Auto indentation" msgstr "Автовідступ" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" #: optiondialog.cpp:701 @@ -1671,120 +1683,113 @@ msgstr "Diff3" msgid "Diff Settings" msgstr "Зберегти параметри і закрити" -#: optiondialog.cpp:743 -#, fuzzy -msgid "Preserve carriage return" -msgstr "Стиль &MacOS (тільки повернення каретки)" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." +#: optiondialog.cpp:750 +msgid "Treat as white space." msgstr "" -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 #, fuzzy msgid "Ignore numbers" msgstr "Додати номери сторінок" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 #, fuzzy msgid "Ignore case" msgstr "Без урахування регістру" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 #, fuzzy msgid "Preprocessor command:" msgstr "Попередню підготовку звуку закінчено." -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Зберегти параметри і закрити" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" msgstr "" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Зберегти параметри і закрити" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 #, fuzzy msgid "Manual Choice" msgstr "при перевірці пошти вручну" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 #, fuzzy msgid "Automatic Merge Regular Expression" msgstr "&Зберегти формальний вираз..." -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 #, fuzzy msgid "Auto merge regular expression:" msgstr "&Формальний вираз меж речень:" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1792,62 +1797,63 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 #, fuzzy msgid "Run regular expression auto merge on merge start" msgstr "" "Ваш формальний вираз неправильний, оскільки щось передує \"початок рядка\"." -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 #, fuzzy msgid "History start regular expression:" msgstr "&Формальний вираз меж речень:" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 #, fuzzy msgid "History entry start regular expression:" msgstr "&Формальний вираз меж речень:" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1857,118 +1863,139 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Кількість підкаталогів:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 #, fuzzy msgid "Test your regular expressions" msgstr "Локальні символи для формальних виразів:" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 #, fuzzy msgid "Directory Merge" msgstr "Приписування каталогів" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 #, fuzzy msgid "Recursive directories" msgstr "Підрахування каталогів..." -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 #, fuzzy msgid "Whether to analyze subdirectories or not." msgstr "Чи додавати каталоги до списку композицій рекурсивно" -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 #, fuzzy msgid "File pattern(s):" msgstr "Виберіть стиль або шаблон." -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." msgstr "" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 #, fuzzy msgid "Find hidden files and directories" msgstr "Ігнорувати приховані файли та теки" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "" -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 #, fuzzy msgid "Follow file links" msgstr "&Йти за символічними посиланнями" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 #, fuzzy msgid "" "On: Compare the directory the link points to.\n" @@ -1977,11 +2004,11 @@ msgstr "" "Дозволяти навігацію по символічних посиланнях, які вка&зують на ділянки поза " "деревом каталогу" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1989,197 +2016,213 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1074 +#: optiondialog.cpp:1091 #, fuzzy -msgid "Trust the modification date (unsafe)" +msgid "Trust the size and modification date (unsafe)" msgstr "Модифіковано:%1" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" + +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 #, fuzzy msgid "Synchronize directories" msgstr "Не вдається розмістити файл; неможливо створювати теки." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 #, fuzzy msgid "Backup files (.orig)" msgstr "Файли резерву:" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 #, fuzzy msgid "Regional Settings" msgstr "Регіональні параметри" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." msgstr "" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 #, fuzzy msgid "File Encoding for A:" msgstr "Попередження про кодування" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 #, fuzzy msgid "File Encoding for B:" msgstr "Попередження про кодування" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 #, fuzzy msgid "File Encoding for C:" msgstr "Попередження про кодування" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "Щоб вибрати, потягніть при натиснутій лівій кнопці." -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration" msgstr "Інтеграція" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 msgid "Integration Settings" msgstr "Параметри інтеграції" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 #, fuzzy msgid "Command line options to ignore:" msgstr "" "Використовуйте --help щоб отримати список можливих опцій командної строки." -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2187,7 +2230,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2197,21 +2260,21 @@ msgid "" "Do you want to continue or do you want to select another font." msgstr "" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 #, fuzzy msgid "Incompatible Font" msgstr "%1 несумісне з %2" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 #, fuzzy msgid "Select Another Font" msgstr "Виберіть будь-які інші втулки:" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2221,8 +2284,7 @@ msgid "PreprocessorCmd: " msgstr "Перед-перегляд (тип 1)" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" msgstr "" #: pdiff.cpp:264 @@ -2288,14 +2350,8 @@ msgstr "" msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" #: pdiff.cpp:530 @@ -2305,109 +2361,55 @@ msgid "" "Continue at your own risk." msgstr "" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Перервати" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Відкриття файлів..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Помилка відкриття файла" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Вирізання вибраного..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Копіювання вибраного до кишені..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Вставлення вмісту кишені..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Зберегти й продовжити" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Продовжити без збереження" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Пошук завершено." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Пошук завершено" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "Помилка додавання повідомлення до теки %1 в KMail" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Налаштувати KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Каталог" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, fuzzy, no-c-format -msgid "Current Item Merge Operation" -msgstr "Припинити поточну дію" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, fuzzy, no-c-format -msgid "Current Item Sync Operation" -msgstr "Припинити поточну дію" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, fuzzy, no-c-format -msgid "&Movement" -msgstr "&Мінімальний рух:" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Об'єднати" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Вікно" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "" @@ -2452,6 +2454,10 @@ msgstr "Коментар (не обов'язковий):" msgid "Configure..." msgstr "Налаштувати..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Знайти текст:" @@ -2527,6 +2533,14 @@ 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 "" @@ -2539,3 +2553,62 @@ msgstr "

Дія завершилась невдало.

%1

" #: smalldialogs.cpp:559 msgid "Opening and closing parentheses don't match in regular expression." msgstr "" + +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "&Каталог" + +#: kdiff3_shell.rc:30 +#, fuzzy, no-c-format +msgid "Current Item Merge Operation" +msgstr "Припинити поточну дію" + +#: kdiff3_shell.rc:38 +#, fuzzy, no-c-format +msgid "Current Item Sync Operation" +msgstr "Припинити поточну дію" + +#: kdiff3_shell.rc:50 +#, fuzzy, no-c-format +msgid "&Movement" +msgstr "&Мінімальний рух:" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Об'єднати" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Вікно" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#, fuzzy +#~ msgid "Preserve carriage return" +#~ msgstr "Стиль &MacOS (тільки повернення каретки)" diff --git a/po/zh_CN.po b/po/zh_CN.po index 7b93bb8..68e135c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,35 +6,36 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2005-02-07 10:03+0800\n" "Last-Translator: Mai Hao Hui \n" "Language-Team: zh_CN \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "开源软件国际化简体中文组(http://i18n.linux.net.cn)" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "i18n-translation@list.linux.net.cn" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "将剪贴板数据写入临时文件失败。" -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "从剪贴板" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -48,7 +49,7 @@ msgstr "" "\n" "现在预处理命令会被禁用。" -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -62,7 +63,7 @@ msgstr "" "\n" "现在行匹配处理命令会被禁用。" -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -70,16 +71,16 @@ msgstr "" "数据丢失错误：\n" "如果它是可复制的，请联系作者。\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "严重内部错误" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "顶端行数 %1" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "末尾" @@ -95,242 +96,246 @@ msgstr "链接：" msgid "Size. " msgstr "大小。" -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "日期和大小：" -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "创建临时 %1 副本失败。" -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "打开 %1 失败。" -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "正在比较文件..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "读取 %1 时错误" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "名称" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "操作" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "状态" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "未解决的" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "已解决的" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "非空白" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "空白" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "您当前正在合并目录。您确定要放弃合并，重新扫描目录吗？" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: 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 "重新扫描" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "继续合并" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "打开目录失败" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"目录 A “%1”不存在或者不是目录。\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "目录 A “%1”不存在或者不是目录。\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"目录 B “%1”不存在或者不是目录。\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "目录 B “%1”不存在或者不是目录。\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"目录 C “%1”不存在或者不是目录。\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "目录 C “%1”不存在或者不是目录。\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "打开目录错误" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "当三个目录合并时，目标目录不能是 A 或者 B。\n" "在继续进行前，请再核对一遍。" -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "参数警告" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "正在扫描目录..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "读取目录 A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "读取目录 B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "读取目录 C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "不能进入读取一些子目录" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "检查子目录权限。" -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "就绪。" -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "目录比较状态" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "子目录数：" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "相同文件数：" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "不同文件数：" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "手动合并数：" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "这将影响全部合并操作。" -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "更改全部合并操作" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "继续(&o)" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "处理 " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "执行。" -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "复制 A 到 B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "复制 B 到 A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "删除 A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "删除 B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "删除 A 和 B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "合并到 A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "合并到 B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "合并到 A 和 B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "删除(如果存在)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "合并" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "合并(手动)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "错误：文件类型冲突" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "错误：日期相同但是文件不同。" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "现在不能执行此操作。" -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "操作不可行" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -344,42 +349,47 @@ msgstr "" "\n" "如果您知道如何重现错误，请联系程序作者。" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "程序错误" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"复制时发生错误。\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "复制时发生错误。\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: 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 "合并错误" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "错误。" -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "完成。" -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "未保存。" -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "未知合并操作。(绝不可以发生！)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "未知合并操作。" -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -397,318 +407,321 @@ msgstr "" "\n" "注意此程序依然处于 beta 状态，没有任何保证！备份您的重要数据！" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "开始合并" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "执行" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "模拟" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "高亮的项目在不同的目录有不同类型。选择做什么。" -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "文件的修改日期相同但是文件不同。选择做什么。" -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "此操作当前不可行，因为目录合并正在运行。" -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "最后一步有错误。\n" "您要继续进行导致错误的项目还是跳过该项？" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "出错后继续合并" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "继续进行上一项" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "跳过项目" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "已跳过。" -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "进行中..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "合并操作完成。" -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "合并完成" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "模拟合并完成：核对您是否赞同被提议的操作。" -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"错误发生。按 OK 看详细信息。\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "错误发生。按 OK 看详细信息。\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "错误：在删除 %1 时：创建备份失败。" -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "递归删除目录( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "删除( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "错误：在试图读取目录时删除目录操作失败。" -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "错误：rmdir( %1 )操作失败。" -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "错误：删除操作失败。" -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "手动合并( %1，%2，%3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " 注意：在手动合并之后用户应该按 F7 继续。" -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "错误：复制( %1 -> %2 )失败。删除现存目标失败。" -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "复制链接( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "错误：复制链接失败：远程链接尚未支持。" -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "错误：复制链接失败。" -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "复制( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "重命名( %1 -> %2 )错误：无法删除现存目标。" -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "重命名( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "错误：重命名失败。" -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "建立目录 %1 出错。无法删除现存文件。" -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "建立目录( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "创建目录时出错。" -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "目标" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "目录" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "类型" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "大小" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "属性" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "上次修改" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "链接目标" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "文件..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "不可用" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (目标)：" -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A 基准" -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (目标)：" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (目标)：" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "目标：" -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 #, fuzzy msgid "Save Directory Merge State As..." msgstr "目录合并" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "开始/继续目录合并" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "开始当前项目操作" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "比较所选文件" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "合并当前文件" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "折叠全部子文件夹" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "打开全部子文件夹" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "选择 A 的全部项目" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "选择 B 的全部项目" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "选择 C 的全部项目" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "为全部项目自动选择操作" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "全部项目无操作" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Show Different Files" msgstr "不同文件数：" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "比较所选文件" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "比较所选文件" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "什么也不做" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "删除 A 和 B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "合并到 A 和 B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " @@ -716,7 +729,7 @@ msgstr "" "试图做备份时，删除旧备份失败。\n" "文件名：" -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -724,421 +737,435 @@ msgstr "" "试图备份时，重命名失败。\n" "文件名：" -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "获取文件状态：%1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "读取文件：%1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "写入文件：%1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "内存溢出" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "建立目录：%1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "删除目录：%1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "删除文件：%1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "创建符号链接：%1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "重命名文件：%1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "复制文件：%1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "文件复制操作出错：打开文件读取失败。文件名：%1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "文件复制操作出错：打开文件写入失败。文件名：%1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "文件复制操作出错：读取失败。文件名：%1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "文件复制操作出错：写入失败。文件名：%1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "读取目录：" -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "目录列表：%1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 #, fuzzy msgid "Current Configuration:" msgstr "当前项目同步操作" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "文件打开出错" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "选项 -- 自动使用，但没有指定输出文件。" -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "选项 -- 自动忽略目录比较。" -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "保存失败。" -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "打开以下文件失败：" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "文件打开出错" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "打开文档比较..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "保存合并结果。必须解决全部冲突！" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "保存当前文档为..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "退出程序" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "剪切所选节，将其放入剪贴板" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "复制所选节至剪贴板" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "粘贴剪贴板内容到实际位置" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "搜索字符串" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "再次搜索该字符串" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "启用/禁止工具栏" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "启用/禁止状态栏" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "配置 KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "到当前 Delta" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "到第一个 Delta" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "到最后一个 Delta" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(禁用“显示空白字符”时跳过空白差异。)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "(禁用“显示空白字符”时也不跳过空白差异。)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "到上一个 Delta" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "到下一个 Delta" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "到上一个冲突" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "到下一个冲突" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "到上一个未解决冲突" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "到下一个未解决冲突" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "从 A 选择 行" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "从 B 选择行" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "从 C 选择行" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "源码选择后自动到下一个未解决冲突" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "显示间距和制表符的不同" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "显示空白字符" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "显示行数" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "选择 A 全部" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "选择 B 全部" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "选择 C 全部" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "选择 A 全部未解决冲突" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "选择 B 全部未解决冲突" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "选择 C 全部未解决冲突" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "选择 A 全部未解决空白字符冲突" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "选择 B 全部未解决空白字符冲突" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "选择 C 全部未解决空白字符冲突" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "自动解决简单冲突" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "设置 Delta 为冲突" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "自动解决简单冲突" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 #, fuzzy msgid "Join Selected Diffs" msgstr "比较所选文件" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "显示窗口 A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "显示窗口 B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "显示窗口 C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "聚焦于下一个窗口" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "普通概览" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "A 和 B 概览" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "A 和 C 概览" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "B 和 C 概览" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "在 Diff 窗口自动换行" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "聚焦于上一个窗口" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "切换分隔方向" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "目录和文本分屏视图" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "切换目录和文本视图" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "合并结果未保存。" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "保存并退出" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "退出不保存" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "保存合并结果失败。" -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "您当前正在合并目录。您确认要放弃吗？" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "正在保存文件..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "正在用新文件名保存文件..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "正在退出..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 #, fuzzy msgid "Printing completed." msgstr "合并操作完成。" -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "正在退出..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "切换工具栏..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "切换状态栏..." @@ -1153,8 +1180,8 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "无法找到我们的组件！\n" "发生此错误通常因为安装错误。详细内容请阅读源码包内的 README 文件。" @@ -1234,19 +1261,18 @@ msgstr "要打开的文件 3" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "+ 十分感谢报告错误和贡献想法的人们！" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "还未解决的冲突数目：%1(其中 %2 项为空白字符)" @@ -1258,55 +1284,31 @@ msgstr "" "已修改输出。\n" "如果您继续您的更改将丢失。" -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "全部输入文件二进制数据相同。" -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "全部输入文件包含相同文本。" -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"文件 A 和 B 二进制数据相同。\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"文件 A 和 B 文本相同。\n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"文件 A 和 C 二进制数据相同。\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"文件 A 和 C 文本相同。\n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"文件 B 和 C 二进制数据相同。\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +#, fuzzy +msgid "Files %1 and %2 are binary equal.\n" +msgstr "文件 B 和 C 二进制数据相同。\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"文件 B 和 C 文本相同。\n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "文件 A 和 B 文本相同。\n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "冲突总数：" -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1314,7 +1316,7 @@ msgstr "" "\n" "自动解决的冲突数目：" -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1322,23 +1324,23 @@ msgstr "" "\n" "未解决冲突数目：" -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "冲突" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "" msgstr "<无源行>" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "" msgstr "<合并冲突(只有空白字符)>" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "" msgstr "<合并冲突>" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1346,11 +1348,11 @@ msgstr "" "尚未解决全部冲突。\n" "文件未保存。\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "遗留的冲突" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1360,29 +1362,29 @@ msgstr "" "\n" "创建备份失败。文件未保存。" -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "保存文件错误" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "写入时出错。" -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "输出" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[已修改]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 #, fuzzy msgid "Encoding for saving" msgstr "C 的文件编码：" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1402,6 +1404,15 @@ 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 输出字体" @@ -1527,10 +1538,8 @@ msgid "Auto indentation" msgstr "自动缩进" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"打开：使用前一行的缩进于新一行。\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "打开：使用前一行的缩进于新一行。\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1566,60 +1575,53 @@ msgstr "KDiff3" msgid "Diff Settings" msgstr "Diff 和 Merge 设置" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "保留回车" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"如果存在，显示回车字符“\\r”。\n" -"这个选项帮助比较在不同操作系统下修改的文件。" +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "按空白字符处理 C/C++ 注解" -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "忽略数字" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "在行匹配阶段，忽略数字字符。(与忽略空白字符相似。)\n" "可能帮助比较带数值数据的文件。" -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "忽略 C/C++ 注解" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "按空白字符处理 C/C++ 注解" -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "忽略大小写" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "按处理空格更改的方法处理大小写更改。(“a”<=>“A”)" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "预处理程序命令：" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "用户定义预处理。(详细内容见文档。)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "行匹配预处理命令：" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1627,11 +1629,11 @@ msgstr "" "此预处理仅在行匹配时使用。\n" "(详细内容见文档。)" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "尽量仔细(较慢)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1639,48 +1641,50 @@ msgstr "" "为外部 diff 程序启用 --minimal 选项。\n" "大文件的分析会慢得多。" -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Diff 和 Merge 设置" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "自动前进延迟(毫秒)：" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" -msgstr "在自动前进模式，当前选择结果显示一定时间，才会跳到下一个冲突。范围：0-2000 毫秒" - -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Diff 和 Merge 设置" +msgstr "" +"在自动前进模式，当前选择结果显示一定时间，才会跳到下一个冲突。范围：0-2000 毫" +"秒" -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "2 文件合并默认空白字符：" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "手动选择" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "允许合并算法为仅有空白字符变化自动选择输入。" -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "默认 3 文件合并空白字符：" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1688,58 +1692,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1749,46 +1754,67 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "子目录数：" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "目录合并" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "包含子目录" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "是否分析子目录。" -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "文件模式：" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1798,11 +1824,11 @@ msgstr "" "通配符：“*”和“?”\n" "几个模式可以使用分隔符：“;”指定" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "排除文件模式：" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1812,11 +1838,11 @@ msgstr "" "通配符：“*”和“?”\n" "几个模式可以使用分隔符：“;”指定" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "排除目录模式：" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1826,11 +1852,11 @@ msgstr "" "通配符：“*”和“?”\n" "几个模式可以使用分隔符：“;”指定" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "使用 .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1838,23 +1864,23 @@ msgstr "" "扩展排除模式至任何被 CVS 忽略的类型。\n" "通过本地“.cvsignore”文件，可以指定目录。" -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "查找隐藏目录和文件" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "查找具有隐藏属性的文件和目录。" -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "查找以“.”开头的文件和目录。" -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "追踪文件链接" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1862,11 +1888,11 @@ msgstr "" "打开：比较链接指向的文件。\n" "关闭：比较链接。" -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "追踪目录链接" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1874,11 +1900,11 @@ msgstr "" "打开：比较链接指向的目录。\n" "关闭：比较链接。" -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1886,23 +1912,23 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "文件比较模式" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "二进制比较" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "用二进制比较模式比较每个文件。" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "完全分析" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1910,24 +1936,45 @@ msgstr "" "进行完全分析并且在额外的列里显示统计信息。\n" "(比较二进制比较模式慢，比较二进制文件更慢。)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "信任修改日期(不安全)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" "假定如果修改日期和文件长度相同，则文件相同。\n" "对于大目录或较慢的网络有用。" -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"假定如果修改日期和文件长度相同，则文件相同。\n" +"对于大目录或较慢的网络有用。" + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "信任大小(不安全)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -1936,11 +1983,11 @@ msgstr "" "假定文件长度相同文件相同。\n" "当下载过程中日期被修改时，对于大目录或较慢网络有用。" -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "同步目录" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -1949,11 +1996,11 @@ msgstr "" "为了以后目录相同，提供在两个目录里存储文件。\n" "仅在比较两个目录并未指定目标目录时有效。" -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "认为相同的空白字符数" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -1961,11 +2008,11 @@ msgstr "" "如果文件只在空白字符上有差异，则认为它们相同。\n" "仅当选择完全比较时此选项才激活。" -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "复制较新而不合并(不安全)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -1975,25 +2022,26 @@ msgstr "" "(如果您知道自己在做什么再选此项！)\n" "仅在比较两个目录时有效。" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "备份文件(.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." -msgstr "在已有旧文件的文件保存时，旧文件将被重命名为“.orig”扩展名，而不是被删除。" +msgstr "" +"在已有旧文件的文件保存时，旧文件将被重命名为“.orig”扩展名，而不是被删除。" -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "区域设置" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "语言(需要重启)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2001,11 +2049,11 @@ msgstr "" "选择 GUI 的语言或者选择“自动”。\n" "要让更改生效，请退出并重启 KDiff3。" -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "所有文件使用同一编码：" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." @@ -2013,60 +2061,60 @@ msgstr "" "启用此选项将使得只更改第一个编码设置即可更改全部文件的编码。\n" "如果需要为每个文件设置不同的编码，请禁用此选项。" -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "注意：本地编码为" -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "A 的文件编码：" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "B 的文件编码：" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "C 的文件编码：" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "合并输出和保存的文件编码：" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "自动复制选择" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "预处理文件的文件编码：" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "从右至左语言" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2074,21 +2122,21 @@ msgstr "" "某些语言是从右到左书写的。\n" "此设置将更改查看器和编辑器的设置。" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "操作" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration Settings" msgstr "区域设置" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2096,7 +2144,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2112,19 +2180,19 @@ msgstr "" "\n" "您要继续，还是另选一种字体。" -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "不兼容字体" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "自愿冒险继续" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "选择另一种字体" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "这将重置全部选项，而不仅是当前主题的选项。" @@ -2133,10 +2201,8 @@ msgid "PreprocessorCmd: " msgstr "预处理程序命令：" #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"你所选的以下选项可能会更改数据：\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "你所选的以下选项可能会更改数据：\n" #: pdiff.cpp:264 msgid "" @@ -2201,19 +2267,10 @@ msgstr "Linediff：A <-> C" msgid "All input files contain the same text, but are not binary equal." msgstr "全部输入文件包含相同文本。" -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -#, fuzzy -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"文件 B 和 C 二进制数据相同。\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 #, fuzzy -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"文件 A 和 B 二进制数据相同。\n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "文件 A 和 B 二进制数据相同。\n" #: pdiff.cpp:530 msgid "" @@ -2225,109 +2282,55 @@ msgstr "" "注意 KDiff3-merge 用于二进制数据。\n" "继续则您自己承担风险。" -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "放弃" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "正在打开文件..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "打开文件错误" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "剪切所选内容..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "复制所选内容到剪贴板..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "插入剪贴板内容..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "保存并继续" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "不保存继续" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "搜索完成。" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "搜索完成" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "创建目录时出错。" -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "配置 KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "目录(&D)" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "当前项目合并操作" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "当前项目同步操作" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "移动(&M)" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "查看 Diff(&I)" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "合并(&M)" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "窗口(&W)" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (基准文件)：" @@ -2370,6 +2373,10 @@ msgstr "输出(可选)：" msgid "Configure..." msgstr "配置..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "搜索文本：" @@ -2442,6 +2449,14 @@ 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 "" @@ -2455,6 +2470,87 @@ msgstr "保存失败。" msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +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" +msgstr "目录(&D)" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "当前项目合并操作" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "当前项目同步操作" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "移动(&M)" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "查看 Diff(&I)" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "合并(&M)" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "窗口(&W)" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "文件 A 和 B 二进制数据相同。\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "文件 A 和 C 二进制数据相同。\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "文件 A 和 C 文本相同。\n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "文件 B 和 C 二进制数据相同。\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "文件 B 和 C 文本相同。\n" + +#~ msgid "Preserve carriage return" +#~ msgstr "保留回车" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "如果存在，显示回车字符“\\r”。\n" +#~ "这个选项帮助比较在不同操作系统下修改的文件。" + #, fuzzy #~ msgid "Diff and Merge" #~ msgstr "Diff 和 Merge" -- cgit v1.2.1