Changeset 1235 for kde-croatia/kde4/summit/hr/summit/messages/extragear-utils/kdiff3.po

Timestamp:

Sep 2, 2011, 3:23:55 AM (13 years ago)

Author:

kde-how-scripter

Message:

SF-KDE: Ažuriranje datoteka bazirano na zadnjim template datotekama + padeži.

File:

• kde-croatia/kde4/summit/hr/summit/messages/extragear-utils/kdiff3.po (modified) (91 diffs)

kde-croatia/kde4/summit/hr/summit/messages/extragear-utils/kdiff3.po

@@ -6 +6 @@
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-05-06 11:42+0200\n"
+"POT-Creation-Date: 2011-09-01 10:10+0200\n"
 "PO-Revision-Date: 2010-01-24 16:47+0100\n"
 "Last-Translator: Andrej Dundovic <adundovi@gmail.com>\n"
@@ -41 +41 @@
 
 #. +> trunk
-#: diff.cpp:471
-#, fuzzy
-msgid "Expecting space after closing quotation mark."
+#: diff.cpp:537
+#, fuzzy
+msgid "Expecting space after closing apostroph."
 msgstr "Automatski dodaj završni znak citata"
 
 #. +> trunk
-#: diff.cpp:474
-#, fuzzy
-msgid "Not matching quotation marks."
-msgstr "Automatski dodaj završni znak citata"
-
-#. +> trunk
-#: diff.cpp:496
-#, fuzzy
-msgid "Unexpected quotation mark within argument."
+#: diff.cpp:540
+#, fuzzy
+msgid "Not matching apostrophs."
+msgstr "Nema podudaranja ni sa jednim ključem"
+
+#. +> trunk
+#: diff.cpp:562
+#, fuzzy
+msgid "Unexpected apostroph within argument."
 msgstr "Nepčekivani argument '%1'."
 
 #. +> trunk
-#: diff.cpp:503
+#: diff.cpp:569
 #, fuzzy
 msgid "No program specified."
@@ -65 +65 @@
 
 #. +> trunk
-#: diff.cpp:605
+#: diff.cpp:671
 #, kde-format
 msgid ""
@@ -76 +76 @@
 
 #. +> trunk
-#: diff.cpp:653
+#: diff.cpp:719
 #, kde-format
 msgid ""
@@ -87 +87 @@
 
 #. +> trunk
-#: diff.cpp:1776 diff.cpp:1790
+#: diff.cpp:1850 diff.cpp:1864
 msgid ""
 "Data loss error:\n"
@@ -94 +94 @@
 
 #. +> trunk
-#: diff.cpp:1778 diff.cpp:1792
+#: diff.cpp:1852 diff.cpp:1866
 msgid "Severe Internal Error"
 msgstr ""
 
 #. +> trunk
-#: difftextwindow.cpp:401 directorymergewindow.cpp:2709
+#: difftextwindow.cpp:401 directorymergewindow.cpp:2723
 #, fuzzy
 msgid "File"
@@ -128 +128 @@
 
 #. +> trunk
-#: difftextwindow.cpp:1737 mergeresultwindow.cpp:3194 optiondialog.cpp:767
+#: difftextwindow.cpp:1737 mergeresultwindow.cpp:3194
 msgid "Unix"
 msgstr ""
@@ -149 +149 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:136
+#: directorymergewindow.cpp:150
 msgid "Mix of links and normal files."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:143
+#: directorymergewindow.cpp:157
 msgid "Link: "
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:151
+#: directorymergewindow.cpp:165
 msgid "Size. "
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:164 directorymergewindow.cpp:174
+#: directorymergewindow.cpp:178 directorymergewindow.cpp:188
 msgid "Date & Size: "
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:184 directorymergewindow.cpp:190
+#: directorymergewindow.cpp:198 directorymergewindow.cpp:204
 #, kde-format
 msgid "Creating temp copy of %1 failed."
@@ -175 +175 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:201 directorymergewindow.cpp:209
+#: directorymergewindow.cpp:215 directorymergewindow.cpp:223
 #, kde-format
 msgid "Opening %1 failed."
@@ -181 +181 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:213
+#: directorymergewindow.cpp:227
 msgid "Comparing file..."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:223 directorymergewindow.cpp:229
+#: directorymergewindow.cpp:237 directorymergewindow.cpp:243
 #, kde-format
 msgid "Error reading from %1"
@@ -192 +192 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:358
+#: directorymergewindow.cpp:372
 #, fuzzy
 msgid "Name"
@@ -198 +198 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:358
+#: directorymergewindow.cpp:372
 #, fuzzy
 msgid "Operation"
@@ -204 +204 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:358
+#: directorymergewindow.cpp:372
 #, fuzzy
 msgid "Status"
@@ -210 +210 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:359
+#: directorymergewindow.cpp:373
 msgid "Unsolved"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:359
+#: directorymergewindow.cpp:373
 msgid "Solved"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:359
+#: directorymergewindow.cpp:373
 msgid "Nonwhite"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:359
+#: directorymergewindow.cpp:373
 msgid "White"
 msgstr "Bijelo"
 
 #. +> trunk
-#: directorymergewindow.cpp:388
+#: directorymergewindow.cpp:402
 msgid "You are currently doing a directory merge. Are you sure, you want to abort the merge and rescan the directory?"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:389 kdiff3.cpp:655 kdiff3.cpp:665 kdiff3.cpp:677
+#: directorymergewindow.cpp:403 kdiff3.cpp:655 kdiff3.cpp:665 kdiff3.cpp:677
 #: mergeresultwindow.cpp:305 pdiff.cpp:1079 pdiff.cpp:1813 pdiff.cpp:1823
 #, fuzzy
@@ -242 +242 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:390 directorymergewindow.cpp:2965
+#: directorymergewindow.cpp:404 directorymergewindow.cpp:2979
 msgid "Rescan"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:391 pdiff.cpp:1081
+#: directorymergewindow.cpp:405 pdiff.cpp:1081
 msgid "Continue Merging"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:548
+#: directorymergewindow.cpp:562
 msgid "Opening of directories failed:"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:551
+#: directorymergewindow.cpp:565
 #, kde-format
 msgid "Dir A \"%1\" does not exist or is not a directory.\n"
@@ -263 +263 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:554
+#: directorymergewindow.cpp:568
 #, kde-format
 msgid "Dir B \"%1\" does not exist or is not a directory.\n"
@@ -269 +269 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:557
+#: directorymergewindow.cpp:571
 #, kde-format
 msgid "Dir C \"%1\" does not exist or is not a directory.\n"
@@ -275 +275 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:559
+#: directorymergewindow.cpp:573
 msgid "Directory Open Error"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:567
+#: directorymergewindow.cpp:581
 msgid ""
 "The destination directory must not be the same as A or B when three directories are merged.\n"
@@ -287 +287 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:569
+#: directorymergewindow.cpp:583
 msgid "Parameter Warning"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:574
+#: directorymergewindow.cpp:588
 msgid "Scanning directories..."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:607
+#: directorymergewindow.cpp:621
 msgid "Reading Directory A"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:629
+#: directorymergewindow.cpp:643
 msgid "Reading Directory B"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:651
+#: directorymergewindow.cpp:665
 msgid "Reading Directory C"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:677
+#: directorymergewindow.cpp:691
 msgid "Some subdirectories were not readable in"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:682
+#: directorymergewindow.cpp:696
 msgid "Check the permissions of the subdirectories."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:721 kdiff3.cpp:620 kdiff3.cpp:712 kdiff3.cpp:737
+#: directorymergewindow.cpp:735 kdiff3.cpp:620 kdiff3.cpp:712 kdiff3.cpp:737
 #: kdiff3.cpp:1022 kdiff3.cpp:1043 pdiff.cpp:1161 pdiff.cpp:1233
 #: pdiff.cpp:1271 pdiff.cpp:1287 pdiff.cpp:1317 pdiff.cpp:1328
@@ -330 +330 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:735
+#: directorymergewindow.cpp:749
 msgid "Directory Comparison Status"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:736
+#: directorymergewindow.cpp:750
 msgid "Number of subdirectories:"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:737
+#: directorymergewindow.cpp:751
 msgid "Number of equal files:"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:738
+#: directorymergewindow.cpp:752
 msgid "Number of different files:"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:741
+#: directorymergewindow.cpp:755
 msgid "Number of manual merges:"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:912
+#: directorymergewindow.cpp:926
 msgid "This affects all merge operations."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:913
+#: directorymergewindow.cpp:927
 msgid "Changing All Merge Operations"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1312
+#: directorymergewindow.cpp:1326
 msgid "Processing "
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1736 directorymergewindow.cpp:1742
+#: directorymergewindow.cpp:1750 directorymergewindow.cpp:1756
 msgid "To do."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1810 directorymergewindow.cpp:2996
+#: directorymergewindow.cpp:1824 directorymergewindow.cpp:3010
 msgid "Copy A to B"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2997
+#: directorymergewindow.cpp:1825 directorymergewindow.cpp:3011
 msgid "Copy B to A"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2998
+#: directorymergewindow.cpp:1826 directorymergewindow.cpp:3012
 msgid "Delete A"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1813 directorymergewindow.cpp:2999
+#: directorymergewindow.cpp:1827 directorymergewindow.cpp:3013
 msgid "Delete B"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1814
+#: directorymergewindow.cpp:1828
 msgid "Delete A & B"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1815 directorymergewindow.cpp:3001
+#: directorymergewindow.cpp:1829 directorymergewindow.cpp:3015
 msgid "Merge to A"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1816 directorymergewindow.cpp:3002
+#: directorymergewindow.cpp:1830 directorymergewindow.cpp:3016
 msgid "Merge to B"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1817
+#: directorymergewindow.cpp:1831
 msgid "Merge to A & B"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2993
+#: directorymergewindow.cpp:1835 directorymergewindow.cpp:3007
 msgid "Delete (if exists)"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1822 directorymergewindow.cpp:1823
-#: directorymergewindow.cpp:2992 optiondialog.cpp:869 smalldialogs.cpp:110
+#: directorymergewindow.cpp:1836 directorymergewindow.cpp:1837
+#: directorymergewindow.cpp:3006 optiondialog.cpp:869 smalldialogs.cpp:110
 #, fuzzy
 msgid "Merge"
@@ -427 +427 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:1822 directorymergewindow.cpp:1823
+#: directorymergewindow.cpp:1836 directorymergewindow.cpp:1837
 msgid "Merge (manual)"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1824
+#: directorymergewindow.cpp:1838
 msgid "Error: Conflicting File Types"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1825
+#: directorymergewindow.cpp:1839
 msgid "Error: Changed and Deleted"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1826
+#: directorymergewindow.cpp:1840
 msgid "Error: Dates are equal but files are not."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1852 directorymergewindow.cpp:1881
-#: directorymergewindow.cpp:1906
+#: directorymergewindow.cpp:1866 directorymergewindow.cpp:1895
+#: directorymergewindow.cpp:1920
 msgid "This operation is currently not possible."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1852 directorymergewindow.cpp:1881
-#: directorymergewindow.cpp:1906 directorymergewindow.cpp:2174
+#: directorymergewindow.cpp:1866 directorymergewindow.cpp:1895
+#: directorymergewindow.cpp:1920 directorymergewindow.cpp:2188
 msgid "Operation Not Possible"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1945
+#: directorymergewindow.cpp:1959
 msgid ""
 "This should never happen: \n"
@@ -469 +469 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:1945
+#: directorymergewindow.cpp:1959
 msgid "Program Error"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1956
+#: directorymergewindow.cpp:1970
 msgid "An error occurred while copying.\n"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1956 directorymergewindow.cpp:2025
-#: directorymergewindow.cpp:2057 directorymergewindow.cpp:2105
-#: directorymergewindow.cpp:2114 directorymergewindow.cpp:2123
-#: directorymergewindow.cpp:2374
+#: directorymergewindow.cpp:1970 directorymergewindow.cpp:2039
+#: directorymergewindow.cpp:2071 directorymergewindow.cpp:2119
+#: directorymergewindow.cpp:2128 directorymergewindow.cpp:2137
+#: directorymergewindow.cpp:2388
 #, fuzzy
 msgid "Error"
@@ -488 +488 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2375
+#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2389
 msgid "Merge Error"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2380
+#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2394
 #, fuzzy
 msgid "Error."
@@ -499 +499 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2272
-#: directorymergewindow.cpp:2312
+#: directorymergewindow.cpp:1981 directorymergewindow.cpp:2286
+#: directorymergewindow.cpp:2326
 #, fuzzy
 msgid "Done."
@@ -506 +506 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:1990
+#: directorymergewindow.cpp:2004
 msgid "Not saved."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2025
+#: directorymergewindow.cpp:2039
 msgid "Unknown merge operation. (This must never happen!)"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2057
+#: directorymergewindow.cpp:2071
 msgid "Unknown merge operation."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2072
+#: directorymergewindow.cpp:2086
 msgid ""
 "The merge is about to begin.\n"
@@ -532 +532 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2077
+#: directorymergewindow.cpp:2091
 msgid "Starting Merge"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2078
+#: directorymergewindow.cpp:2092
 msgid "Do It"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2079
+#: directorymergewindow.cpp:2093
 msgid "Simulate It"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2105
+#: directorymergewindow.cpp:2119
 msgid "The highlighted item has a different type in the different directories. Select what to do."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2114
+#: directorymergewindow.cpp:2128
 msgid "The modification dates of the file are equal but the files are not. Select what to do."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2123
+#: directorymergewindow.cpp:2137
 msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2174
+#: directorymergewindow.cpp:2188
 msgid "This operation is currently not possible because directory merge is currently running."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2234
+#: directorymergewindow.cpp:2248
 msgid ""
 "There was an error in the last step.\n"
@@ -574 +574 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2236
+#: directorymergewindow.cpp:2250
 msgid "Continue merge after an error"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2237
+#: directorymergewindow.cpp:2251
 msgid "Continue With Last Item"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2238
+#: directorymergewindow.cpp:2252
 msgid "Skip Item"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2272
+#: directorymergewindow.cpp:2286
 msgid "Skipped."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2279 directorymergewindow.cpp:2493
+#: directorymergewindow.cpp:2293 directorymergewindow.cpp:2507
 msgid "In progress..."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2327
+#: directorymergewindow.cpp:2341
 msgid "Merge operation complete."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2327 directorymergewindow.cpp:2330
+#: directorymergewindow.cpp:2341 directorymergewindow.cpp:2344
 msgid "Merge Complete"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2340
+#: directorymergewindow.cpp:2354
 msgid "Simulated merge complete: Check if you agree with the proposed operations."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2374
+#: directorymergewindow.cpp:2388
 msgid "An error occurred. Press OK to see detailed information.\n"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2406
+#: directorymergewindow.cpp:2420
 #, kde-format
 msgid "Error: While deleting %1: Creating backup failed."
@@ -625 +625 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2413
+#: directorymergewindow.cpp:2427
 #, kde-format
 msgid "delete directory recursively( %1 )"
@@ -631 +631 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2415
+#: directorymergewindow.cpp:2429
 #, kde-format
 msgid "delete( %1 )"
@@ -637 +637 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2430
+#: directorymergewindow.cpp:2444
 msgid "Error: delete dir operation failed while trying to read the directory."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2449
+#: directorymergewindow.cpp:2463
 #, kde-format
 msgid "Error: rmdir( %1 ) operation failed."
@@ -648 +648 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2459
+#: directorymergewindow.cpp:2473
 msgid "Error: delete operation failed."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2485
+#: directorymergewindow.cpp:2499
 #, kde-format
 msgid "manual merge( %1, %2, %3 -> %4)"
@@ -659 +659 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2488
+#: directorymergewindow.cpp:2502
 msgid "     Note: After a manual merge the user should continue by pressing F7."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2513
+#: directorymergewindow.cpp:2527
 #, kde-format
 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed."
@@ -670 +670 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2522
+#: directorymergewindow.cpp:2536
 #, kde-format
 msgid "copyLink( %1 -> %2 )"
@@ -676 +676 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2533
+#: directorymergewindow.cpp:2547
 msgid "Error: copyLink failed: Remote links are not yet supported."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2539
+#: directorymergewindow.cpp:2553
 msgid "Error: copyLink failed."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2564
+#: directorymergewindow.cpp:2578
 #, kde-format
 msgid "copy( %1 -> %2 )"
@@ -692 +692 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2590
+#: directorymergewindow.cpp:2604
 #, kde-format
 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination."
@@ -698 +698 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2596
+#: directorymergewindow.cpp:2610
 #, kde-format
 msgid "rename( %1 -> %2 )"
@@ -704 +704 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2605
+#: directorymergewindow.cpp:2619
 msgid "Error: Rename failed."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2623
+#: directorymergewindow.cpp:2637
 #, kde-format
 msgid "Error during makeDir of %1. Cannot delete existing file."
@@ -715 +715 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2639
+#: directorymergewindow.cpp:2653
 #, kde-format
 msgid "makeDir( %1 )"
@@ -721 +721 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2649
+#: directorymergewindow.cpp:2663
 msgid "Error while creating directory."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2784
+#: directorymergewindow.cpp:2688 directorymergewindow.cpp:2798
 msgid "Dest"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2709
+#: directorymergewindow.cpp:2692 directorymergewindow.cpp:2723
 msgid "Dir"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2678
+#: directorymergewindow.cpp:2692
 #, fuzzy
 msgid "Type"
@@ -742 +742 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2678
+#: directorymergewindow.cpp:2692
 #, fuzzy
 msgid "Size"
@@ -748 +748 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2679
+#: directorymergewindow.cpp:2693
 msgid "Attr"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2679
+#: directorymergewindow.cpp:2693
 msgid "Last Modification"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2679
+#: directorymergewindow.cpp:2693
 msgid "Link-Destination"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2726
+#: directorymergewindow.cpp:2740
 #, fuzzy
 msgid "not available"
@@ -769 +769 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2746
+#: directorymergewindow.cpp:2760
 msgid "A (Dest): "
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2749
+#: directorymergewindow.cpp:2763
 msgid "A (Base): "
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2755
+#: directorymergewindow.cpp:2769
 msgid "B (Dest): "
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2763
+#: directorymergewindow.cpp:2777
 msgid "C (Dest): "
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2769
+#: directorymergewindow.cpp:2783
 msgid "Dest: "
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2836
+#: directorymergewindow.cpp:2850
 msgid "Save Directory Merge State As..."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2959
+#: directorymergewindow.cpp:2973
 msgid "Start/Continue Directory Merge"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2960
+#: directorymergewindow.cpp:2974
 msgid "Run Operation for Current Item"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2961
+#: directorymergewindow.cpp:2975
 msgid "Compare Selected File"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2962
+#: directorymergewindow.cpp:2976
 msgid "Merge Current File"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2962
+#: directorymergewindow.cpp:2976
 msgid ""
 "Merge\n"
@@ -826 +826 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2963
+#: directorymergewindow.cpp:2977
 msgid "Fold All Subdirs"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2964
+#: directorymergewindow.cpp:2978
 msgid "Unfold All Subdirs"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2968
+#: directorymergewindow.cpp:2982
 msgid "Choose A for All Items"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2969
+#: directorymergewindow.cpp:2983
 msgid "Choose B for All Items"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2970
+#: directorymergewindow.cpp:2984
 msgid "Choose C for All Items"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2971
+#: directorymergewindow.cpp:2985
 msgid "Auto-Choose Operation for All Items"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2972
+#: directorymergewindow.cpp:2986
 msgid "No Operation for All Items"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2977
+#: directorymergewindow.cpp:2991
 msgid "Show Identical Files"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2977
+#: directorymergewindow.cpp:2991
 msgid ""
 "Identical\n"
@@ -873 +873 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2978
+#: directorymergewindow.cpp:2992
 msgid "Show Different Files"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2979
+#: directorymergewindow.cpp:2993
 msgid "Show Files only in A"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2979
+#: directorymergewindow.cpp:2993
 msgid ""
 "Files\n"
@@ -890 +890 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2980
+#: directorymergewindow.cpp:2994
 msgid "Show Files only in B"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2980
+#: directorymergewindow.cpp:2994
 msgid ""
 "Files\n"
@@ -902 +902 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2981
+#: directorymergewindow.cpp:2995
 msgid "Show Files only in C"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2981
+#: directorymergewindow.cpp:2995
 msgid ""
 "Files\n"
@@ -914 +914 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2985
+#: directorymergewindow.cpp:2999
 msgid "Compare Explicitly Selected Files"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2986
+#: directorymergewindow.cpp:3000
 msgid "Merge Explicitly Selected Files"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2988 directorymergewindow.cpp:2995
+#: directorymergewindow.cpp:3002 directorymergewindow.cpp:3009
 #, fuzzy
 msgid "Do Nothing"
@@ -930 +930 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2989
+#: directorymergewindow.cpp:3003
 #, fuzzy
 msgid "A"
@@ -936 +936 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2990
+#: directorymergewindow.cpp:3004
 #, fuzzy
 msgid "B"
@@ -942 +942 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2991
+#: directorymergewindow.cpp:3005
 #, fuzzy
 msgid "C"
@@ -948 +948 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:3000
+#: directorymergewindow.cpp:3014
 msgid "Delete A && B"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:3003
+#: directorymergewindow.cpp:3017
 msgid "Merge to A && B"
 msgstr ""
 
 #. +> trunk
-#: fileaccess.cpp:612
+#: fileaccess.cpp:617
 msgid ""
 "While trying to make a backup, deleting an older backup failed. \n"
@@ -965 +965 @@
 
 #. +> trunk
-#: fileaccess.cpp:619
+#: fileaccess.cpp:624
 msgid ""
 "While trying to make a backup, renaming failed. \n"
@@ -972 +972 @@
 
 #. +> trunk
-#: fileaccess.cpp:643
+#: fileaccess.cpp:648
 #, kde-format
 msgid "Getting file status: %1"
@@ -978 +978 @@
 
 #. +> trunk
-#: fileaccess.cpp:686
+#: fileaccess.cpp:691
 #, kde-format
 msgid "Reading file: %1"
@@ -984 +984 @@
 
 #. +> trunk
-#: fileaccess.cpp:723
+#: fileaccess.cpp:728
 #, kde-format
 msgid "Writing file: %1"
@@ -990 +990 @@
 
 #. +> trunk
-#: fileaccess.cpp:751
+#: fileaccess.cpp:756
 #, fuzzy
 msgid "Out of memory"
@@ -996 +996 @@
 
 #. +> trunk
-#: fileaccess.cpp:786
+#: fileaccess.cpp:791
 #, kde-format
 msgid "Making directory: %1"
@@ -1002 +1002 @@
 
 #. +> trunk
-#: fileaccess.cpp:806
+#: fileaccess.cpp:811
 #, kde-format
 msgid "Removing directory: %1"
@@ -1008 +1008 @@
 
 #. +> trunk
-#: fileaccess.cpp:821
+#: fileaccess.cpp:826
 #, kde-format
 msgid "Removing file: %1"
@@ -1014 +1014 @@
 
 #. +> trunk
-#: fileaccess.cpp:837
+#: fileaccess.cpp:842
 #, kde-format
 msgid "Creating symbolic link: %1 -> %2"
@@ -1020 +1020 @@
 
 #. +> trunk
-#: fileaccess.cpp:864
+#: fileaccess.cpp:869
 #, kde-format
 msgid "Renaming file: %1 -> %2"
@@ -1026 +1026 @@
 
 #. +> trunk
-#: fileaccess.cpp:897
+#: fileaccess.cpp:902
 #, kde-format
 msgid "Copying file: %1 -> %2"
@@ -1032 +1032 @@
 
 #. +> trunk
-#: fileaccess.cpp:911
+#: fileaccess.cpp:916
 #, kde-format
 msgid "Error during file copy operation: Opening file for reading failed. Filename: %1"
@@ -1038 +1038 @@
 
 #. +> trunk
-#: fileaccess.cpp:917
+#: fileaccess.cpp:922
 #, kde-format
 msgid "Error during file copy operation: Opening file for writing failed. Filename: %1"
@@ -1044 +1044 @@
 
 #. +> trunk
-#: fileaccess.cpp:932
+#: fileaccess.cpp:937
 #, kde-format
 msgid "Error during file copy operation: Reading failed. Filename: %1"
@@ -1050 +1050 @@
 
 #. +> trunk
-#: fileaccess.cpp:941
+#: fileaccess.cpp:946
 #, kde-format
 msgid "Error during file copy operation: Writing failed. Filename: %1"
@@ -1056 +1056 @@
 
 #. +> trunk
-#: fileaccess.cpp:1231
+#: fileaccess.cpp:1236
 msgid "Reading directory: "
 msgstr ""
 
 #. +> trunk
-#: fileaccess.cpp:1355
+#: fileaccess.cpp:1360
 #, kde-format
 msgid "Listing directory: %1"
@@ -1067 +1067 @@
 
 #. +> trunk
-#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396
+#: fileaccess.cpp:1494 smalldialogs.cpp:179 smalldialogs.cpp:396
 #, fuzzy
 msgid "&Cancel"
@@ -1631 +1631 @@
 
 #. +> trunk
-#: kdiff3_part.cpp:303 main.cpp:172
+#: kdiff3_part.cpp:303 main.cpp:174
 msgid "Joachim Eibl"
 msgstr ""
@@ -1873 +1873 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:788 optiondialog.cpp:1676
+#: kreplacements/kreplacements.cpp:788 optiondialog.cpp:1679
 msgid ""
 "You selected a variable width font.\n"
@@ -1937 +1937 @@
 
 #. +> trunk
-#: main.cpp:164
+#: main.cpp:166
 msgid "Tool for Comparison and Merge of Files and Directories"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:165
+#: main.cpp:167
 #, fuzzy
 msgid "(c) 2002-2011 Joachim Eibl"
@@ -1948 +1948 @@
 
 #. +> trunk
-#: main.cpp:173
+#: main.cpp:175
 msgid "Eike Sauer"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:173
+#: main.cpp:175
 msgid "Bugfixes, Debian package maintainer"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:174
+#: main.cpp:176
 msgid "Sebastien Fricker"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:174
+#: main.cpp:176
 msgid "Windows installer"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:175
+#: main.cpp:177
 #, fuzzy
 msgid "Stephan Binner"
@@ -1974 +1974 @@
 
 #. +> trunk
-#: main.cpp:175
+#: main.cpp:177
 msgid "i18n-help"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:176
+#: main.cpp:178
 msgid "Stefan Partheymueller"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:176
+#: main.cpp:178
 msgid "Clipboard-patch"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:177
+#: main.cpp:179
 #, fuzzy
 msgid "David Faure"
@@ -1995 +1995 @@
 
 #. +> trunk
-#: main.cpp:177
+#: main.cpp:179
 msgid "KIO-Help"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:178
+#: main.cpp:180
 #, fuzzy
 msgid "Bernd Gehrmann"
@@ -2006 +2006 @@
 
 #. +> trunk
-#: main.cpp:178
+#: main.cpp:180
 msgid "Class CvsIgnoreList from Cervisia"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:179
+#: main.cpp:181
 msgid "Andre Woebbeking"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:179
+#: main.cpp:181
 msgid "Class StringMatcher"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:180
+#: main.cpp:182
 msgid "Michael Denio"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:180
+#: main.cpp:182
 msgid "Directory Equality-Coloring patch"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:181
+#: main.cpp:183
 msgid "Manfred Koehler"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:181
+#: main.cpp:183
 msgid "Fix for slow startup on Windows"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:182
+#: main.cpp:184
 msgid "Sergey Zorin"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:182
+#: main.cpp:184
 msgid "Diff Ext for Windows"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:183
+#: main.cpp:185
 msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:183
+#: main.cpp:185
 msgid "GNU-Diffutils"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:184
+#: main.cpp:186
 msgid "Tino Boellsterling, Timothy Mee"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:184
+#: main.cpp:186
 msgid "Intensive test, use and feedback"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:185
+#: main.cpp:187
 msgid "Michael Schmidt"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:185
+#: main.cpp:187
 msgid "Mac support"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:186
+#: main.cpp:188
 msgid "Valentin Rusu"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:186 main.cpp:187
+#: main.cpp:188 main.cpp:189
 #, fuzzy
 msgid "KDE4 porting"
@@ -2092 +2092 @@
 
 #. +> trunk
-#: main.cpp:187
+#: main.cpp:189
 #, fuzzy
 msgid "Albert Astals Cid"
@@ -2098 +2098 @@
 
 #. +> trunk
-#: main.cpp:188
+#: main.cpp:190
 #, fuzzy
 msgid "Silvan Scherrer"
@@ -2104 +2104 @@
 
 #. +> trunk
-#: main.cpp:188
+#: main.cpp:190
 #, fuzzy
 msgid "OS2 port"
@@ -2110 +2110 @@
 
 #. +> trunk
-#: main.cpp:190
+#: main.cpp:192
 msgid "+ Many thanks to those who reported bugs and contributed ideas!"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:196
+#: main.cpp:198
 msgid "Merge the input."
 msgstr ""
 
 #. +> trunk
-#: main.cpp:197
+#: main.cpp:199
 msgid "Explicit base file. For compatibility with certain tools."
 msgstr ""
 
 #. +> trunk
-#: main.cpp:198
+#: main.cpp:200
 msgid "Output file. Implies -m. E.g.: -o newfile.txt"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:199
+#: main.cpp:201
 msgid "Output file, again. (For compatibility with certain tools.)"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:200
+#: main.cpp:202
 msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:201
+#: main.cpp:203
 msgid "Don't solve conflicts automatically. (For compatibility...)"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:202
+#: main.cpp:204
 msgid "Visible name replacement for input file 1 (base)."
 msgstr ""
 
 #. +> trunk
-#: main.cpp:203
+#: main.cpp:205
 msgid "Visible name replacement for input file 2."
 msgstr ""
 
 #. +> trunk
-#: main.cpp:204
+#: main.cpp:206
 msgid "Visible name replacement for input file 3."
 msgstr ""
 
 #. +> trunk
-#: main.cpp:205
+#: main.cpp:207
 msgid "Alternative visible name replacement. Supply this once for every input."
 msgstr ""
 
 #. +> trunk
-#: main.cpp:206
+#: main.cpp:208
 msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\""
 msgstr ""
 
 #. +> trunk
-#: main.cpp:207
+#: main.cpp:209
 msgid "Show list of config settings and current values."
 msgstr ""
 
 #. +> trunk
-#: main.cpp:208
+#: main.cpp:210
 msgid "Use a different config file."
 msgstr ""
 
 #. +> trunk
-#: main.cpp:211
+#: main.cpp:213
 msgid "file1 to open (base, if not specified via --base)"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:212
+#: main.cpp:214
 msgid "file2 to open"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:213
+#: main.cpp:215
 msgid "file3 to open"
 msgstr ""
@@ -2534 +2534 @@
 "Off: You must explicitely copy e.g. via Ctrl-C."
 msgstr ""
-
-#. +> trunk
-#: optiondialog.cpp:768
-#, fuzzy
-msgid "Dos/Windows"
-msgstr "Dos/Windows"
-
-#. +> trunk
-#: optiondialog.cpp:769
-#, fuzzy
-msgid "Autodetect"
-msgstr "Samodetekcija"
 
 #. +> trunk
@@ -3075 +3063 @@
 
 #. +> trunk
-#: optiondialog.cpp:1402
+#: optiondialog.cpp:1405
 msgid "Language (restart required)"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1445
+#: optiondialog.cpp:1448
 msgid ""
 "Choose the language of the GUI strings or \"Auto\".\n"
@@ -3087 +3075 @@
 
 #. +> trunk
-#: optiondialog.cpp:1463
+#: optiondialog.cpp:1466
 msgid "Use the same encoding for everything:"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1466
+#: optiondialog.cpp:1469
 msgid ""
 "Enable this allows to change all encodings by changing the first only.\n"
@@ -3099 +3087 @@
 
 #. +> trunk
-#: optiondialog.cpp:1471
+#: optiondialog.cpp:1474
 msgid "Note: Local Encoding is "
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1475
+#: optiondialog.cpp:1478
 msgid "File Encoding for A:"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1481
+#: optiondialog.cpp:1484
 msgid ""
 "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n"
@@ -3117 +3105 @@
 
 #. +> trunk
-#: optiondialog.cpp:1485 optiondialog.cpp:1494 optiondialog.cpp:1503
+#: optiondialog.cpp:1488 optiondialog.cpp:1497 optiondialog.cpp:1506
 msgid "Auto Detect Unicode"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1490
+#: optiondialog.cpp:1493
 msgid "File Encoding for B:"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1499
+#: optiondialog.cpp:1502
 msgid "File Encoding for C:"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1508
+#: optiondialog.cpp:1511
 msgid "File Encoding for Merge Output and Saving:"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1512
+#: optiondialog.cpp:1515
 #, fuzzy
 msgid "Auto Select"
@@ -3143 +3131 @@
 
 #. +> trunk
-#: optiondialog.cpp:1515
+#: optiondialog.cpp:1518
 msgid ""
 "If enabled then the encoding from the input files is used.\n"
@@ -3150 +3138 @@
 
 #. +> trunk
-#: optiondialog.cpp:1519
+#: optiondialog.cpp:1522
 msgid "File Encoding for Preprocessor Files:"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1530
+#: optiondialog.cpp:1533
 msgid "Right To Left Language"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1533
+#: optiondialog.cpp:1536
 msgid ""
 "Some languages are read from right to left.\n"
@@ -3167 +3155 @@
 
 #. +> trunk
-#: optiondialog.cpp:1548
+#: optiondialog.cpp:1551
 msgid "Integration"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1549
+#: optiondialog.cpp:1552
 msgid "Integration Settings"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1563
+#: optiondialog.cpp:1566
 msgid "Command line options to ignore:"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1568
+#: optiondialog.cpp:1571
 msgid ""
 "List of command line options that should be ignored when KDiff3 is used by other tools.\n"
@@ -3190 +3178 @@
 
 #. +> trunk
-#: optiondialog.cpp:1575
+#: optiondialog.cpp:1578
 msgid "Quit also via Escape key"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1578
+#: optiondialog.cpp:1581
 msgid ""
 "Fast method to exit.\n"
@@ -3202 +3190 @@
 
 #. +> trunk
-#: optiondialog.cpp:1583
+#: optiondialog.cpp:1586
 msgid "Integrate with ClearCase"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1586
+#: optiondialog.cpp:1589
 msgid ""
 "Integrate with Rational ClearCase from IBM.\n"
@@ -3215 +3203 @@
 
 #. +> trunk
-#: optiondialog.cpp:1592
+#: optiondialog.cpp:1595
 msgid "Remove ClearCase Integration"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1595
+#: optiondialog.cpp:1598
 msgid "Restore the old \"map\" file from before doing the ClearCase integration."
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1680
+#: optiondialog.cpp:1683
 msgid "Incompatible Font"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1681
+#: optiondialog.cpp:1684
 msgid "Continue at Own Risk"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1682
+#: optiondialog.cpp:1685
 msgid "Select Another Font"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1717
+#: optiondialog.cpp:1720
 msgid "This resets all options. Not only those of the current topic."
 msgstr ""
@@ -3591 +3579 @@
 
 #, fuzzy
-#~ msgid "Not matching apostrophs."
-#~ msgstr "Nema podudaranja ni sa jednim ključem"
+#~ msgid "Not matching quotation marks."
+#~ msgstr "Automatski dodaj završni znak citata"
+
+#, fuzzy
+#~ msgid "Dos/Windows"
+#~ msgstr "Dos/Windows"
+
+#, fuzzy
+#~ msgid "Autodetect"
+#~ msgstr "Samodetekcija"