From 3e7df269d0947f32e0fdde56619adc440c5440d0 Mon Sep 17 00:00:00 2001 From: TDE Weblate Date: Mon, 31 Dec 2018 19:04:42 +0000 Subject: Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: tdesdk/kompare Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/tdesdk/kompare/ (cherry picked from commit 364e0ab2be9e2a9808bf801fec4ac41896d851cd) --- tde-i18n-rw/messages/tdesdk/kompare.po | 1236 ++++++++++++++++---------------- 1 file changed, 632 insertions(+), 604 deletions(-) (limited to 'tde-i18n-rw/messages/tdesdk') diff --git a/tde-i18n-rw/messages/tdesdk/kompare.po b/tde-i18n-rw/messages/tdesdk/kompare.po index ff3c4fb2d1c..9ea69d216f1 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 12:05-0500\n" +"POT-Creation-Date: 2018-12-31 18:49+0100\n" "PO-Revision-Date: 2005-05-25 18:11-0600\n" "Last-Translator: Steve Murphy \n" "Language-Team: Kinyarwanda \n" @@ -24,607 +24,523 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libdiff2/komparemodellist.cpp:61 -#, fuzzy -msgid "&Apply Difference" -msgstr "Ikinyuranyo/Itandukaniro" +#: _translatorinfo:1 +msgid "" +"_: NAME OF TRANSLATORS\n" +"Your names" +msgstr "" +"Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien " +"NSENGIYUMVA" -#: libdiff2/komparemodellist.cpp:64 +#: _translatorinfo:2 +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 "Un&apply Difference" -msgstr "Ikinyuranyo/Itandukaniro" +msgid "Could not find our KompareViewPart." +msgstr "OYA Gushaka . " -#: libdiff2/komparemodellist.cpp:67 +#: kompare_shell.cpp:106 #, fuzzy -msgid "App&ly All" -msgstr "Gushyira Hose" +msgid "Could not load our KompareViewPart." +msgstr "OYA Ibirimo . " -#: libdiff2/komparemodellist.cpp:70 +#: kompare_shell.cpp:114 #, fuzzy -msgid "&Unapply All" -msgstr "Gusubiza Byose" +msgid "Could not find our KompareNavigationPart." +msgstr "OYA Gushaka . " -#: libdiff2/komparemodellist.cpp:73 +#: kompare_shell.cpp:138 #, fuzzy -msgid "P&revious File" -msgstr "Idosiye " +msgid "Could not load our KompareNavigationPart." +msgstr "OYA Ibirimo . " -#: libdiff2/komparemodellist.cpp:76 +#: kompare_shell.cpp:233 #, fuzzy -msgid "N&ext File" -msgstr "Idosiye " +msgid "&Open Diff..." +msgstr "Gufungura ... " -#: libdiff2/komparemodellist.cpp:79 +#: kompare_shell.cpp:234 #, fuzzy -msgid "&Previous Difference" -msgstr "Kureba Ikinyuranyo" +msgid "&Compare Files..." +msgstr "Gukoporora &Amadosiye..." -#: libdiff2/komparemodellist.cpp:82 +#: kompare_shell.cpp:237 #, fuzzy -msgid "&Next Difference" -msgstr "Kureba Ikinyuranyo" +msgid "&Blend URL with Diff..." +msgstr "Na: ... " -#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 +#: kompare_shell.cpp:246 #, fuzzy -msgid "" -"No models or no differences, this file: %1" -", is not a valid diff file." -msgstr "" -" Ingerofatizo Cyangwa Oya Ibinyuranyo , iyi Idosiye : %1 " -", ni OYA A Byemewe Idosiye . " +msgid "Show T&ext View" +msgstr "Igaragaza rigufi" -#: libdiff2/komparemodellist.cpp:246 +#: kompare_shell.cpp:248 #, fuzzy -msgid "" -"There were problems applying the diff %1 to the file %2." -msgstr " i %1 Kuri i Idosiye %2 . " +msgid "Hide T&ext View" +msgstr "Name=Igaragaza Umwandiko" -#: libdiff2/komparemodellist.cpp:271 +#: kompare_shell.cpp:257 #, fuzzy -msgid "" -"There were problems applying the diff %1 to the folder %2" -"." -msgstr " i %1 Kuri i Ububiko... %2 . " +msgid " 0 of 0 differences " +msgstr "0 %S Bya 0 %S Ibinyuranyo " -#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 +#: kompare_shell.cpp:258 #, fuzzy -msgid "Could not open a temporary file." -msgstr "OYA Gufungura A By'igihe gito Idosiye . " +msgid " 0 of 0 files " +msgstr "0 %S Bya 0 %S Idosiye " -#: libdiff2/komparemodellist.cpp:350 +#: kompare_shell.cpp:273 #, fuzzy -msgid "Could not write to the temporary file %1, deleting it." +msgid "" +"_n: %1 of %n file \n" +" %1 of %n files " msgstr "" -" OYA Kwandika Kuri i By'igihe gito Idosiye %1 , Gusiba . " +"%1 Bya %n Idosiye \n" +"%1 Bya %n Idosiye " -#: libdiff2/komparemodellist.cpp:368 -#, fuzzy +#: kompare_shell.cpp:275 +#, fuzzy, c-format msgid "" -"Could not create destination directory %1.\n" -"The file has not been saved." +"_n: %n file \n" +" %n files " msgstr "" -" OYA Kurema Ishyika: Ububiko %1 . \n" -"Idosiye OYA . " +"%n Idosiye \n" +"%n Idosiye " -#: libdiff2/komparemodellist.cpp:383 +#: kompare_shell.cpp:278 #, fuzzy msgid "" -"Could not upload the temporary file to the destination location %1" -". The temporary file is still available under: %2" -". You can manually copy it to the right place." +"_n: %1 of %n difference, %2 applied \n" +" %1 of %n differences, %2 applied " msgstr "" -" OYA Gushyiraho i By'igihe gito Idosiye Kuri i Ishyika: Indanganturo " -"%1 . By'igihe gito Idosiye ni Bihari : %2 " -". N'intoki Gukoporora Kuri i Iburyo: . " +"%1 Bya %n Ikinyuranyo/Itandukaniro , %2 Byashyizweho \n" +"%1 Bya %n Ibinyuranyo , %2 Byashyizweho " -#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 -#, fuzzy -msgid "Could not parse diff output." -msgstr "OYA Ibisohoka . " +#: kompare_shell.cpp:281 +#, fuzzy, c-format +msgid "" +"_n: %n difference \n" +" %n differences " +msgstr "" +"%n Ikinyuranyo/Itandukaniro \n" +"%n Ibinyuranyo " -#: libdiff2/komparemodellist.cpp:451 +#: kompare_shell.cpp:369 #, fuzzy -msgid "The files are identical." -msgstr "Idosiye birasa . " +msgid "Blend File/Folder with diff Output" +msgstr "Idosiye /Na: " -#: libdiff2/komparemodellist.cpp:613 +#: kompare_shell.cpp:370 #, fuzzy -msgid "Could not write to the temporary file." -msgstr "OYA Kwandika Kuri i By'igihe gito Idosiye . " +msgid "File/Folder" +msgstr "Idosiye /" -#. i18n: file komparepart/komparepartui.rc line 13 -#: rc.cpp:15 -#, fuzzy, no-c-format -msgid "&Difference" -msgstr "Ikinyuranyo/ Itandukaniro" +#: kompare_shell.cpp:371 +#, fuzzy +msgid "Diff Output" +msgstr "Ibisohoka" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 41 -#: rc.cpp:21 -#, no-c-format -msgid "Run Diff In" -msgstr "" +#: kompare_shell.cpp:373 +#, fuzzy +msgid "Blend" +msgstr "impera" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 84 -#: rc.cpp:24 -#, fuzzy, no-c-format -msgid "Command Line" -msgstr "Komandi" +#: kompare_shell.cpp:373 +#, fuzzy +msgid "Blend this file or folder with the diff output" +msgstr "iyi Idosiye Cyangwa Ububiko... Na: i Ibisohoka " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 108 -#: rc.cpp:27 -#, fuzzy, no-c-format -msgid "cd dir && diff -udHprNa -- source destination" -msgstr "& & - - - Inkomoko Ishyika: " +#: 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 . " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 135 -#: rc.cpp:33 -#, fuzzy, no-c-format -msgid "Look for smaller changes" -msgstr "ya: Gitoya Amahinduka " +#: kompare_shell.cpp:398 main.cpp:185 +#, fuzzy +msgid "Compare Files or Folders" +msgstr "Cyangwa " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 146 -#: rc.cpp:36 -#, fuzzy, no-c-format -msgid "Optimize for large files" -msgstr "ya: Kinini Idosiye " +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "Inkomoko" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 157 -#: rc.cpp:39 -#, fuzzy, no-c-format -msgid "Ignore changes in case" -msgstr "Amahinduka in " +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "Ishyika" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 165 -#: rc.cpp:42 -#, fuzzy, no-c-format -msgid "Expand tabs to spaces" -msgstr "Amasimbuka Kuri Imyanya " +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "Kugereranya" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 173 -#: rc.cpp:45 -#, fuzzy, no-c-format -msgid "Ignore added or removed empty lines" -msgstr "Kyongewe Cyangwa Cyavanyweho ubusa Imirongo " +#: kompare_shell.cpp:402 +#, fuzzy +msgid "Compare these files or folders" +msgstr "Idosiye Cyangwa Ububiko " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 181 -#: rc.cpp:48 -#, fuzzy, no-c-format -msgid "Ignore changes in whitespace" -msgstr "Amahinduka in " +#: 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 . " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 189 -#: rc.cpp:51 -#, fuzzy, no-c-format -msgid "Show function names" -msgstr "Umumaro Amazina " +#: kompare_shell.cpp:439 +#, fuzzy +msgid "Text View" +msgstr "Kugaragaza Ibikurikira" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 200 -#: rc.cpp:54 -#, fuzzy, no-c-format -msgid "Compare folders recursively" -msgstr "Ububiko " +#: komparenavtreepart/komparenavtreepart.cpp:61 +#, fuzzy +msgid "Source Folder" +msgstr "Idosiye y'Ishungura" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 211 -#: rc.cpp:57 -#, fuzzy, no-c-format -msgid "Treat new files as empty" -msgstr "Gishya Idosiye Nka ubusa " +#: komparenavtreepart/komparenavtreepart.cpp:66 +msgid "Destination Folder" +msgstr "Ububiko bw'Ishyika" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 227 -#: rc.cpp:60 -#, no-c-format -msgid "Format" -msgstr "Imiterere" +#: komparenavtreepart/komparenavtreepart.cpp:71 +#, fuzzy +msgid "Source File" +msgstr "Idosiye nkomoko" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 244 -#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63 -#, no-c-format -msgid "Context" -msgstr "urwego rw'imyumvire, rw'imivugirwe" +#: komparenavtreepart/komparenavtreepart.cpp:72 +#, fuzzy +msgid "Destination File" +msgstr "Amerekezo- Nyandiko" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 252 -#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66 -#, fuzzy, no-c-format -msgid "Ed" -msgstr "Impera" +#: komparenavtreepart/komparenavtreepart.cpp:78 +#, fuzzy +msgid "Source Line" +msgstr "Idosiye nkomoko" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 260 -#: komparepart/kompare_part.cpp:647 libdialogpages/diffpage.cpp:241 rc.cpp:69 -#, no-c-format -msgid "Normal" -msgstr "Bisanzwe" +#: komparenavtreepart/komparenavtreepart.cpp:79 +#, fuzzy +msgid "Destination Line" +msgstr "Amerekezo-Nyandiko" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 268 -#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72 -#, fuzzy, no-c-format -msgid "RCS" -msgstr "COS" +#: komparenavtreepart/komparenavtreepart.cpp:80 +msgid "Difference" +msgstr "Ikinyuranyo/Itandukaniro" -#. i18n: file komparepart/komparesaveoptionsbase.ui line 276 -#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75 -#, fuzzy, no-c-format -msgid "Unified" -msgstr "Bitarangira" - -#. i18n: file komparepart/komparesaveoptionsbase.ui line 287 -#: rc.cpp:78 -#, fuzzy, no-c-format -msgid "Side-by-side" -msgstr "- ku - " +#: 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 " -#. i18n: file komparepart/komparesaveoptionsbase.ui line 312 -#: libdialogpages/diffpage.cpp:251 rc.cpp:81 -#, fuzzy, no-c-format -msgid "Number of context lines:" -msgstr "Bya Imvugiro Imirongo : " +#: komparenavtreepart/komparenavtreepart.cpp:429 +#, fuzzy, c-format +msgid "" +"_n: Changed %n line\n" +"Changed %n lines" +msgstr "%n %n Imirongo " -#: main.cpp:33 -#, fuzzy +#: komparenavtreepart/komparenavtreepart.cpp:434 +#, fuzzy, c-format 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 " +"_n: Applied: Insertion of %n line undone\n" +"Applied: Insertion of %n lines undone" +msgstr ": Bya %n Umurongo: : Bya %n Imirongo " -#: main.cpp:39 -#, fuzzy -msgid "This will compare URL1 with URL2" -msgstr "Kugereranya # Na: " +#: komparenavtreepart/komparenavtreepart.cpp:437 +#, fuzzy, c-format +msgid "" +"_n: Inserted %n line\n" +"Inserted %n lines" +msgstr "%n %n Imirongo " -#: main.cpp:40 -#, fuzzy +#: komparenavtreepart/komparenavtreepart.cpp:442 +#, fuzzy, c-format 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 . " +"_n: Applied: Deletion of %n line undone\n" +"Applied: Deletion of %n lines undone" +msgstr ": Bya %n Umurongo: : Bya %n Imirongo " -#: main.cpp:41 -#, fuzzy +#: komparenavtreepart/komparenavtreepart.cpp:445 +#, fuzzy, c-format 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. " +"_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 "" -", ni Ikitezwe: $(ARG1) Kuri Ibisohoka na i Idosiye Cyangwa Ububiko... i Kuri . " -#: main.cpp:42 +#: komparepart/kompare_part.cpp:165 #, 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 "Save &All" +msgstr "Gushyingura Byose" -#: main.cpp:43 +#: komparepart/kompare_part.cpp:168 #, 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." -msgstr "" -"iyi Kuri Kugaragaza i Imisobekere: Ryari: Kuva: i command Umurongo: . Mburabuzi " -"Kuri i Bya hafi Imisobekere: NIBA OYA . " +msgid "Save .&diff..." +msgstr "Kubika." -#: main.cpp:52 +#: komparepart/kompare_part.cpp:171 #, fuzzy -msgid "Kompare" -msgstr "Kugereranya" +msgid "Swap Source with Destination" +msgstr "Na: " -#: main.cpp:54 +#: komparepart/kompare_part.cpp:174 #, fuzzy -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "( C ) - , na " +msgid "Show Statistics" +msgstr "Sitatisitiki" -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "Umwanditsi" +#: komparepart/kompare_part.cpp:269 +#, fuzzy +msgid "The URL %1 cannot be downloaded." +msgstr " %1 Yimuwe . " -#: main.cpp:57 +#: komparepart/kompare_part.cpp:281 #, fuzzy -msgid "Kompare icon artist" -msgstr "Agashushondanga Umuhanzi " +msgid "The URL %1 does not exist on your system." +msgstr " %1 OYA ku Sisitemu . " -#: main.cpp:58 +#: komparepart/kompare_part.cpp:425 #, fuzzy -msgid "A lot of good advice" -msgstr "A Bya " +msgid "Diff Options" +msgstr "Guhitamo" -#: main.cpp:59 +#: komparepart/kompare_part.cpp:443 #, fuzzy -msgid "Cervisia diff viewer" -msgstr "Ushinzwe kureba Impamyabushobozi" +msgid "*.diff *.dif *.patch|Patch Files" +msgstr "*.DIF." -#: kompare_shell.cpp:398 main.cpp:185 +#: komparepart/kompare_part.cpp:443 #, fuzzy -msgid "Compare Files or Folders" -msgstr "Cyangwa " +msgid "Save .diff" +msgstr "Kubika." -#: kompare_shell.cpp:399 main.cpp:186 -msgid "Source" -msgstr "Inkomoko" +#: 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 ? " -#: kompare_shell.cpp:400 main.cpp:187 -msgid "Destination" -msgstr "Ishyika" +#: komparepart/kompare_part.cpp:446 +#, fuzzy +msgid "File Exists" +msgstr "Idosiye " -#: kompare_shell.cpp:402 main.cpp:189 -msgid "Compare" -msgstr "Kugereranya" +#: komparepart/kompare_part.cpp:446 +msgid "Overwrite" +msgstr "Gusimbuza" -#: main.cpp:189 +#: komparepart/kompare_part.cpp:446 #, fuzzy -msgid "Compare these files or folder" -msgstr "Idosiye Cyangwa Ububiko... " +msgid "Do Not Overwrite" +msgstr "Gusimbuza " -#: kompare_shell.cpp:402 main.cpp:189 +#: komparepart/kompare_part.cpp:481 #, 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 . " - -#: _translatorinfo.cpp:1 -msgid "" -"_: NAME OF TRANSLATORS\n" -"Your names" -msgstr "" -"Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien " -"NSENGIYUMVA" +msgid "KomparePart" +msgstr "Igice Kate " -#: _translatorinfo.cpp:3 -msgid "" -"_: EMAIL OF TRANSLATORS\n" -"Your emails" +#: komparepart/kompare_part.cpp:493 +msgid "Running diff..." msgstr "" -"muvia1@yahoo.fr, ngenda_denis@yahoo.co.uk, akiberwa@yahoo.co.uk, " -"ndonatienuk@yahoo.co.uk" -#: kompare_shell.cpp:77 +#: komparepart/kompare_part.cpp:496 #, fuzzy -msgid "Could not find our KompareViewPart." -msgstr "OYA Gushaka . " +msgid "Parsing diff output..." +msgstr "Ibisohoka ... " -#: kompare_shell.cpp:106 +#: komparepart/kompare_part.cpp:545 #, fuzzy -msgid "Could not load our KompareViewPart." -msgstr "OYA Ibirimo . " +msgid "Comparing file %1 with file %2" +msgstr "Idosiye %1 Na: Idosiye %2 " -#: kompare_shell.cpp:114 +#: komparepart/kompare_part.cpp:550 #, fuzzy -msgid "Could not find our KompareNavigationPart." -msgstr "OYA Gushaka . " +msgid "Comparing files in %1 with files in %2" +msgstr "Idosiye in %1 Na: Idosiye in %2 " -#: kompare_shell.cpp:138 -#, fuzzy -msgid "Could not load our KompareNavigationPart." -msgstr "OYA Ibirimo . " +#: komparepart/kompare_part.cpp:555 +#, fuzzy, c-format +msgid "Viewing diff output from %1" +msgstr "Ibisohoka Kuva: %1 " -#: kompare_shell.cpp:233 +#: komparepart/kompare_part.cpp:558 #, fuzzy -msgid "&Open Diff..." -msgstr "Gufungura ... " +msgid "Blending diff output from %1 into file %2" +msgstr "Ibisohoka Kuva: %1 Idosiye %2 " -#: kompare_shell.cpp:234 +#: komparepart/kompare_part.cpp:563 #, fuzzy -msgid "&Compare Files..." -msgstr "Gukoporora &Amadosiye..." +msgid "Blending diff output from %1 into folder %2" +msgstr "Ibisohoka Kuva: %1 Ububiko... %2 " -#: kompare_shell.cpp:237 +#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709 #, fuzzy -msgid "&Blend URL with Diff..." -msgstr "Na: ... " +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 ? " -#: kompare_shell.cpp:246 +#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 #, fuzzy -msgid "Show T&ext View" -msgstr "Igaragaza rigufi" +msgid "Save Changes?" +msgstr "Kubika ? " -#: kompare_shell.cpp:248 -#, fuzzy -msgid "Hide T&ext View" -msgstr "Name=Igaragaza Umwandiko" +#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276 +#: libdialogpages/diffpage.cpp:244 +#, fuzzy, no-c-format +msgid "Unified" +msgstr "Bitarangira" -#: kompare_shell.cpp:257 -#, fuzzy -msgid " 0 of 0 differences " -msgstr "0 %S Bya 0 %S Ibinyuranyo " +#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244 +#: libdialogpages/diffpage.cpp:238 +#, no-c-format +msgid "Context" +msgstr "urwego rw'imyumvire, rw'imivugirwe" -#: kompare_shell.cpp:258 -#, fuzzy -msgid " 0 of 0 files " -msgstr "0 %S Bya 0 %S Idosiye " +#: komparepart/kompare_part.cpp:641 komparepart/komparesaveoptionsbase.ui:268 +#: libdialogpages/diffpage.cpp:242 +#, fuzzy, no-c-format +msgid "RCS" +msgstr "COS" -#: kompare_shell.cpp:273 +#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252 +#: libdialogpages/diffpage.cpp:239 +#, fuzzy, no-c-format +msgid "Ed" +msgstr "Impera" + +#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260 +#: libdialogpages/diffpage.cpp:241 +#, no-c-format +msgid "Normal" +msgstr "Bisanzwe" + +#: komparepart/kompare_part.cpp:667 #, 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 " +"No diff file, or no 2 files have been diffed. Therefore no stats are " +"available." +msgstr "Idosiye , Cyangwa Oya 2 Idosiye . Oya stats Bihari . " -#: kompare_shell.cpp:278 +#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 +#: komparepart/kompare_part.cpp:698 #, 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 " +msgid "Diff Statistics" +msgstr "Sitatisitiki" -#: kompare_shell.cpp:281 -#, fuzzy, c-format +#: komparepart/kompare_part.cpp:673 +#, fuzzy msgid "" -"_n: %n difference \n" -" %n differences " +"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 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 " +": \n" +"\n" +"Idosiye : %1 \n" +"Idosiye : %2 \n" +"\n" +": %3 \n" +"Bya : %4 \n" +"Bya Ibinyuranyo : %5 " -#: kompare_shell.cpp:373 +#: komparepart/kompare_part.cpp:686 #, 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. " +"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 "" -"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 . " +": \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 " -#: kompare_shell.cpp:402 -#, fuzzy -msgid "Compare these files or folders" -msgstr "Idosiye Cyangwa Ububiko " +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "Ibyahisemo" -#: kompare_shell.cpp:439 +#: komparepart/kompareprefdlg.cpp:39 #, fuzzy -msgid "Text View" +msgid "View" msgstr "Kugaragaza Ibikurikira" -#: 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 +#: komparepart/kompareprefdlg.cpp:39 #, fuzzy -msgid "Source File" -msgstr "Idosiye nkomoko" +msgid "View Settings" +msgstr "Amagenamiterere y'Igaragaza ry'Urutonde" -#: komparenavtreepart/komparenavtreepart.cpp:72 -#, fuzzy -msgid "Destination File" -msgstr "Amerekezo- Nyandiko" +#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 +msgid "Diff" +msgstr "" -#: komparenavtreepart/komparenavtreepart.cpp:78 +#: komparepart/kompareprefdlg.cpp:43 #, fuzzy -msgid "Source Line" -msgstr "Idosiye nkomoko" +msgid "Diff Settings" +msgstr "Amagenamiterere nyamubyimba" -#: komparenavtreepart/komparenavtreepart.cpp:79 +#: kompareurldialog.cpp:41 #, 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 "" +msgid "Files" +msgstr "&Amadosiye" #: 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 "Appearance" +msgstr "Imigaragarire" + #: kompareurldialog.cpp:53 #, fuzzy msgid "Here you can change the options for the view." @@ -642,8 +558,8 @@ msgid "" "program does not support all the options that the GNU version does. This way " "you can select that version." msgstr "" -"Guhitamo A Porogaramu . i Bisanzwe Porogaramu OYA Gushigikira Byose i Amahitamo " -"i Verisiyo . Guhitamo Verisiyo . " +"Guhitamo A Porogaramu . i Bisanzwe Porogaramu OYA Gushigikira Byose i " +"Amahitamo i Verisiyo . Guhitamo Verisiyo . " #: libdialogpages/diffpage.cpp:221 #, fuzzy @@ -658,18 +574,23 @@ msgstr "Ibisohoka imiterere:" #: libdialogpages/diffpage.cpp:233 #, fuzzy msgid "" -"Select the format of the output generated by diff. Unified is the one that is " -"used most frequently because it is very readable. The TDE developers like this " -"format the best so use it for sending patches." +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it is very readable. The TDE developers like " +"this format the best so use it for sending patches." msgstr "" -"i Imiterere Bya i Ibisohoka ku . ni i Rimwe ni Byakoreshejwe ni . MukusanyaTDE " -"nka iyi Imiterere i Bihebuje Koresha ya: . " +"i Imiterere Bya i Ibisohoka ku . ni i Rimwe ni Byakoreshejwe ni . " +"MukusanyaTDE nka iyi Imiterere i Bihebuje Koresha ya: . " #: libdialogpages/diffpage.cpp:247 #, fuzzy msgid "Lines of Context" msgstr "Bya " +#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251 +#, fuzzy, no-c-format +msgid "Number of context lines:" +msgstr "Bya Imvugiro Imirongo : " + #: libdialogpages/diffpage.cpp:253 #, fuzzy msgid "" @@ -812,8 +733,8 @@ msgstr "Idosiye Kuri " #: libdialogpages/diffpage.cpp:330 #, fuzzy msgid "" -"If this is checked you can enter a shell pattern in the text box on the right " -"or select entries from the list." +"If this is checked you can enter a shell pattern in the text box on the " +"right or select entries from the list." msgstr "" "iyi ni Ivivuwe Injiza A Igikonoshwa Ishusho in i Umwandiko Agasanduku ku i " "Iburyo: Cyangwa Guhitamo Ibyinjijwe Kuva: i Urutonde . " @@ -821,8 +742,8 @@ msgstr "" #: libdialogpages/diffpage.cpp:332 #, fuzzy msgid "" -"Here you can enter or remove a shell pattern or select one or more entries from " -"the list." +"Here you can enter or remove a shell pattern or select one or more entries " +"from the list." msgstr "" "Injiza Cyangwa Gukuraho A Igikonoshwa Ishusho Cyangwa Guhitamo Rimwe Cyangwa " "Birenzeho Ibyinjijwe Kuva: i Urutonde . " @@ -842,16 +763,16 @@ msgstr "" #: libdialogpages/diffpage.cpp:342 #, fuzzy msgid "" -"Here you can enter the URL of a file with shell patterns to ignore during the " -"comparison of the folders." +"Here you can enter the URL of a file with shell patterns to ignore during " +"the comparison of the folders." msgstr "" "Injiza i Bya A Idosiye Na: Igikonoshwa Imitako Kuri Kureka i Bya i Ububiko . " #: libdialogpages/diffpage.cpp:344 #, fuzzy msgid "" -"Any file you select in the dialog that pops up when you click it will be put in " -"the dialog to the left of this button." +"Any file you select in the dialog that pops up when you click it will be put " +"in the dialog to the left of this button." msgstr "" "Idosiye Guhitamo in i Ikiganiro Hejuru Ryari: Kanda Gushyira in i Ikiganiro " "Kuri i Ibumoso: Bya iyi Akabuto . " @@ -928,191 +849,298 @@ msgstr "Imyandikire:" msgid "Size:" msgstr "Ingano:" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "Ibyahisemo" - -#: komparepart/kompareprefdlg.cpp:39 +#: libdialogpages/viewpage.cpp:119 #, fuzzy -msgid "View Settings" -msgstr "Amagenamiterere y'Igaragaza ry'Urutonde" +msgid "&Fonts" +msgstr "Imyandikire:" -#: komparepart/kompareprefdlg.cpp:43 +#: libdiff2/komparemodellist.cpp:61 #, fuzzy -msgid "Diff Settings" -msgstr "Amagenamiterere nyamubyimba" +msgid "&Apply Difference" +msgstr "Ikinyuranyo/Itandukaniro" -#: komparepart/kompare_part.cpp:165 +#: libdiff2/komparemodellist.cpp:64 #, fuzzy -msgid "Save &All" -msgstr "Gushyingura Byose" +msgid "Un&apply Difference" +msgstr "Ikinyuranyo/Itandukaniro" -#: komparepart/kompare_part.cpp:168 +#: libdiff2/komparemodellist.cpp:67 #, fuzzy -msgid "Save .&diff..." -msgstr "Kubika." +msgid "App&ly All" +msgstr "Gushyira Hose" -#: komparepart/kompare_part.cpp:171 +#: libdiff2/komparemodellist.cpp:70 #, fuzzy -msgid "Swap Source with Destination" -msgstr "Na: " +msgid "&Unapply All" +msgstr "Gusubiza Byose" -#: komparepart/kompare_part.cpp:174 +#: libdiff2/komparemodellist.cpp:73 #, fuzzy -msgid "Show Statistics" -msgstr "Sitatisitiki" +msgid "P&revious File" +msgstr "Idosiye " -#: komparepart/kompare_part.cpp:269 +#: libdiff2/komparemodellist.cpp:76 #, fuzzy -msgid "The URL %1 cannot be downloaded." -msgstr " %1 Yimuwe . " +msgid "N&ext File" +msgstr "Idosiye " -#: komparepart/kompare_part.cpp:281 +#: libdiff2/komparemodellist.cpp:79 #, fuzzy -msgid "The URL %1 does not exist on your system." -msgstr " %1 OYA ku Sisitemu . " +msgid "&Previous Difference" +msgstr "Kureba Ikinyuranyo" -#: komparepart/kompare_part.cpp:425 +#: libdiff2/komparemodellist.cpp:82 #, fuzzy -msgid "Diff Options" -msgstr "Guhitamo" +msgid "&Next Difference" +msgstr "Kureba Ikinyuranyo" -#: komparepart/kompare_part.cpp:443 +#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262 #, fuzzy -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.DIF." +msgid "" +"No models or no differences, this file: %1, is not a valid diff " +"file." +msgstr "" +" Ingerofatizo Cyangwa Oya Ibinyuranyo , iyi Idosiye : %1 , ni " +"OYA A Byemewe Idosiye . " -#: komparepart/kompare_part.cpp:443 +#: libdiff2/komparemodellist.cpp:246 #, fuzzy -msgid "Save .diff" -msgstr "Kubika." +msgid "" +"There were problems applying the diff %1 to the file %2." +msgstr " i %1 Kuri i Idosiye %2 . " -#: komparepart/kompare_part.cpp:446 +#: libdiff2/komparemodellist.cpp:271 #, fuzzy -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "Idosiye Cyangwa ni Kwandika - Birinzwe ; Kuri Guhindura ? " +msgid "" +"There were problems applying the diff %1 to the folder %2." +"" +msgstr " i %1 Kuri i Ububiko... %2 . " -#: komparepart/kompare_part.cpp:446 +#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582 #, fuzzy -msgid "File Exists" -msgstr "Idosiye " - -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "Gusimbuza" +msgid "Could not open a temporary file." +msgstr "OYA Gufungura A By'igihe gito Idosiye . " -#: komparepart/kompare_part.cpp:446 +#: libdiff2/komparemodellist.cpp:350 #, fuzzy -msgid "Do Not Overwrite" -msgstr "Gusimbuza " +msgid "Could not write to the temporary file %1, deleting it." +msgstr "" +" OYA Kwandika Kuri i By'igihe gito Idosiye %1 , Gusiba . " -#: komparepart/kompare_part.cpp:481 +#: libdiff2/komparemodellist.cpp:368 #, fuzzy -msgid "KomparePart" -msgstr "Igice Kate " +msgid "" +"Could not create destination directory %1.\n" +"The file has not been saved." +msgstr "" +" OYA Kurema Ishyika: Ububiko %1 . \n" +"Idosiye OYA . " -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." +#: libdiff2/komparemodellist.cpp:383 +#, fuzzy +msgid "" +"Could not upload the temporary file to the destination location %1. The temporary file is still available under: %2. You can manually " +"copy it to the right place." msgstr "" +" OYA Gushyiraho i By'igihe gito Idosiye Kuri i Ishyika: Indanganturo " +"%1 . By'igihe gito Idosiye ni Bihari : %2 . N'intoki " +"Gukoporora Kuri i Iburyo: . " -#: komparepart/kompare_part.cpp:496 +#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548 #, fuzzy -msgid "Parsing diff output..." -msgstr "Ibisohoka ... " +msgid "Could not parse diff output." +msgstr "OYA Ibisohoka . " -#: komparepart/kompare_part.cpp:545 +#: libdiff2/komparemodellist.cpp:451 #, fuzzy -msgid "Comparing file %1 with file %2" -msgstr "Idosiye %1 Na: Idosiye %2 " +msgid "The files are identical." +msgstr "Idosiye birasa . " -#: komparepart/kompare_part.cpp:550 +#: libdiff2/komparemodellist.cpp:613 #, fuzzy -msgid "Comparing files in %1 with files in %2" -msgstr "Idosiye in %1 Na: Idosiye in %2 " +msgid "Could not write to the temporary file." +msgstr "OYA Kwandika Kuri i By'igihe gito Idosiye . " -#: komparepart/kompare_part.cpp:555 -#, fuzzy, c-format -msgid "Viewing diff output from %1" -msgstr "Ibisohoka Kuva: %1 " +#: main.cpp:33 +#, 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 " -#: komparepart/kompare_part.cpp:558 +#: main.cpp:39 #, fuzzy -msgid "Blending diff output from %1 into file %2" -msgstr "Ibisohoka Kuva: %1 Idosiye %2 " +msgid "This will compare URL1 with URL2" +msgstr "Kugereranya # Na: " -#: komparepart/kompare_part.cpp:563 +#: main.cpp:40 #, fuzzy -msgid "Blending diff output from %1 into folder %2" -msgstr "Ibisohoka Kuva: %1 Ububiko... %2 " +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:586 komparepart/kompare_part.cpp:709 +#: main.cpp:41 #, fuzzy msgid "" -"You have made changes to the destination file(s).\n" -"Would you like to save them?" +"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 "" -"Amahinduka Kuri i Ishyika: Idosiye ( S ) . \n" -"nka Kuri Kubika ? " +", ni Ikitezwe: $(ARG1) Kuri Ibisohoka na i Idosiye Cyangwa Ububiko... i " +"Kuri . " -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 +#: main.cpp:42 #, fuzzy -msgid "Save Changes?" -msgstr "Kubika ? " +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:667 +#: main.cpp:43 #, 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 . " +"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:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 +#: main.cpp:52 #, fuzzy -msgid "Diff Statistics" -msgstr "Sitatisitiki" +msgid "Kompare" +msgstr "Kugereranya" -#: komparepart/kompare_part.cpp:673 +#: main.cpp:54 #, 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 " +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "( C ) - , na " -#: komparepart/kompare_part.cpp:686 +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "Umwanditsi" + +#: main.cpp:57 #, 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" +msgid "Kompare icon artist" +msgstr "Agashushondanga Umuhanzi " + +#: main.cpp:58 +#, fuzzy +msgid "A lot of good advice" +msgstr "A Bya " + +#: main.cpp:59 +#, fuzzy +msgid "Cervisia diff viewer" +msgstr "Ushinzwe kureba Impamyabushobozi" + +#: main.cpp:189 +#, fuzzy +msgid "Compare these files or folder" +msgstr "Idosiye Cyangwa Ububiko... " + +#: komparepart/komparepartui.rc:4 kompareui.rc:4 +#, fuzzy, no-c-format +msgid "&File" +msgstr "&Amadosiye" + +#: komparepart/komparepartui.rc:13 +#, fuzzy, no-c-format +msgid "&Difference" +msgstr "Ikinyuranyo/ Itandukaniro" + +#: komparepart/komparepartui.rc:25 kompareui.rc:14 +#, fuzzy, no-c-format +msgid "&Settings" +msgstr "Amagenamiterere y'Igaragaza ry'Urutonde" + +#: komparepart/komparesaveoptionsbase.ui:41 +#, no-c-format +msgid "Run Diff In" +msgstr "" + +#: komparepart/komparesaveoptionsbase.ui:84 +#, fuzzy, no-c-format +msgid "Command Line" +msgstr "Komandi" + +#: komparepart/komparesaveoptionsbase.ui:108 +#, fuzzy, no-c-format +msgid "cd dir && diff -udHprNa -- source destination" +msgstr "& & - - - Inkomoko Ishyika: " + +#: komparepart/komparesaveoptionsbase.ui:118 +#, fuzzy, no-c-format +msgid "Options" +msgstr "Amahitamo" + +#: komparepart/komparesaveoptionsbase.ui:135 +#, fuzzy, no-c-format +msgid "Look for smaller changes" +msgstr "ya: Gitoya Amahinduka " + +#: komparepart/komparesaveoptionsbase.ui:146 +#, fuzzy, no-c-format +msgid "Optimize for large files" +msgstr "ya: Kinini Idosiye " + +#: komparepart/komparesaveoptionsbase.ui:157 +#, fuzzy, no-c-format +msgid "Ignore changes in case" +msgstr "Amahinduka in " + +#: komparepart/komparesaveoptionsbase.ui:165 +#, fuzzy, no-c-format +msgid "Expand tabs to spaces" +msgstr "Amasimbuka Kuri Imyanya " + +#: komparepart/komparesaveoptionsbase.ui:173 +#, fuzzy, no-c-format +msgid "Ignore added or removed empty lines" +msgstr "Kyongewe Cyangwa Cyavanyweho ubusa Imirongo " + +#: komparepart/komparesaveoptionsbase.ui:181 +#, fuzzy, no-c-format +msgid "Ignore changes in whitespace" +msgstr "Amahinduka in " + +#: komparepart/komparesaveoptionsbase.ui:189 +#, fuzzy, no-c-format +msgid "Show function names" +msgstr "Umumaro Amazina " + +#: komparepart/komparesaveoptionsbase.ui:200 +#, fuzzy, no-c-format +msgid "Compare folders recursively" +msgstr "Ububiko " + +#: komparepart/komparesaveoptionsbase.ui:211 +#, fuzzy, no-c-format +msgid "Treat new files as empty" +msgstr "Gishya Idosiye Nka ubusa " + +#: komparepart/komparesaveoptionsbase.ui:227 +#, no-c-format +msgid "Format" +msgstr "Imiterere" + +#: komparepart/komparesaveoptionsbase.ui:287 +#, fuzzy, no-c-format +msgid "Side-by-side" +msgstr "- ku - " + +#: kompareui.rc:27 +#, no-c-format +msgid "Main Toolbar" 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 " -- cgit v1.2.3