summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTDE Weblate <weblate@mirror.git.trinitydesktop.org>2018-12-27 19:21:46 +0000
committerTDE Weblate <weblate@mirror.git.trinitydesktop.org>2018-12-27 19:21:46 +0000
commit7637a92a1da3eec5e3f9f55ca614dd98aac8e7f9 (patch)
treef721d683c8819eda284133d5e11ecb5ae3942c79
parent0ee39c1ce96dbd9152a597eb5bf3da51daa6d15f (diff)
downloadkdiff3-7637a92a1da3eec5e3f9f55ca614dd98aac8e7f9.tar.gz
kdiff3-7637a92a1da3eec5e3f9f55ca614dd98aac8e7f9.zip
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/
-rw-r--r--po/ar.po1152
-rw-r--r--po/az.po1137
-rw-r--r--po/bg.po1287
-rw-r--r--po/br.po1147
-rw-r--r--po/ca.po1135
-rw-r--r--po/cs.po1151
-rw-r--r--po/cy.po1140
-rw-r--r--po/da.po1263
-rw-r--r--po/de.po1301
-rw-r--r--po/el.po1305
-rw-r--r--po/en_GB.po1259
-rw-r--r--po/es.po1327
-rw-r--r--po/et.po1249
-rw-r--r--po/fr.po1295
-rw-r--r--po/ga.po1145
-rw-r--r--po/gl.po1136
-rw-r--r--po/hi.po1221
-rw-r--r--po/hu.po1274
-rw-r--r--po/is.po1135
-rw-r--r--po/it.po1250
-rw-r--r--po/ja.po1241
-rw-r--r--po/ka.po1228
-rw-r--r--po/lt.po1169
-rw-r--r--po/nb.po1242
-rw-r--r--po/nl.po1302
-rw-r--r--po/pl.po1275
-rw-r--r--po/pt.po1310
-rw-r--r--po/pt_BR.po1312
-rw-r--r--po/ro.po1135
-rw-r--r--po/ru.po1206
-rw-r--r--po/rw.po1231
-rw-r--r--po/sk.po1135
-rw-r--r--po/sr.po1269
-rw-r--r--po/sr@Latn.po1264
-rw-r--r--po/sv.po1283
-rw-r--r--po/ta.po1323
-rw-r--r--po/tg.po1186
-rw-r--r--po/tr.po1209
-rw-r--r--po/uk.po1187
-rw-r--r--po/zh_CN.po1222
40 files changed, 26331 insertions, 22707 deletions
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 <metehyi@free.fr>\n"
"Language-Team: Arabic <doc@arabeyes.org>\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 "<No src line>"
msgstr ""
-#: mergeresultwindow.cpp:1660
+#: mergeresultwindow.cpp:1699
msgid "<Merge Conflict (Whitespace only)>"
msgstr ""
-#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427
+#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469
msgid "<Merge Conflict>"
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 <metin@karegen.com>\n"
"Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\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 "<No src line>"
msgstr ""
-#: mergeresultwindow.cpp:1660
+#: mergeresultwindow.cpp:1699
msgid "<Merge Conflict (Whitespace only)>"
msgstr ""
-#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427
+#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469
msgid "<Merge Conflict>"
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 <zlatkopopov@fsa-bg.org>\n"
"Language-Team: Bulgarian <dict@linux.zonebg.com>\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 "<No src line>"
msgstr "<Няма входен ред>"
-#: mergeresultwindow.cpp:1660
+#: mergeresultwindow.cpp:1699
msgid "<Merge Conflict (Whitespace only)>"
msgstr "<Сливане на конфликт (Само интервали)>"
-#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427
+#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469
msgid "<Merge Conflict>"
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 <tvignaud@mandriva.com>\n"
"Language-Team: br <LL@li.org>\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 "<No src line>"
msgstr ""
-#: mergeresultwindow.cpp:1660
+#: mergeresultwindow.cpp:1699
msgid "<Merge Conflict (Whitespace only)>"
msgstr ""
-#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427
+#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469
msgid "<Merge Conflict>"
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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 "<No src line>"
msgstr ""
-#: mergeresultwindow.cpp:1660
+#: mergeresultwindow.cpp:1699
msgid "<Merge Conflict (Whitespace only)>"
msgstr ""
-#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427
+#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469
msgid "<Merge Conflict>"
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á <koty@seznam.cz>\n"
"Language-Team: Czech <cs@li.org>\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 "<No src line>"
msgstr ""
-#: mergeresultwindow.cpp:1660
+#: mergeresultwindow.cpp:1699
msgid "<Merge Conflict (Whitespace only)>"
msgstr ""
-#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427
+#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469
msgid "<Merge Conflict>"
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 <tvignaud@mandrakesoft.com>\n"
"Language-Team: cy <LL@li.org>\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 "<No src line>"
msgstr ""
-#: mergeresultwindow.cpp:1660
+#: mergeresultwindow.cpp:1699
msgid "<Merge Conflict (Whitespace only)>"
msgstr ""
-#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427
+#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469
msgid "<Merge Conflict>"
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 <erik@binghamton.edu>\n"
"Language-Team: Danish <dansk@klid.dk>\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 "<No src line>"
msgstr "<Nr kilde linje>"
-#: mergeresultwindow.cpp:1660
+#: mergeresultwindow.cpp:1699
msgid "<Merge Conflict (Whitespace only)>"
msgstr "<Indfletningskonflikt (kun blanke tegn)>"
-#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427
+#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469
msgid "<Merge Conflict>"
msgstr "<Indfletningskonflikt>"
-#: 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 <tr@erdfunkstelle.de>\n"
"Language-Team: German <kde-i18n-de@kde.org>\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( %