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)

1 files changed, 535 insertions, 507 deletions

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 <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -24,353 +24,7 @@ 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"
-
-#: libdiff2/komparemodellist.cpp:64
-#, fuzzy
-msgid "Un&apply Difference"
-msgstr "Ikinyuranyo/Itandukaniro"
-
-#: libdiff2/komparemodellist.cpp:67
-#, fuzzy
-msgid "App&ly All"
-msgstr "Gushyira Hose"
-
-#: libdiff2/komparemodellist.cpp:70
-#, fuzzy
-msgid "&Unapply All"
-msgstr "Gusubiza Byose"
-
-#: libdiff2/komparemodellist.cpp:73
-#, fuzzy
-msgid "P&revious File"
-msgstr "Idosiye "
-
-#: libdiff2/komparemodellist.cpp:76
-#, fuzzy
-msgid "N&ext File"
-msgstr "Idosiye "
-
-#: libdiff2/komparemodellist.cpp:79
-#, fuzzy
-msgid "&Previous Difference"
-msgstr "Kureba Ikinyuranyo"
-
-#: libdiff2/komparemodellist.cpp:82
-#, fuzzy
-msgid "&Next Difference"
-msgstr "Kureba Ikinyuranyo"
-
-#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
-#, fuzzy
-msgid ""
-"<qt>No models or no differences, this file: <b>%1</b>"
-", is not a valid diff file.</qt>"
-msgstr ""
-"<qt> Ingerofatizo Cyangwa Oya Ibinyuranyo , iyi Idosiye : <b> %1 </b> "
-", ni OYA A Byemewe Idosiye . </qt> "
-
-#: libdiff2/komparemodellist.cpp:246
-#, fuzzy
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
-msgstr "<qt> i <b> %1 </b> Kuri i Idosiye <b> %2 </b> . </qt> "
-
-#: libdiff2/komparemodellist.cpp:271
-#, fuzzy
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
-".</qt>"
-msgstr "<qt> i <b> %1 </b> Kuri i Ububiko... <b> %2 </b> . </qt> "
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-#, fuzzy
-msgid "Could not open a temporary file."
-msgstr "OYA Gufungura A By'igihe gito Idosiye . "
-
-#: libdiff2/komparemodellist.cpp:350
-#, fuzzy
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr ""
-"<qt> OYA Kwandika Kuri i By'igihe gito Idosiye <b> %1 </b> , Gusiba . </qt> "
-
-#: libdiff2/komparemodellist.cpp:368
-#, fuzzy
-msgid ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
-msgstr ""
-"<qt> OYA Kurema Ishyika: Ububiko <b> %1 </b> . \n"
-"Idosiye OYA . </qt> "
-
-#: libdiff2/komparemodellist.cpp:383
-#, fuzzy
-msgid ""
-"<qt>Could not upload the temporary file to the destination location <b>%1</b>"
-". The temporary file is still available under: <b>%2</b>"
-". You can manually copy it to the right place.</qt>"
-msgstr ""
-"<qt> OYA Gushyiraho i By'igihe gito Idosiye Kuri i Ishyika: Indanganturo <b> "
-"%1 </b> . By'igihe gito Idosiye ni Bihari : <b> %2 </b> "
-". N'intoki Gukoporora Kuri i Iburyo: . </qt> "
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-#, fuzzy
-msgid "Could not parse diff output."
-msgstr "OYA Ibisohoka . "
-
-#: libdiff2/komparemodellist.cpp:451
-#, fuzzy
-msgid "The files are identical."
-msgstr "Idosiye birasa . "
-
-#: libdiff2/komparemodellist.cpp:613
-#, fuzzy
-msgid "Could not write to the temporary file."
-msgstr "OYA Kwandika Kuri i By'igihe gito Idosiye . "
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, fuzzy, no-c-format
-msgid "&Difference"
-msgstr "Ikinyuranyo/ Itandukaniro"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, fuzzy, no-c-format
-msgid "Command Line"
-msgstr "Komandi"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 108
-#: rc.cpp:27
-#, fuzzy, no-c-format
-msgid "cd dir && diff -udHprNa -- source destination"
-msgstr "& & - - - Inkomoko Ishyika: "
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, fuzzy, no-c-format
-msgid "Look for smaller changes"
-msgstr "ya:  Gitoya Amahinduka "
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, fuzzy, no-c-format
-msgid "Optimize for large files"
-msgstr "ya:  Kinini Idosiye "
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, fuzzy, no-c-format
-msgid "Ignore changes in case"
-msgstr "Amahinduka in "
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, fuzzy, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "Amasimbuka Kuri Imyanya "
-
-#. 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 "
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, fuzzy, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "Amahinduka in "
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, fuzzy, no-c-format
-msgid "Show function names"
-msgstr "Umumaro Amazina "
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, fuzzy, no-c-format
-msgid "Compare folders recursively"
-msgstr "Ububiko "
-
-#. 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 "
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "Imiterere"
-
-#. 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"
-
-#. 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"
-
-#. 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"
-
-#. 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"
-
-#. 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 - "
-
-#. 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 : "
-
-#: 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 "
-
-#: main.cpp:39
-#, fuzzy
-msgid "This will compare URL1 with URL2"
-msgstr "Kugereranya # Na: "
-
-#: main.cpp:40
-#, 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 . "
-
-#: main.cpp:41
-#, 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 . "
-
-#: main.cpp:42
-#, 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 . "
-
-#: main.cpp:43
-#, 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 . "
-
-#: main.cpp:52
-#, fuzzy
-msgid "Kompare"
-msgstr "Kugereranya"
-
-#: main.cpp:54
-#, fuzzy
-msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
-msgstr "( C ) - , na "
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "Umwanditsi"
-
-#: main.cpp:57
-#, fuzzy
-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"
-
-#: 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"
-
-#: main.cpp:189
-#, fuzzy
-msgid "Compare these files or folder"
-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 . "
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
@@ -378,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"
@@ -505,23 +159,50 @@ 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. "
+"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 . "
+"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"
@@ -611,15 +292,245 @@ msgstr "Kitazwi"
 msgid "KompareNavTreePart"
 msgstr ""
 
-#: kompareurldialog.cpp:41
+#: komparepart/kompare_part.cpp:165
 #, fuzzy
-msgid "Here you can enter the files you want to compare."
-msgstr "Injiza i Idosiye Kuri Kugereranya # . "
+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 ""
+
+#: komparepart/kompare_part.cpp:496
+#, fuzzy
+msgid "Parsing diff output..."
+msgstr "Ibisohoka ... "
+
+#: komparepart/kompare_part.cpp:545
+#, fuzzy
+msgid "Comparing file %1 with file %2"
+msgstr "Idosiye %1 Na: Idosiye %2 "
+
+#: komparepart/kompare_part.cpp:550
+#, fuzzy
+msgid "Comparing files in %1 with files in %2"
+msgstr "Idosiye in %1 Na: Idosiye in %2 "
+
+#: 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 "Blending diff output from %1 into file %2"
+msgstr "Ibisohoka Kuva: %1 Idosiye %2 "
+
+#: komparepart/kompare_part.cpp:563
+#, fuzzy
+msgid "Blending diff output from %1 into folder %2"
+msgstr "Ibisohoka Kuva: %1 Ububiko... %2 "
+
+#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
+#, 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 ? "
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+#, fuzzy
+msgid "Save Changes?"
+msgstr "Kubika ? "
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, fuzzy, no-c-format
+msgid "Unified"
+msgstr "Bitarangira"
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, no-c-format
+msgid "Context"
+msgstr "urwego rw'imyumvire, rw'imivugirwe"
+
+#: komparepart/kompare_part.cpp:641 komparepart/komparesaveoptionsbase.ui:268
+#: libdialogpages/diffpage.cpp:242
+#, fuzzy, no-c-format
+msgid "RCS"
+msgstr "COS"
+
+#: 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 ""
+"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 "
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "Ibyahisemo"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "Kugaragaza Ibikurikira"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View Settings"
+msgstr "Amagenamiterere y'Igaragaza ry'Urutonde"
 
 #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
 msgid "Diff"
 msgstr ""
 
+#: komparepart/kompareprefdlg.cpp:43
+#, fuzzy
+msgid "Diff Settings"
+msgstr "Amagenamiterere nyamubyimba"
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+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 # . "
+
 #: kompareurldialog.cpp:47
 #, fuzzy
 msgid "Here you can change the options for comparing the files."
@@ -627,6 +538,11 @@ 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."
 msgstr "Guhindura... i Amahitamo ya:  i Reba . "
 
@@ -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 "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr "<qt> <b> %1 </b> Yimuwe . </qt> "
+msgid "N&ext File"
+msgstr "Idosiye "
 
-#: komparepart/kompare_part.cpp:281
+#: libdiff2/komparemodellist.cpp:79
 #, 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 "&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 ""
+"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff "
+"file.</qt>"
+msgstr ""
+"<qt> Ingerofatizo Cyangwa Oya Ibinyuranyo , iyi Idosiye : <b> %1 </b> , ni "
+"OYA A Byemewe Idosiye . </qt> "
 
-#: komparepart/kompare_part.cpp:443
+#: libdiff2/komparemodellist.cpp:246
 #, fuzzy
-msgid "Save .diff"
-msgstr "Kubika."
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
+msgstr "<qt> i <b> %1 </b> Kuri i Idosiye <b> %2 </b> . </qt> "
 
-#: 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 ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
+"</qt>"
+msgstr "<qt> i <b> %1 </b> Kuri i Ububiko... <b> %2 </b> . </qt> "
 
-#: 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 "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr ""
+"<qt> OYA Kwandika Kuri i By'igihe gito Idosiye <b> %1 </b> , Gusiba . </qt> "
 
-#: komparepart/kompare_part.cpp:481
+#: libdiff2/komparemodellist.cpp:368
 #, fuzzy
-msgid "KomparePart"
-msgstr "Igice Kate "
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
+msgstr ""
+"<qt> OYA Kurema Ishyika: Ububiko <b> %1 </b> . \n"
+"Idosiye OYA . </qt> "
 
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
+#: libdiff2/komparemodellist.cpp:383
+#, fuzzy
+msgid ""
+"<qt>Could not upload the temporary file to the destination location <b>%1</"
+"b>. The temporary file is still available under: <b>%2</b>. You can manually "
+"copy it to the right place.</qt>"
 msgstr ""
+"<qt> OYA Gushyiraho i By'igihe gito Idosiye Kuri i Ishyika: Indanganturo <b> "
+"%1 </b> . By'igihe gito Idosiye ni Bihari : <b> %2 </b> . N'intoki "
+"Gukoporora Kuri i Iburyo: . </qt> "
 
-#: 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 "