diff options
Diffstat (limited to 'po/rw.po')
| -rw-r--r-- | po/rw.po | 1231 |
1 files changed, 662 insertions, 569 deletions
@@ -15,15 +15,16 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3 3.4\n" -"POT-Creation-Date: 2006-11-05 08:45+0100\n" +"POT-Creation-Date: 2018-12-27 20:04+0100\n" "PO-Revision-Date: 2005-05-25 18:07-0600\n" "Last-Translator: Steve Murphy <[email protected]>\n" "Language-Team: Kinyarwanda <[email protected]>\n" +"Language: rw\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: _translatorinfo.cpp:1 +#: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" @@ -31,7 +32,7 @@ msgstr "" "Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien " "NSENGIYUMVA" -#: _translatorinfo.cpp:3 +#: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" @@ -39,17 +40,17 @@ msgstr "" -#: diff.cpp:246 +#: diff.cpp:247 #, fuzzy msgid "Writing clipboard data to temp file failed." msgstr "Ububikokoporora Ibyatanzwe Kuri Idosiye Byanze . " -#: diff.cpp:250 +#: diff.cpp:251 #, fuzzy msgid "From Clipboard" msgstr "Ububikokoporora" -#: diff.cpp:491 +#: diff.cpp:493 #, fuzzy msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -64,7 +65,7 @@ msgstr "" "\n" "command Yahagaritswe NONEAHA . " -#: diff.cpp:526 +#: diff.cpp:528 #, fuzzy msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -79,7 +80,7 @@ msgstr "" "\n" "Umurongo: - - command Yahagaritswe NONEAHA . " -#: diff.cpp:1631 diff.cpp:1645 +#: diff.cpp:1633 diff.cpp:1647 #, fuzzy msgid "" "Data loss error:\n" @@ -88,17 +89,17 @@ msgstr "" "Ikosa : \n" "ni Umuntu i Umwanditsi: . \n" -#: diff.cpp:1633 diff.cpp:1647 +#: diff.cpp:1635 diff.cpp:1649 #, fuzzy msgid "Severe Internal Error" msgstr "Ikosa " -#: difftextwindow.cpp:1643 kdiff3.cpp:753 +#: difftextwindow.cpp:1644 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Umurongo: %1 " -#: difftextwindow.cpp:1653 +#: difftextwindow.cpp:1654 msgid "End" msgstr "Impera" @@ -117,288 +118,292 @@ msgstr "Ihuza..." msgid "Size. " msgstr "Ingano:" -#: directorymergewindow.cpp:170 +#: directorymergewindow.cpp:170 directorymergewindow.cpp:180 #, fuzzy msgid "Date & Size: " msgstr "Itariki & Igihe" -#: directorymergewindow.cpp:179 directorymergewindow.cpp:185 +#: directorymergewindow.cpp:190 directorymergewindow.cpp:196 #, fuzzy msgid "Creating temp copy of %1 failed." msgstr "Gukoporora Bya %1 Byanze . " -#: directorymergewindow.cpp:196 directorymergewindow.cpp:204 +#: directorymergewindow.cpp:207 directorymergewindow.cpp:215 #, fuzzy msgid "Opening %1 failed." msgstr "%1 Byanze . " -#: directorymergewindow.cpp:208 +#: directorymergewindow.cpp:219 #, fuzzy msgid "Comparing file..." msgstr "Idosiye ... " -#: directorymergewindow.cpp:218 directorymergewindow.cpp:224 +#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 #, fuzzy, c-format msgid "Error reading from %1" msgstr "Ikosa Kuva: %1 " -#: directorymergewindow.cpp:282 +#: directorymergewindow.cpp:297 msgid "Name" msgstr "Izina" -#: directorymergewindow.cpp:286 +#: directorymergewindow.cpp:301 msgid "Operation" msgstr "Igikorwa" -#: directorymergewindow.cpp:287 +#: directorymergewindow.cpp:302 msgid "Status" msgstr "Imimerere" -#: directorymergewindow.cpp:288 +#: directorymergewindow.cpp:303 #, fuzzy msgid "Unsolved" msgstr "Kidakoreshwa" -#: directorymergewindow.cpp:289 +#: directorymergewindow.cpp:304 #, fuzzy msgid "Solved" msgstr "Gikomeye" -#: directorymergewindow.cpp:290 +#: directorymergewindow.cpp:305 #, fuzzy msgid "Nonwhite" msgstr "Nta na kimwe" -#: directorymergewindow.cpp:291 +#: directorymergewindow.cpp:306 msgid "White" msgstr "Umweru" -#: directorymergewindow.cpp:319 +#: directorymergewindow.cpp:334 #, fuzzy msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort the " -"merge and rescan the directory?" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" msgstr "A Ububiko Gukomatanya . , Kuri Kureka i Gukomatanya na i Ububiko ? " -#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868 +#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622 +#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732 +msgid "Warning" +msgstr "" + +#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 #, fuzzy msgid "Rescan" msgstr "Urukiramende" -#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979 +#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 #, fuzzy msgid "Continue Merging" msgstr "Gukomeza " -#: directorymergewindow.cpp:462 +#: directorymergewindow.cpp:507 #, fuzzy msgid "Opening of directories failed:" msgstr "Bya ububiko bw'amaderese Byanze : " -#: directorymergewindow.cpp:465 +#: directorymergewindow.cpp:510 #, fuzzy -msgid "" -"Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" -"A \" %1 \" OYA Cyangwa ni OYA A Ububiko . \n" +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "A \" %1 \" OYA Cyangwa ni OYA A Ububiko . \n" -#: directorymergewindow.cpp:468 +#: directorymergewindow.cpp:513 #, fuzzy -msgid "" -"Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"\" %1 \" OYA Cyangwa ni OYA A Ububiko . \n" +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "\" %1 \" OYA Cyangwa ni OYA A Ububiko . \n" -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:516 #, fuzzy -msgid "" -"Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" -"\" %1 \" OYA Cyangwa ni OYA A Ububiko . \n" +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "\" %1 \" OYA Cyangwa ni OYA A Ububiko . \n" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:518 #, fuzzy msgid "Directory Open Error" msgstr "Gufungura Ikosa " -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:526 #, fuzzy msgid "" -"The destination directory must not be the same as A or B when three directories " -"are merged.\n" +"The destination directory must not be the same as A or B when three " +"directories are merged.\n" "Check again before continuing." msgstr "" "Ishyika: Ububiko OYA i Nka A Cyangwa Ryari: ububiko bw'amaderese . \n" "Nanone Mbere . " -#: directorymergewindow.cpp:483 +#: directorymergewindow.cpp:528 #, fuzzy msgid "Parameter Warning" msgstr "Kuburira bijyanye na mucapyi" -#: directorymergewindow.cpp:488 +#: directorymergewindow.cpp:533 #, fuzzy msgid "Scanning directories..." msgstr "ububiko bw'amaderese ... " -#: directorymergewindow.cpp:537 +#: directorymergewindow.cpp:582 #, fuzzy msgid "Reading Directory A" msgstr "A " -#: directorymergewindow.cpp:559 +#: directorymergewindow.cpp:604 #, fuzzy msgid "Reading Directory B" msgstr "Guhanga ububiko " -#: directorymergewindow.cpp:581 +#: directorymergewindow.cpp:626 #, fuzzy msgid "Reading Directory C" msgstr "Guhanga ububiko " -#: directorymergewindow.cpp:607 +#: directorymergewindow.cpp:652 #, fuzzy msgid "Some subdirectories were not readable in" msgstr "Ububiko bwungirije OYA in " -#: directorymergewindow.cpp:612 +#: directorymergewindow.cpp:657 #, fuzzy msgid "Check the permissions of the subdirectories." msgstr "i Uruhushya Bya i Ububiko bwungirije . " -#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661 -#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169 -#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226 +#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 +#: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Cyiteguye." -#: directorymergewindow.cpp:660 +#: directorymergewindow.cpp:705 #, fuzzy msgid "Directory Comparison Status" msgstr "Inzira y'ububiko" -#: directorymergewindow.cpp:661 +#: directorymergewindow.cpp:706 #, fuzzy msgid "Number of subdirectories:" msgstr "Bya Ububiko bwungirije : " -#: directorymergewindow.cpp:662 +#: directorymergewindow.cpp:707 #, fuzzy msgid "Number of equal files:" msgstr "Bya bingana Idosiye : " -#: directorymergewindow.cpp:663 +#: directorymergewindow.cpp:708 #, fuzzy msgid "Number of different files:" msgstr "Bya Idosiye : " -#: directorymergewindow.cpp:666 +#: directorymergewindow.cpp:711 #, fuzzy msgid "Number of manual merges:" msgstr "Bya Bikorwa : " -#: directorymergewindow.cpp:802 +#: directorymergewindow.cpp:867 #, fuzzy msgid "This affects all merge operations." msgstr "Byose Gukomatanya Ibikorwa: . " -#: directorymergewindow.cpp:803 +#: directorymergewindow.cpp:868 #, fuzzy msgid "Changing All Merge Operations" msgstr "Ibikorerwa Ishusho" -#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "Komeza" -#: directorymergewindow.cpp:1169 +#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287 +#: smalldialogs.cpp:169 smalldialogs.cpp:381 +msgid "&Cancel" +msgstr "" + +#: directorymergewindow.cpp:1236 #, fuzzy msgid "Processing " msgstr "Inonosora" -#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653 +#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 #, fuzzy msgid "To do." msgstr "Gukora" -#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899 +#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 #, fuzzy msgid "Copy A to B" msgstr "A Kuri " -#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 #, fuzzy msgid "Copy B to A" msgstr "Kuri A " -#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 #, fuzzy msgid "Delete A" msgstr "A " -#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902 +#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 #, fuzzy msgid "Delete B" msgstr "Gusiba #" -#: directorymergewindow.cpp:1760 +#: directorymergewindow.cpp:1823 #, fuzzy msgid "Delete A & B" msgstr "A & " -#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904 +#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 #, fuzzy msgid "Merge to A" msgstr "Kuri A " -#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905 +#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 #, fuzzy msgid "Merge to B" msgstr "Kuri " -#: directorymergewindow.cpp:1763 +#: directorymergewindow.cpp:1826 #, fuzzy msgid "Merge to A & B" msgstr "Kuri A & " -#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896 +#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 #, fuzzy msgid "Delete (if exists)" msgstr "( NIBA ) " -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 -#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Gukomatanya" -#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769 +#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 #, fuzzy msgid "Merge (manual)" msgstr "( Bikorwa ) " -#: directorymergewindow.cpp:1770 +#: directorymergewindow.cpp:1833 #, fuzzy msgid "Error: Conflicting File Types" msgstr "Ikosa : Idosiye " -#: directorymergewindow.cpp:1771 +#: directorymergewindow.cpp:1834 #, fuzzy msgid "Error: Dates are equal but files are not." msgstr "Ikosa : bingana Idosiye OYA . " -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 #, fuzzy msgid "This operation is currently not possible." msgstr "Igikorwa ni OYA . " -#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824 -#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 +#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 #, fuzzy msgid "Operation Not Possible" msgstr "Igikorwa nticyashobotse" -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 #, fuzzy msgid "" "This should never happen: \n" @@ -411,48 +416,53 @@ msgstr "" "\n" ": = Kuri iyi , Umuntu i Porogaramu Umwanditsi: . " -#: directorymergewindow.cpp:1888 +#: directorymergewindow.cpp:1954 #, fuzzy msgid "Program Error" msgstr "Ikosa " -#: directorymergewindow.cpp:1899 +#: directorymergewindow.cpp:1965 #, fuzzy -msgid "" -"An error occurred while copying.\n" -msgstr "" -"Ikosa Gukoporora . \n" +msgid "An error occurred while copying.\n" +msgstr "Ikosa Gukoporora . \n" -#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306 +#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371 +#, fuzzy +msgid "Error" +msgstr "Ikosa." + +#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 #, fuzzy msgid "Merge Error" msgstr "Ikosa " -#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311 +#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 msgid "Error." msgstr "Ikosa." -#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202 -#: directorymergewindow.cpp:2242 +#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2308 msgid "Done." msgstr "Byakozwe." -#: directorymergewindow.cpp:1933 +#: directorymergewindow.cpp:1999 #, fuzzy msgid "Not saved." msgstr "Bidasangiwe" -#: directorymergewindow.cpp:1968 +#: directorymergewindow.cpp:2034 #, fuzzy msgid "Unknown merge operation. (This must never happen!)" msgstr "Gukomatanya Igikorwa . ( Nta na rimwe ! ) " -#: directorymergewindow.cpp:2000 +#: directorymergewindow.cpp:2066 #, fuzzy msgid "Unknown merge operation." msgstr "Gukomatanya Igikorwa . " -#: directorymergewindow.cpp:2015 +#: directorymergewindow.cpp:2081 #, fuzzy msgid "" "The merge is about to begin.\n" @@ -471,372 +481,376 @@ msgstr "" "\n" "iyi Porogaramu beta Imimerere na ni ! Ibyashyinguwe Bya Ibyatanzwe ! " -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 #, fuzzy msgid "Starting Merge" msgstr "Gutangiza serivise" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 #, fuzzy msgid "Do It" msgstr "Akadomo" -#: directorymergewindow.cpp:2020 +#: directorymergewindow.cpp:2086 #, fuzzy msgid "Simulate It" msgstr "Kwigana Igaragaza" -#: directorymergewindow.cpp:2046 +#: directorymergewindow.cpp:2112 #, fuzzy msgid "" -"The highlighted item has a different type in the different directories. Select " -"what to do." +"The highlighted item has a different type in the different directories. " +"Select what to do." msgstr "Ikintu A Ubwoko: in i ububiko bw'amaderese . Kuri . " -#: directorymergewindow.cpp:2055 +#: directorymergewindow.cpp:2121 #, fuzzy msgid "" -"The modification dates of the file are equal but the files are not. Select what " -"to do." +"The modification dates of the file are equal but the files are not. Select " +"what to do." msgstr "Amatariki Bya i Idosiye bingana i Idosiye OYA . Kuri . " -#: directorymergewindow.cpp:2106 +#: directorymergewindow.cpp:2172 #, fuzzy msgid "" -"This operation is currently not possible because directory merge is currently " -"running." +"This operation is currently not possible because directory merge is " +"currently running." msgstr "Igikorwa ni OYA Ububiko Gukomatanya ni . " -#: directorymergewindow.cpp:2166 +#: directorymergewindow.cpp:2232 #, fuzzy msgid "" "There was an error in the last step.\n" -"Do you want to continue with the item that caused the error or do you want to " -"skip this item?" +"Do you want to continue with the item that caused the error or do you want " +"to skip this item?" msgstr "" "Ikosa in i Iheruka Intera . \n" "Kuri Gukomeza Na: i Ikintu i Ikosa Cyangwa Kuri Gusimbuka iyi Ikintu ? " -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 #, fuzzy msgid "Continue merge after an error" msgstr "Gukomeza Gukomatanya Nyuma Ikosa " -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 #, fuzzy msgid "Continue With Last Item" msgstr "Gukomeza " -#: directorymergewindow.cpp:2168 +#: directorymergewindow.cpp:2234 #, fuzzy msgid "Skip Item" msgstr "Ibigize by'ilisiti" -#: directorymergewindow.cpp:2202 +#: directorymergewindow.cpp:2268 #, fuzzy msgid "Skipped." msgstr "Byoherejwe ku" -#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435 +#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 #, fuzzy msgid "In progress..." msgstr "Aho bigeze: ... " -#: directorymergewindow.cpp:2257 +#: directorymergewindow.cpp:2323 #, fuzzy msgid "Merge operation complete." msgstr "Igikorwa Byuzuye . " -#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 #, fuzzy msgid "Merge Complete" msgstr "Gushyira ku gihe byarangiye" -#: directorymergewindow.cpp:2269 +#: directorymergewindow.cpp:2335 #, fuzzy msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "Gukomatanya Byuzuye : NIBA Na: i Ibikorwa: . " -#: directorymergewindow.cpp:2305 +#: directorymergewindow.cpp:2371 #, fuzzy -msgid "" -"An error occurred. Press OK to see detailed information.\n" +msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Habayemoikosa." -#: directorymergewindow.cpp:2348 +#: directorymergewindow.cpp:2414 #, fuzzy msgid "Error: While deleting %1: Creating backup failed." msgstr "Ikosa : Gusiba %1 : Inyibutsa Byanze . " -#: directorymergewindow.cpp:2355 +#: directorymergewindow.cpp:2421 #, fuzzy msgid "delete directory recursively( %1 )" msgstr "Gusiba Ububiko ( %1 ) " -#: directorymergewindow.cpp:2357 +#: directorymergewindow.cpp:2423 #, fuzzy msgid "delete( %1 )" msgstr "Gusiba" -#: directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:2438 #, fuzzy msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Ikosa : Gusiba Igikorwa Byanze Kuri Soma i Ububiko . " -#: directorymergewindow.cpp:2391 +#: directorymergewindow.cpp:2457 #, fuzzy msgid "Error: rmdir( %1 ) operation failed." msgstr "Ikosa : ( %1 ) Igikorwa Byanze . " -#: directorymergewindow.cpp:2401 +#: directorymergewindow.cpp:2467 #, fuzzy msgid "Error: delete operation failed." msgstr "Ikosa : Gusiba Igikorwa Byanze . " -#: directorymergewindow.cpp:2427 +#: directorymergewindow.cpp:2493 #, fuzzy msgid "manual merge( %1, %2, %3 -> %4)" msgstr "Bikorwa Gukomatanya ( %1 , %2 , %3 - > %4 ) " -#: directorymergewindow.cpp:2430 +#: directorymergewindow.cpp:2496 #, fuzzy msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "icyitonderwa : A Bikorwa Gukomatanya i Umukoresha Gukomeza ku . " -#: directorymergewindow.cpp:2453 +#: directorymergewindow.cpp:2519 #, fuzzy msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "Ikosa : Gukoporora ( %1 - > %2 ) Byanze . Ishyika: Byanze . " -#: directorymergewindow.cpp:2463 +#: directorymergewindow.cpp:2529 #, fuzzy msgid "copyLink( %1 -> %2 )" msgstr "Ihuza ku %1 (%2)" -#: directorymergewindow.cpp:2474 +#: directorymergewindow.cpp:2540 #, fuzzy msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Ikosa : Byanze : amahuza OYA . " -#: directorymergewindow.cpp:2480 +#: directorymergewindow.cpp:2546 #, fuzzy msgid "Error: copyLink failed." msgstr "Ikosa : Byanze . " -#: directorymergewindow.cpp:2500 +#: directorymergewindow.cpp:2566 #, fuzzy msgid "copy( %1 -> %2 )" msgstr "Gukoporora" -#: directorymergewindow.cpp:2526 +#: directorymergewindow.cpp:2592 #, fuzzy msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Ikosa Guhindura izina ( %1 - > %2 ) : Gusiba Ishyika: . " -#: directorymergewindow.cpp:2532 +#: directorymergewindow.cpp:2598 #, fuzzy msgid "rename( %1 -> %2 )" msgstr "Guhindura izina" -#: directorymergewindow.cpp:2541 +#: directorymergewindow.cpp:2607 #, fuzzy msgid "Error: Rename failed." msgstr "Ikosa : Byanze . " -#: directorymergewindow.cpp:2559 +#: directorymergewindow.cpp:2625 #, fuzzy msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Ikosa Bya %1 . Gusiba Idosiye . " -#: directorymergewindow.cpp:2575 +#: directorymergewindow.cpp:2641 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2585 +#: directorymergewindow.cpp:2651 #, fuzzy msgid "Error while creating directory." msgstr "Ikosa Kurema Ububiko . " -#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 #, fuzzy msgid "Dest" msgstr "Kugogora" -#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650 +#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 #, fuzzy msgid "Dir" msgstr "Muhamagazatelefoni" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2679 msgid "Type" msgstr "Ubwoko" -#: directorymergewindow.cpp:2614 +#: directorymergewindow.cpp:2680 msgid "Size" msgstr "Ingano" -#: directorymergewindow.cpp:2615 +#: directorymergewindow.cpp:2681 #, fuzzy msgid "Attr" msgstr "Nyuma" -#: directorymergewindow.cpp:2616 +#: directorymergewindow.cpp:2682 #, fuzzy msgid "Last Modification" msgstr "Iherutse guhindurwa" -#: directorymergewindow.cpp:2617 +#: directorymergewindow.cpp:2683 #, fuzzy msgid "Link-Destination" msgstr "Ishyika" -#: directorymergewindow.cpp:2667 +#: directorymergewindow.cpp:2712 +#, fuzzy +msgid "File" +msgstr "Idosiye..." + +#: directorymergewindow.cpp:2729 #, fuzzy msgid "not available" msgstr "Ntibonetse" -#: directorymergewindow.cpp:2687 +#: directorymergewindow.cpp:2749 #, fuzzy msgid "A (Dest): " msgstr "A ( ) : " -#: directorymergewindow.cpp:2690 +#: directorymergewindow.cpp:2752 #, fuzzy msgid "A (Base): " msgstr "A ( Base ) : " -#: directorymergewindow.cpp:2696 +#: directorymergewindow.cpp:2758 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2704 +#: directorymergewindow.cpp:2766 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2710 +#: directorymergewindow.cpp:2772 #, fuzzy msgid "Dest: " msgstr "Ibiro: %1" -#: directorymergewindow.cpp:2775 +#: directorymergewindow.cpp:2837 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Seriveri y'ububiko:" -#: directorymergewindow.cpp:2862 +#: directorymergewindow.cpp:2924 #, fuzzy msgid "Start/Continue Directory Merge" msgstr "Gutangira /Gukomeza " -#: directorymergewindow.cpp:2863 +#: directorymergewindow.cpp:2925 #, fuzzy msgid "Run Operation for Current Item" msgstr "ya: " -#: directorymergewindow.cpp:2864 +#: directorymergewindow.cpp:2926 #, fuzzy msgid "Compare Selected File" msgstr "Idosiye " -#: directorymergewindow.cpp:2865 +#: directorymergewindow.cpp:2927 #, fuzzy msgid "Merge Current File" msgstr "Idosiye " -#: directorymergewindow.cpp:2866 +#: directorymergewindow.cpp:2928 #, fuzzy msgid "Fold All Subdirs" msgstr "Amajwi Yose" -#: directorymergewindow.cpp:2867 +#: directorymergewindow.cpp:2929 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2871 +#: directorymergewindow.cpp:2933 #, fuzzy msgid "Choose A for All Items" msgstr "A ya: " -#: directorymergewindow.cpp:2872 +#: directorymergewindow.cpp:2934 #, fuzzy msgid "Choose B for All Items" msgstr "ya: " -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2935 #, fuzzy msgid "Choose C for All Items" msgstr "ya: " -#: directorymergewindow.cpp:2874 +#: directorymergewindow.cpp:2936 #, fuzzy msgid "Auto-Choose Operation for All Items" msgstr "- ya: " -#: directorymergewindow.cpp:2875 +#: directorymergewindow.cpp:2937 #, fuzzy msgid "No Operation for All Items" msgstr "ya: " -#: directorymergewindow.cpp:2880 +#: directorymergewindow.cpp:2942 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2881 +#: directorymergewindow.cpp:2943 #, fuzzy msgid "Show Different Files" msgstr "Bya Idosiye : " -#: directorymergewindow.cpp:2882 +#: directorymergewindow.cpp:2944 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2883 +#: directorymergewindow.cpp:2945 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2884 +#: directorymergewindow.cpp:2946 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2888 +#: directorymergewindow.cpp:2950 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Idosiye " -#: directorymergewindow.cpp:2889 +#: directorymergewindow.cpp:2951 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Idosiye " -#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898 +#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 msgid "Do Nothing" msgstr "Ntugire icyo Ukora" -#: directorymergewindow.cpp:2892 +#: directorymergewindow.cpp:2954 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2893 +#: directorymergewindow.cpp:2955 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2894 +#: directorymergewindow.cpp:2956 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2903 +#: directorymergewindow.cpp:2965 #, fuzzy msgid "Delete A && B" msgstr "A & & " -#: directorymergewindow.cpp:2906 +#: directorymergewindow.cpp:2968 #, fuzzy msgid "Merge to A && B" msgstr "Kuri A & & " -#: fileaccess.cpp:595 +#: fileaccess.cpp:599 #, fuzzy msgid "" "While trying to make a backup, deleting an older backup failed. \n" @@ -845,7 +859,7 @@ msgstr "" "Kuri Ubwoko A Inyibutsa , Gusiba Inyibutsa Byanze . \n" ": " -#: fileaccess.cpp:602 +#: fileaccess.cpp:606 #, fuzzy msgid "" "While trying to make a backup, renaming failed. \n" @@ -854,211 +868,217 @@ msgstr "" "Kuri Ubwoko A Inyibutsa , Guhindura izina Byanze . \n" ": " -#: fileaccess.cpp:624 +#: fileaccess.cpp:628 #, fuzzy, c-format msgid "Getting file status: %1" msgstr "Idosiye Imimerere : %1 " -#: fileaccess.cpp:667 +#: fileaccess.cpp:671 #, fuzzy, c-format msgid "Reading file: %1" msgstr "Idosiye : %1 " -#: fileaccess.cpp:703 +#: fileaccess.cpp:707 #, fuzzy, c-format msgid "Writing file: %1" msgstr "Idosiye : %1 " -#: fileaccess.cpp:731 +#: fileaccess.cpp:735 msgid "Out of memory" msgstr "Ububiko bwarenzwe" -#: fileaccess.cpp:766 +#: fileaccess.cpp:770 #, fuzzy, c-format msgid "Making directory: %1" msgstr "Ububiko : %1 " -#: fileaccess.cpp:786 +#: fileaccess.cpp:790 #, fuzzy, c-format msgid "Removing directory: %1" msgstr "Ububiko : %1 " -#: fileaccess.cpp:801 +#: fileaccess.cpp:805 #, fuzzy, c-format msgid "Removing file: %1" msgstr "Idosiye : %1 " -#: fileaccess.cpp:817 +#: fileaccess.cpp:821 #, fuzzy msgid "Creating symbolic link: %1 -> %2" msgstr "Ihuza : %1 - > %2 " -#: fileaccess.cpp:843 +#: fileaccess.cpp:851 #, fuzzy msgid "Renaming file: %1 -> %2" msgstr "Idosiye : %1 - > %2 " -#: fileaccess.cpp:879 +#: fileaccess.cpp:887 #, fuzzy msgid "Copying file: %1 -> %2" msgstr "Idosiye : %1 - > %2 " -#: fileaccess.cpp:893 +#: fileaccess.cpp:901 #, fuzzy, c-format msgid "" -"Error during file copy operation: Opening file for reading failed. Filename: %1" +"Error during file copy operation: Opening file for reading failed. Filename: " +"%1" msgstr "Ikosa Idosiye Gukoporora Igikorwa : Idosiye ya: Byanze . : %1 " -#: fileaccess.cpp:899 +#: fileaccess.cpp:907 #, fuzzy, c-format msgid "" -"Error during file copy operation: Opening file for writing failed. Filename: %1" +"Error during file copy operation: Opening file for writing failed. Filename: " +"%1" msgstr "Ikosa Idosiye Gukoporora Igikorwa : Idosiye ya: Byanze . : %1 " -#: fileaccess.cpp:914 +#: fileaccess.cpp:919 #, fuzzy, c-format msgid "Error during file copy operation: Reading failed. Filename: %1" msgstr "Ikosa Idosiye Gukoporora Igikorwa : Byanze . : %1 " -#: fileaccess.cpp:923 +#: fileaccess.cpp:928 #, fuzzy, c-format msgid "Error during file copy operation: Writing failed. Filename: %1" msgstr "Ikosa Idosiye Gukoporora Igikorwa : Byanze . : %1 " -#: fileaccess.cpp:1219 +#: fileaccess.cpp:1218 #, fuzzy msgid "Reading directory: " msgstr "Ububiko : " -#: fileaccess.cpp:1348 +#: fileaccess.cpp:1347 #, fuzzy, c-format msgid "Listing directory: %1" msgstr "Ububiko : %1 " -#: kdiff3.cpp:142 +#: kdiff3.cpp:145 #, fuzzy msgid "Current Configuration:" msgstr "Iki cyiciro" -#: kdiff3.cpp:147 +#: kdiff3.cpp:150 #, fuzzy msgid "Config Option Error:" msgstr "Ikosa gufungura idosiye" -#: kdiff3.cpp:187 +#: kdiff3.cpp:193 #, fuzzy msgid "Option --auto used, but no output file specified." msgstr "- - Ikiyega Byakoreshejwe , Oya Ibisohoka Idosiye . " -#: kdiff3.cpp:323 +#: kdiff3.cpp:331 #, fuzzy msgid "Option --auto ignored for directory comparison." msgstr "- - Ikiyega ya: Ububiko . " -#: kdiff3.cpp:359 +#: kdiff3.cpp:367 #, fuzzy msgid "Saving failed." msgstr "Byanze . " -#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112 +#: kdiff3.cpp:402 pdiff.cpp:1052 pdiff.cpp:1123 #, fuzzy msgid "Opening of these files failed:" msgstr "Bya Idosiye Byanze : " -#: kdiff3.cpp:395 +#: kdiff3.cpp:411 #, fuzzy msgid "File Open Error" msgstr "Ikosa gufungura idosiye" -#: kdiff3.cpp:418 +#: kdiff3.cpp:434 #, fuzzy msgid "Opens documents for comparison..." msgstr "Inyandiko ya: ... " -#: kdiff3.cpp:423 +#: kdiff3.cpp:436 +msgid "Reload" +msgstr "" + +#: kdiff3.cpp:439 #, fuzzy msgid "Saves the merge result. All conflicts must be solved!" msgstr "i Gukomatanya Igisubizo . ! " -#: kdiff3.cpp:425 +#: kdiff3.cpp:441 #, fuzzy msgid "Saves the current document as..." msgstr "i KIGEZWEHO Inyandiko Nka ... " -#: kdiff3.cpp:427 +#: kdiff3.cpp:443 msgid "Print the differences" msgstr "" -#: kdiff3.cpp:429 +#: kdiff3.cpp:445 #, fuzzy msgid "Quits the application" msgstr "i Porogaramu " -#: kdiff3.cpp:431 +#: kdiff3.cpp:447 #, fuzzy msgid "Cuts the selected section and puts it to the clipboard" msgstr "i Byahiswemo Icyiciro na Kuri i Ububikokoporora " -#: kdiff3.cpp:433 +#: kdiff3.cpp:449 #, fuzzy msgid "Copies the selected section to the clipboard" msgstr "i Byahiswemo Icyiciro Kuri i Ububikokoporora " -#: kdiff3.cpp:435 +#: kdiff3.cpp:451 #, fuzzy msgid "Pastes the clipboard contents to actual position" msgstr "i Ububikokoporora Ibigize Kuri Ibirindiro: " -#: kdiff3.cpp:437 +#: kdiff3.cpp:453 msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:439 +#: kdiff3.cpp:455 #, fuzzy msgid "Search for a string" msgstr "ya: A Ikurikiranyanyuguti " -#: kdiff3.cpp:441 +#: kdiff3.cpp:457 #, fuzzy msgid "Search again for the string" msgstr "Nanone ya: i Ikurikiranyanyuguti " -#: kdiff3.cpp:443 +#: kdiff3.cpp:459 #, fuzzy msgid "Enables/disables the toolbar" msgstr "/i Umwanyabikoresho " -#: kdiff3.cpp:445 +#: kdiff3.cpp:461 #, fuzzy msgid "Enables/disables the statusbar" msgstr "/i Umurongomiterere " -#: kdiff3.cpp:449 +#: kdiff3.cpp:465 #, fuzzy msgid "Configure KDiff3..." msgstr "Kugena imiterere..." -#: kdiff3.cpp:470 +#: kdiff3.cpp:486 #, fuzzy msgid "Go to Current Delta" msgstr "Kuri " -#: kdiff3.cpp:471 +#: kdiff3.cpp:487 #, fuzzy msgid "Go to First Delta" msgstr "Kuri " -#: kdiff3.cpp:472 +#: kdiff3.cpp:488 #, fuzzy msgid "Go to Last Delta" msgstr "Kuri " -#: kdiff3.cpp:473 +#: kdiff3.cpp:489 #, fuzzy msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "( Umweru Umwanya Ibinyuranyo Ryari: \" \" ni Yahagaritswe . ) " -#: kdiff3.cpp:474 +#: kdiff3.cpp:490 #, fuzzy msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1067,279 +1087,287 @@ msgstr "" "( OYA Gusimbuka Umweru Umwanya Ibinyuranyo ATARIIGIHARWE Ryari: \" \" ni " "Yahagaritswe . ) " -#: kdiff3.cpp:475 +#: kdiff3.cpp:491 #, fuzzy msgid "Go to Previous Delta" msgstr "Kuri " -#: kdiff3.cpp:477 +#: kdiff3.cpp:493 #, fuzzy msgid "Go to Next Delta" msgstr "Kuri " -#: kdiff3.cpp:479 +#: kdiff3.cpp:495 #, fuzzy msgid "Go to Previous Conflict" msgstr "Kuri " -#: kdiff3.cpp:481 +#: kdiff3.cpp:497 #, fuzzy msgid "Go to Next Conflict" msgstr "Kuri " -#: kdiff3.cpp:483 +#: kdiff3.cpp:499 #, fuzzy msgid "Go to Previous Unsolved Conflict" msgstr "Kuri " -#: kdiff3.cpp:485 +#: kdiff3.cpp:501 #, fuzzy msgid "Go to Next Unsolved Conflict" msgstr "Kuri " -#: kdiff3.cpp:487 +#: kdiff3.cpp:503 #, fuzzy msgid "Select Line(s) From A" msgstr "( S ) A " -#: kdiff3.cpp:488 +#: kdiff3.cpp:504 #, fuzzy msgid "Select Line(s) From B" msgstr "( S ) " -#: kdiff3.cpp:489 +#: kdiff3.cpp:505 #, fuzzy msgid "Select Line(s) From C" msgstr "( S ) " -#: kdiff3.cpp:490 +#: kdiff3.cpp:506 #, fuzzy msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Kuri " -#: kdiff3.cpp:492 +#: kdiff3.cpp:508 #, fuzzy msgid "Show Space && Tabulator Characters for Differences" msgstr "& & ya: " -#: kdiff3.cpp:493 +#: kdiff3.cpp:509 #, fuzzy msgid "Show White Space" msgstr "Umwanya w'Umweru" -#: kdiff3.cpp:495 +#: kdiff3.cpp:511 #, fuzzy msgid "Show Line Numbers" msgstr "Kwerekana nomero z'umurongo" -#: kdiff3.cpp:496 +#: kdiff3.cpp:512 #, fuzzy msgid "Choose A Everywhere" msgstr "A " -#: kdiff3.cpp:497 +#: kdiff3.cpp:513 #, fuzzy msgid "Choose B Everywhere" msgstr "Hitamo darayiva" -#: kdiff3.cpp:498 +#: kdiff3.cpp:514 #, fuzzy msgid "Choose C Everywhere" msgstr "Hitamo darayiva" -#: kdiff3.cpp:499 +#: kdiff3.cpp:515 #, fuzzy msgid "Choose A for All Unsolved Conflicts" msgstr "A ya: " -#: kdiff3.cpp:500 +#: kdiff3.cpp:516 #, fuzzy msgid "Choose B for All Unsolved Conflicts" msgstr "ya: " -#: kdiff3.cpp:501 +#: kdiff3.cpp:517 #, fuzzy msgid "Choose C for All Unsolved Conflicts" msgstr "ya: " -#: kdiff3.cpp:502 +#: kdiff3.cpp:518 #, fuzzy msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "A ya: " -#: kdiff3.cpp:503 +#: kdiff3.cpp:519 #, fuzzy msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "ya: " -#: kdiff3.cpp:504 +#: kdiff3.cpp:520 #, fuzzy msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "ya: " -#: kdiff3.cpp:505 +#: kdiff3.cpp:521 #, fuzzy msgid "Automatically Solve Simple Conflicts" msgstr "Gufunga mu buryo bwikoresha impago zidakoreshwa" -#: kdiff3.cpp:506 +#: kdiff3.cpp:522 #, fuzzy msgid "Set Deltas to Conflicts" msgstr "Kuri " -#: kdiff3.cpp:507 +#: kdiff3.cpp:523 msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:508 +#: kdiff3.cpp:524 #, fuzzy msgid "Automatically Solve History Conflicts" msgstr "Gufunga mu buryo bwikoresha impago zidakoreshwa" -#: kdiff3.cpp:509 +#: kdiff3.cpp:525 msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:510 +#: kdiff3.cpp:526 #, fuzzy msgid "Join Selected Diffs" msgstr "Idosiye " -#: kdiff3.cpp:512 +#: kdiff3.cpp:528 #, fuzzy msgid "Show Window A" msgstr "A " -#: kdiff3.cpp:513 +#: kdiff3.cpp:529 #, fuzzy msgid "Show Window B" msgstr "Kwerekana Ilisiti y'Amadirishya" -#: kdiff3.cpp:514 +#: kdiff3.cpp:530 #, fuzzy msgid "Show Window C" msgstr "Kwerekana Ilisiti y'Amadirishya" -#: kdiff3.cpp:515 kdiff3.cpp:526 +#: kdiff3.cpp:531 kdiff3.cpp:542 #, fuzzy msgid "Focus Next Window" msgstr "idirishya rikurikira" -#: kdiff3.cpp:517 +#: kdiff3.cpp:533 #, fuzzy msgid "Normal Overview" msgstr "Gahunda-Nyamwaka" -#: kdiff3.cpp:518 +#: kdiff3.cpp:534 #, fuzzy msgid "A vs. B Overview" msgstr "A . " -#: kdiff3.cpp:519 +#: kdiff3.cpp:535 #, fuzzy msgid "A vs. C Overview" msgstr "A . " -#: kdiff3.cpp:520 +#: kdiff3.cpp:536 #, fuzzy msgid "B vs. C Overview" msgstr "Incamake" -#: kdiff3.cpp:521 +#: kdiff3.cpp:537 msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:522 +#: kdiff3.cpp:538 msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:523 +#: kdiff3.cpp:539 msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:528 +#: kdiff3.cpp:544 #, fuzzy msgid "Focus Prev Window" msgstr "Kwerekeza ku idirishya: " -#: kdiff3.cpp:529 +#: kdiff3.cpp:545 #, fuzzy msgid "Toggle Split Orientation" msgstr "Icyerekezo mwandiko" -#: kdiff3.cpp:531 +#: kdiff3.cpp:547 msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:549 msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:582 pdiff.cpp:1712 +#: kdiff3.cpp:601 pdiff.cpp:1723 #, fuzzy msgid "The merge result hasn't been saved." msgstr "Gukomatanya Igisubizo . " -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 #, fuzzy msgid "Save && Quit" msgstr "Kubika & & " -#: kdiff3.cpp:583 +#: kdiff3.cpp:602 #, fuzzy msgid "Quit Without Saving" msgstr "Komeka utahinduye imiterere" -#: kdiff3.cpp:591 pdiff.cpp:1721 +#: kdiff3.cpp:610 pdiff.cpp:1732 #, fuzzy msgid "Saving the merge result failed." msgstr "i Gukomatanya Igisubizo Byanze . " -#: kdiff3.cpp:602 pdiff.cpp:978 +#: kdiff3.cpp:621 pdiff.cpp:980 #, fuzzy msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "A Ububiko Gukomatanya . , Kuri Kureka ? " -#: kdiff3.cpp:625 +#: kdiff3.cpp:622 +msgid "Quit" +msgstr "" + +#: kdiff3.cpp:644 #, fuzzy msgid "Saving file..." msgstr "Idosiye ... " -#: kdiff3.cpp:642 +#: kdiff3.cpp:661 #, fuzzy msgid "Saving file with a new filename..." msgstr "Idosiye Na: A Gishya Izina ry'idosiye: ... " -#: kdiff3.cpp:732 +#: kdiff3.cpp:663 +msgid "Save As..." +msgstr "" + +#: kdiff3.cpp:751 #, fuzzy msgid "Printing..." msgstr "Tegereza..." -#: kdiff3.cpp:738 kdiff3.cpp:900 +#: kdiff3.cpp:757 kdiff3.cpp:919 msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:870 +#: kdiff3.cpp:889 msgid "Selection" msgstr "" -#: kdiff3.cpp:896 +#: kdiff3.cpp:915 #, fuzzy msgid "Printing completed." msgstr "Igikorwa Byuzuye . " -#: kdiff3.cpp:906 +#: kdiff3.cpp:925 #, fuzzy msgid "Exiting..." msgstr "Tegereza..." -#: kdiff3.cpp:918 +#: kdiff3.cpp:937 #, fuzzy msgid "Toggling toolbar..." msgstr "Umwanyabikoresho ... " -#: kdiff3.cpp:939 +#: kdiff3.cpp:958 #, fuzzy msgid "Toggle the statusbar..." msgstr "i Umurongomiterere ... " @@ -1357,8 +1385,8 @@ msgstr "" #, fuzzy msgid "" "Could not find our part!\n" -"This usually happens due to an installation problem. Please read the " -"README-file in the source package for details." +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." msgstr "" "OYA Gushaka Inzira %s ! \n" "Kuri iyinjizaporogaramu . Soma i - Idosiye in i Inkomoko Porogaramu ya: " @@ -1453,20 +1481,19 @@ msgstr "Kuri Gufungura " msgid "Ignored. (User defined.)" msgstr "" -#. i18n: file kdiff3_part.rc line 16 -#: main.cpp:173 rc.cpp:9 +#: kdiff3_part.rc:16 main.cpp:173 #, no-c-format msgid "KDiff3" msgstr "" -#: main.cpp:186 +#: main.cpp:191 #, fuzzy msgid "+ Many thanks to those who reported bugs and contributed ideas!" msgstr "+ Kuri na ! " -#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939 -#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965 -#: mergeresultwindow.cpp:977 +#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:950 +#: mergeresultwindow.cpp:964 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:988 #, fuzzy msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Bya : %1 ( Bya %2 ) " @@ -1480,64 +1507,34 @@ msgstr "" "Ibisohoka Byahinduwe: . \n" "Gukomeza Amahinduka . " -#: mergeresultwindow.cpp:797 pdiff.cpp:511 +#: mergeresultwindow.cpp:808 pdiff.cpp:511 #, fuzzy msgid "All input files are binary equal." msgstr "Iyinjiza Idosiye Nyabibiri bingana . " -#: mergeresultwindow.cpp:799 +#: mergeresultwindow.cpp:810 #, fuzzy msgid "All input files contain the same text." msgstr "Iyinjiza Idosiye i Umwandiko . " -#: mergeresultwindow.cpp:801 -#, fuzzy -msgid "" -"Files A and B are binary equal.\n" -msgstr "" -"A na Nyabibiri bingana . \n" - -#: mergeresultwindow.cpp:802 -#, fuzzy -msgid "" -"Files A and B have equal text. \n" -msgstr "" -"A na bingana Umwandiko . \n" - -#: mergeresultwindow.cpp:803 +#: mergeresultwindow.cpp:812 mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:816 pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 #, fuzzy -msgid "" -"Files A and C are binary equal.\n" -msgstr "" -"A na Nyabibiri bingana . \n" - -#: mergeresultwindow.cpp:804 -#, fuzzy -msgid "" -"Files A and C have equal text. \n" -msgstr "" -"A na bingana Umwandiko . \n" - -#: mergeresultwindow.cpp:805 -#, fuzzy -msgid "" -"Files B and C are binary equal.\n" -msgstr "" -"na Nyabibiri bingana . \n" +msgid "Files %1 and %2 are binary equal.\n" +msgstr "na Nyabibiri bingana . \n" -#: mergeresultwindow.cpp:806 +#: mergeresultwindow.cpp:813 mergeresultwindow.cpp:815 +#: mergeresultwindow.cpp:817 #, fuzzy -msgid "" -"Files B and C have equal text. \n" -msgstr "" -"na bingana Umwandiko . \n" +msgid "Files %1 and %2 have equal text.\n" +msgstr "A na bingana Umwandiko . \n" -#: mergeresultwindow.cpp:812 +#: mergeresultwindow.cpp:823 #, fuzzy msgid "Total number of conflicts: " msgstr "Umubare Bya : " -#: mergeresultwindow.cpp:813 +#: mergeresultwindow.cpp:824 #, fuzzy msgid "" "\n" @@ -1546,7 +1543,7 @@ msgstr "" "\n" "Bya mu buryo bwikora: : " -#: mergeresultwindow.cpp:814 +#: mergeresultwindow.cpp:825 #, fuzzy msgid "" "\n" @@ -1555,26 +1552,26 @@ msgstr "" "\n" "Bya : " -#: mergeresultwindow.cpp:816 +#: mergeresultwindow.cpp:827 #, fuzzy msgid "Conflicts" msgstr "Ishyamirana ry'ingenzi" -#: mergeresultwindow.cpp:1652 +#: mergeresultwindow.cpp:1691 #, fuzzy msgid "<No src line>" msgstr "< Umurongo: > " -#: mergeresultwindow.cpp:1660 +#: mergeresultwindow.cpp:1699 msgid "<Merge Conflict (Whitespace only)>" msgstr "" -#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427 +#: mergeresultwindow.cpp:1701 mergeresultwindow.cpp:2469 #, fuzzy msgid "<Merge Conflict>" msgstr "Ishyamirana ry'ingenzi" -#: mergeresultwindow.cpp:2635 +#: mergeresultwindow.cpp:2677 #, fuzzy msgid "" "Not all conflicts are solved yet.\n" @@ -1583,12 +1580,12 @@ msgstr "" "Byose . \n" "Idosiye OYA . \n" -#: mergeresultwindow.cpp:2637 +#: mergeresultwindow.cpp:2679 #, fuzzy msgid "Conflicts Left" msgstr "Guhitamo Ibumoso" -#: mergeresultwindow.cpp:2649 +#: mergeresultwindow.cpp:2691 #, fuzzy msgid "" "\n" @@ -1599,32 +1596,32 @@ msgstr "" "\n" "Inyibutsa Byanze . Idosiye OYA . " -#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2691 mergeresultwindow.cpp:2730 #, fuzzy msgid "File Save Error" msgstr "Idosiye Kubika Ikosa " -#: mergeresultwindow.cpp:2689 +#: mergeresultwindow.cpp:2730 #, fuzzy msgid "Error while writing." msgstr "Ikosa . " -#: mergeresultwindow.cpp:3020 +#: mergeresultwindow.cpp:3061 msgid "Output" msgstr "Ibisohoka" -#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139 +#: mergeresultwindow.cpp:3073 mergeresultwindow.cpp:3180 #, fuzzy msgid "[Modified]" msgstr "Byahinduwe" -#: mergeresultwindow.cpp:3039 +#: mergeresultwindow.cpp:3080 #, fuzzy msgid "Encoding for saving" msgstr "Idosiye ya: : " -#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081 -#: mergeresultwindow.cpp:3087 +#: mergeresultwindow.cpp:3116 mergeresultwindow.cpp:3122 +#: mergeresultwindow.cpp:3128 msgid "Codec from" msgstr "" @@ -1647,6 +1644,15 @@ msgstr "Ikilatini-1" msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "iyi NIBA - Inyuguti OYA . " +#: optiondialog.cpp:455 +#, fuzzy +msgid "Configure" +msgstr "Kugena imiterere..." + +#: optiondialog.cpp:510 +msgid "Font" +msgstr "" + #: optiondialog.cpp:510 msgid "Editor & Diff Output Font" msgstr "" @@ -1787,11 +1793,10 @@ msgstr "Isunika " #: optiondialog.cpp:697 #, fuzzy -msgid "" -"On: The indentation of the previous line is used for a new line.\n" +msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -": Isunika Bya i Ibanjirije Umurongo: ni Byakoreshejwe ya: A Gishya Umurongo: . " -"\n" +": Isunika Bya i Ibanjirije Umurongo: ni Byakoreshejwe ya: A Gishya " +"Umurongo: . \n" #: optiondialog.cpp:701 #, fuzzy @@ -1829,71 +1834,62 @@ msgstr "Igabanya" msgid "Diff Settings" msgstr "Iganamiterere rya musomyi" -#: optiondialog.cpp:743 -#, fuzzy -msgid "Preserve carriage return" -msgstr "Garuka " - -#: optiondialog.cpp:746 +#: optiondialog.cpp:750 #, fuzzy -msgid "" -"Show carriage return characters '\\r' if they exist.\n" -"Helps to compare files that were modified under different operating systems." -msgstr "" -"Garuka Inyuguti ' \\r ' NIBA . \n" -"Kuri Kugereranya # Idosiye Byahinduwe: . " +msgid "Treat as white space." +msgstr "/+ + Ibisobanuro nka Umweru Umwanya . " -#: optiondialog.cpp:751 +#: optiondialog.cpp:752 #, fuzzy msgid "Ignore numbers" msgstr "Imibare " -#: optiondialog.cpp:754 +#: optiondialog.cpp:755 #, fuzzy msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore white " -"space.)\n" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" "Might help to compare files with numeric data." msgstr "" "Umubare Inyuguti Umurongo: . ( Kuri Umweru Umwanya . ) \n" "Ifashayobora Kuri Kugereranya # Idosiye Na: Bikurikije umubare Ibyatanzwe . " -#: optiondialog.cpp:759 +#: optiondialog.cpp:760 #, fuzzy msgid "Ignore C/C++ comments" msgstr "/+ + Ibisobanuro " -#: optiondialog.cpp:761 +#: optiondialog.cpp:762 #, fuzzy msgid "Treat C/C++ comments like white space." msgstr "/+ + Ibisobanuro nka Umweru Umwanya . " -#: optiondialog.cpp:765 +#: optiondialog.cpp:766 #, fuzzy msgid "Ignore case" msgstr "Kwirengagiza Inshuro Imwe" -#: optiondialog.cpp:768 +#: optiondialog.cpp:769 #, fuzzy msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Ibinyuranyo nka Umweru Umwanya Amahinduka . ( ' < = > ' ) " -#: optiondialog.cpp:772 +#: optiondialog.cpp:773 #, fuzzy msgid "Preprocessor command:" msgstr "command : " -#: optiondialog.cpp:776 +#: optiondialog.cpp:777 #, fuzzy msgid "User defined pre-processing. (See the docs for details.)" msgstr "Byahawe imiterere mbere - Inonosora . ( i ya: Birambuye . ) " -#: optiondialog.cpp:779 +#: optiondialog.cpp:780 #, fuzzy msgid "Line-matching preprocessor command:" msgstr "- command : " -#: optiondialog.cpp:783 +#: optiondialog.cpp:784 #, fuzzy msgid "" "This pre-processor is only used during line matching.\n" @@ -1902,12 +1898,12 @@ msgstr "" "Byahawe imiterere mbere - ni Byakoreshejwe Umurongo: . \n" "( i ya: Birambuye . ) " -#: optiondialog.cpp:786 +#: optiondialog.cpp:787 #, fuzzy msgid "Try hard (slower)" msgstr "Ikomeye ( ) " -#: optiondialog.cpp:789 +#: optiondialog.cpp:790 #, fuzzy msgid "" "Enables the --minimal option for the external diff.\n" @@ -1916,12 +1912,17 @@ msgstr "" "i - - Ihitamo ya: i external . \n" "Bya Idosiye . " -#: optiondialog.cpp:794 +#: optiondialog.cpp:800 +#, fuzzy +msgid "Merge Settings" +msgstr "Iganamiterere rya musomyi" + +#: optiondialog.cpp:813 #, fuzzy msgid "Auto advance delay (ms):" msgstr "Gutinda ( Madamu ) : " -#: optiondialog.cpp:799 +#: optiondialog.cpp:818 #, fuzzy msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -1930,44 +1931,39 @@ msgstr "" "in - Ubwoko i Igisubizo Bya i KIGEZWEHO Ihitamo ni \n" "ya: i Igihe , Mbere Kuri i Ibikurikira > . : 0 %S - Madamu " -#: optiondialog.cpp:809 -#, fuzzy -msgid "Merge Settings" -msgstr "Iganamiterere rya musomyi" - -#: optiondialog.cpp:822 +#: optiondialog.cpp:823 #, fuzzy msgid "White space 2-file merge default:" msgstr "Umwanya 2 - Idosiye Gukomatanya Mburabuzi : " -#: optiondialog.cpp:826 optiondialog.cpp:839 +#: optiondialog.cpp:827 optiondialog.cpp:840 #, fuzzy msgid "Manual Choice" msgstr "Ibishushanyo by'Intoki" -#: optiondialog.cpp:830 optiondialog.cpp:844 +#: optiondialog.cpp:831 optiondialog.cpp:845 #, fuzzy msgid "" -"Allow the merge algorithm to automatically select an input for white-space-only " -"changes." +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." msgstr "" -"i Gukomatanya Kuri mu buryo bwikora: Guhitamo Iyinjiza ya: Umweru - Umwanya - " -"Amahinduka . " +"i Gukomatanya Kuri mu buryo bwikora: Guhitamo Iyinjiza ya: Umweru - Umwanya " +"- Amahinduka . " -#: optiondialog.cpp:835 +#: optiondialog.cpp:836 #, fuzzy msgid "White space 3-file merge default:" msgstr "Umwanya 3 - Idosiye Gukomatanya Mburabuzi : " -#: optiondialog.cpp:849 +#: optiondialog.cpp:850 msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:858 smalldialogs.cpp:397 +#: optiondialog.cpp:859 smalldialogs.cpp:397 msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:862 +#: optiondialog.cpp:863 msgid "" "Regular expression for lines where KDiff3 should automatically choose one " "source.\n" @@ -1975,58 +1971,59 @@ msgid "" "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:868 +#: optiondialog.cpp:869 msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:870 +#: optiondialog.cpp:871 msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:875 +#: optiondialog.cpp:876 msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:884 smalldialogs.cpp:424 +#: optiondialog.cpp:885 smalldialogs.cpp:424 msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:888 +#: optiondialog.cpp:889 msgid "" "Regular expression for the start of the version control history entry.\n" "Usually this line contains the \"$Log$\"-keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:894 smalldialogs.cpp:453 +#: optiondialog.cpp:895 smalldialogs.cpp:453 msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:907 msgid "" "A version control history entry consists of several lines.\n" "Specify the regular expression to detect the first line (without the leading " "comment).\n" "Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history entries.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" "See the documentation for details." msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:915 msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:916 +#: optiondialog.cpp:917 msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:927 msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:930 +#: optiondialog.cpp:931 msgid "" "Each parentheses used in the regular expression for the history start entry\n" "groups a key that can be used for sorting.\n" @@ -2036,50 +2033,71 @@ msgid "" "See the documentation for details." msgstr "" -#: optiondialog.cpp:941 +#: optiondialog.cpp:942 msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:943 +#: optiondialog.cpp:944 msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:947 +#: optiondialog.cpp:948 +#, fuzzy +msgid "Max number of history entries:" +msgstr "Bya Ububiko bwungirije : " + +#: optiondialog.cpp:951 +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:955 msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:952 +#: optiondialog.cpp:960 msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:964 msgid "" "If specified this script is run after automerge\n" "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:966 +#: optiondialog.cpp:970 +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:973 +msgid "" +"When KDiff3 was started for a file-merge from the commandline and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\"." +msgstr "" + +#: optiondialog.cpp:983 #, fuzzy msgid "Directory Merge" msgstr "Seriveri y'ububiko:" -#: optiondialog.cpp:975 +#: optiondialog.cpp:992 #, fuzzy msgid "Recursive directories" msgstr "ububiko bw'amaderese " -#: optiondialog.cpp:977 +#: optiondialog.cpp:994 #, fuzzy msgid "Whether to analyze subdirectories or not." msgstr "Kuri Ububiko bwungirije Cyangwa OYA . " -#: optiondialog.cpp:979 +#: optiondialog.cpp:996 #, fuzzy msgid "File pattern(s):" msgstr "Idosiye Ishusho ( S ) : " -#: optiondialog.cpp:984 +#: optiondialog.cpp:1001 #, fuzzy msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2090,12 +2108,12 @@ msgstr "" ": ' * ' na ' ? ' \n" "ku ikoresha i Mutandukanya : ' ; ' " -#: optiondialog.cpp:990 +#: optiondialog.cpp:1007 #, fuzzy msgid "File-anti-pattern(s):" msgstr "Idosiye - - Ishusho ( S ) : " -#: optiondialog.cpp:995 +#: optiondialog.cpp:1012 #, fuzzy msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2106,12 +2124,12 @@ msgstr "" ": ' * ' na ' ? ' \n" "ku ikoresha i Mutandukanya : ' ; ' " -#: optiondialog.cpp:1001 +#: optiondialog.cpp:1018 #, fuzzy msgid "Dir-anti-pattern(s):" msgstr "- - Ishusho ( S ) : " -#: optiondialog.cpp:1006 +#: optiondialog.cpp:1023 #, fuzzy msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2122,11 +2140,11 @@ msgstr "" ": ' * ' na ' ? ' \n" "ku ikoresha i Mutandukanya : ' " -#: optiondialog.cpp:1012 +#: optiondialog.cpp:1029 msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1015 +#: optiondialog.cpp:1032 #, fuzzy msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2135,27 +2153,27 @@ msgstr "" "i Kuri ku . \n" "Bya hafi \" . \" - Idosiye iyi Ububiko . " -#: optiondialog.cpp:1020 +#: optiondialog.cpp:1037 #, fuzzy msgid "Find hidden files and directories" msgstr "Birahishe Idosiye na ububiko bw'amaderese " -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1040 #, fuzzy msgid "Finds files and directories with the hidden attribute." msgstr "Idosiye na ububiko bw'amaderese Na: i Birahishe Ikiranga: . " -#: optiondialog.cpp:1025 +#: optiondialog.cpp:1042 #, fuzzy msgid "Finds files and directories starting with '.'." msgstr "Idosiye na ububiko bw'amaderese Itangira... Na: ' . ' . " -#: optiondialog.cpp:1029 +#: optiondialog.cpp:1046 #, fuzzy msgid "Follow file links" msgstr "Idosiye amahuza " -#: optiondialog.cpp:1032 +#: optiondialog.cpp:1049 #, fuzzy msgid "" "On: Compare the file the link points to.\n" @@ -2164,12 +2182,12 @@ msgstr "" ": i Idosiye i Ihuza Utudomo Kuri . \n" ": i amahuza . " -#: optiondialog.cpp:1037 +#: optiondialog.cpp:1054 #, fuzzy msgid "Follow directory links" msgstr "Ububiko amahuza " -#: optiondialog.cpp:1040 +#: optiondialog.cpp:1057 #, fuzzy msgid "" "On: Compare the directory the link points to.\n" @@ -2178,11 +2196,11 @@ msgstr "" ": i Ububiko i Ihuza Utudomo Kuri . \n" ": i amahuza . " -#: optiondialog.cpp:1056 +#: optiondialog.cpp:1073 msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1059 +#: optiondialog.cpp:1076 msgid "" "The directory comparison will compare files or directories when their names " "match.\n" @@ -2190,26 +2208,26 @@ msgid "" "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1080 #, fuzzy msgid "File Comparison Mode" msgstr "Idosiye " -#: optiondialog.cpp:1067 +#: optiondialog.cpp:1084 msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1085 #, fuzzy msgid "Binary comparison of each file. (Default)" msgstr "Bya Idosiye . ( ) " -#: optiondialog.cpp:1070 +#: optiondialog.cpp:1087 #, fuzzy msgid "Full analysis" msgstr "Kwikaraga hose" -#: optiondialog.cpp:1071 +#: optiondialog.cpp:1088 #, fuzzy msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2218,27 +2236,46 @@ msgstr "" "A Cyuzuye na Herekana %S Sitatisitiki Ibisobanuro: in Birenga Inkingi: . \n" "( A Nyabibiri , ya: Nyabibiri Idosiye . ) " -#: optiondialog.cpp:1074 +#: optiondialog.cpp:1091 #, fuzzy -msgid "Trust the modification date (unsafe)" +msgid "Trust the size and modification date (unsafe)" msgstr "i Itariki: ( ) " -#: optiondialog.cpp:1075 +#: optiondialog.cpp:1092 +#, fuzzy +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" +"Idosiye bingana NIBA i Itariki: na Idosiye Uburebure bingana . \n" +"ya: ububiko bw'amaderese Cyangwa Buhoro . " + +#: optiondialog.cpp:1096 +msgid "" +"Trust the size and date, but use binary comparison if date doesn't match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1097 #, fuzzy msgid "" "Assume that files are equal if the modification date and file length are " "equal.\n" +"If the date isn't equal but the sizes are, use binary comparison.\n" "Useful for big directories or slow networks." msgstr "" "Idosiye bingana NIBA i Itariki: na Idosiye Uburebure bingana . \n" "ya: ububiko bw'amaderese Cyangwa Buhoro . " -#: optiondialog.cpp:1078 +#: optiondialog.cpp:1101 #, fuzzy msgid "Trust the size (unsafe)" msgstr "i Ingano: ( ) " -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1102 #, fuzzy msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2249,12 +2286,12 @@ msgstr "" "ya: ububiko bw'amaderese Cyangwa Buhoro Ryari: i Itariki: ni Byahinduwe: " "Iyimura . " -#: optiondialog.cpp:1083 +#: optiondialog.cpp:1106 #, fuzzy msgid "Synchronize directories" msgstr "ububiko bw'amaderese " -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1109 #, fuzzy msgid "" "Offers to store files in both directories so that\n" @@ -2264,12 +2301,12 @@ msgstr "" "Kuri Idosiye in Byombi ububiko bw'amaderese ububiko bw'amaderese i . \n" "Ryari: Kabiri ububiko bw'amaderese A Ishyika: . " -#: optiondialog.cpp:1092 +#: optiondialog.cpp:1115 #, fuzzy msgid "White space differences considered equal" msgstr "Umwanya Ibinyuranyo bingana " -#: optiondialog.cpp:1095 +#: optiondialog.cpp:1118 #, fuzzy msgid "" "If files differ only by white space consider them equal.\n" @@ -2278,12 +2315,12 @@ msgstr "" "Idosiye ku Umweru Umwanya bingana . \n" "ni Gikora Ryari: Cyuzuye ni . " -#: optiondialog.cpp:1101 +#: optiondialog.cpp:1124 #, fuzzy msgid "Copy newer instead of merging (unsafe)" msgstr "Bya ( ) " -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1127 #, fuzzy msgid "" "Don't look inside, just take the newer file.\n" @@ -2294,31 +2331,31 @@ msgstr "" "( iyi NIBA ! ) \n" "CYUZUYE Ryari: Kabiri ububiko bw'amaderese . " -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1132 #, fuzzy msgid "Backup files (.orig)" msgstr "Idosiye ( . ) " -#: optiondialog.cpp:1112 +#: optiondialog.cpp:1135 #, fuzzy msgid "" "When a file would be saved over an old file, then the old file\n" "will be renamed with a '.orig'-extension instead of being deleted." msgstr "" -"A Idosiye KURI ki/bishaje Idosiye , Hanyuma i ki/bishaje Na: A ' . - Umugereka: " -"Bya Kyasibwe: %S . " +"A Idosiye KURI ki/bishaje Idosiye , Hanyuma i ki/bishaje Na: A ' . - " +"Umugereka: Bya Kyasibwe: %S . " -#: optiondialog.cpp:1176 +#: optiondialog.cpp:1213 #, fuzzy msgid "Regional Settings" msgstr "Amagenamiterere y'Akarere" -#: optiondialog.cpp:1272 +#: optiondialog.cpp:1309 #, fuzzy msgid "Language (restart required)" msgstr "( Ongera utangire Bya ngombwa ) " -#: optiondialog.cpp:1304 +#: optiondialog.cpp:1341 #, fuzzy msgid "" "Choose the language of the GUI-strings or \"Auto\".\n" @@ -2327,12 +2364,12 @@ msgstr "" "i Ururimi: Bya i - Ikurikiranyanyuguti Cyangwa \" \" . \n" "A Guhindura... Bya Ururimi: Kuri , &Kuvamo na Ongera utangire . " -#: optiondialog.cpp:1322 +#: optiondialog.cpp:1359 #, fuzzy msgid "Use the same encoding for everything:" msgstr "i Imisobekere: ya: : " -#: optiondialog.cpp:1325 +#: optiondialog.cpp:1362 #, fuzzy msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2341,67 +2378,67 @@ msgstr "" "iyi Kuri Guhindura... Byose ku i Itangira . \n" "iyi NIBA Igenamiterere . " -#: optiondialog.cpp:1330 +#: optiondialog.cpp:1367 #, fuzzy msgid "Note: Local Encoding is " msgstr "icyitonderwa : ni " -#: optiondialog.cpp:1334 +#: optiondialog.cpp:1371 #, fuzzy msgid "File Encoding for A:" msgstr "Idosiye ya: A : " -#: optiondialog.cpp:1340 +#: optiondialog.cpp:1377 msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" -"If the file encoding is not detected then the selected encoding will be used as " -"fallback.\n" -"(Unicode detection depends on the first bytes of a file - the byte order mark " -"\"BOM\".)" +"If the file encoding is not detected then the selected encoding will be used " +"as fallback.\n" +"(Unicode detection depends on the first bytes of a file - the byte order " +"mark \"BOM\".)" msgstr "" -#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362 +#: optiondialog.cpp:1381 optiondialog.cpp:1390 optiondialog.cpp:1399 msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1349 +#: optiondialog.cpp:1386 #, fuzzy msgid "File Encoding for B:" msgstr "Idosiye ya: : " -#: optiondialog.cpp:1358 +#: optiondialog.cpp:1395 #, fuzzy msgid "File Encoding for C:" msgstr "Idosiye ya: : " -#: optiondialog.cpp:1367 +#: optiondialog.cpp:1404 #, fuzzy msgid "File Encoding for Merge Output and Saving:" msgstr "Idosiye ya: na : " -#: optiondialog.cpp:1371 +#: optiondialog.cpp:1408 #, fuzzy msgid "Auto Select" msgstr "Gukoporora Ihitamo " -#: optiondialog.cpp:1374 +#: optiondialog.cpp:1411 msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" -#: optiondialog.cpp:1378 +#: optiondialog.cpp:1415 #, fuzzy msgid "File Encoding for Preprocessor Files:" msgstr "Idosiye ya: : " -#: optiondialog.cpp:1389 +#: optiondialog.cpp:1426 #, fuzzy msgid "Right To Left Language" msgstr "Iburyo ku ibumoso" -#: optiondialog.cpp:1392 +#: optiondialog.cpp:1429 #, fuzzy msgid "" "Some languages are read from right to left.\n" @@ -2410,21 +2447,21 @@ msgstr "" "Indimi Soma Kuva: Iburyo: Kuri Ibumoso: . \n" "Igenamiterere Guhindura... i na Muhinduzi . " -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration" msgstr "Igikorwa" -#: optiondialog.cpp:1402 +#: optiondialog.cpp:1443 #, fuzzy msgid "Integration Settings" msgstr "Amagenamiterere y'Akarere" -#: optiondialog.cpp:1412 +#: optiondialog.cpp:1453 msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1417 +#: optiondialog.cpp:1458 msgid "" "List of command line options that should be ignored when KDiff3 is used by " "other tools.\n" @@ -2432,7 +2469,27 @@ msgid "" "This will suppress the \"Unknown option\"-error." msgstr "" -#: optiondialog.cpp:1480 +#: optiondialog.cpp:1465 +msgid "Integrate with ClearCase" +msgstr "" + +#: optiondialog.cpp:1468 +msgid "" +"Integrate with Rational ClearCase from IBM.\n" +"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" +"(Only enabled when ClearCase \"bin\" directory is in the path.)" +msgstr "" + +#: optiondialog.cpp:1474 +msgid "Remove ClearCase Integration" +msgstr "" + +#: optiondialog.cpp:1477 +msgid "" +"Restore the old \"map\" file from before doing the Clearcase integration." +msgstr "" + +#: optiondialog.cpp:1558 #, fuzzy msgid "" "You selected a variable width font.\n" @@ -2448,22 +2505,22 @@ msgstr "" "\n" "Kuri Gukomeza Cyangwa Kuri Guhitamo Imyandikire . " -#: optiondialog.cpp:1484 +#: optiondialog.cpp:1562 #, fuzzy msgid "Incompatible Font" msgstr "%S Itakorana" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 #, fuzzy msgid "Continue at Own Risk" msgstr "Gukomeza Ku " -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1563 #, fuzzy msgid "Select Another Font" msgstr "Gutoranya imyandikire" -#: optiondialog.cpp:1521 +#: optiondialog.cpp:1599 #, fuzzy msgid "This resets all options. Not only those of the current topic." msgstr "Byose Amahitamo . Bya i KIGEZWEHO . " @@ -2475,10 +2532,8 @@ msgstr "Munonosora" #: pdiff.cpp:263 #, fuzzy -msgid "" -"The following option(s) you selected might change data:\n" -msgstr "" -"Ihitamo ( S ) Byahiswemo Guhindura... Ibyatanzwe : \n" +msgid "The following option(s) you selected might change data:\n" +msgstr "Ihitamo ( S ) Byahiswemo Guhindura... Ibyatanzwe : \n" #: pdiff.cpp:264 #, fuzzy @@ -2553,19 +2608,10 @@ msgstr ": A < - > " msgid "All input files contain the same text, but are not binary equal." msgstr "Iyinjiza Idosiye i Umwandiko . " -#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519 -#, fuzzy -msgid "" -"Files %1 and %2 are binary equal.\n" -msgstr "" -"na Nyabibiri bingana . \n" - #: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520 #, fuzzy -msgid "" -"Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" -"A na Nyabibiri bingana . \n" +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "A na Nyabibiri bingana . \n" #: pdiff.cpp:530 #, fuzzy @@ -2578,117 +2624,63 @@ msgstr "" "icyitonderwa i - Gukomatanya OYA ya: Nyabibiri Ibyatanzwe . \n" "Gukomeza Ku . " -#: pdiff.cpp:979 +#: pdiff.cpp:981 msgid "Abort" msgstr "Ntibyakunze" -#: pdiff.cpp:985 pdiff.cpp:1073 +#: pdiff.cpp:987 pdiff.cpp:1084 #, fuzzy msgid "Opening files..." msgstr "Mu Gufungura dosiye" -#: pdiff.cpp:1050 pdiff.cpp:1121 +#: pdiff.cpp:1061 pdiff.cpp:1132 msgid "File open error" msgstr "Ikosa gufungura idosiye" -#: pdiff.cpp:1153 +#: pdiff.cpp:1164 #, fuzzy msgid "Cutting selection..." msgstr "Ihitamo ... " -#: pdiff.cpp:1174 +#: pdiff.cpp:1185 #, fuzzy msgid "Copying selection to clipboard..." msgstr "Ihitamo Kuri Ububikokoporora ... " -#: pdiff.cpp:1190 +#: pdiff.cpp:1201 #, fuzzy msgid "Inserting clipboard contents..." msgstr "Ububikokoporora Ibigize ... " -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 #, fuzzy msgid "Save && Continue" msgstr "Kubika & & Gukomeza " -#: pdiff.cpp:1713 +#: pdiff.cpp:1724 #, fuzzy msgid "Continue Without Saving" msgstr "Gukomeza " -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 #, fuzzy msgid "Search complete." msgstr "Byuzuye . " -#: pdiff.cpp:1920 +#: pdiff.cpp:1931 #, fuzzy msgid "Search Complete" msgstr "Igishushanyombonera cy'Ishakisha" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2144 +#: pdiff.cpp:2155 #, fuzzy msgid "Error while adding manual diff range" msgstr "Ikosa Kurema Ububiko . " -#. i18n: file kdiff3_part.rc line 4 -#: rc.cpp:3 -#, no-c-format -msgid "&KDiff3" -msgstr "" - -#. i18n: file kdiff3_part.rc line 13 -#: rc.cpp:6 -#, fuzzy, no-c-format -msgid "Configure KDiff3" -msgstr "Kuboneza Gucapa na KDE" - -#. i18n: file kdiff3_shell.rc line 7 -#: rc.cpp:15 -#, fuzzy, no-c-format -msgid "&Directory" -msgstr "Ububiko" - -#. i18n: file kdiff3_shell.rc line 30 -#: rc.cpp:18 -#, fuzzy, no-c-format -msgid "Current Item Merge Operation" -msgstr "Ibikorerwa Ishusho" - -#. i18n: file kdiff3_shell.rc line 38 -#: rc.cpp:21 -#, fuzzy, no-c-format -msgid "Current Item Sync Operation" -msgstr "Iki cyiciro" - -#. i18n: file kdiff3_shell.rc line 50 -#: rc.cpp:24 -#, fuzzy, no-c-format -msgid "&Movement" -msgstr "Igenda" - -#. i18n: file kdiff3_shell.rc line 61 -#: rc.cpp:27 -#, fuzzy, no-c-format -msgid "D&iffview" -msgstr "Igabanya" - -#. i18n: file kdiff3_shell.rc line 73 -#: rc.cpp:30 -#, fuzzy, no-c-format -msgid "&Merge" -msgstr "Gukomatanya" - -#. i18n: file kdiff3_shell.rc line 95 -#: rc.cpp:33 -#, no-c-format -msgid "&Window" -msgstr "Idirishya" - #: smalldialogs.cpp:53 #, fuzzy msgid "A (Base):" @@ -2736,6 +2728,10 @@ msgstr "( Bitari ngombwa ) : " msgid "Configure..." msgstr "Kugena imiterere..." +#: smalldialogs.cpp:164 +msgid "&OK" +msgstr "" + #: smalldialogs.cpp:347 #, fuzzy msgid "Search text:" @@ -2813,6 +2809,14 @@ msgstr "" msgid "Sort key result:" msgstr "" +#: smalldialogs.cpp:493 +msgid "OK" +msgstr "" + +#: smalldialogs.cpp:497 +msgid "Cancel" +msgstr "" + #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568 msgid "Match success." msgstr "" @@ -2826,6 +2830,94 @@ msgstr "Byanze . " msgid "Opening and closing parentheses don't match in regular expression." msgstr "" +#: kdiff3_part.rc:4 +#, no-c-format +msgid "&KDiff3" +msgstr "" + +#: kdiff3_part.rc:13 +#, fuzzy, no-c-format +msgid "Configure KDiff3" +msgstr "Kuboneza Gucapa na KDE" + +#: kdiff3_shell.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "Idosiye..." + +#: kdiff3_shell.rc:7 +#, fuzzy, no-c-format +msgid "&Directory" +msgstr "Ububiko" + +#: kdiff3_shell.rc:30 +#, fuzzy, no-c-format +msgid "Current Item Merge Operation" +msgstr "Ibikorerwa Ishusho" + +#: kdiff3_shell.rc:38 +#, fuzzy, no-c-format +msgid "Current Item Sync Operation" +msgstr "Iki cyiciro" + +#: kdiff3_shell.rc:50 +#, fuzzy, no-c-format +msgid "&Movement" +msgstr "Igenda" + +#: kdiff3_shell.rc:61 +#, fuzzy, no-c-format +msgid "D&iffview" +msgstr "Igabanya" + +#: kdiff3_shell.rc:73 +#, fuzzy, no-c-format +msgid "&Merge" +msgstr "Gukomatanya" + +#: kdiff3_shell.rc:95 +#, no-c-format +msgid "&Window" +msgstr "Idirishya" + +#: kdiff3_shell.rc:106 +#, no-c-format +msgid "Main Toolbar" +msgstr "" + +#, fuzzy +#~ msgid "Files A and B are binary equal.\n" +#~ msgstr "A na Nyabibiri bingana . \n" + +#, fuzzy +#~ msgid "Files A and C are binary equal.\n" +#~ msgstr "A na Nyabibiri bingana . \n" + +#, fuzzy +#~ msgid "Files A and C have equal text. \n" +#~ msgstr "A na bingana Umwandiko . \n" + +#, fuzzy +#~ msgid "Files B and C are binary equal.\n" +#~ msgstr "na Nyabibiri bingana . \n" + +#, fuzzy +#~ msgid "Files B and C have equal text. \n" +#~ msgstr "na bingana Umwandiko . \n" + +#, fuzzy +#~ msgid "Preserve carriage return" +#~ msgstr "Garuka " + +#, fuzzy +#~ msgid "" +#~ "Show carriage return characters '\\r' if they exist.\n" +#~ "Helps to compare files that were modified under different operating " +#~ "systems." +#~ msgstr "" +#~ "Garuka Inyuguti ' \\r ' NIBA . \n" +#~ "Kuri Kugereranya # Idosiye Byahinduwe: . " + #, fuzzy #~ msgid "Diff and Merge" #~ msgstr "Ikinyuranyo/Itandukaniro" @@ -2852,7 +2944,8 @@ msgstr "" #, fuzzy #~ msgid "Files and directories without change will not appear in the list." -#~ msgstr "na ububiko bw'amaderese Guhindura... OYA Kugaragara in i Urutonde . " +#~ msgstr "" +#~ "na ububiko bw'amaderese Guhindura... OYA Kugaragara in i Urutonde . " #, fuzzy #~ msgid "no selection" |