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

Timestamp:

May 2, 2011, 3:06:58 AM (14 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) (143 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: 2010-12-16 14:22+0100\n"
+"POT-Creation-Date: 2011-05-01 12: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:504
+#: diff.cpp:471
+msgid "Expecting space after closing apostroph."
+msgstr ""
+
+#. +> trunk
+#: diff.cpp:474
+#, fuzzy
+msgid "Not matching apostrophs."
+msgstr "Nema podudaranja ni sa jednim ključem"
+
+#. +> trunk
+#: diff.cpp:496
+#, fuzzy
+msgid "Unexpected apostroph within argument."
+msgstr "Nepčekivani argument '%1'."
+
+#. +> trunk
+#: diff.cpp:503
+#, fuzzy
+msgid "No program specified."
+msgstr "Program nije definiran"
+
+#. +> trunk
+#: diff.cpp:605
 #, kde-format
 msgid ""
@@ -52 +75 @@
 
 #. +> trunk
-#: diff.cpp:544
+#: diff.cpp:653
 #, kde-format
 msgid ""
@@ -63 +86 @@
 
 #. +> trunk
-#: diff.cpp:1662 diff.cpp:1676
+#: diff.cpp:1776 diff.cpp:1790
 msgid ""
 "Data loss error:\n"
@@ -70 +93 @@
 
 #. +> trunk
-#: diff.cpp:1664 diff.cpp:1678
+#: diff.cpp:1778 diff.cpp:1792
 msgid "Severe Internal Error"
 msgstr ""
 
 #. +> trunk
-#: difftextwindow.cpp:401 directorymergewindow.cpp:2700
+#: difftextwindow.cpp:401 directorymergewindow.cpp:2709
 #, fuzzy
 msgid "File"
@@ -92 +115 @@
 
 #. +> trunk
-#: difftextwindow.cpp:1700 difftextwindow.cpp:1733
+#: difftextwindow.cpp:1703 difftextwindow.cpp:1736
 #, fuzzy
 msgid "Encoding:"
@@ -98 +121 @@
 
 #. +> trunk
-#: difftextwindow.cpp:1701 difftextwindow.cpp:1734 mergeresultwindow.cpp:3135
+#: difftextwindow.cpp:1704 difftextwindow.cpp:1737 mergeresultwindow.cpp:3149
 #: optiondialog.cpp:762
 msgid "Line end style:"
@@ -104 +127 @@
 
 #. +> trunk
-#: difftextwindow.cpp:1734 mergeresultwindow.cpp:3180
+#: difftextwindow.cpp:1737 mergeresultwindow.cpp:3194
 msgid "Unix"
 msgstr ""
 
 #. +> trunk
-#: difftextwindow.cpp:1734 mergeresultwindow.cpp:3181
+#: difftextwindow.cpp:1737 mergeresultwindow.cpp:3195
 msgid "DOS"
 msgstr ""
 
 #. +> trunk
-#: difftextwindow.cpp:1756 kdiff3.cpp:826
+#: difftextwindow.cpp:1759 kdiff3.cpp:831
 msgid "Top line"
 msgstr ""
 
 #. +> trunk
-#: difftextwindow.cpp:1766
+#: difftextwindow.cpp:1769
 #, fuzzy
 msgid "End"
@@ -211 +234 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:389 kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675
-#: mergeresultwindow.cpp:303 pdiff.cpp:1059 pdiff.cpp:1793 pdiff.cpp:1803
+#: directorymergewindow.cpp:389 kdiff3.cpp:655 kdiff3.cpp:665 kdiff3.cpp:677
+#: mergeresultwindow.cpp:305 pdiff.cpp:1079 pdiff.cpp:1813 pdiff.cpp:1823
 #, fuzzy
 msgid "Warning"
@@ -218 +241 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:390 directorymergewindow.cpp:2956
+#: directorymergewindow.cpp:390 directorymergewindow.cpp:2965
 msgid "Rescan"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:391 pdiff.cpp:1061
+#: directorymergewindow.cpp:391 pdiff.cpp:1081
 msgid "Continue Merging"
 msgstr ""
@@ -298 +321 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:721 kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735
-#: kdiff3.cpp:1016 kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213
-#: pdiff.cpp:1251 pdiff.cpp:1267 pdiff.cpp:1297 pdiff.cpp:1308
+#: directorymergewindow.cpp:721 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
 #, fuzzy
 msgid "Ready."
@@ -331 +354 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:909
+#: directorymergewindow.cpp:912
 msgid "This affects all merge operations."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:910
+#: directorymergewindow.cpp:913
 msgid "Changing All Merge Operations"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1309
+#: directorymergewindow.cpp:1312
 msgid "Processing "
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1733 directorymergewindow.cpp:1739
+#: directorymergewindow.cpp:1736 directorymergewindow.cpp:1742
 msgid "To do."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2987
+#: directorymergewindow.cpp:1810 directorymergewindow.cpp:2996
 msgid "Copy A to B"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2988
+#: directorymergewindow.cpp:1811 directorymergewindow.cpp:2997
 msgid "Copy B to A"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2989
+#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2998
 msgid "Delete A"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1810 directorymergewindow.cpp:2990
+#: directorymergewindow.cpp:1813 directorymergewindow.cpp:2999
 msgid "Delete B"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1811
+#: directorymergewindow.cpp:1814
 msgid "Delete A & B"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1812 directorymergewindow.cpp:2992
+#: directorymergewindow.cpp:1815 directorymergewindow.cpp:3001
 msgid "Merge to A"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1813 directorymergewindow.cpp:2993
+#: directorymergewindow.cpp:1816 directorymergewindow.cpp:3002
 msgid "Merge to B"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1814
+#: directorymergewindow.cpp:1817
 msgid "Merge to A & B"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2984
+#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2993
 msgid "Delete (if exists)"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1819 directorymergewindow.cpp:1820
-#: directorymergewindow.cpp:2983 optiondialog.cpp:869 smalldialogs.cpp:110
+#: directorymergewindow.cpp:1822 directorymergewindow.cpp:1823
+#: directorymergewindow.cpp:2992 optiondialog.cpp:869 smalldialogs.cpp:110
 #, fuzzy
 msgid "Merge"
@@ -403 +426 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:1819 directorymergewindow.cpp:1820
+#: directorymergewindow.cpp:1822 directorymergewindow.cpp:1823
 msgid "Merge (manual)"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1821
+#: directorymergewindow.cpp:1824
 msgid "Error: Conflicting File Types"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1822
+#: directorymergewindow.cpp:1825
 msgid "Error: Changed and Deleted"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1823
+#: directorymergewindow.cpp:1826
 msgid "Error: Dates are equal but files are not."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1849 directorymergewindow.cpp:1878
-#: directorymergewindow.cpp:1903
+#: directorymergewindow.cpp:1852 directorymergewindow.cpp:1881
+#: directorymergewindow.cpp:1906
 msgid "This operation is currently not possible."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1849 directorymergewindow.cpp:1878
-#: directorymergewindow.cpp:1903 directorymergewindow.cpp:2171
+#: directorymergewindow.cpp:1852 directorymergewindow.cpp:1881
+#: directorymergewindow.cpp:1906 directorymergewindow.cpp:2174
 msgid "Operation Not Possible"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1942
+#: directorymergewindow.cpp:1945
 msgid ""
 "This should never happen: \n"
@@ -445 +468 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:1942
+#: directorymergewindow.cpp:1945
 msgid "Program Error"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1953
+#: directorymergewindow.cpp:1956
 msgid "An error occurred while copying.\n"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1953 directorymergewindow.cpp:2022
-#: directorymergewindow.cpp:2054 directorymergewindow.cpp:2102
-#: directorymergewindow.cpp:2111 directorymergewindow.cpp:2120
-#: directorymergewindow.cpp:2371
+#: directorymergewindow.cpp:1956 directorymergewindow.cpp:2025
+#: directorymergewindow.cpp:2057 directorymergewindow.cpp:2105
+#: directorymergewindow.cpp:2114 directorymergewindow.cpp:2123
+#: directorymergewindow.cpp:2374
 #, fuzzy
 msgid "Error"
@@ -464 +487 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:1954 directorymergewindow.cpp:2372
+#: directorymergewindow.cpp:1957 directorymergewindow.cpp:2375
 msgid "Merge Error"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:1959 directorymergewindow.cpp:2377
+#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2380
 #, fuzzy
 msgid "Error."
@@ -475 +498 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:1964 directorymergewindow.cpp:2269
-#: directorymergewindow.cpp:2309
+#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2272
+#: directorymergewindow.cpp:2312
 #, fuzzy
 msgid "Done."
@@ -482 +505 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:1987
+#: directorymergewindow.cpp:1990
 msgid "Not saved."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2022
+#: directorymergewindow.cpp:2025
 msgid "Unknown merge operation. (This must never happen!)"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2054
+#: directorymergewindow.cpp:2057
 msgid "Unknown merge operation."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2069
+#: directorymergewindow.cpp:2072
 msgid ""
 "The merge is about to begin.\n"
@@ -508 +531 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2074
+#: directorymergewindow.cpp:2077
 msgid "Starting Merge"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2075
+#: directorymergewindow.cpp:2078
 msgid "Do It"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2076
+#: directorymergewindow.cpp:2079
 msgid "Simulate It"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2102
+#: directorymergewindow.cpp:2105
 msgid "The highlighted item has a different type in the different directories. Select what to do."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2111
+#: directorymergewindow.cpp:2114
 msgid "The modification dates of the file are equal but the files are not. Select what to do."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2120
+#: directorymergewindow.cpp:2123
 msgid "The highlighted item was changed in one directory and deleted in the other. Select what to do."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2171
+#: directorymergewindow.cpp:2174
 msgid "This operation is currently not possible because directory merge is currently running."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2231
+#: directorymergewindow.cpp:2234
 msgid ""
 "There was an error in the last step.\n"
@@ -550 +573 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2233
+#: directorymergewindow.cpp:2236
 msgid "Continue merge after an error"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2234
+#: directorymergewindow.cpp:2237
 msgid "Continue With Last Item"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2235
+#: directorymergewindow.cpp:2238
 msgid "Skip Item"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2269
+#: directorymergewindow.cpp:2272
 msgid "Skipped."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2276 directorymergewindow.cpp:2490
+#: directorymergewindow.cpp:2279 directorymergewindow.cpp:2493
 msgid "In progress..."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2324
+#: directorymergewindow.cpp:2327
 msgid "Merge operation complete."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2324 directorymergewindow.cpp:2327
+#: directorymergewindow.cpp:2327 directorymergewindow.cpp:2330
 msgid "Merge Complete"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2337
+#: directorymergewindow.cpp:2340
 msgid "Simulated merge complete: Check if you agree with the proposed operations."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2371
+#: directorymergewindow.cpp:2374
 msgid "An error occurred. Press OK to see detailed information.\n"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2403
+#: directorymergewindow.cpp:2406
 #, kde-format
 msgid "Error: While deleting %1: Creating backup failed."
@@ -601 +624 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2410
+#: directorymergewindow.cpp:2413
 #, kde-format
 msgid "delete directory recursively( %1 )"
@@ -607 +630 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2412
+#: directorymergewindow.cpp:2415
 #, kde-format
 msgid "delete( %1 )"
@@ -613 +636 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2427
+#: directorymergewindow.cpp:2430
 msgid "Error: delete dir operation failed while trying to read the directory."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2446
+#: directorymergewindow.cpp:2449
 #, kde-format
 msgid "Error: rmdir( %1 ) operation failed."
@@ -624 +647 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2456
+#: directorymergewindow.cpp:2459
 msgid "Error: delete operation failed."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2482
+#: directorymergewindow.cpp:2485
 #, kde-format
 msgid "manual merge( %1, %2, %3 -> %4)"
@@ -635 +658 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2485
+#: directorymergewindow.cpp:2488
 msgid "     Note: After a manual merge the user should continue by pressing F7."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2508
+#: directorymergewindow.cpp:2513
 #, kde-format
 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed."
@@ -646 +669 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2518
+#: directorymergewindow.cpp:2522
 #, kde-format
 msgid "copyLink( %1 -> %2 )"
@@ -652 +675 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2529
+#: directorymergewindow.cpp:2533
 msgid "Error: copyLink failed: Remote links are not yet supported."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2535
+#: directorymergewindow.cpp:2539
 msgid "Error: copyLink failed."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2555
+#: directorymergewindow.cpp:2564
 #, kde-format
 msgid "copy( %1 -> %2 )"
@@ -668 +691 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2581
+#: directorymergewindow.cpp:2590
 #, kde-format
 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination."
@@ -674 +697 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2587
+#: directorymergewindow.cpp:2596
 #, kde-format
 msgid "rename( %1 -> %2 )"
@@ -680 +703 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2596
+#: directorymergewindow.cpp:2605
 msgid "Error: Rename failed."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2614
+#: directorymergewindow.cpp:2623
 #, kde-format
 msgid "Error during makeDir of %1. Cannot delete existing file."
@@ -691 +714 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2630
+#: directorymergewindow.cpp:2639
 #, kde-format
 msgid "makeDir( %1 )"
@@ -697 +720 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2640
+#: directorymergewindow.cpp:2649
 msgid "Error while creating directory."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2665 directorymergewindow.cpp:2775
+#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2784
 msgid "Dest"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2669 directorymergewindow.cpp:2700
+#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2709
 msgid "Dir"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2669
+#: directorymergewindow.cpp:2678
 #, fuzzy
 msgid "Type"
@@ -718 +741 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2669
+#: directorymergewindow.cpp:2678
 #, fuzzy
 msgid "Size"
@@ -724 +747 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2670
+#: directorymergewindow.cpp:2679
 msgid "Attr"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2670
+#: directorymergewindow.cpp:2679
 msgid "Last Modification"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2670
+#: directorymergewindow.cpp:2679
 msgid "Link-Destination"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2717
+#: directorymergewindow.cpp:2726
 #, fuzzy
 msgid "not available"
@@ -745 +768 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2737
+#: directorymergewindow.cpp:2746
 msgid "A (Dest): "
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2740
+#: directorymergewindow.cpp:2749
 msgid "A (Base): "
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2746
+#: directorymergewindow.cpp:2755
 msgid "B (Dest): "
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2754
+#: directorymergewindow.cpp:2763
 msgid "C (Dest): "
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2760
+#: directorymergewindow.cpp:2769
 msgid "Dest: "
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2827
+#: directorymergewindow.cpp:2836
 msgid "Save Directory Merge State As..."
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2950
+#: directorymergewindow.cpp:2959
 msgid "Start/Continue Directory Merge"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2951
+#: directorymergewindow.cpp:2960
 msgid "Run Operation for Current Item"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2952
+#: directorymergewindow.cpp:2961
 msgid "Compare Selected File"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2953
+#: directorymergewindow.cpp:2962
 msgid "Merge Current File"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2953
+#: directorymergewindow.cpp:2962
 msgid ""
 "Merge\n"
@@ -802 +825 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2954
+#: directorymergewindow.cpp:2963
 msgid "Fold All Subdirs"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2955
+#: directorymergewindow.cpp:2964
 msgid "Unfold All Subdirs"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2959
+#: directorymergewindow.cpp:2968
 msgid "Choose A for All Items"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2960
+#: directorymergewindow.cpp:2969
 msgid "Choose B for All Items"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2961
+#: directorymergewindow.cpp:2970
 msgid "Choose C for All Items"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2962
+#: directorymergewindow.cpp:2971
 msgid "Auto-Choose Operation for All Items"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2963
+#: directorymergewindow.cpp:2972
 msgid "No Operation for All Items"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2968
+#: directorymergewindow.cpp:2977
 msgid "Show Identical Files"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2968
+#: directorymergewindow.cpp:2977
 msgid ""
 "Identical\n"
@@ -849 +872 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2969
+#: directorymergewindow.cpp:2978
 msgid "Show Different Files"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2970
+#: directorymergewindow.cpp:2979
 msgid "Show Files only in A"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2970
+#: directorymergewindow.cpp:2979
 msgid ""
 "Files\n"
@@ -866 +889 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2971
+#: directorymergewindow.cpp:2980
 msgid "Show Files only in B"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2971
+#: directorymergewindow.cpp:2980
 msgid ""
 "Files\n"
@@ -878 +901 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2972
+#: directorymergewindow.cpp:2981
 msgid "Show Files only in C"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2972
+#: directorymergewindow.cpp:2981
 msgid ""
 "Files\n"
@@ -890 +913 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2976
+#: directorymergewindow.cpp:2985
 msgid "Compare Explicitly Selected Files"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2977
+#: directorymergewindow.cpp:2986
 msgid "Merge Explicitly Selected Files"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2979 directorymergewindow.cpp:2986
+#: directorymergewindow.cpp:2988 directorymergewindow.cpp:2995
 #, fuzzy
 msgid "Do Nothing"
@@ -906 +929 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2980
+#: directorymergewindow.cpp:2989
 #, fuzzy
 msgid "A"
@@ -912 +935 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2981
+#: directorymergewindow.cpp:2990
 #, fuzzy
 msgid "B"
@@ -918 +941 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2982
+#: directorymergewindow.cpp:2991
 #, fuzzy
 msgid "C"
@@ -924 +947 @@
 
 #. +> trunk
-#: directorymergewindow.cpp:2991
+#: directorymergewindow.cpp:3000
 msgid "Delete A && B"
 msgstr ""
 
 #. +> trunk
-#: directorymergewindow.cpp:2994
+#: directorymergewindow.cpp:3003
 msgid "Merge to A && B"
 msgstr ""
@@ -1074 +1097 @@
 
 #. +> trunk
-#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194
+#: kdiff3.cpp:440 pdiff.cpp:1143 pdiff.cpp:1214
 msgid "Opening of these files failed:"
 msgstr ""
@@ -1105 +1128 @@
 
 #. +> trunk
-#: kdiff3.cpp:486
+#: kdiff3.cpp:487
 msgid "Print the differences"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:488
+#: kdiff3.cpp:490
 msgid "Quits the application"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:490
+#: kdiff3.cpp:492
 msgid "Cuts the selected section and puts it to the clipboard"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:492
+#: kdiff3.cpp:494
 #, fuzzy
 msgid "Copies the selected section to the clipboard"
@@ -1126 +1149 @@
 
 #. +> trunk
-#: kdiff3.cpp:494
+#: kdiff3.cpp:496
 #, fuzzy
 msgid "Pastes the clipboard contents to current position"
@@ -1132 +1155 @@
 
 #. +> trunk
-#: kdiff3.cpp:496
+#: kdiff3.cpp:498
 msgid "Select everything in current window"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:498
+#: kdiff3.cpp:500
 msgid "Search for a string"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:500
+#: kdiff3.cpp:502
 msgid "Search again for the string"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:505
+#: kdiff3.cpp:507
 msgid "Enables/disables the statusbar"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:509
+#: kdiff3.cpp:511
 msgid "Configure KDiff3..."
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:530
+#: kdiff3.cpp:532
 msgid "Go to Current Delta"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:530
+#: kdiff3.cpp:532
 msgid ""
 "Current\n"
@@ -1169 +1192 @@
 
 #. +> trunk
-#: kdiff3.cpp:532
+#: kdiff3.cpp:534
 msgid "Go to First Delta"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:532
+#: kdiff3.cpp:534
 msgid ""
 "First\n"
@@ -1181 +1204 @@
 
 #. +> trunk
-#: kdiff3.cpp:534
+#: kdiff3.cpp:536
 msgid "Go to Last Delta"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:534
+#: kdiff3.cpp:536
 msgid ""
 "Last\n"
@@ -1193 +1216 @@
 
 #. +> trunk
-#: kdiff3.cpp:536
+#: kdiff3.cpp:538
 msgid "(Skips white space differences when \"Show White Space\" is disabled.)"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:537
+#: kdiff3.cpp:539
 msgid "(Does not skip white space differences even when \"Show White Space\" is disabled.)"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:538
+#: kdiff3.cpp:540
 msgid "Go to Previous Delta"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:538
+#: kdiff3.cpp:540
 msgid ""
 "Prev\n"
@@ -1215 +1238 @@
 
 #. +> trunk
-#: kdiff3.cpp:540
+#: kdiff3.cpp:542
 msgid "Go to Next Delta"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:540
+#: kdiff3.cpp:542
 msgid ""
 "Next\n"
@@ -1227 +1250 @@
 
 #. +> trunk
-#: kdiff3.cpp:542
+#: kdiff3.cpp:544
 msgid "Go to Previous Conflict"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:542
+#: kdiff3.cpp:544
 msgid ""
 "Prev\n"
@@ -1239 +1262 @@
 
 #. +> trunk
-#: kdiff3.cpp:544
+#: kdiff3.cpp:546
 msgid "Go to Next Conflict"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:544
+#: kdiff3.cpp:546
 msgid ""
 "Next\n"
@@ -1251 +1274 @@
 
 #. +> trunk
-#: kdiff3.cpp:546
+#: kdiff3.cpp:548
 msgid "Go to Previous Unsolved Conflict"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:546
+#: kdiff3.cpp:548
 msgid ""
 "Prev\n"
@@ -1263 +1286 @@
 
 #. +> trunk
-#: kdiff3.cpp:548
+#: kdiff3.cpp:550
 msgid "Go to Next Unsolved Conflict"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:548
+#: kdiff3.cpp:550
 msgid ""
 "Next\n"
@@ -1275 +1298 @@
 
 #. +> trunk
-#: kdiff3.cpp:550
+#: kdiff3.cpp:552
 msgid "Select Line(s) From A"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:550
+#: kdiff3.cpp:552
 msgid ""
 "Choose\n"
@@ -1287 +1310 @@
 
 #. +> trunk
-#: kdiff3.cpp:551
+#: kdiff3.cpp:553
 msgid "Select Line(s) From B"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:551
+#: kdiff3.cpp:553
 msgid ""
 "Choose\n"
@@ -1299 +1322 @@
 
 #. +> trunk
-#: kdiff3.cpp:552
+#: kdiff3.cpp:554
 msgid "Select Line(s) From C"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:552
+#: kdiff3.cpp:554
 msgid ""
 "Choose\n"
@@ -1311 +1334 @@
 
 #. +> trunk
-#: kdiff3.cpp:553
+#: kdiff3.cpp:555
 msgid "Automatically Go to Next Unsolved Conflict After Source Selection"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:553
+#: kdiff3.cpp:555
 msgid ""
 "Auto\n"
@@ -1323 +1346 @@
 
 #. +> trunk
-#: kdiff3.cpp:555
+#: kdiff3.cpp:557
 msgid "Show Space && Tabulator Characters for Differences"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:555
+#: kdiff3.cpp:557
 msgid ""
 "White\n"
@@ -1335 +1358 @@
 
 #. +> trunk
-#: kdiff3.cpp:556
+#: kdiff3.cpp:558
 msgid "Show White Space"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:556
+#: kdiff3.cpp:558
 msgid ""
 "White\n"
@@ -1347 +1370 @@
 
 #. +> trunk
-#: kdiff3.cpp:558
+#: kdiff3.cpp:560
 msgid "Show Line Numbers"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:558
+#: kdiff3.cpp:560
 msgid ""
 "Line\n"
@@ -1359 +1382 @@
 
 #. +> trunk
-#: kdiff3.cpp:559
+#: kdiff3.cpp:561
 msgid "Choose A Everywhere"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:560
+#: kdiff3.cpp:562
 msgid "Choose B Everywhere"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:561
+#: kdiff3.cpp:563
 msgid "Choose C Everywhere"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:562
+#: kdiff3.cpp:564
 msgid "Choose A for All Unsolved Conflicts"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:563
+#: kdiff3.cpp:565
 msgid "Choose B for All Unsolved Conflicts"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:564
+#: kdiff3.cpp:566
 msgid "Choose C for All Unsolved Conflicts"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:565
+#: kdiff3.cpp:567
 msgid "Choose A for All Unsolved Whitespace Conflicts"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:566
+#: kdiff3.cpp:568
 msgid "Choose B for All Unsolved Whitespace Conflicts"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:567
+#: kdiff3.cpp:569
 msgid "Choose C for All Unsolved Whitespace Conflicts"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:568
+#: kdiff3.cpp:570
 msgid "Automatically Solve Simple Conflicts"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:569
+#: kdiff3.cpp:571
 msgid "Set Deltas to Conflicts"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:570
+#: kdiff3.cpp:572
 msgid "Run Regular Expression Auto Merge"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:571
+#: kdiff3.cpp:573
 msgid "Automatically Solve History Conflicts"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:572
+#: kdiff3.cpp:574
 msgid "Split Diff At Selection"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:573
+#: kdiff3.cpp:575
 msgid "Join Selected Diffs"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:575
+#: kdiff3.cpp:577
 msgid "Show Window A"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:576
+#: kdiff3.cpp:578
 msgid "Show Window B"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:577
+#: kdiff3.cpp:579
 msgid "Show Window C"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:578 kdiff3.cpp:589
+#: kdiff3.cpp:580 kdiff3.cpp:591
 msgid "Focus Next Window"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:580
+#: kdiff3.cpp:582
 msgid "Normal Overview"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:581
+#: kdiff3.cpp:583
 msgid "A vs. B Overview"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:582
+#: kdiff3.cpp:584
 msgid "A vs. C Overview"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:583
+#: kdiff3.cpp:585
 msgid "B vs. C Overview"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:584
+#: kdiff3.cpp:586
 msgid "Word Wrap Diff Windows"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:585
+#: kdiff3.cpp:587
 msgid "Add Manual Diff Alignment"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:586
+#: kdiff3.cpp:588
 msgid "Clear All Manual Diff Alignments"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:591
+#: kdiff3.cpp:593
 msgid "Focus Prev Window"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:592
+#: kdiff3.cpp:594
 msgid "Toggle Split Orientation"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:594
+#: kdiff3.cpp:596
 msgid "Dir && Text Split Screen View"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:596
+#: kdiff3.cpp:598
 msgid "Toggle Between Dir && Text View"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:652 pdiff.cpp:1792
+#: kdiff3.cpp:654 pdiff.cpp:1812
 msgid "The merge result hasn't been saved."
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:654
+#: kdiff3.cpp:656
 msgid "Save && Quit"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:655
+#: kdiff3.cpp:657
 msgid "Quit Without Saving"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:663 pdiff.cpp:1803
+#: kdiff3.cpp:665 pdiff.cpp:1823
 msgid "Saving the merge result failed."
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:674 pdiff.cpp:1058
+#: kdiff3.cpp:676 pdiff.cpp:1078
 msgid "You are currently doing a directory merge. Are you sure, you want to abort?"
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:699
+#: kdiff3.cpp:701
 #, fuzzy
 msgid "Saving file..."
@@ -1540 +1563 @@
 
 #. +> trunk
-#: kdiff3.cpp:716
+#: kdiff3.cpp:718
 msgid "Saving file with a new filename..."
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620
+#: kdiff3.cpp:720 kreplacements/kreplacements.cpp:614
 #, fuzzy
 msgid "Save As..."
@@ -1551 +1574 @@
 
 #. +> trunk
-#: kdiff3.cpp:810
+#: kdiff3.cpp:781
+#, fuzzy
+msgid "Printing not implemented."
+msgstr "Ovaj postupak nije ugrađen."
+
+#. +> trunk
+#: kdiff3.cpp:815
 #, fuzzy
 msgid "Printing..."
@@ -1557 +1586 @@
 
 #. +> trunk
-#: kdiff3.cpp:951
+#: kdiff3.cpp:956
 #, fuzzy
 msgid "Selection"
@@ -1563 +1592 @@
 
 #. +> trunk
-#: kdiff3.cpp:977
+#: kdiff3.cpp:982
 msgid "Printing completed."
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:981
+#: kdiff3.cpp:986
 msgid "Printing aborted."
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:987
+#: kdiff3.cpp:993
 #, fuzzy
 msgid "Exiting..."
@@ -1579 +1608 @@
 
 #. +> trunk
-#: kdiff3.cpp:1000
+#: kdiff3.cpp:1006
 msgid "Toggling toolbar..."
 msgstr ""
 
 #. +> trunk
-#: kdiff3.cpp:1021
+#: kdiff3.cpp:1027
 msgid "Toggle the statusbar..."
 msgstr ""
@@ -1599 +1628 @@
 
 #. +> trunk
-#: kdiff3_part.cpp:303 main.cpp:167
+#: kdiff3_part.cpp:303 main.cpp:172
 msgid "Joachim Eibl"
 msgstr ""
@@ -1625 +1654 @@
 #: kdiff3_shell.cpp:76
 msgid ""
-"Could not initialize the KDiff part.\n"
+"Could not initialize the KDiff3 part.\n"
 "This usually happens due to an installation problem. Please read the README-file in the source package for details."
 msgstr ""
@@ -1631 +1660 @@
 #. i18n: ectx: Menu (file)
 #. +> trunk
-#: kdiff3_shell.rc:4 kreplacements/kreplacements.cpp:302
+#: kdiff3_shell.rc:4 kreplacements/kreplacements.cpp:296
 #, fuzzy
 msgid "&File"
@@ -1638 +1667 @@
 #. i18n: ectx: Menu (directory)
 #. +> trunk
-#: kdiff3_shell.rc:7 kreplacements/kreplacements.cpp:304
+#: kdiff3_shell.rc:7 kreplacements/kreplacements.cpp:298
 msgid "&Directory"
 msgstr ""
@@ -1644 +1673 @@
 #. i18n: ectx: Menu (dir_current_merge_menu)
 #. +> trunk
-#: kdiff3_shell.rc:30 kreplacements/kreplacements.cpp:494
-#: kreplacements/kreplacements.cpp:503
+#: kdiff3_shell.rc:30 kreplacements/kreplacements.cpp:488
+#: kreplacements/kreplacements.cpp:497
 msgid "Current Item Merge Operation"
 msgstr ""
@@ -1651 +1680 @@
 #. i18n: ectx: Menu (dir_current_sync_menu)
 #. +> trunk
-#: kdiff3_shell.rc:38 kreplacements/kreplacements.cpp:495
-#: kreplacements/kreplacements.cpp:504
+#: kdiff3_shell.rc:38 kreplacements/kreplacements.cpp:489
+#: kreplacements/kreplacements.cpp:498
 msgid "Current Item Sync Operation"
 msgstr ""
@@ -1658 +1687 @@
 #. i18n: ectx: Menu (movement)
 #. +> trunk
-#: kdiff3_shell.rc:50 kreplacements/kreplacements.cpp:307
+#: kdiff3_shell.rc:50 kreplacements/kreplacements.cpp:301
 msgid "&Movement"
 msgstr ""
@@ -1664 +1693 @@
 #. i18n: ectx: Menu (diff)
 #. +> trunk
-#: kdiff3_shell.rc:61 kreplacements/kreplacements.cpp:308
+#: kdiff3_shell.rc:61 kreplacements/kreplacements.cpp:302
 msgid "D&iffview"
 msgstr ""
@@ -1670 +1699 @@
 #. i18n: ectx: Menu (merge)
 #. +> trunk
-#: kdiff3_shell.rc:73 kreplacements/kreplacements.cpp:309
+#: kdiff3_shell.rc:73 kreplacements/kreplacements.cpp:303
 msgid "&Merge"
 msgstr ""
@@ -1676 +1705 @@
 #. i18n: ectx: Menu (window)
 #. +> trunk
-#: kdiff3_shell.rc:95 kreplacements/kreplacements.cpp:310
+#: kdiff3_shell.rc:95 kreplacements/kreplacements.cpp:304
 #, fuzzy
 msgid "&Window"
@@ -1689 +1718 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195
-#: kreplacements/kreplacements.h:104 smalldialogs.cpp:514
+#: kreplacements/kreplacements.cpp:158 kreplacements/kreplacements.cpp:189
+#: kreplacements/kreplacements.h:106 smalldialogs.cpp:512
 #, fuzzy
 msgid "Cancel"
@@ -1696 +1725 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:183 kreplacements/kreplacements.cpp:345
+#: kreplacements/kreplacements.cpp:177 kreplacements/kreplacements.cpp:339
 #, fuzzy
 msgid "Ok"
@@ -1702 +1731 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:187 kreplacements/kreplacements.cpp:721
+#: kreplacements/kreplacements.cpp:181 kreplacements/kreplacements.cpp:715
 #, fuzzy
 msgid "Help"
@@ -1708 +1737 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:191
+#: kreplacements/kreplacements.cpp:185
 #, fuzzy
 msgid "Defaults"
@@ -1714 +1743 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:303
+#: kreplacements/kreplacements.cpp:297
 #, fuzzy
 msgid "&Edit"
@@ -1720 +1749 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:311
+#: kreplacements/kreplacements.cpp:305
 #, fuzzy
 msgid "&Settings"
@@ -1726 +1755 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:312
+#: kreplacements/kreplacements.cpp:306
 #, fuzzy
 msgid "&Help"
@@ -1732 +1761 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:359
+#: kreplacements/kreplacements.cpp:353
 #, fuzzy
 msgid "&About"
@@ -1738 +1767 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:375
+#: kreplacements/kreplacements.cpp:369
 #, fuzzy
 msgid "A&uthor"
@@ -1744 +1773 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:389
+#: kreplacements/kreplacements.cpp:383
 #, fuzzy
 msgid "&Thanks To"
@@ -1750 +1779 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:603
+#: kreplacements/kreplacements.cpp:597
 #, fuzzy
 msgid "Open"
@@ -1756 +1785 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:612
+#: kreplacements/kreplacements.cpp:606
 #, fuzzy
 msgid "Save"
@@ -1762 +1791 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:629
+#: kreplacements/kreplacements.cpp:623
 #, fuzzy
 msgid "Print..."
@@ -1768 +1797 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:637 kreplacements/kreplacements.h:105
+#: kreplacements/kreplacements.cpp:631 kreplacements/kreplacements.h:107
 #, fuzzy
 msgid "Quit"
@@ -1774 +1803 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:645
+#: kreplacements/kreplacements.cpp:639
 #, fuzzy
 msgid "Cut"
@@ -1780 +1809 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:653
+#: kreplacements/kreplacements.cpp:647
 #, fuzzy
 msgid "Copy"
@@ -1786 +1815 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:661
+#: kreplacements/kreplacements.cpp:655
 #, fuzzy
 msgid "Paste"
@@ -1792 +1821 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:669
+#: kreplacements/kreplacements.cpp:663
 #, fuzzy
 msgid "Select All"
@@ -1798 +1827 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:677
+#: kreplacements/kreplacements.cpp:671
 msgid "Show Toolbar"
 msgstr ""
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:685
+#: kreplacements/kreplacements.cpp:679
 msgid "Show &Status Bar"
 msgstr ""
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:693
+#: kreplacements/kreplacements.cpp:687
 #, fuzzy, kde-format
 msgid "&Configure %1..."
@@ -1817 +1846 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:705 kreplacements/kreplacements.cpp:713
+#: kreplacements/kreplacements.cpp:699 kreplacements/kreplacements.cpp:707
 #, fuzzy
 msgid "About"
@@ -1823 +1852 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:728
+#: kreplacements/kreplacements.cpp:722
 #, fuzzy
 msgid "Find"
@@ -1829 +1858 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:736
+#: kreplacements/kreplacements.cpp:730
 #, fuzzy
 msgid "Find Next"
@@ -1835 +1864 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:756
+#: kreplacements/kreplacements.cpp:750
 #, fuzzy
 msgid "Select Font"
@@ -1841 +1870 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:794 optiondialog.cpp:1699
+#: kreplacements/kreplacements.cpp:788 optiondialog.cpp:1676
 msgid ""
 "You selected a variable width font.\n"
@@ -1852 +1881 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:798
+#: kreplacements/kreplacements.cpp:792
 msgid "Incompatible font."
 msgstr ""
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:799
+#: kreplacements/kreplacements.cpp:793
 msgid "Continue at my own risk"
 msgstr ""
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:799
+#: kreplacements/kreplacements.cpp:793
 msgid "Select another font"
 msgstr ""
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:1138
+#: kreplacements/kreplacements.cpp:1134
 msgid "For more documentation, see the help-menu or the subdirectory doc."
 msgstr ""
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:1141
+#: kreplacements/kreplacements.cpp:1137
 msgid "KDiff3-Usage"
 msgstr ""
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:1141
+#: kreplacements/kreplacements.cpp:1137
 #, fuzzy
 msgid "Ignore"
@@ -1883 +1912 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.cpp:1141
+#: kreplacements/kreplacements.cpp:1137
 #, fuzzy
 msgid "Exit"
@@ -1889 +1918 @@
 
 #. +> trunk
-#: kreplacements/kreplacements.h:103
+#: kreplacements/kreplacements.h:105
 #, fuzzy
 msgid "Continue"
@@ -1900 +1929 @@
 
 #. +> trunk
-#: main.cpp:157
+#: main.cpp:162
 msgid "kdiff3"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:159
+#: main.cpp:164
 msgid "Tool for Comparison and Merge of Files and Directories"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:160
-msgid "(c) 2002-2009 Joachim Eibl"
-msgstr ""
-
-#. +> trunk
-#: main.cpp:168
+#: main.cpp:165
+#, fuzzy
+msgid "(c) 2002-2011 Joachim Eibl"
+msgstr "© 2006 Sebastian Sauer"
+
+#. +> trunk
+#: main.cpp:173
 msgid "Eike Sauer"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:168
+#: main.cpp:173
 msgid "Bugfixes, Debian package maintainer"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:169
+#: main.cpp:174
 msgid "Sebastien Fricker"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:169
+#: main.cpp:174
 msgid "Windows installer"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:170
+#: main.cpp:175
 #, fuzzy
 msgid "Stephan Binner"
@@ -1941 +1971 @@
 
 #. +> trunk
-#: main.cpp:170
+#: main.cpp:175
 msgid "i18n-help"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:171
+#: main.cpp:176
 msgid "Stefan Partheymueller"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:171
+#: main.cpp:176
 msgid "Clipboard-patch"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:172
+#: main.cpp:177
 #, fuzzy
 msgid "David Faure"
@@ -1962 +1992 @@
 
 #. +> trunk
-#: main.cpp:172
+#: main.cpp:177
 msgid "KIO-Help"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:173
+#: main.cpp:178
 #, fuzzy
 msgid "Bernd Gehrmann"
@@ -1973 +2003 @@
 
 #. +> trunk
-#: main.cpp:173
+#: main.cpp:178
 msgid "Class CvsIgnoreList from Cervisia"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:174
+#: main.cpp:179
 msgid "Andre Woebbeking"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:174
+#: main.cpp:179
 msgid "Class StringMatcher"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:175
+#: main.cpp:180
 msgid "Michael Denio"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:175
+#: main.cpp:180
 msgid "Directory Equality-Coloring patch"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:176
+#: main.cpp:181
 msgid "Manfred Koehler"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:176
+#: main.cpp:181
 msgid "Fix for slow startup on Windows"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:177
+#: main.cpp:182
 msgid "Sergey Zorin"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:177
+#: main.cpp:182
 msgid "Diff Ext for Windows"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:178
+#: main.cpp:183
 msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:178
+#: main.cpp:183
 msgid "GNU-Diffutils"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:179
+#: main.cpp:184
 msgid "Tino Boellsterling, Timothy Mee"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:179
+#: main.cpp:184
 msgid "Intensive test, use and feedback"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:180
+#: main.cpp:185
 msgid "Michael Schmidt"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:180
+#: main.cpp:185
 msgid "Mac support"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:181
+#: main.cpp:186
 msgid "Valentin Rusu"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:181 main.cpp:182
+#: main.cpp:186 main.cpp:187
 #, fuzzy
 msgid "KDE4 porting"
@@ -2059 +2089 @@
 
 #. +> trunk
-#: main.cpp:182
+#: main.cpp:187
 #, fuzzy
 msgid "Albert Astals Cid"
@@ -2065 +2095 @@
 
 #. +> trunk
-#: main.cpp:184
+#: main.cpp:188
+#, fuzzy
+msgid "Silvan Scherrer"
+msgstr "Simon Schmeisser"
+
+#. +> trunk
+#: main.cpp:188
+#, fuzzy
+msgid "OS2 port"
+msgstr "Prebacio na SGI"
+
+#. +> trunk
+#: main.cpp:190
 msgid "+ Many thanks to those who reported bugs and contributed ideas!"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:190
+#: main.cpp:196
 msgid "Merge the input."
 msgstr ""
 
 #. +> trunk
-#: main.cpp:191
+#: main.cpp:197
 msgid "Explicit base file. For compatibility with certain tools."
 msgstr ""
 
 #. +> trunk
-#: main.cpp:192
+#: main.cpp:198
 msgid "Output file. Implies -m. E.g.: -o newfile.txt"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:193
+#: main.cpp:199
 msgid "Output file, again. (For compatibility with certain tools.)"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:194
+#: main.cpp:200
 msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:195
+#: main.cpp:201
 msgid "Don't solve conflicts automatically. (For compatibility...)"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:196
+#: main.cpp:202
 msgid "Visible name replacement for input file 1 (base)."
 msgstr ""
 
 #. +> trunk
-#: main.cpp:197
+#: main.cpp:203
 msgid "Visible name replacement for input file 2."
 msgstr ""
 
 #. +> trunk
-#: main.cpp:198
+#: main.cpp:204
 msgid "Visible name replacement for input file 3."
 msgstr ""
 
 #. +> trunk
-#: main.cpp:199
+#: main.cpp:205
 msgid "Alternative visible name replacement. Supply this once for every input."
 msgstr ""
 
 #. +> trunk
-#: main.cpp:200
+#: main.cpp:206
 msgid "Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\""
 msgstr ""
 
 #. +> trunk
-#: main.cpp:201
+#: main.cpp:207
 msgid "Show list of config settings and current values."
 msgstr ""
 
 #. +> trunk
-#: main.cpp:202
+#: main.cpp:208
 msgid "Use a different config file."
 msgstr ""
 
 #. +> trunk
-#: main.cpp:205
+#: main.cpp:211
 msgid "file1 to open (base, if not specified via --base)"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:206
+#: main.cpp:212
 msgid "file2 to open"
 msgstr ""
 
 #. +> trunk
-#: main.cpp:207
+#: main.cpp:213
 msgid "file3 to open"
 msgstr ""
 
 #. +> trunk
-#: mergeresultwindow.cpp:152 mergeresultwindow.cpp:970
-#: mergeresultwindow.cpp:984 mergeresultwindow.cpp:996
-#: mergeresultwindow.cpp:1008
+#: mergeresultwindow.cpp:152 mergeresultwindow.cpp:976
+#: mergeresultwindow.cpp:990 mergeresultwindow.cpp:1002
+#: mergeresultwindow.cpp:1014
 #, kde-format
 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)"
@@ -2158 +2200 @@
 
 #. +> trunk
-#: mergeresultwindow.cpp:301
+#: mergeresultwindow.cpp:303
 msgid ""
 "The output has been modified.\n"
@@ -2165 +2207 @@
 
 #. +> trunk
-#: mergeresultwindow.cpp:828 pdiff.cpp:532
+#: mergeresultwindow.cpp:834 pdiff.cpp:532
 msgid "All input files are binary equal."
 msgstr ""
 
 #. +> trunk
-#: mergeresultwindow.cpp:830
+#: mergeresultwindow.cpp:836
 msgid "All input files contain the same text."
 msgstr ""
 
 #. +> trunk
-#: mergeresultwindow.cpp:832 mergeresultwindow.cpp:834
-#: mergeresultwindow.cpp:836 pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540
+#: mergeresultwindow.cpp:838 mergeresultwindow.cpp:840
+#: mergeresultwindow.cpp:842 pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540
 #, kde-format
 msgid "Files %1 and %2 are binary equal.\n"
@@ -2182 +2224 @@
 
 #. +> trunk
-#: mergeresultwindow.cpp:833 mergeresultwindow.cpp:835
-#: mergeresultwindow.cpp:837
+#: mergeresultwindow.cpp:839 mergeresultwindow.cpp:841
+#: mergeresultwindow.cpp:843
 #, kde-format
 msgid "Files %1 and %2 have equal text.\n"
@@ -2189 +2231 @@
 
 #. +> trunk
-#: mergeresultwindow.cpp:843
+#: mergeresultwindow.cpp:849
 msgid "Total number of conflicts: "
 msgstr ""
 
 #. +> trunk
-#: mergeresultwindow.cpp:844
+#: mergeresultwindow.cpp:850
 msgid ""
 "\n"
@@ -2201 +2243 @@
 
 #. +> trunk
-#: mergeresultwindow.cpp:845
+#: mergeresultwindow.cpp:851
 msgid ""
 "\n"
@@ -2208 +2250 @@
 
 #. +> trunk
-#: mergeresultwindow.cpp:847
+#: mergeresultwindow.cpp:853
 msgid "Conflicts"
 msgstr ""
 
 #. +> trunk
-#: mergeresultwindow.cpp:1714
+#: mergeresultwindow.cpp:1728
 msgid "<No src line>"
 msgstr ""
 
 #. +> trunk
-#: mergeresultwindow.cpp:1722
+#: mergeresultwindow.cpp:1736
 msgid "<Merge Conflict (Whitespace only)>"
 msgstr ""
 
 #. +> trunk
-#: mergeresultwindow.cpp:1724 mergeresultwindow.cpp:2503
+#: mergeresultwindow.cpp:1738 mergeresultwindow.cpp:2517
 msgid "<Merge Conflict>"
 msgstr ""
 
 #. +> trunk
-#: mergeresultwindow.cpp:2711
+#: mergeresultwindow.cpp:2725
 msgid ""
 "Not all conflicts are solved yet.\n"
@@ -2235 +2277 @@
 
 #. +> trunk
-#: mergeresultwindow.cpp:2713 mergeresultwindow.cpp:2722
+#: mergeresultwindow.cpp:2727 mergeresultwindow.cpp:2736
 msgid "Conflicts Left"
 msgstr ""
 
 #. +> trunk
-#: mergeresultwindow.cpp:2720
+#: mergeresultwindow.cpp:2734
 msgid ""
 "There is a line end style conflict. Please choose the line end style manually.\n"
@@ -2247 +2289 @@
 
 #. +> trunk
-#: mergeresultwindow.cpp:2734
+#: mergeresultwindow.cpp:2748
 msgid ""
 "\n"
@@ -2255 +2297 @@
 
 #. +> trunk
-#: mergeresultwindow.cpp:2734 mergeresultwindow.cpp:2778
+#: mergeresultwindow.cpp:2748 mergeresultwindow.cpp:2792
 msgid "File Save Error"
 msgstr ""
 
 #. +> trunk
-#: mergeresultwindow.cpp:2778
+#: mergeresultwindow.cpp:2792
 msgid "Error while writing."
 msgstr ""
 
 #. +> trunk
-#: mergeresultwindow.cpp:3108
+#: mergeresultwindow.cpp:3122
 #, fuzzy
 msgid "Output"
@@ -2271 +2313 @@
 
 #. +> trunk
-#: mergeresultwindow.cpp:3120 mergeresultwindow.cpp:3300
+#: mergeresultwindow.cpp:3134 mergeresultwindow.cpp:3314
 msgid "[Modified]"
 msgstr ""
 
 #. +> trunk
-#: mergeresultwindow.cpp:3127
+#: mergeresultwindow.cpp:3141
 msgid "Encoding for saving"
 msgstr ""
 
 #. +> trunk
-#: mergeresultwindow.cpp:3215
+#: mergeresultwindow.cpp:3229
 #, fuzzy
 msgid "Conflict"
@@ -2287 +2329 @@
 
 #. +> trunk
-#: mergeresultwindow.cpp:3247 mergeresultwindow.cpp:3249
-#: mergeresultwindow.cpp:3251
+#: mergeresultwindow.cpp:3261 mergeresultwindow.cpp:3263
+#: mergeresultwindow.cpp:3265
 msgid "Codec from"
 msgstr ""
@@ -2688 +2730 @@
 
 #. +> trunk
-#: optiondialog.cpp:972 smalldialogs.cpp:470
+#: optiondialog.cpp:972 smalldialogs.cpp:469
 msgid "History entry start regular expression:"
 msgstr ""
@@ -3013 +3055 @@
 
 #. +> trunk
-#: optiondialog.cpp:1324 optiondialog.cpp:1325
+#: optiondialog.cpp:1301 optiondialog.cpp:1302
 msgid "Regional Settings"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1425
+#: optiondialog.cpp:1402
 msgid "Language (restart required)"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1468
+#: optiondialog.cpp:1445
 msgid ""
 "Choose the language of the GUI strings or \"Auto\".\n"
@@ -3030 +3072 @@
 
 #. +> trunk
-#: optiondialog.cpp:1486
+#: optiondialog.cpp:1463
 msgid "Use the same encoding for everything:"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1489
+#: optiondialog.cpp:1466
 msgid ""
 "Enable this allows to change all encodings by changing the first only.\n"
@@ -3042 +3084 @@
 
 #. +> trunk
-#: optiondialog.cpp:1494
+#: optiondialog.cpp:1471
 msgid "Note: Local Encoding is "
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1498
+#: optiondialog.cpp:1475
 msgid "File Encoding for A:"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1504
+#: optiondialog.cpp:1481
 msgid ""
 "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n"
@@ -3060 +3102 @@
 
 #. +> trunk
-#: optiondialog.cpp:1508 optiondialog.cpp:1517 optiondialog.cpp:1526
+#: optiondialog.cpp:1485 optiondialog.cpp:1494 optiondialog.cpp:1503
 msgid "Auto Detect Unicode"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1513
+#: optiondialog.cpp:1490
 msgid "File Encoding for B:"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1522
+#: optiondialog.cpp:1499
 msgid "File Encoding for C:"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1531
+#: optiondialog.cpp:1508
 msgid "File Encoding for Merge Output and Saving:"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1535
+#: optiondialog.cpp:1512
 #, fuzzy
 msgid "Auto Select"
@@ -3086 +3128 @@
 
 #. +> trunk
-#: optiondialog.cpp:1538
+#: optiondialog.cpp:1515
 msgid ""
 "If enabled then the encoding from the input files is used.\n"
@@ -3093 +3135 @@
 
 #. +> trunk
-#: optiondialog.cpp:1542
+#: optiondialog.cpp:1519
 msgid "File Encoding for Preprocessor Files:"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1553
+#: optiondialog.cpp:1530
 msgid "Right To Left Language"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1556
+#: optiondialog.cpp:1533
 msgid ""
 "Some languages are read from right to left.\n"
@@ -3110 +3152 @@
 
 #. +> trunk
-#: optiondialog.cpp:1571
+#: optiondialog.cpp:1548
 msgid "Integration"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1572
+#: optiondialog.cpp:1549
 msgid "Integration Settings"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1586
+#: optiondialog.cpp:1563
 msgid "Command line options to ignore:"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1591
+#: optiondialog.cpp:1568
 msgid ""
 "List of command line options that should be ignored when KDiff3 is used by other tools.\n"
@@ -3133 +3175 @@
 
 #. +> trunk
-#: optiondialog.cpp:1598
+#: optiondialog.cpp:1575
 msgid "Quit also via Escape key"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1601
+#: optiondialog.cpp:1578
 msgid ""
 "Fast method to exit.\n"
@@ -3145 +3187 @@
 
 #. +> trunk
-#: optiondialog.cpp:1606
+#: optiondialog.cpp:1583
 msgid "Integrate with ClearCase"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1609
+#: optiondialog.cpp:1586
 msgid ""
 "Integrate with Rational ClearCase from IBM.\n"
@@ -3158 +3200 @@
 
 #. +> trunk
-#: optiondialog.cpp:1615
+#: optiondialog.cpp:1592
 msgid "Remove ClearCase Integration"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1618
+#: optiondialog.cpp:1595
 msgid "Restore the old \"map\" file from before doing the ClearCase integration."
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1703
+#: optiondialog.cpp:1680
 msgid "Incompatible Font"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1704
+#: optiondialog.cpp:1681
 msgid "Continue at Own Risk"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1705
+#: optiondialog.cpp:1682
 msgid "Select Another Font"
 msgstr ""
 
 #. +> trunk
-#: optiondialog.cpp:1740
+#: optiondialog.cpp:1717
 msgid "This resets all options. Not only those of the current topic."
 msgstr ""
@@ -3285 +3327 @@
 
 #. +> trunk
-#: pdiff.cpp:1060
+#: pdiff.cpp:566
+#, kde-format
+msgid ""
+"Some input characters could not be converted to valid unicode.\n"
+"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n"
+"Don't save the result if unsure. Continue at your own risk.\n"
+"Affected input files are in %1."
+msgstr ""
+
+#. +> trunk
+#: pdiff.cpp:1080
 #, fuzzy
 msgid "Abort"
@@ -3291 +3343 @@
 
 #. +> trunk
-#: pdiff.cpp:1067 pdiff.cpp:1155
+#: pdiff.cpp:1087 pdiff.cpp:1175
 msgid "Opening files..."
 msgstr ""
 
 #. +> trunk
-#: pdiff.cpp:1132 pdiff.cpp:1203
+#: pdiff.cpp:1152 pdiff.cpp:1223
 msgid "File open error"
 msgstr ""
 
 #. +> trunk
-#: pdiff.cpp:1235
+#: pdiff.cpp:1255
 #, fuzzy
 msgid "Cutting selection..."
@@ -3307 +3359 @@
 
 #. +> trunk
-#: pdiff.cpp:1256
+#: pdiff.cpp:1276
 #, fuzzy
 msgid "Copying selection to clipboard..."
@@ -3313 +3365 @@
 
 #. +> trunk
-#: pdiff.cpp:1272
+#: pdiff.cpp:1292
 #, fuzzy
 msgid "Inserting clipboard contents..."
@@ -3319 +3371 @@
 
 #. +> trunk
-#: pdiff.cpp:1794
+#: pdiff.cpp:1814
 msgid "Save && Continue"
 msgstr ""
 
 #. +> trunk
-#: pdiff.cpp:1795
+#: pdiff.cpp:1815
 msgid "Continue Without Saving"
 msgstr ""
 
 #. +> trunk
-#: pdiff.cpp:1997
+#: pdiff.cpp:2018
 msgid "Search complete."
 msgstr ""
 
 #. +> trunk
-#: pdiff.cpp:1997
+#: pdiff.cpp:2018
 msgid "Search Complete"
 msgstr ""
 
 #. +> trunk
-#: pdiff.cpp:2231
+#: pdiff.cpp:2252
 msgid "Nothing is selected in either diff input window."
 msgstr ""
 
 #. +> trunk
-#: pdiff.cpp:2231
+#: pdiff.cpp:2252
 msgid "Error while adding manual diff range"
 msgstr ""
@@ -3464 +3516 @@
 
 #. +> trunk
-#: smalldialogs.cpp:430 smalldialogs.cpp:459 smalldialogs.cpp:496
+#: smalldialogs.cpp:430 smalldialogs.cpp:458 smalldialogs.cpp:494
 msgid "Match result:"
 msgstr ""
@@ -3474 +3526 @@
 
 #. +> trunk
-#: smalldialogs.cpp:452
+#: smalldialogs.cpp:451
 msgid ""
 "Copy a history start line as used in your files,\n"
@@ -3481 +3533 @@
 
 #. +> trunk
-#: smalldialogs.cpp:478
+#: smalldialogs.cpp:477
 msgid "History sort key order:"
 msgstr ""
 
 #. +> trunk
-#: smalldialogs.cpp:486
+#: smalldialogs.cpp:485
 msgid "Example history entry start line (without leading comment):"
 msgstr ""
 
 #. +> trunk
-#: smalldialogs.cpp:488
+#: smalldialogs.cpp:487
 msgid ""
 "Copy a history entry start line as used in your files,\n"
@@ -3498 +3550 @@
 
 #. +> trunk
-#: smalldialogs.cpp:503
+#: smalldialogs.cpp:501
 msgid "Sort key result:"
 msgstr ""
 
 #. +> trunk
-#: smalldialogs.cpp:510
+#: smalldialogs.cpp:508
 #, fuzzy
 msgid "OK"
@@ -3509 +3561 @@
 
 #. +> trunk
-#: smalldialogs.cpp:554 smalldialogs.cpp:564 smalldialogs.cpp:585
+#: smalldialogs.cpp:552 smalldialogs.cpp:562 smalldialogs.cpp:583
 msgid "Match success."
 msgstr ""
 
 #. +> trunk
-#: smalldialogs.cpp:558 smalldialogs.cpp:568 smalldialogs.cpp:591
+#: smalldialogs.cpp:556 smalldialogs.cpp:566 smalldialogs.cpp:589
 msgid "Match failed."
 msgstr ""
 
 #. +> trunk
-#: smalldialogs.cpp:576
+#: smalldialogs.cpp:574
 msgid "Opening and closing parentheses do not match in regular expression."
 msgstr ""