diff options
Diffstat (limited to 'tde-i18n-rw/messages/tdesdk/kompare.po')
| -rw-r--r-- | tde-i18n-rw/messages/tdesdk/kompare.po | 1044 |
1 files changed, 522 insertions, 522 deletions
diff --git a/tde-i18n-rw/messages/tdesdk/kompare.po b/tde-i18n-rw/messages/tdesdk/kompare.po index 19ff3daf659..ff3c4fb2d1c 100644 --- a/tde-i18n-rw/messages/tdesdk/kompare.po +++ b/tde-i18n-rw/messages/tdesdk/kompare.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare 3.4\n" -"POT-Creation-Date: 2014-09-29 00:48-0500\n" +"POT-Creation-Date: 2014-09-29 12:05-0500\n" "PO-Revision-Date: 2005-05-25 18:11-0600\n" "Last-Translator: Steve Murphy <murf@e-tools.com>\n" "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n" @@ -24,106 +24,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: _translatorinfo.cpp:1 -msgid "" -"_: NAME OF TRANSLATORS\n" -"Your names" -msgstr "" -"Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien " -"NSENGIYUMVA" - -#: _translatorinfo.cpp:3 -msgid "" -"_: EMAIL OF TRANSLATORS\n" -"Your emails" -msgstr "" -"muvia1@yahoo.fr, ngenda_denis@yahoo.co.uk, akiberwa@yahoo.co.uk, " -"ndonatienuk@yahoo.co.uk" - -#: komparenavtreepart/komparenavtreepart.cpp:61 -#, fuzzy -msgid "Source Folder" -msgstr "Idosiye y'Ishungura" - -#: komparenavtreepart/komparenavtreepart.cpp:66 -msgid "Destination Folder" -msgstr "Ububiko bw'Ishyika" - -#: komparenavtreepart/komparenavtreepart.cpp:71 -#, fuzzy -msgid "Source File" -msgstr "Idosiye nkomoko" - -#: komparenavtreepart/komparenavtreepart.cpp:72 -#, fuzzy -msgid "Destination File" -msgstr "Amerekezo- Nyandiko" - -#: komparenavtreepart/komparenavtreepart.cpp:78 -#, fuzzy -msgid "Source Line" -msgstr "Idosiye nkomoko" - -#: komparenavtreepart/komparenavtreepart.cpp:79 -#, fuzzy -msgid "Destination Line" -msgstr "Amerekezo-Nyandiko" - -#: komparenavtreepart/komparenavtreepart.cpp:80 -msgid "Difference" -msgstr "Ikinyuranyo/Itandukaniro" - -#: komparenavtreepart/komparenavtreepart.cpp:426 -#, fuzzy, c-format -msgid "" -"_n: Applied: Changes made to %n line undone\n" -"Applied: Changes made to %n lines undone" -msgstr ": Kuri %n Umurongo: : Kuri %n Imirongo " - -#: komparenavtreepart/komparenavtreepart.cpp:429 -#, fuzzy, c-format -msgid "" -"_n: Changed %n line\n" -"Changed %n lines" -msgstr "%n %n Imirongo " - -#: komparenavtreepart/komparenavtreepart.cpp:434 -#, fuzzy, c-format -msgid "" -"_n: Applied: Insertion of %n line undone\n" -"Applied: Insertion of %n lines undone" -msgstr ": Bya %n Umurongo: : Bya %n Imirongo " - -#: komparenavtreepart/komparenavtreepart.cpp:437 -#, fuzzy, c-format -msgid "" -"_n: Inserted %n line\n" -"Inserted %n lines" -msgstr "%n %n Imirongo " - -#: komparenavtreepart/komparenavtreepart.cpp:442 -#, fuzzy, c-format -msgid "" -"_n: Applied: Deletion of %n line undone\n" -"Applied: Deletion of %n lines undone" -msgstr ": Bya %n Umurongo: : Bya %n Imirongo " - -#: komparenavtreepart/komparenavtreepart.cpp:445 -#, fuzzy, c-format -msgid "" -"_n: Deleted %n line\n" -"Deleted %n lines" -msgstr "%n %n Imirongo " - -#: komparenavtreepart/komparenavtreepart.cpp:531 -#: komparepart/kompare_part.cpp:651 -msgid "Unknown" -msgstr "Kitazwi" - -#: komparenavtreepart/komparenavtreepart.cpp:694 -msgid "KompareNavTreePart" -msgstr "" - #: libdiff2/komparemodellist.cpp:61 #, fuzzy msgid "&Apply Difference" @@ -232,193 +132,6 @@ msgstr "Idosiye birasa . " msgid "Could not write to the temporary file." msgstr "OYA Kwandika Kuri i By'igihe gito Idosiye . " -#: kompare_shell.cpp:77 -#, fuzzy -msgid "Could not find our KompareViewPart." -msgstr "OYA Gushaka . " - -#: kompare_shell.cpp:106 -#, fuzzy -msgid "Could not load our KompareViewPart." -msgstr "OYA Ibirimo . " - -#: kompare_shell.cpp:114 -#, fuzzy -msgid "Could not find our KompareNavigationPart." -msgstr "OYA Gushaka . " - -#: kompare_shell.cpp:138 -#, fuzzy -msgid "Could not load our KompareNavigationPart." -msgstr "OYA Ibirimo . " - -#: kompare_shell.cpp:233 -#, fuzzy -msgid "&Open Diff..." -msgstr "Gufungura ... " - -#: kompare_shell.cpp:234 -#, fuzzy -msgid "&Compare Files..." -msgstr "Gukoporora &Amadosiye..." - -#: kompare_shell.cpp:237 -#, fuzzy -msgid "&Blend URL with Diff..." -msgstr "Na: ... " - -#: kompare_shell.cpp:246 -#, fuzzy -msgid "Show T&ext View" -msgstr "Igaragaza rigufi" - -#: kompare_shell.cpp:248 -#, fuzzy -msgid "Hide T&ext View" -msgstr "Name=Igaragaza Umwandiko" - -#: kompare_shell.cpp:257 -#, fuzzy -msgid " 0 of 0 differences " -msgstr "0 %S Bya 0 %S Ibinyuranyo " - -#: kompare_shell.cpp:258 -#, fuzzy -msgid " 0 of 0 files " -msgstr "0 %S Bya 0 %S Idosiye " - -#: kompare_shell.cpp:273 -#, fuzzy -msgid "" -"_n: %1 of %n file \n" -" %1 of %n files " -msgstr "" -"%1 Bya %n Idosiye \n" -"%1 Bya %n Idosiye " - -#: kompare_shell.cpp:275 -#, fuzzy, c-format -msgid "" -"_n: %n file \n" -" %n files " -msgstr "" -"%n Idosiye \n" -"%n Idosiye " - -#: kompare_shell.cpp:278 -#, fuzzy -msgid "" -"_n: %1 of %n difference, %2 applied \n" -" %1 of %n differences, %2 applied " -msgstr "" -"%1 Bya %n Ikinyuranyo/Itandukaniro , %2 Byashyizweho \n" -"%1 Bya %n Ibinyuranyo , %2 Byashyizweho " - -#: kompare_shell.cpp:281 -#, fuzzy, c-format -msgid "" -"_n: %n difference \n" -" %n differences " -msgstr "" -"%n Ikinyuranyo/Itandukaniro \n" -"%n Ibinyuranyo " - -#: kompare_shell.cpp:369 -#, fuzzy -msgid "Blend File/Folder with diff Output" -msgstr "Idosiye /Na: " - -#: kompare_shell.cpp:370 -#, fuzzy -msgid "File/Folder" -msgstr "Idosiye /" - -#: kompare_shell.cpp:371 -#, fuzzy -msgid "Diff Output" -msgstr "Ibisohoka" - -#: kompare_shell.cpp:373 -#, fuzzy -msgid "Blend" -msgstr "impera" - -#: kompare_shell.cpp:373 -#, fuzzy -msgid "Blend this file or folder with the diff output" -msgstr "iyi Idosiye Cyangwa Ububiko... Na: i Ibisohoka " - -#: kompare_shell.cpp:373 -#, fuzzy -msgid "" -"If you have entered a file or folder name and a file that contains diff output " -"in the fields in this dialog then this button will be enabled and pressing it " -"will open kompare's main view where the output of the entered file or files " -"from the folder are mixed with the diff output so you can then apply the " -"difference(s) to a file or to the files. " -msgstr "" -"A Idosiye Cyangwa Ububiko... Izina: na A Idosiye ifite Ibisohoka in i Amashami: " -"in iyi Ikiganiro Hanyuma iyi Akabuto Bikora na Gufungura Reba i Ibisohoka Bya i " -"Idosiye Cyangwa Idosiye Kuva: i Ububiko... Bivanze Na: i Ibisohoka Hanyuma " -"Gushyiraho i Ikinyuranyo/Itandukaniro ( S ) Kuri A Idosiye Cyangwa Kuri i " -"Idosiye . " - -#: kompare_shell.cpp:398 main.cpp:185 -#, fuzzy -msgid "Compare Files or Folders" -msgstr "Cyangwa " - -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Inkomoko" - -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Ishyika" - -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Kugereranya" - -#: kompare_shell.cpp:402 -#, fuzzy -msgid "Compare these files or folders" -msgstr "Idosiye Cyangwa Ububiko " - -#: kompare_shell.cpp:402 main.cpp:189 -#, fuzzy -msgid "" -"If you have entered 2 filenames or 2 folders in the fields in this dialog then " -"this button will be enabled and pressing it will start a comparison of the " -"entered files or folders. " -msgstr "" -"2 Cyangwa 2 Ububiko in i Amashami: in iyi Ikiganiro Hanyuma iyi Akabuto Bikora " -"na Tangira &vendorShortName; A Bya i Idosiye Cyangwa Ububiko . " - -#: kompare_shell.cpp:439 -#, fuzzy -msgid "Text View" -msgstr "Kugaragaza Ibikurikira" - -#: kompareurldialog.cpp:41 -#, fuzzy -msgid "Here you can enter the files you want to compare." -msgstr "Injiza i Idosiye Kuri Kugereranya # . " - -#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 -msgid "Diff" -msgstr "" - -#: kompareurldialog.cpp:47 -#, fuzzy -msgid "Here you can change the options for comparing the files." -msgstr "Guhindura... i Amahitamo ya: i Idosiye . " - -#: kompareurldialog.cpp:53 -#, fuzzy -msgid "Here you can change the options for the view." -msgstr "Guhindura... i Amahitamo ya: i Reba . " - #. i18n: file komparepart/komparepartui.rc line 13 #: rc.cpp:15 #, fuzzy, no-c-format @@ -545,261 +258,377 @@ msgstr "- ku - " msgid "Number of context lines:" msgstr "Bya Imvugiro Imirongo : " -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Ibyahisemo" - -#: komparepart/kompareprefdlg.cpp:39 +#: main.cpp:33 #, fuzzy -msgid "View Settings" -msgstr "Amagenamiterere y'Igaragaza ry'Urutonde" +msgid "" +"A program to view the differences between files and optionally generate a diff" +msgstr "A Porogaramu Kuri Reba i Ibinyuranyo hagati Idosiye na A " -#: komparepart/kompareprefdlg.cpp:43 +#: main.cpp:39 #, fuzzy -msgid "Diff Settings" -msgstr "Amagenamiterere nyamubyimba" +msgid "This will compare URL1 with URL2" +msgstr "Kugereranya # Na: " -#: komparepart/kompare_part.cpp:165 +#: main.cpp:40 #, fuzzy -msgid "Save &All" -msgstr "Gushyingura Byose" +msgid "" +"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and " +"then it will read from standard input. Can be used for instance for cvs diff | " +"kompare -o -. Kompare will do a check to see if it can find the original " +"file(s) and then blend the original file(s) into the diffoutput and show that " +"in the viewer. -n disables the check." +msgstr "" +"Gufungura na Kuri Ibisohoka . A ' - ' na Hanyuma Soma Kuva: Bisanzwe Iyinjiza . " +"Byakoreshejwe ya: Urugero ya: | - o - . A Kugenzura Kuri NIBA Gushaka i " +"~Umwimerere Idosiye ( S ) na Hanyuma i ~Umwimerere Idosiye ( S ) i na Herekana " +"%S in i . - n i Kugenzura . " -#: komparepart/kompare_part.cpp:168 +#: main.cpp:41 #, fuzzy -msgid "Save .&diff..." -msgstr "Kubika." +msgid "" +"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the " +"file or folder that the diffoutput needs to be blended into. " +msgstr "" +", ni Ikitezwe: $(ARG1) Kuri Ibisohoka na i Idosiye Cyangwa Ububiko... i Kuri . " -#: komparepart/kompare_part.cpp:171 +#: main.cpp:42 #, fuzzy -msgid "Swap Source with Destination" -msgstr "Na: " +msgid "" +"Disables the check for automatically finding the original file(s) when using " +"'-' as URL with the -o option." +msgstr "" +"i Kugenzura ya: mu buryo bwikora: i ~Umwimerere Idosiye ( S ) Ryari: ikoresha " +"' - ' Nka Na: i - o Ihitamo . " -#: komparepart/kompare_part.cpp:174 +#: main.cpp:43 #, fuzzy -msgid "Show Statistics" -msgstr "Sitatisitiki" +msgid "" +"Use this to specify the encoding when calling it from the command line. It will " +"default to the local encoding if not specified." +msgstr "" +"iyi Kuri Kugaragaza i Imisobekere: Ryari: Kuva: i command Umurongo: . Mburabuzi " +"Kuri i Bya hafi Imisobekere: NIBA OYA . " -#: komparepart/kompare_part.cpp:269 +#: main.cpp:52 #, fuzzy -msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" -msgstr "<qt> <b> %1 </b> Yimuwe . </qt> " +msgid "Kompare" +msgstr "Kugereranya" -#: komparepart/kompare_part.cpp:281 +#: main.cpp:54 #, fuzzy -msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" -msgstr "<qt> <b> %1 </b> OYA ku Sisitemu . </qt> " +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "( C ) - , na " -#: komparepart/kompare_part.cpp:425 -#, fuzzy -msgid "Diff Options" -msgstr "Guhitamo" +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Umwanditsi" -#: komparepart/kompare_part.cpp:443 +#: main.cpp:57 #, fuzzy -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.DIF." +msgid "Kompare icon artist" +msgstr "Agashushondanga Umuhanzi " -#: komparepart/kompare_part.cpp:443 +#: main.cpp:58 #, fuzzy -msgid "Save .diff" -msgstr "Kubika." +msgid "A lot of good advice" +msgstr "A Bya " -#: komparepart/kompare_part.cpp:446 +#: main.cpp:59 #, fuzzy -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Idosiye Cyangwa ni Kwandika - Birinzwe ; Kuri Guhindura ? " +msgid "Cervisia diff viewer" +msgstr "Ushinzwe kureba Impamyabushobozi" -#: komparepart/kompare_part.cpp:446 +#: kompare_shell.cpp:398 main.cpp:185 #, fuzzy -msgid "File Exists" -msgstr "Idosiye " +msgid "Compare Files or Folders" +msgstr "Cyangwa " -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Gusimbuza" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Inkomoko" -#: komparepart/kompare_part.cpp:446 +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Ishyika" + +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Kugereranya" + +#: main.cpp:189 #, fuzzy -msgid "Do Not Overwrite" -msgstr "Gusimbuza " +msgid "Compare these files or folder" +msgstr "Idosiye Cyangwa Ububiko... " -#: komparepart/kompare_part.cpp:481 +#: kompare_shell.cpp:402 main.cpp:189 #, fuzzy -msgid "KomparePart" -msgstr "Igice Kate " +msgid "" +"If you have entered 2 filenames or 2 folders in the fields in this dialog then " +"this button will be enabled and pressing it will start a comparison of the " +"entered files or folders. " +msgstr "" +"2 Cyangwa 2 Ububiko in i Amashami: in iyi Ikiganiro Hanyuma iyi Akabuto Bikora " +"na Tangira &vendorShortName; A Bya i Idosiye Cyangwa Ububiko . " -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." +#: _translatorinfo.cpp:1 +msgid "" +"_: NAME OF TRANSLATORS\n" +"Your names" msgstr "" +"Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien " +"NSENGIYUMVA" -#: komparepart/kompare_part.cpp:496 +#: _translatorinfo.cpp:3 +msgid "" +"_: EMAIL OF TRANSLATORS\n" +"Your emails" +msgstr "" +"muvia1@yahoo.fr, ngenda_denis@yahoo.co.uk, akiberwa@yahoo.co.uk, " +"ndonatienuk@yahoo.co.uk" + +#: kompare_shell.cpp:77 #, fuzzy -msgid "Parsing diff output..." -msgstr "Ibisohoka ... " +msgid "Could not find our KompareViewPart." +msgstr "OYA Gushaka . " -#: komparepart/kompare_part.cpp:545 +#: kompare_shell.cpp:106 #, fuzzy -msgid "Comparing file %1 with file %2" -msgstr "Idosiye %1 Na: Idosiye %2 " +msgid "Could not load our KompareViewPart." +msgstr "OYA Ibirimo . " -#: komparepart/kompare_part.cpp:550 +#: kompare_shell.cpp:114 #, fuzzy -msgid "Comparing files in %1 with files in %2" -msgstr "Idosiye in %1 Na: Idosiye in %2 " +msgid "Could not find our KompareNavigationPart." +msgstr "OYA Gushaka . " -#: komparepart/kompare_part.cpp:555 -#, fuzzy, c-format -msgid "Viewing diff output from %1" -msgstr "Ibisohoka Kuva: %1 " +#: kompare_shell.cpp:138 +#, fuzzy +msgid "Could not load our KompareNavigationPart." +msgstr "OYA Ibirimo . " -#: komparepart/kompare_part.cpp:558 +#: kompare_shell.cpp:233 #, fuzzy -msgid "Blending diff output from %1 into file %2" -msgstr "Ibisohoka Kuva: %1 Idosiye %2 " +msgid "&Open Diff..." +msgstr "Gufungura ... " -#: komparepart/kompare_part.cpp:563 +#: kompare_shell.cpp:234 #, fuzzy -msgid "Blending diff output from %1 into folder %2" -msgstr "Ibisohoka Kuva: %1 Ububiko... %2 " +msgid "&Compare Files..." +msgstr "Gukoporora &Amadosiye..." -#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 +#: kompare_shell.cpp:237 #, fuzzy -msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" -msgstr "" -"Amahinduka Kuri i Ishyika: Idosiye ( S ) . \n" -"nka Kuri Kubika ? " +msgid "&Blend URL with Diff..." +msgstr "Na: ... " -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +#: kompare_shell.cpp:246 #, fuzzy -msgid "Save Changes?" -msgstr "Kubika ? " +msgid "Show T&ext View" +msgstr "Igaragaza rigufi" -#: komparepart/kompare_part.cpp:667 +#: kompare_shell.cpp:248 #, fuzzy -msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." -msgstr "Idosiye , Cyangwa Oya 2 Idosiye . Oya stats Bihari . " +msgid "Hide T&ext View" +msgstr "Name=Igaragaza Umwandiko" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 +#: kompare_shell.cpp:257 #, fuzzy -msgid "Diff Statistics" -msgstr "Sitatisitiki" +msgid " 0 of 0 differences " +msgstr "0 %S Bya 0 %S Ibinyuranyo " -#: komparepart/kompare_part.cpp:673 +#: kompare_shell.cpp:258 +#, fuzzy +msgid " 0 of 0 files " +msgstr "0 %S Bya 0 %S Idosiye " + +#: kompare_shell.cpp:273 #, fuzzy msgid "" -"Statistics:\n" -"\n" -"Old file: %1\n" -"New file: %2\n" -"\n" -"Format: %3\n" -"Number of hunks: %4\n" -"Number of differences: %5" +"_n: %1 of %n file \n" +" %1 of %n files " msgstr "" -": \n" -"\n" -"Idosiye : %1 \n" -"Idosiye : %2 \n" -"\n" -": %3 \n" -"Bya : %4 \n" -"Bya Ibinyuranyo : %5 " +"%1 Bya %n Idosiye \n" +"%1 Bya %n Idosiye " -#: komparepart/kompare_part.cpp:686 +#: kompare_shell.cpp:275 +#, fuzzy, c-format +msgid "" +"_n: %n file \n" +" %n files " +msgstr "" +"%n Idosiye \n" +"%n Idosiye " + +#: kompare_shell.cpp:278 #, fuzzy msgid "" -"Statistics:\n" -"\n" -"Number of files in diff file: %1\n" -"Format: %2\n" -"\n" -"Current old file: %3\n" -"Current new file: %4\n" -"\n" -"Number of hunks: %5\n" -"Number of differences: %6" +"_n: %1 of %n difference, %2 applied \n" +" %1 of %n differences, %2 applied " msgstr "" -": \n" -"\n" -"Bya Idosiye in Idosiye : %1 \n" -": %2 \n" -"\n" -"ki/bishaje Idosiye : %3 \n" -"Gishya Idosiye : %4 \n" -"\n" -"Bya : %5 \n" -"Bya Ibinyuranyo : %6 " +"%1 Bya %n Ikinyuranyo/Itandukaniro , %2 Byashyizweho \n" +"%1 Bya %n Ibinyuranyo , %2 Byashyizweho " -#: libdialogpages/filespage.cpp:53 -msgid "Encoding" -msgstr "Imisobekere:" +#: kompare_shell.cpp:281 +#, fuzzy, c-format +msgid "" +"_n: %n difference \n" +" %n differences " +msgstr "" +"%n Ikinyuranyo/Itandukaniro \n" +"%n Ibinyuranyo " -#: libdialogpages/filespage.cpp:64 -msgid "&Files" -msgstr "&Amadosiye" +#: kompare_shell.cpp:369 +#, fuzzy +msgid "Blend File/Folder with diff Output" +msgstr "Idosiye /Na: " -#: libdialogpages/viewpage.cpp:51 -msgid "Colors" -msgstr "Amabara" +#: kompare_shell.cpp:370 +#, fuzzy +msgid "File/Folder" +msgstr "Idosiye /" -#: libdialogpages/viewpage.cpp:56 +#: kompare_shell.cpp:371 #, fuzzy -msgid "Removed color:" -msgstr "Ibara: : " +msgid "Diff Output" +msgstr "Ibisohoka" -#: libdialogpages/viewpage.cpp:61 +#: kompare_shell.cpp:373 #, fuzzy -msgid "Changed color:" -msgstr "Ibara: : " +msgid "Blend" +msgstr "impera" -#: libdialogpages/viewpage.cpp:66 +#: kompare_shell.cpp:373 #, fuzzy -msgid "Added color:" -msgstr "Ibara: : " +msgid "Blend this file or folder with the diff output" +msgstr "iyi Idosiye Cyangwa Ububiko... Na: i Ibisohoka " -#: libdialogpages/viewpage.cpp:71 +#: kompare_shell.cpp:373 #, fuzzy -msgid "Applied color:" -msgstr "Ibara: : " +msgid "" +"If you have entered a file or folder name and a file that contains diff output " +"in the fields in this dialog then this button will be enabled and pressing it " +"will open kompare's main view where the output of the entered file or files " +"from the folder are mixed with the diff output so you can then apply the " +"difference(s) to a file or to the files. " +msgstr "" +"A Idosiye Cyangwa Ububiko... Izina: na A Idosiye ifite Ibisohoka in i Amashami: " +"in iyi Ikiganiro Hanyuma iyi Akabuto Bikora na Gufungura Reba i Ibisohoka Bya i " +"Idosiye Cyangwa Idosiye Kuva: i Ububiko... Bivanze Na: i Ibisohoka Hanyuma " +"Gushyiraho i Ikinyuranyo/Itandukaniro ( S ) Kuri A Idosiye Cyangwa Kuri i " +"Idosiye . " -#: libdialogpages/viewpage.cpp:76 -msgid "Mouse Wheel" -msgstr "Ipine y'imbeba" +#: kompare_shell.cpp:402 +#, fuzzy +msgid "Compare these files or folders" +msgstr "Idosiye Cyangwa Ububiko " -#: libdialogpages/viewpage.cpp:80 -msgid "Number of lines:" -msgstr "Umubare w'imirongo:" +#: kompare_shell.cpp:439 +#, fuzzy +msgid "Text View" +msgstr "Kugaragaza Ibikurikira" -#: libdialogpages/viewpage.cpp:86 +#: komparenavtreepart/komparenavtreepart.cpp:61 #, fuzzy -msgid "Tabs to Spaces" -msgstr "Kuri " +msgid "Source Folder" +msgstr "Idosiye y'Ishungura" -#: libdialogpages/viewpage.cpp:90 +#: komparenavtreepart/komparenavtreepart.cpp:66 +msgid "Destination Folder" +msgstr "Ububiko bw'Ishyika" + +#: komparenavtreepart/komparenavtreepart.cpp:71 #, fuzzy -msgid "Number of spaces to convert a tab character to:" -msgstr "Bya Imyanya Kuri GUHINDURA A tab Inyuguti: Kuri : " +msgid "Source File" +msgstr "Idosiye nkomoko" -#: libdialogpages/viewpage.cpp:97 -msgid "A&ppearance" -msgstr "Imigaragarire" +#: komparenavtreepart/komparenavtreepart.cpp:72 +#, fuzzy +msgid "Destination File" +msgstr "Amerekezo- Nyandiko" -#: libdialogpages/viewpage.cpp:104 +#: komparenavtreepart/komparenavtreepart.cpp:78 #, fuzzy -msgid "Text Font" -msgstr "Imiterere y'umwandiko" +msgid "Source Line" +msgstr "Idosiye nkomoko" -#: libdialogpages/viewpage.cpp:108 -msgid "Font:" -msgstr "Imyandikire:" +#: komparenavtreepart/komparenavtreepart.cpp:79 +#, fuzzy +msgid "Destination Line" +msgstr "Amerekezo-Nyandiko" -#: libdialogpages/viewpage.cpp:112 -msgid "Size:" -msgstr "Ingano:" +#: komparenavtreepart/komparenavtreepart.cpp:80 +msgid "Difference" +msgstr "Ikinyuranyo/Itandukaniro" + +#: komparenavtreepart/komparenavtreepart.cpp:426 +#, fuzzy, c-format +msgid "" +"_n: Applied: Changes made to %n line undone\n" +"Applied: Changes made to %n lines undone" +msgstr ": Kuri %n Umurongo: : Kuri %n Imirongo " + +#: komparenavtreepart/komparenavtreepart.cpp:429 +#, fuzzy, c-format +msgid "" +"_n: Changed %n line\n" +"Changed %n lines" +msgstr "%n %n Imirongo " + +#: komparenavtreepart/komparenavtreepart.cpp:434 +#, fuzzy, c-format +msgid "" +"_n: Applied: Insertion of %n line undone\n" +"Applied: Insertion of %n lines undone" +msgstr ": Bya %n Umurongo: : Bya %n Imirongo " + +#: komparenavtreepart/komparenavtreepart.cpp:437 +#, fuzzy, c-format +msgid "" +"_n: Inserted %n line\n" +"Inserted %n lines" +msgstr "%n %n Imirongo " + +#: komparenavtreepart/komparenavtreepart.cpp:442 +#, fuzzy, c-format +msgid "" +"_n: Applied: Deletion of %n line undone\n" +"Applied: Deletion of %n lines undone" +msgstr ": Bya %n Umurongo: : Bya %n Imirongo " + +#: komparenavtreepart/komparenavtreepart.cpp:445 +#, fuzzy, c-format +msgid "" +"_n: Deleted %n line\n" +"Deleted %n lines" +msgstr "%n %n Imirongo " + +#: komparenavtreepart/komparenavtreepart.cpp:531 +#: komparepart/kompare_part.cpp:651 +msgid "Unknown" +msgstr "Kitazwi" + +#: komparenavtreepart/komparenavtreepart.cpp:694 +msgid "KompareNavTreePart" +msgstr "" + +#: kompareurldialog.cpp:41 +#, fuzzy +msgid "Here you can enter the files you want to compare." +msgstr "Injiza i Idosiye Kuri Kugereranya # . " + +#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 +msgid "Diff" +msgstr "" + +#: kompareurldialog.cpp:47 +#, fuzzy +msgid "Here you can change the options for comparing the files." +msgstr "Guhindura... i Amahitamo ya: i Idosiye . " + +#: kompareurldialog.cpp:53 +#, fuzzy +msgid "Here you can change the options for the view." +msgstr "Guhindura... i Amahitamo ya: i Reba . " #: libdialogpages/diffpage.cpp:211 #, fuzzy @@ -1032,87 +861,258 @@ msgstr "" msgid "&Exclude" msgstr "Gukora" -#: main.cpp:33 +#: libdialogpages/filespage.cpp:53 +msgid "Encoding" +msgstr "Imisobekere:" + +#: libdialogpages/filespage.cpp:64 +msgid "&Files" +msgstr "&Amadosiye" + +#: libdialogpages/viewpage.cpp:51 +msgid "Colors" +msgstr "Amabara" + +#: libdialogpages/viewpage.cpp:56 #, fuzzy -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "A Porogaramu Kuri Reba i Ibinyuranyo hagati Idosiye na A " +msgid "Removed color:" +msgstr "Ibara: : " -#: main.cpp:39 +#: libdialogpages/viewpage.cpp:61 #, fuzzy -msgid "This will compare URL1 with URL2" -msgstr "Kugereranya # Na: " +msgid "Changed color:" +msgstr "Ibara: : " -#: main.cpp:40 +#: libdialogpages/viewpage.cpp:66 #, fuzzy -msgid "" -"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and " -"then it will read from standard input. Can be used for instance for cvs diff | " -"kompare -o -. Kompare will do a check to see if it can find the original " -"file(s) and then blend the original file(s) into the diffoutput and show that " -"in the viewer. -n disables the check." -msgstr "" -"Gufungura na Kuri Ibisohoka . A ' - ' na Hanyuma Soma Kuva: Bisanzwe Iyinjiza . " -"Byakoreshejwe ya: Urugero ya: | - o - . A Kugenzura Kuri NIBA Gushaka i " -"~Umwimerere Idosiye ( S ) na Hanyuma i ~Umwimerere Idosiye ( S ) i na Herekana " -"%S in i . - n i Kugenzura . " +msgid "Added color:" +msgstr "Ibara: : " -#: main.cpp:41 +#: libdialogpages/viewpage.cpp:71 #, fuzzy -msgid "" -"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the " -"file or folder that the diffoutput needs to be blended into. " -msgstr "" -", ni Ikitezwe: $(ARG1) Kuri Ibisohoka na i Idosiye Cyangwa Ububiko... i Kuri . " +msgid "Applied color:" +msgstr "Ibara: : " -#: main.cpp:42 +#: libdialogpages/viewpage.cpp:76 +msgid "Mouse Wheel" +msgstr "Ipine y'imbeba" + +#: libdialogpages/viewpage.cpp:80 +msgid "Number of lines:" +msgstr "Umubare w'imirongo:" + +#: libdialogpages/viewpage.cpp:86 #, fuzzy -msgid "" -"Disables the check for automatically finding the original file(s) when using " -"'-' as URL with the -o option." -msgstr "" -"i Kugenzura ya: mu buryo bwikora: i ~Umwimerere Idosiye ( S ) Ryari: ikoresha " -"' - ' Nka Na: i - o Ihitamo . " +msgid "Tabs to Spaces" +msgstr "Kuri " -#: main.cpp:43 +#: libdialogpages/viewpage.cpp:90 #, fuzzy -msgid "" -"Use this to specify the encoding when calling it from the command line. It will " -"default to the local encoding if not specified." +msgid "Number of spaces to convert a tab character to:" +msgstr "Bya Imyanya Kuri GUHINDURA A tab Inyuguti: Kuri : " + +#: libdialogpages/viewpage.cpp:97 +msgid "A&ppearance" +msgstr "Imigaragarire" + +#: libdialogpages/viewpage.cpp:104 +#, fuzzy +msgid "Text Font" +msgstr "Imiterere y'umwandiko" + +#: libdialogpages/viewpage.cpp:108 +msgid "Font:" +msgstr "Imyandikire:" + +#: libdialogpages/viewpage.cpp:112 +msgid "Size:" +msgstr "Ingano:" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Ibyahisemo" + +#: komparepart/kompareprefdlg.cpp:39 +#, fuzzy +msgid "View Settings" +msgstr "Amagenamiterere y'Igaragaza ry'Urutonde" + +#: komparepart/kompareprefdlg.cpp:43 +#, fuzzy +msgid "Diff Settings" +msgstr "Amagenamiterere nyamubyimba" + +#: komparepart/kompare_part.cpp:165 +#, fuzzy +msgid "Save &All" +msgstr "Gushyingura Byose" + +#: komparepart/kompare_part.cpp:168 +#, fuzzy +msgid "Save .&diff..." +msgstr "Kubika." + +#: komparepart/kompare_part.cpp:171 +#, fuzzy +msgid "Swap Source with Destination" +msgstr "Na: " + +#: komparepart/kompare_part.cpp:174 +#, fuzzy +msgid "Show Statistics" +msgstr "Sitatisitiki" + +#: komparepart/kompare_part.cpp:269 +#, fuzzy +msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" +msgstr "<qt> <b> %1 </b> Yimuwe . </qt> " + +#: komparepart/kompare_part.cpp:281 +#, fuzzy +msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" +msgstr "<qt> <b> %1 </b> OYA ku Sisitemu . </qt> " + +#: komparepart/kompare_part.cpp:425 +#, fuzzy +msgid "Diff Options" +msgstr "Guhitamo" + +#: komparepart/kompare_part.cpp:443 +#, fuzzy +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.DIF." + +#: komparepart/kompare_part.cpp:443 +#, fuzzy +msgid "Save .diff" +msgstr "Kubika." + +#: komparepart/kompare_part.cpp:446 +#, fuzzy +msgid "The file exists or is write-protected; do you want to overwrite it?" +msgstr "Idosiye Cyangwa ni Kwandika - Birinzwe ; Kuri Guhindura ? " + +#: komparepart/kompare_part.cpp:446 +#, fuzzy +msgid "File Exists" +msgstr "Idosiye " + +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Gusimbuza" + +#: komparepart/kompare_part.cpp:446 +#, fuzzy +msgid "Do Not Overwrite" +msgstr "Gusimbuza " + +#: komparepart/kompare_part.cpp:481 +#, fuzzy +msgid "KomparePart" +msgstr "Igice Kate " + +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." msgstr "" -"iyi Kuri Kugaragaza i Imisobekere: Ryari: Kuva: i command Umurongo: . Mburabuzi " -"Kuri i Bya hafi Imisobekere: NIBA OYA . " -#: main.cpp:52 +#: komparepart/kompare_part.cpp:496 #, fuzzy -msgid "Kompare" -msgstr "Kugereranya" +msgid "Parsing diff output..." +msgstr "Ibisohoka ... " -#: main.cpp:54 +#: komparepart/kompare_part.cpp:545 #, fuzzy -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "( C ) - , na " +msgid "Comparing file %1 with file %2" +msgstr "Idosiye %1 Na: Idosiye %2 " -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Umwanditsi" +#: komparepart/kompare_part.cpp:550 +#, fuzzy +msgid "Comparing files in %1 with files in %2" +msgstr "Idosiye in %1 Na: Idosiye in %2 " -#: main.cpp:57 +#: komparepart/kompare_part.cpp:555 +#, fuzzy, c-format +msgid "Viewing diff output from %1" +msgstr "Ibisohoka Kuva: %1 " + +#: komparepart/kompare_part.cpp:558 #, fuzzy -msgid "Kompare icon artist" -msgstr "Agashushondanga Umuhanzi " +msgid "Blending diff output from %1 into file %2" +msgstr "Ibisohoka Kuva: %1 Idosiye %2 " -#: main.cpp:58 +#: komparepart/kompare_part.cpp:563 #, fuzzy -msgid "A lot of good advice" -msgstr "A Bya " +msgid "Blending diff output from %1 into folder %2" +msgstr "Ibisohoka Kuva: %1 Ububiko... %2 " -#: main.cpp:59 +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 #, fuzzy -msgid "Cervisia diff viewer" -msgstr "Ushinzwe kureba Impamyabushobozi" +msgid "" +"You have made changes to the destination file(s).\n" +"Would you like to save them?" +msgstr "" +"Amahinduka Kuri i Ishyika: Idosiye ( S ) . \n" +"nka Kuri Kubika ? " -#: main.cpp:189 +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 #, fuzzy -msgid "Compare these files or folder" -msgstr "Idosiye Cyangwa Ububiko... " +msgid "Save Changes?" +msgstr "Kubika ? " + +#: komparepart/kompare_part.cpp:667 +#, fuzzy +msgid "" +"No diff file, or no 2 files have been diffed. Therefore no stats are available." +msgstr "Idosiye , Cyangwa Oya 2 Idosiye . Oya stats Bihari . " + +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 +#, fuzzy +msgid "Diff Statistics" +msgstr "Sitatisitiki" + +#: komparepart/kompare_part.cpp:673 +#, fuzzy +msgid "" +"Statistics:\n" +"\n" +"Old file: %1\n" +"New file: %2\n" +"\n" +"Format: %3\n" +"Number of hunks: %4\n" +"Number of differences: %5" +msgstr "" +": \n" +"\n" +"Idosiye : %1 \n" +"Idosiye : %2 \n" +"\n" +": %3 \n" +"Bya : %4 \n" +"Bya Ibinyuranyo : %5 " + +#: komparepart/kompare_part.cpp:686 +#, fuzzy +msgid "" +"Statistics:\n" +"\n" +"Number of files in diff file: %1\n" +"Format: %2\n" +"\n" +"Current old file: %3\n" +"Current new file: %4\n" +"\n" +"Number of hunks: %5\n" +"Number of differences: %6" +msgstr "" +": \n" +"\n" +"Bya Idosiye in Idosiye : %1 \n" +": %2 \n" +"\n" +"ki/bishaje Idosiye : %3 \n" +"Gishya Idosiye : %4 \n" +"\n" +"Bya : %5 \n" +"Bya Ibinyuranyo : %6 " |