diff options
Diffstat (limited to 'po/en_GB.po')
| -rw-r--r-- | po/en_GB.po | 1259 |
1 files changed, 678 insertions, 581 deletions
diff --git a/po/en_GB.po b/po/en_GB.po index 4d92607..6254ee9 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,36 +7,37 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2005-02-02 11:52+0000\n" "Last-Translator: Andrew Coles <[email protected]>\n" "Language-Team: British English <[email protected]>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "Jonathan Riddell" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "[email protected]" -#: diff.cpp:246 +#: diff.cpp:247 msgid "Writing clipboard data to temp file failed." msgstr "Writing clipboard data to temp file failed." -#: diff.cpp:250 +#: diff.cpp:251 msgid "From Clipboard" msgstr "From Clipboard" -#: diff.cpp:491 +#: diff.cpp:493 msgid "" "Preprocessing possibly failed. Check this command:\n" "\n" @@ -50,7 +51,7 @@ msgstr "" "\n" "The preprocessing command will be disabled now." -#: diff.cpp:526 +#: diff.cpp:528 msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" "\n" @@ -64,7 +65,7 @@ msgstr "" "\n" "The line-matching-preprocessing command will be disabled now." -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 msgid "" "Data loss error:\n" "If it is reproducable please contact the author.\n" @@ -72,16 +73,16 @@ msgstr "" "Data loss error:\n" "If it is reproducable please contact the author.\n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 msgid "Severe Internal Error" msgstr "Severe Internal Error" -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Top line %1" -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "End" @@ -97,245 +98,249 @@ msgstr "Link: " msgid "Size. " msgstr "Size. " -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 msgid "Date & Size: " msgstr "Date & Size: " -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 msgid "Creating temp copy of %1 failed." msgstr "Creating temp copy of %1 failed." -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 msgid "Opening %1 failed." msgstr "Opening %1 failed." -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 msgid "Comparing file..." msgstr "Comparing file..." -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, c-format msgid "Error reading from %1" msgstr "Error reading from %1" -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Name" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Operation" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 msgid "Unsolved" msgstr "Unsolved" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 msgid "Solved" msgstr "Solved" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 msgid "Nonwhite" msgstr "Nonwhite" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "White" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 +#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 +msgid "Warning" +msgstr "" + +#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" msgstr "Rescan" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Continue Merging" -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 msgid "Opening of directories failed:" msgstr "Opening of directories failed:" -#: directorymergewindow.cpp:465 -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir A \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:510 +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Dir A \"%1\" does not exist or is not a directory.\n" -#: directorymergewindow.cpp:468 -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir B \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:513 +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Dir B \"%1\" does not exist or is not a directory.\n" -#: directorymergewindow.cpp:471 -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"Dir C \"%1\" does not exist or is not a directory.\n" +#: directorymergewindow.cpp:516 +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Dir C \"%1\" does not exist or is not a directory.\n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 msgid "Directory Open Error" msgstr "Directory Open Error" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 msgid "Parameter Warning" msgstr "Parameter Warning" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 msgid "Scanning directories..." msgstr "Scanning directories..." -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 msgid "Reading Directory A" msgstr "Reading Directory A" -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 msgid "Reading Directory B" msgstr "Reading Directory B" -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 msgid "Reading Directory C" msgstr "Reading Directory C" -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 msgid "Some subdirectories were not readable in" msgstr "Some subdirectories were not readable in" -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 msgid "Check the permissions of the subdirectories." msgstr "Check the permissions of the subdirectories." -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Ready." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 msgid "Directory Comparison Status" msgstr "Directory Comparison Status" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 msgid "Number of subdirectories:" msgstr "Number of subdirectories:" -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 msgid "Number of equal files:" msgstr "Number of equal files:" -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 msgid "Number of different files:" msgstr "Number of different files:" -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 msgid "Number of manual merges:" msgstr "Number of manual merges:" -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 msgid "This affects all merge operations." msgstr "This affects all merge operations." -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 msgid "Changing All Merge Operations" msgstr "Changing All Merge Operations" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "C&ontinue" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 msgid "Processing " msgstr "Processing " -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 msgid "To do." msgstr "To do." -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 msgid "Copy A to B" msgstr "Copy A to B" -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Copy B to A" msgstr "Copy B to A" -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Delete A" msgstr "Delete A" -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 msgid "Delete B" msgstr "Delete B" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 msgid "Delete A & B" msgstr "Delete A & B" -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 msgid "Merge to A" msgstr "Merge to A" -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 msgid "Merge to B" msgstr "Merge to B" -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 msgid "Merge to A & B" msgstr "Merge to A & B" -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 msgid "Delete (if exists)" msgstr "Delete (if exists)" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Merge" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 msgid "Merge (manual)" msgstr "Merge (manual)" -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 msgid "Error: Conflicting File Types" msgstr "Error: Conflicting File Types" -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 msgid "Error: Dates are equal but files are not." msgstr "Error: Dates are equal but files are not." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 msgid "This operation is currently not possible." msgstr "This operation is currently not possible." -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 msgid "Operation Not Possible" msgstr "Operation Not Possible" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "" "This should never happen: \n" "\n" @@ -349,42 +354,47 @@ msgstr "" "\n" "If you know how to reproduce this, please contact the program author." -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 msgid "Program Error" msgstr "Program Error" -#: directorymergewindow.cpp:1899 -msgid "" -"An error occurred while copying.\n" -msgstr "" -"An error occurred while copying.\n" +#: directorymergewindow.cpp:1965 +msgid "An error occurred while copying.\n" +msgstr "An error occurred while copying.\n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 +#, fuzzy +msgid "Error" +msgstr "Error." + +#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 msgid "Merge Error" msgstr "Merge Error" -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Error." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Done." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 msgid "Not saved." msgstr "Not saved." -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 msgid "Unknown merge operation. (This must never happen!)" msgstr "Unknown merge operation. (This must never happen!)" -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 msgid "Unknown merge operation." msgstr "Unknown merge operation." -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 msgid "" "The merge is about to begin.\n" "\n" @@ -404,327 +414,330 @@ msgstr "" "Be aware that this program still has beta status and there is NO WARRANTY " "whatsoever! Make backups of your vital data!" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Starting Merge" msgstr "Starting Merge" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Do It" msgstr "Do It" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 msgid "Simulate It" msgstr "Simulate It" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue merge after an error" msgstr "Continue merge after an error" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Continue With Last Item" msgstr "Continue With Last Item" -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 msgid "Skip Item" msgstr "Skip Item" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 msgid "Skipped." msgstr "Skipped." -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 msgid "In progress..." msgstr "In progress..." -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 msgid "Merge operation complete." msgstr "Merge operation complete." -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 msgid "Merge Complete" msgstr "Merge Complete" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Simulated merge complete: Check if you agree with the proposed operations." -#: directorymergewindow.cpp:2305 -msgid "" -"An error occurred. Press OK to see detailed information.\n" -msgstr "" -"An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2371 +msgid "An error occurred. Press OK to see detailed information.\n" +msgstr "An error occurred. Press OK to see detailed information.\n" -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 msgid "Error: While deleting %1: Creating backup failed." msgstr "Error: While deleting %1: Creating backup failed." -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 msgid "delete directory recursively( %1 )" msgstr "delete directory recursively( %1 )" -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 msgid "delete( %1 )" msgstr "delete( %1 )" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Error: delete dir operation failed while trying to read the directory." -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 msgid "Error: rmdir( %1 ) operation failed." msgstr "Error: rmdir( %1 ) operation failed." -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 msgid "Error: delete operation failed." msgstr "Error: delete operation failed." -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "manual merge( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Note: After a manual merge the user should continue by pressing F7." -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Error: copyLink failed: Remote links are not yet supported." -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 msgid "Error: copyLink failed." msgstr "Error: copyLink failed." -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 msgid "copy( %1 -> %2 )" msgstr "copy( %1 -> %2 )" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Error during rename( %1 -> %2 ): Cannot delete existing destination." -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 msgid "Error: Rename failed." msgstr "Error: Rename failed." -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Error during makeDir of %1. Cannot delete existing file." -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 msgid "Error while creating directory." msgstr "Error while creating directory." -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Size" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 msgid "Last Modification" msgstr "Last Modification" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 msgid "Link-Destination" msgstr "Link-Destination" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "File..." + +#: directorymergewindow.cpp:2729 msgid "not available" msgstr "not available" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 msgid "Dest: " msgstr "Dest: " -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Directory Merge" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 msgid "Start/Continue Directory Merge" msgstr "Start/Continue Directory Merge" -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 msgid "Run Operation for Current Item" msgstr "Run Operation for Current Item" -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 msgid "Compare Selected File" msgstr "Compare Selected File" -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 msgid "Merge Current File" msgstr "Merge Current File" -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 msgid "Fold All Subdirs" msgstr "Fold All Subdirs" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "Unfold All Subdirs" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 msgid "Choose A for All Items" msgstr "Choose A for All Items" -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 msgid "Choose B for All Items" msgstr "Choose B for All Items" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 msgid "Choose C for All Items" msgstr "Choose C for All Items" -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 msgid "Auto-Choose Operation for All Items" msgstr "Auto-Choose Operation for All Items" -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 msgid "No Operation for All Items" msgstr "No Operation for All Items" -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Show Different Files" msgstr "Number of different files:" -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Compare Selected File" -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Compare Selected File" -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Do Nothing" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 msgid "Delete A && B" msgstr "Delete A && B" -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 msgid "Merge to A && B" msgstr "Merge to A && B" -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 msgid "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " @@ -732,7 +745,7 @@ msgstr "" "While trying to make a backup, deleting an older backup failed. \n" "Filename: " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 msgid "" "While trying to make a backup, renaming failed. \n" "Filenames: " @@ -740,188 +753,196 @@ msgstr "" "While trying to make a backup, renaming failed. \n" "Filenames: " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, c-format msgid "Getting file status: %1" msgstr "Getting file status: %1" -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, c-format msgid "Reading file: %1" msgstr "Reading file: %1" -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, c-format msgid "Writing file: %1" msgstr "Writing file: %1" -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Out of memory" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, c-format msgid "Making directory: %1" msgstr "Making directory: %1" -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, c-format msgid "Removing directory: %1" msgstr "Removing directory: %1" -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, c-format msgid "Removing file: %1" msgstr "Removing file: %1" -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 msgid "Creating symbolic link: %1 -> %2" msgstr "Creating symbolic link: %1 -> %2" -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 msgid "Renaming file: %1 -> %2" msgstr "Renaming file: %1 -> %2" -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 msgid "Copying file: %1 -> %2" msgstr "Copying file: %1 -> %2" -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "Error during file copy operation: Reading failed. Filename: %1" -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Error during file copy operation: Writing failed. Filename: %1" -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 msgid "Reading directory: " msgstr "Reading directory: " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, c-format msgid "Listing directory: %1" msgstr "Listing directory: %1" -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 #, fuzzy msgid "Current Configuration:" msgstr "Current Item Sync Operation" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "File Open Error" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 msgid "Option --auto used, but no output file specified." msgstr "Option --auto used, but no output file specified." -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 msgid "Option --auto ignored for directory comparison." msgstr "Option --auto ignored for directory comparison." -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 msgid "Saving failed." msgstr "Saving failed." -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 msgid "Opening of these files failed:" msgstr "Opening of these files failed:" -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 msgid "File Open Error" msgstr "File Open Error" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 msgid "Opens documents for comparison..." msgstr "Opens documents for comparison..." -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 msgid "Saves the merge result. All conflicts must be solved!" msgstr "Saves the merge result. All conflicts must be solved!" -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 msgid "Saves the current document as..." msgstr "Saves the current document as..." -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 msgid "Quits the application" msgstr "Quits the application" -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 msgid "Cuts the selected section and puts it to the clipboard" msgstr "Cuts the selected section and puts it to the clipboard" -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 msgid "Copies the selected section to the clipboard" msgstr "Copies the selected section to the clipboard" -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 msgid "Pastes the clipboard contents to actual position" msgstr "Pastes the clipboard contents to actual position" -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 msgid "Search for a string" msgstr "Search for a string" -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 msgid "Search again for the string" msgstr "Search again for the string" -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 msgid "Enables/disables the toolbar" msgstr "Enables/disables the toolbar" -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 msgid "Enables/disables the statusbar" msgstr "Enables/disables the statusbar" -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 msgid "Configure KDiff3..." msgstr "Configure KDiff3..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 msgid "Go to Current Delta" msgstr "Go to Current Delta" -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 msgid "Go to First Delta" msgstr "Go to First Delta" -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 msgid "Go to Last Delta" msgstr "Go to Last Delta" -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(Skips white space differences when \"Show White Space\" is disabled.)" -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" @@ -929,237 +950,245 @@ msgstr "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 msgid "Go to Previous Delta" msgstr "Go to Previous Delta" -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 msgid "Go to Next Delta" msgstr "Go to Next Delta" -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 msgid "Go to Previous Conflict" msgstr "Go to Previous Conflict" -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 msgid "Go to Next Conflict" msgstr "Go to Next Conflict" -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 msgid "Go to Previous Unsolved Conflict" msgstr "Go to Previous Unsolved Conflict" -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 msgid "Go to Next Unsolved Conflict" msgstr "Go to Next Unsolved Conflict" -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 msgid "Select Line(s) From A" msgstr "Select Line(s) From A" -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 msgid "Select Line(s) From B" msgstr "Select Line(s) From B" -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 msgid "Select Line(s) From C" msgstr "Select Line(s) From C" -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Automatically Go to Next Unsolved Conflict After Source Selection" -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 msgid "Show Space && Tabulator Characters for Differences" msgstr "Show Space && Tabulator Characters for Differences" -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 msgid "Show White Space" msgstr "Show White Space" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 msgid "Show Line Numbers" msgstr "Show Line Numbers" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 msgid "Choose A Everywhere" msgstr "Choose A Everywhere" -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 msgid "Choose B Everywhere" msgstr "Choose B Everywhere" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 msgid "Choose C Everywhere" msgstr "Choose C Everywhere" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 msgid "Choose A for All Unsolved Conflicts" msgstr "Choose A for All Unsolved Conflicts" -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 msgid "Choose B for All Unsolved Conflicts" msgstr "Choose B for All Unsolved Conflicts" -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 msgid "Choose C for All Unsolved Conflicts" msgstr "Choose C for All Unsolved Conflicts" -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Choose A for All Unsolved Whitespace Conflicts" -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Choose B for All Unsolved Whitespace Conflicts" -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Choose C for All Unsolved Whitespace Conflicts" -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 msgid "Automatically Solve Simple Conflicts" msgstr "Automatically Solve Simple Conflicts" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 msgid "Set Deltas to Conflicts" msgstr "Set Deltas to Conflicts" -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Automatically Solve Simple Conflicts" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 #, fuzzy msgid "Join Selected Diffs" msgstr "Compare Selected File" -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 msgid "Show Window A" msgstr "Show Window A" -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 msgid "Show Window B" msgstr "Show Window B" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 msgid "Show Window C" msgstr "Show Window C" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 msgid "Focus Next Window" msgstr "Focus Next Window" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 msgid "Normal Overview" msgstr "Normal Overview" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 msgid "A vs. B Overview" msgstr "A vs. B Overview" -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 msgid "A vs. C Overview" msgstr "A vs. C Overview" -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 msgid "B vs. C Overview" msgstr "B vs. C Overview" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "Word Wrap Diff Windows" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 msgid "Focus Prev Window" msgstr "Focus Prev Window" -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 msgid "Toggle Split Orientation" msgstr "Toggle Split Orientation" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "Dir && Text Split Screen View" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "Toggle Between Dir && Text View" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 msgid "The merge result hasn't been saved." msgstr "The merge result hasn't been saved." -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Save && Quit" msgstr "Save && Quit" -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 msgid "Quit Without Saving" msgstr "Quit Without Saving" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 msgid "Saving the merge result failed." msgstr "Saving the merge result failed." -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "You are currently doing a directory merge. Are you sure, you want to abort?" -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 msgid "Saving file..." msgstr "Saving file..." -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 msgid "Saving file with a new filename..." msgstr "Saving file with a new filename..." -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "Exiting..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 #, fuzzy msgid "Printing completed." msgstr "Merge operation complete." -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 msgid "Exiting..." msgstr "Exiting..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 msgid "Toggling toolbar..." msgstr "Toggling toolbar..." -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 msgid "Toggle the statusbar..." msgstr "Toggle the statusbar..." @@ -1174,12 +1203,12 @@ msgstr "KDiff3Part" #: kdiff3_shell.cpp:78 msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." #: main.cpp:35 msgid "Tool for Comparison and Merge of Files and Directories" @@ -1257,19 +1286,18 @@ msgstr "file3 to open" msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "KDiff3" -#: main.cpp:186 +#: main.cpp:191 msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "+ Many thanks to those who reported bugs and contributed ideas!" -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" @@ -1282,55 +1310,31 @@ msgstr "" "The output has been modified.\n" "If you continue your changes will be lost." -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 msgid "All input files are binary equal." msgstr "All input files are binary equal." -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 msgid "All input files contain the same text." msgstr "All input files contain the same text." -#: mergeresultwindow.cpp:801 -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"Files A and B are binary equal.\n" - -#: mergeresultwindow.cpp:802 -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"Files A and B have equal text. \n" - -#: mergeresultwindow.cpp:803 -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"Files A and C are binary equal.\n" - -#: mergeresultwindow.cpp:804 -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"Files A and C have equal text. \n" - -#: mergeresultwindow.cpp:805 -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"Files B and C are binary equal.\n" +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 +#, fuzzy +msgid "Files %1 and %2 are binary equal.\n" +msgstr "Files B and C are binary equal.\n" -#: mergeresultwindow.cpp:806 -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"Files B and C have equal text. \n" +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 +#, fuzzy +msgid "Files %1 and %2 have equal text.\n" +msgstr "Files A and B have equal text. \n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " msgstr "Total number of conflicts: " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 msgid "" "\n" "Nr of automatically solved conflicts: " @@ -1338,7 +1342,7 @@ msgstr "" "\n" "Nr of automatically solved conflicts: " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 msgid "" "\n" "Nr of unsolved conflicts: " @@ -1346,23 +1350,23 @@ msgstr "" "\n" "Nr of unsolved conflicts: " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 msgid "Conflicts" msgstr "Conflicts" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 msgid "<No src line>" msgstr "<No src line>" -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "<Merge Conflict (Whitespace only)>" msgstr "<Merge Conflict (Whitespace only)>" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 msgid "<Merge Conflict>" msgstr "<Merge Conflict>" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 msgid "" "Not all conflicts are solved yet.\n" "File not saved.\n" @@ -1370,11 +1374,11 @@ msgstr "" "Not all conflicts are solved yet.\n" "File not saved.\n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 msgid "Conflicts Left" msgstr "Conflicts Left" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 msgid "" "\n" "\n" @@ -1384,29 +1388,29 @@ msgstr "" "\n" "Creating backup failed. File not saved." -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 msgid "File Save Error" msgstr "File Save Error" -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 msgid "Error while writing." msgstr "Error while writing." -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Output" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 msgid "[Modified]" msgstr "[Modified]" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 #, fuzzy msgid "Encoding for saving" msgstr "File Encoding for C:" -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1426,6 +1430,15 @@ msgstr "Latin1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Change this if non-ASCII characters are not displayed correctly." +#: optiondialog.cpp:455 +#, fuzzy +msgid "Configure" +msgstr "Configure..." + +#: optiondialog.cpp:510 +msgid "Font" +msgstr "" + #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "Editor & Diff Output Font" @@ -1551,10 +1564,8 @@ msgid "Auto indentation" msgstr "Auto indentation" #: optiondialog.cpp:697 -msgid "" -"On: The indentation of the previous line is used for a new line.\n" -msgstr "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "On: The indentation of the previous line is used for a new line.\n" #: optiondialog.cpp:701 msgid "Auto copy selection" @@ -1590,61 +1601,54 @@ msgstr "KDiff3" msgid "Diff Settings" msgstr "Diff & Merge Settings" -#: optiondialog.cpp:743 -msgid "Preserve carriage return" -msgstr "Preserve carriage return" - -#: optiondialog.cpp:746 -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." +#: optiondialog.cpp:750 +#, fuzzy +msgid "Treat as white space." +msgstr "Treat C/C++ comments like white space." -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 msgid "Ignore numbers" msgstr "Ignore numbers" -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 msgid "Ignore C/C++ comments" msgstr "Ignore C/C++ comments" -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 msgid "Treat C/C++ comments like white space." msgstr "Treat C/C++ comments like white space." -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 msgid "Ignore case" msgstr "Ignore case" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Treat case differences like white space changes. ('a'<=>'A')" -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 msgid "Preprocessor command:" msgstr "Preprocessor command:" -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 msgid "User defined pre-processing. (See the docs for details.)" msgstr "User defined pre-processing. (See the docs for details.)" -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 msgid "Line-matching preprocessor command:" msgstr "Line-matching preprocessor command:" -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" @@ -1652,11 +1656,11 @@ msgstr "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 msgid "Try hard (slower)" msgstr "Try hard (slower)" -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." @@ -1664,11 +1668,16 @@ msgstr "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Diff & Merge Settings" + +#: optiondialog.cpp:813 msgid "Auto advance delay (ms):" msgstr "Auto advance delay (ms):" -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" @@ -1676,40 +1685,35 @@ msgstr "" "When in Auto-Advance mode the result of the current selection is shown \n" "for the specified time, before jumping to the next conflict. Range: 0-2000 ms" -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Diff & Merge Settings" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 msgid "White space 2-file merge default:" msgstr "White space 2-file merge default:" -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 msgid "Manual Choice" msgstr "Manual Choice" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 msgid "White space 3-file merge default:" msgstr "White space 3-file merge default:" -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1717,58 +1721,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -1778,46 +1783,67 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Number of subdirectories:" + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 msgid "Directory Merge" msgstr "Directory Merge" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 msgid "Recursive directories" msgstr "Recursive directories" -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 msgid "Whether to analyze subdirectories or not." msgstr "Whether to analyse subdirectories or not." -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 msgid "File pattern(s):" msgstr "File pattern(s):" -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" @@ -1827,11 +1853,11 @@ msgstr "" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 msgid "File-anti-pattern(s):" msgstr "File-anti-pattern(s):" -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1841,11 +1867,11 @@ msgstr "" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 msgid "Dir-anti-pattern(s):" msgstr "Dir-anti-pattern(s):" -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" @@ -1855,11 +1881,11 @@ msgstr "" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "Use .cvsignore" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." @@ -1867,23 +1893,23 @@ msgstr "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 msgid "Find hidden files and directories" msgstr "Find hidden files and directories" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 msgid "Finds files and directories with the hidden attribute." msgstr "Finds files and directories with the hidden attribute." -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 msgid "Finds files and directories starting with '.'." msgstr "Finds files and directories starting with '.'." -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 msgid "Follow file links" msgstr "Follow file links" -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." @@ -1891,11 +1917,11 @@ msgstr "" "On: Compare the file the link points to.\n" "Off: Compare the links." -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 msgid "Follow directory links" msgstr "Follow directory links" -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." @@ -1903,11 +1929,11 @@ msgstr "" "On: Compare the directory the link points to.\n" "Off: Compare the links." -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -1915,23 +1941,23 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 msgid "File Comparison Mode" msgstr "File Comparison Mode" -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "Binary comparison" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 msgid "Binary comparison of each file. (Default)" msgstr "Binary comparison of each file. (Default)" -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 msgid "Full analysis" msgstr "Full analysis" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" @@ -1939,25 +1965,47 @@ msgstr "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" -#: optiondialog.cpp:1074 -msgid "Trust the modification date (unsafe)" +#: optiondialog.cpp:1091 +#, fuzzy +msgid "Trust the size and modification date (unsafe)" msgstr "Trust the modification date (unsafe)" -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" "Useful for big directories or slow networks." msgstr "" "Assume that files are equal if the modification date and file length are " "equal.\n" "Useful for big directories or slow networks." -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Useful for big directories or slow networks." + +#: optiondialog.cpp:1101 msgid "Trust the size (unsafe)" msgstr "Trust the size (unsafe)" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " @@ -1967,11 +2015,11 @@ msgstr "" "Useful for big directories or slow networks when the date is modified during " "download." -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 msgid "Synchronize directories" msgstr "Synchronise directories" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 msgid "" "Offers to store files in both directories so that\n" "both directories are the same afterwards.\n" @@ -1981,11 +2029,11 @@ msgstr "" "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 msgid "White space differences considered equal" msgstr "White space differences considered equal" -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." @@ -1993,11 +2041,11 @@ msgstr "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 msgid "Copy newer instead of merging (unsafe)" msgstr "Copy newer instead of merging (unsafe)" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 msgid "" "Don't look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2007,11 +2055,11 @@ msgstr "" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 msgid "Backup files (.orig)" msgstr "Backup files (.orig)" -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." @@ -2019,15 +2067,15 @@ msgstr "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 msgid "Regional Settings" msgstr "Regional Settings" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 msgid "Language (restart required)" msgstr "Language (restart required)" -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." @@ -2035,11 +2083,11 @@ msgstr "" "Choose the language of the GUI-strings or \"Auto\".\n" "For a change of language to take place, quit and restart KDiff3." -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 msgid "Use the same encoding for everything:" msgstr "Use the same encoding for everything:" -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." @@ -2047,60 +2095,60 @@ msgstr "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 msgid "Note: Local Encoding is " msgstr "Note: Local Encoding is " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 msgid "File Encoding for A:" msgstr "File Encoding for A:" -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 msgid "File Encoding for B:" msgstr "File Encoding for B:" -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 msgid "File Encoding for C:" msgstr "File Encoding for C:" -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 msgid "File Encoding for Merge Output and Saving:" msgstr "File Encoding for Merge Output and Saving:" -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "Auto copy selection" -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 msgid "File Encoding for Preprocessor Files:" msgstr "File Encoding for Preprocessor Files:" -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 msgid "Right To Left Language" msgstr "Right To Left Language" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." @@ -2108,21 +2156,21 @@ msgstr "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "Operation" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration Settings" msgstr "Regional Settings" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2130,7 +2178,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 msgid "" "You selected a variable width font.\n" "\n" @@ -2146,19 +2214,19 @@ msgstr "" "\n" "Do you want to continue or do you want to select another font." -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 msgid "Incompatible Font" msgstr "Incompatible Font" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Continue at Own Risk" msgstr "Continue at Own Risk" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 msgid "Select Another Font" msgstr "Select Another Font" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 msgid "This resets all options. Not only those of the current topic." msgstr "This resets all options. Not only those of the current topic." @@ -2167,10 +2235,8 @@ msgid "PreprocessorCmd: " msgstr "PreprocessorCmd: " #: pdiff.cpp:263 -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"The following option(s) you selected might change data:\n" +msgid "The following option(s) you selected might change data:\n" +msgstr "The following option(s) you selected might change data:\n" #: pdiff.cpp:264 msgid "" @@ -2235,19 +2301,10 @@ msgstr "Linediff: A <-> C" msgid "All input files contain the same text, but are not binary equal." msgstr "All input files contain the same text." -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -#, fuzzy -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"Files B and C are binary equal.\n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 #, fuzzy -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"Files A and B are binary equal.\n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "Files A and B are binary equal.\n" #: pdiff.cpp:530 msgid "" @@ -2259,109 +2316,55 @@ msgstr "" "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Abort" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." msgstr "Opening files..." -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "File open error" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 msgid "Cutting selection..." msgstr "Cutting selection..." -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 msgid "Copying selection to clipboard..." msgstr "Copying selection to clipboard..." -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 msgid "Inserting clipboard contents..." msgstr "Inserting clipboard contents..." -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Save && Continue" msgstr "Save && Continue" -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 msgid "Continue Without Saving" msgstr "Continue Without Saving" -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search complete." msgstr "Search complete." -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 msgid "Search Complete" msgstr "Search Complete" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "Error while creating directory." -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "&KDiff3" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, no-c-format -msgid "Configure KDiff3" -msgstr "Configure KDiff3" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, no-c-format -msgid "&Directory" -msgstr "&Directory" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, no-c-format -msgid "Current Item Merge Operation" -msgstr "Current Item Merge Operation" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, no-c-format -msgid "Current Item Sync Operation" -msgstr "Current Item Sync Operation" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, no-c-format -msgid "&Movement" -msgstr "&Movement" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, no-c-format -msgid "D&iffview" -msgstr "D&iffview" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, no-c-format -msgid "&Merge" -msgstr "&Merge" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "&Window" - #: smalldialogs.cpp:53 msgid "A (Base):" msgstr "A (Base):" @@ -2404,6 +2407,10 @@ msgstr "Output (optional):" msgid "Configure..." msgstr "Configure..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 msgid "Search text:" msgstr "Search text:" @@ -2476,6 +2483,14 @@ msgstr "" msgid "Sort key result:" msgstr "" +#: smalldialogs.cpp:493 +msgid "OK" +msgstr "" + +#: smalldialogs.cpp:497 +msgid "Cancel" +msgstr "" + #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2489,6 +2504,88 @@ msgstr "Saving failed." msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#: kdiff3_part.rc:13 +#, no-c-format +msgid "Configure KDiff3" +msgstr "Configure KDiff3" + +#: kdiff3_shell.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "File..." + +#: kdiff3_shell.rc:7 +#, no-c-format +msgid "&Directory" +msgstr "&Directory" + +#: kdiff3_shell.rc:30 +#, no-c-format +msgid "Current Item Merge Operation" +msgstr "Current Item Merge Operation" + +#: kdiff3_shell.rc:38 +#, no-c-format +msgid "Current Item Sync Operation" +msgstr "Current Item Sync Operation" + +#: kdiff3_shell.rc:50 +#, no-c-format +msgid "&Movement" +msgstr "&Movement" + +#: kdiff3_shell.rc:61 +#, no-c-format +msgid "D&iffview" +msgstr "D&iffview" + +#: kdiff3_shell.rc:73 +#, no-c-format +msgid "&Merge" +msgstr "&Merge" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "&Window" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "Files A and B are binary equal.\n" + +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "Files A and C are binary equal.\n" + +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "Files A and C have equal text. \n" + +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "Files B and C are binary equal.\n" + +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "Files B and C have equal text. \n" + +#~ msgid "Preserve carriage return" +#~ msgstr "Preserve carriage return" + +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." + #, fuzzy #~ msgid "Diff and Merge" #~ msgstr "Diff & Merge" |