summaryrefslogtreecommitdiffstats
path: root/tde-i18n-ms/messages/tdesdk/kompare.po
diff options
context:
space:
mode:
Diffstat (limited to 'tde-i18n-ms/messages/tdesdk/kompare.po')
-rw-r--r--tde-i18n-ms/messages/tdesdk/kompare.po994
1 files changed, 497 insertions, 497 deletions
diff --git a/tde-i18n-ms/messages/tdesdk/kompare.po b/tde-i18n-ms/messages/tdesdk/kompare.po
index 926e94e0120..da504f7ccfe 100644
--- a/tde-i18n-ms/messages/tdesdk/kompare.po
+++ b/tde-i18n-ms/messages/tdesdk/kompare.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: kompare\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\n"
"PO-Revision-Date: 2008-02-18 20:45+0800\n"
"Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
"Language-Team: Malay <kedidiemas@yahoogroups.com>\n"
@@ -16,107 +16,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.6\n"
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Muhammad Najmi bin Ahmad Zabidi"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "mnajem@linuxmail.org"
-
-#: komparenavtreepart/komparenavtreepart.cpp:61
-#, fuzzy
-msgid "Source Folder"
-msgstr "Folder Rumah"
-
-#: komparenavtreepart/komparenavtreepart.cpp:66
-#, fuzzy
-msgid "Destination Folder"
-msgstr "Folder Rumah"
-
-#: komparenavtreepart/komparenavtreepart.cpp:71
-msgid "Source File"
-msgstr "Fail Sumber"
-
-#: komparenavtreepart/komparenavtreepart.cpp:72
-msgid "Destination File"
-msgstr "Fail Destinasi"
-
-#: komparenavtreepart/komparenavtreepart.cpp:78
-msgid "Source Line"
-msgstr "Baris Sumber"
-
-#: komparenavtreepart/komparenavtreepart.cpp:79
-msgid "Destination Line"
-msgstr "Baris Destinasi"
-
-#: komparenavtreepart/komparenavtreepart.cpp:80
-msgid "Difference"
-msgstr "Perbezaan"
-
-#: 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 ""
-"Telah tukar %n baris\n"
-"Telah tukar %n baris-baris"
-
-#: komparenavtreepart/komparenavtreepart.cpp:429
-#, c-format
-msgid ""
-"_n: Changed %n line\n"
-"Changed %n lines"
-msgstr ""
-"Telah tukar %n baris\n"
-"Telah tukar %n baris-baris"
-
-#: komparenavtreepart/komparenavtreepart.cpp:434
-#, c-format
-msgid ""
-"_n: Applied: Insertion of %n line undone\n"
-"Applied: Insertion of %n lines undone"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:437
-#, c-format
-msgid ""
-"_n: Inserted %n line\n"
-"Inserted %n lines"
-msgstr ""
-"Telah masukkan %n baris\n"
-"Telah masukkan %n baris-baris"
-
-#: komparenavtreepart/komparenavtreepart.cpp:442
-#, c-format
-msgid ""
-"_n: Applied: Deletion of %n line undone\n"
-"Applied: Deletion of %n lines undone"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:445
-#, c-format
-msgid ""
-"_n: Deleted %n line\n"
-"Deleted %n lines"
-msgstr ""
-"Telah padam %n baris\n"
-"Telah padam %n baris-baris"
-
-#: komparenavtreepart/komparenavtreepart.cpp:531
-#: komparepart/kompare_part.cpp:651
-msgid "Unknown"
-msgstr "Tidak Diketahui"
-
-#: komparenavtreepart/komparenavtreepart.cpp:694
-msgid "KompareNavTreePart"
-msgstr "KompareNavTreePart"
-
#: libdiff2/komparemodellist.cpp:61
msgid "&Apply Difference"
msgstr "Ter&ap Perubahan"
@@ -201,179 +100,6 @@ msgstr "Fail adalah sama."
msgid "Could not write to the temporary file."
msgstr "Tidak dapat menulis ke fail sementara."
-#: kompare_shell.cpp:77
-#, fuzzy
-msgid "Could not find our KompareViewPart."
-msgstr "Tidak dapat menjumpai konfigurasi X"
-
-#: kompare_shell.cpp:106
-#, fuzzy
-msgid "Could not load our KompareViewPart."
-msgstr "Tidak dapat mengaktifkan/memuatkan plugin"
-
-#: kompare_shell.cpp:114
-#, fuzzy
-msgid "Could not find our KompareNavigationPart."
-msgstr "Tidak dapat menjumpai konfigurasi X"
-
-#: kompare_shell.cpp:138
-#, fuzzy
-msgid "Could not load our KompareNavigationPart."
-msgstr "Tidak dapat mengaktifkan/memuatkan plugin"
-
-#: kompare_shell.cpp:233
-#, fuzzy
-msgid "&Open Diff..."
-msgstr "Buka Fail"
-
-#: kompare_shell.cpp:234
-msgid "&Compare Files..."
-msgstr "Bandin&g Fail..."
-
-#: kompare_shell.cpp:237
-msgid "&Blend URL with Diff..."
-msgstr ""
-
-#: kompare_shell.cpp:246
-#, fuzzy
-msgid "Show T&ext View"
-msgstr "Lihat sejarah dokumen"
-
-#: kompare_shell.cpp:248
-#, fuzzy
-msgid "Hide T&ext View"
-msgstr "Lihat sejarah dokumen"
-
-#: kompare_shell.cpp:257
-msgid " 0 of 0 differences "
-msgstr " 0 dari 0 perbezaan"
-
-#: kompare_shell.cpp:258
-msgid " 0 of 0 files "
-msgstr " 0 dari 0 fail"
-
-#: kompare_shell.cpp:273
-msgid ""
-"_n: %1 of %n file \n"
-" %1 of %n files "
-msgstr ""
-" %1 dari %n fail \n"
-" %1 dari %n fail-fail"
-
-#: kompare_shell.cpp:275
-#, c-format
-msgid ""
-"_n: %n file \n"
-" %n files "
-msgstr ""
-" %n fail \n"
-" %n fail-fail"
-
-#: kompare_shell.cpp:278
-msgid ""
-"_n: %1 of %n difference, %2 applied \n"
-" %1 of %n differences, %2 applied "
-msgstr ""
-" %1 dari %n perbezaan, %2 telah diterapkan \n"
-" %1 dari %n perbezaan, %2 telah diterapkan"
-
-#: kompare_shell.cpp:281
-#, c-format
-msgid ""
-"_n: %n difference \n"
-" %n differences "
-msgstr ""
-"%n perbezaan \n"
-" %n perbezaan"
-
-#: kompare_shell.cpp:369
-msgid "Blend File/Folder with diff Output"
-msgstr ""
-
-#: kompare_shell.cpp:370
-#, fuzzy
-msgid "File/Folder"
-msgstr "Folder Rumah"
-
-#: kompare_shell.cpp:371
-#, fuzzy
-msgid "Diff Output"
-msgstr "Bahagian Depan Beza/Tampal"
-
-#: kompare_shell.cpp:373
-#, fuzzy
-msgid "Blend"
-msgstr "Name=Smooth Blend"
-
-#: kompare_shell.cpp:373
-msgid "Blend this file or folder with the diff output"
-msgstr ""
-
-#: 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 ""
-"Jika anda telah memasukkan 2 nama fail atau 2 direktori di dalam ruangan pada "
-"dialog ini, butang ini akan dihidupkan, dan jika ditekan perbandingan di antara "
-"fail atau direktori dimasukkan akan dimulakan."
-
-#: kompare_shell.cpp:398 main.cpp:185
-#, fuzzy
-msgid "Compare Files or Folders"
-msgstr "Semua Fail dan Folder"
-
-#: kompare_shell.cpp:399 main.cpp:186
-msgid "Source"
-msgstr "Sumber"
-
-#: kompare_shell.cpp:400 main.cpp:187
-msgid "Destination"
-msgstr "Destinasi"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr "Banding"
-
-#: kompare_shell.cpp:402
-msgid "Compare these files or folders"
-msgstr "Bandingkan fail atau direktori ini"
-
-#: 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 ""
-"Jika anda telah memasukkan 2 nama fail atau 2 direktori di dalam ruangan pada "
-"dialog ini, butang ini akan dihidupkan, dan jika ditekan perbandingan di antara "
-"fail atau direktori dimasukkan akan dimulakan."
-
-#: kompare_shell.cpp:439
-msgid "Text View"
-msgstr "Lihat Teks"
-
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
-msgstr ""
-
-#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
-msgid "Diff"
-msgstr "Diff"
-
-#: kompareurldialog.cpp:47
-msgid "Here you can change the options for comparing the files."
-msgstr ""
-
-#: kompareurldialog.cpp:53
-msgid "Here you can change the options for the view."
-msgstr ""
-
#. i18n: file komparepart/komparepartui.rc line 13
#: rc.cpp:15
#, no-c-format
@@ -500,241 +226,348 @@ msgstr "Sebelah-sebelah"
msgid "Number of context lines:"
msgstr "Nombor dari baris konteks:"
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "Keutamaan"
+#: main.cpp:33
+#, fuzzy
+msgid ""
+"A program to view the differences between files and optionally generate a diff"
+msgstr ""
+"Program untuk melihat perbezaan di antara fail dan menjana diff jika dipilih."
-#: komparepart/kompareprefdlg.cpp:39
+#: main.cpp:39
+msgid "This will compare URL1 with URL2"
+msgstr ""
+
+#: main.cpp:40
+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 ""
+
+#: main.cpp:41
+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 ""
+
+#: main.cpp:42
+msgid ""
+"Disables the check for automatically finding the original file(s) when using "
+"'-' as URL with the -o option."
+msgstr ""
+
+#: main.cpp:43
+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 ""
+
+#: main.cpp:52
+msgid "Kompare"
+msgstr "Kompare"
+
+#: main.cpp:54
+msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
+msgstr "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
+
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr "Penulis"
+
+#: main.cpp:57
#, fuzzy
-msgid "View Settings"
-msgstr "Tetapan Semasa"
+msgid "Kompare icon artist"
+msgstr "Teks dan Ikon"
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
-msgstr "Tetapan Diff"
+#: main.cpp:58
+#, fuzzy
+msgid "A lot of good advice"
+msgstr "Selamat berjaya dengan Mandriva Linux!"
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "Simp&an Semua"
+#: main.cpp:59
+msgid "Cervisia diff viewer"
+msgstr "Peninjau diff Cervisia"
-#: komparepart/kompare_part.cpp:168
+#: kompare_shell.cpp:398 main.cpp:185
#, fuzzy
-msgid "Save .&diff..."
-msgstr "Auto &Simpan"
+msgid "Compare Files or Folders"
+msgstr "Semua Fail dan Folder"
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
-msgstr "Swap Sumber dengan Destinasi"
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Sumber"
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "Papar Statistik"
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Destinasi"
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr ""
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "Banding"
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+#: main.cpp:189
+#, fuzzy
+msgid "Compare these files or folder"
+msgstr "Bandingkan fail atau direktori ini"
+
+#: 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 ""
+"Jika anda telah memasukkan 2 nama fail atau 2 direktori di dalam ruangan pada "
+"dialog ini, butang ini akan dihidupkan, dan jika ditekan perbandingan di antara "
+"fail atau direktori dimasukkan akan dimulakan."
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "Pilihan Diff"
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Muhammad Najmi bin Ahmad Zabidi"
-#: komparepart/kompare_part.cpp:443
-#, fuzzy
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "--diff-program=PROGRAM Guna PROGRAM untuk membanding fail."
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "mnajem@linuxmail.org"
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "Simpan .diff"
+#: kompare_shell.cpp:77
+#, fuzzy
+msgid "Could not find our KompareViewPart."
+msgstr "Tidak dapat menjumpai konfigurasi X"
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
-msgstr ""
+#: kompare_shell.cpp:106
+#, fuzzy
+msgid "Could not load our KompareViewPart."
+msgstr "Tidak dapat mengaktifkan/memuatkan plugin"
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr "Fail Wujud"
+#: kompare_shell.cpp:114
+#, fuzzy
+msgid "Could not find our KompareNavigationPart."
+msgstr "Tidak dapat menjumpai konfigurasi X"
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr "Tindih"
+#: kompare_shell.cpp:138
+#, fuzzy
+msgid "Could not load our KompareNavigationPart."
+msgstr "Tidak dapat mengaktifkan/memuatkan plugin"
-#: komparepart/kompare_part.cpp:446
+#: kompare_shell.cpp:233
#, fuzzy
-msgid "Do Not Overwrite"
-msgstr "Fail %s tidak dijumpai"
+msgid "&Open Diff..."
+msgstr "Buka Fail"
-#: komparepart/kompare_part.cpp:481
-msgid "KomparePart"
-msgstr "KomparePart"
+#: kompare_shell.cpp:234
+msgid "&Compare Files..."
+msgstr "Bandin&g Fail..."
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
-msgstr "Laksana diff..."
+#: kompare_shell.cpp:237
+msgid "&Blend URL with Diff..."
+msgstr ""
-#: komparepart/kompare_part.cpp:496
+#: kompare_shell.cpp:246
#, fuzzy
-msgid "Parsing diff output..."
-msgstr "Bahagian Depan Beza/Tampal"
+msgid "Show T&ext View"
+msgstr "Lihat sejarah dokumen"
-#: komparepart/kompare_part.cpp:545
+#: kompare_shell.cpp:248
#, fuzzy
-msgid "Comparing file %1 with file %2"
-msgstr "Aksara (dengan ruang):"
+msgid "Hide T&ext View"
+msgstr "Lihat sejarah dokumen"
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
-msgstr "Membandingkan fail dalam %1 dengan fail dalam %2"
+#: kompare_shell.cpp:257
+msgid " 0 of 0 differences "
+msgstr " 0 dari 0 perbezaan"
-#: komparepart/kompare_part.cpp:555
-#, fuzzy, c-format
-msgid "Viewing diff output from %1"
-msgstr "-n --rcs Keluarkan diff format RCS."
+#: kompare_shell.cpp:258
+msgid " 0 of 0 files "
+msgstr " 0 dari 0 fail"
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
+#: kompare_shell.cpp:273
+msgid ""
+"_n: %1 of %n file \n"
+" %1 of %n files "
msgstr ""
+" %1 dari %n fail \n"
+" %1 dari %n fail-fail"
-#: komparepart/kompare_part.cpp:563
-msgid "Blending diff output from %1 into folder %2"
+#: kompare_shell.cpp:275
+#, c-format
+msgid ""
+"_n: %n file \n"
+" %n files "
msgstr ""
+" %n fail \n"
+" %n fail-fail"
-#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
-#, fuzzy
+#: kompare_shell.cpp:278
msgid ""
-"You have made changes to the destination file(s).\n"
-"Would you like to save them?"
+"_n: %1 of %n difference, %2 applied \n"
+" %1 of %n differences, %2 applied "
msgstr ""
-"Anda telah membuat perubahan pada destinasi.\n"
-"Anda mahu simpan perubahan?"
-
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
-msgstr "Simpan Perubahan?"
+" %1 dari %n perbezaan, %2 telah diterapkan \n"
+" %1 dari %n perbezaan, %2 telah diterapkan"
-#: komparepart/kompare_part.cpp:667
+#: kompare_shell.cpp:281
+#, c-format
msgid ""
-"No diff file, or no 2 files have been diffed. Therefore no stats are available."
+"_n: %n difference \n"
+" %n differences "
msgstr ""
-"Tiada fail diff, atau tiada 2 fail yang telah dibandingkan. Oleh itu, tiada "
-"stat dapatditunjukkan."
+"%n perbezaan \n"
+" %n perbezaan"
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
-msgstr "Statistik Diff"
+#: kompare_shell.cpp:369
+msgid "Blend File/Folder with diff Output"
+msgstr ""
-#: komparepart/kompare_part.cpp:673
-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"
+#: kompare_shell.cpp:370
+#, fuzzy
+msgid "File/Folder"
+msgstr "Folder Rumah"
+
+#: kompare_shell.cpp:371
+#, fuzzy
+msgid "Diff Output"
+msgstr "Bahagian Depan Beza/Tampal"
+
+#: kompare_shell.cpp:373
+#, fuzzy
+msgid "Blend"
+msgstr "Name=Smooth Blend"
+
+#: kompare_shell.cpp:373
+msgid "Blend this file or folder with the diff output"
msgstr ""
-"Statistik:\n"
-"\n"
-"Fail lama %1\n"
-"Fail baru %2\n"
-"\n"
-"Format: %3\n"
-"Number of hunks: %4\n"
-"Jumlah perbezaan: %5"
-#: komparepart/kompare_part.cpp:686
+#: kompare_shell.cpp:373
+#, 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"
+"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 ""
-"Statistik:\n"
-"\n"
-"Jumlah fail dalam fail diff: %1\n"
-"Format: %2\n"
-"\n"
-"Fail lama semasa: %3\n"
-"Fail baru semasa: %4\n"
-"\n"
-"Number of hunks: %5\n"
-"Jumlah perbezaan: %6"
+"Jika anda telah memasukkan 2 nama fail atau 2 direktori di dalam ruangan pada "
+"dialog ini, butang ini akan dihidupkan, dan jika ditekan perbandingan di antara "
+"fail atau direktori dimasukkan akan dimulakan."
-#: libdialogpages/filespage.cpp:53
+#: kompare_shell.cpp:402
+msgid "Compare these files or folders"
+msgstr "Bandingkan fail atau direktori ini"
+
+#: kompare_shell.cpp:439
+msgid "Text View"
+msgstr "Lihat Teks"
+
+#: komparenavtreepart/komparenavtreepart.cpp:61
#, fuzzy
-msgid "Encoding"
-msgstr "Pengenkodan"
+msgid "Source Folder"
+msgstr "Folder Rumah"
-#: libdialogpages/filespage.cpp:64
+#: komparenavtreepart/komparenavtreepart.cpp:66
#, fuzzy
-msgid "&Files"
-msgstr "&Fail Terbaru"
+msgid "Destination Folder"
+msgstr "Folder Rumah"
-#: libdialogpages/viewpage.cpp:51
-msgid "Colors"
-msgstr "Warna"
+#: komparenavtreepart/komparenavtreepart.cpp:71
+msgid "Source File"
+msgstr "Fail Sumber"
-#: libdialogpages/viewpage.cpp:56
-msgid "Removed color:"
-msgstr "Warna dibuang"
+#: komparenavtreepart/komparenavtreepart.cpp:72
+msgid "Destination File"
+msgstr "Fail Destinasi"
-#: libdialogpages/viewpage.cpp:61
-msgid "Changed color:"
-msgstr "Warna diubah:"
+#: komparenavtreepart/komparenavtreepart.cpp:78
+msgid "Source Line"
+msgstr "Baris Sumber"
-#: libdialogpages/viewpage.cpp:66
-msgid "Added color:"
-msgstr "Warna ditambah:"
+#: komparenavtreepart/komparenavtreepart.cpp:79
+msgid "Destination Line"
+msgstr "Baris Destinasi"
-#: libdialogpages/viewpage.cpp:71
-msgid "Applied color:"
-msgstr "Warna diterap:"
+#: komparenavtreepart/komparenavtreepart.cpp:80
+msgid "Difference"
+msgstr "Perbezaan"
-#: libdialogpages/viewpage.cpp:76
-msgid "Mouse Wheel"
-msgstr "Roda Tetikus"
+#: 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 ""
+"Telah tukar %n baris\n"
+"Telah tukar %n baris-baris"
-#: libdialogpages/viewpage.cpp:80
-msgid "Number of lines:"
-msgstr "Nombor dari baris:"
+#: komparenavtreepart/komparenavtreepart.cpp:429
+#, c-format
+msgid ""
+"_n: Changed %n line\n"
+"Changed %n lines"
+msgstr ""
+"Telah tukar %n baris\n"
+"Telah tukar %n baris-baris"
-#: libdialogpages/viewpage.cpp:86
-#, fuzzy
-msgid "Tabs to Spaces"
-msgstr "Kiraan Aksara (tanpa ruang)"
+#: komparenavtreepart/komparenavtreepart.cpp:434
+#, c-format
+msgid ""
+"_n: Applied: Insertion of %n line undone\n"
+"Applied: Insertion of %n lines undone"
+msgstr ""
-#: libdialogpages/viewpage.cpp:90
-msgid "Number of spaces to convert a tab character to:"
+#: komparenavtreepart/komparenavtreepart.cpp:437
+#, c-format
+msgid ""
+"_n: Inserted %n line\n"
+"Inserted %n lines"
msgstr ""
+"Telah masukkan %n baris\n"
+"Telah masukkan %n baris-baris"
-#: libdialogpages/viewpage.cpp:97
-msgid "A&ppearance"
-msgstr "&Paparan"
+#: komparenavtreepart/komparenavtreepart.cpp:442
+#, c-format
+msgid ""
+"_n: Applied: Deletion of %n line undone\n"
+"Applied: Deletion of %n lines undone"
+msgstr ""
-#: libdialogpages/viewpage.cpp:104
-#, fuzzy
-msgid "Text Font"
-msgstr "Ubah font pada teks pilihan"
+#: komparenavtreepart/komparenavtreepart.cpp:445
+#, c-format
+msgid ""
+"_n: Deleted %n line\n"
+"Deleted %n lines"
+msgstr ""
+"Telah padam %n baris\n"
+"Telah padam %n baris-baris"
-#: libdialogpages/viewpage.cpp:108
-msgid "Font:"
-msgstr "Font:"
+#: komparenavtreepart/komparenavtreepart.cpp:531
+#: komparepart/kompare_part.cpp:651
+msgid "Unknown"
+msgstr "Tidak Diketahui"
-#: libdialogpages/viewpage.cpp:112
-msgid "Size:"
-msgstr "Saiz:"
+#: komparenavtreepart/komparenavtreepart.cpp:694
+msgid "KompareNavTreePart"
+msgstr "KompareNavTreePart"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr ""
+
+#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
+msgid "Diff"
+msgstr "Diff"
+
+#: kompareurldialog.cpp:47
+msgid "Here you can change the options for comparing the files."
+msgstr ""
+
+#: kompareurldialog.cpp:53
+msgid "Here you can change the options for the view."
+msgstr ""
#: libdialogpages/diffpage.cpp:211
#, fuzzy
@@ -935,71 +768,238 @@ msgstr ""
msgid "&Exclude"
msgstr "Laluan untuk diabaikan"
-#: main.cpp:33
+#: libdialogpages/filespage.cpp:53
#, fuzzy
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr ""
-"Program untuk melihat perbezaan di antara fail dan menjana diff jika dipilih."
+msgid "Encoding"
+msgstr "Pengenkodan"
-#: main.cpp:39
-msgid "This will compare URL1 with URL2"
-msgstr ""
+#: libdialogpages/filespage.cpp:64
+#, fuzzy
+msgid "&Files"
+msgstr "&Fail Terbaru"
-#: main.cpp:40
-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."
+#: libdialogpages/viewpage.cpp:51
+msgid "Colors"
+msgstr "Warna"
+
+#: libdialogpages/viewpage.cpp:56
+msgid "Removed color:"
+msgstr "Warna dibuang"
+
+#: libdialogpages/viewpage.cpp:61
+msgid "Changed color:"
+msgstr "Warna diubah:"
+
+#: libdialogpages/viewpage.cpp:66
+msgid "Added color:"
+msgstr "Warna ditambah:"
+
+#: libdialogpages/viewpage.cpp:71
+msgid "Applied color:"
+msgstr "Warna diterap:"
+
+#: libdialogpages/viewpage.cpp:76
+msgid "Mouse Wheel"
+msgstr "Roda Tetikus"
+
+#: libdialogpages/viewpage.cpp:80
+msgid "Number of lines:"
+msgstr "Nombor dari baris:"
+
+#: libdialogpages/viewpage.cpp:86
+#, fuzzy
+msgid "Tabs to Spaces"
+msgstr "Kiraan Aksara (tanpa ruang)"
+
+#: libdialogpages/viewpage.cpp:90
+msgid "Number of spaces to convert a tab character to:"
msgstr ""
-#: main.cpp:41
-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. "
+#: libdialogpages/viewpage.cpp:97
+msgid "A&ppearance"
+msgstr "&Paparan"
+
+#: libdialogpages/viewpage.cpp:104
+#, fuzzy
+msgid "Text Font"
+msgstr "Ubah font pada teks pilihan"
+
+#: libdialogpages/viewpage.cpp:108
+msgid "Font:"
+msgstr "Font:"
+
+#: libdialogpages/viewpage.cpp:112
+msgid "Size:"
+msgstr "Saiz:"
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "Keutamaan"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View Settings"
+msgstr "Tetapan Semasa"
+
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr "Tetapan Diff"
+
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "Simp&an Semua"
+
+#: komparepart/kompare_part.cpp:168
+#, fuzzy
+msgid "Save .&diff..."
+msgstr "Auto &Simpan"
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr "Swap Sumber dengan Destinasi"
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "Papar Statistik"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
msgstr ""
-#: main.cpp:42
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
msgstr ""
-#: main.cpp:43
-msgid ""
-"Use this to specify the encoding when calling it from the command line. It will "
-"default to the local encoding if not specified."
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "Pilihan Diff"
+
+#: komparepart/kompare_part.cpp:443
+#, fuzzy
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "--diff-program=PROGRAM Guna PROGRAM untuk membanding fail."
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "Simpan .diff"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
msgstr ""
-#: main.cpp:52
-msgid "Kompare"
-msgstr "Kompare"
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr "Fail Wujud"
-#: main.cpp:54
-msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
-msgstr "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr "Tindih"
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "Penulis"
+#: komparepart/kompare_part.cpp:446
+#, fuzzy
+msgid "Do Not Overwrite"
+msgstr "Fail %s tidak dijumpai"
-#: main.cpp:57
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "KomparePart"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "Laksana diff..."
+
+#: komparepart/kompare_part.cpp:496
#, fuzzy
-msgid "Kompare icon artist"
-msgstr "Teks dan Ikon"
+msgid "Parsing diff output..."
+msgstr "Bahagian Depan Beza/Tampal"
-#: main.cpp:58
+#: komparepart/kompare_part.cpp:545
#, fuzzy
-msgid "A lot of good advice"
-msgstr "Selamat berjaya dengan Mandriva Linux!"
+msgid "Comparing file %1 with file %2"
+msgstr "Aksara (dengan ruang):"
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr "Peninjau diff Cervisia"
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "Membandingkan fail dalam %1 dengan fail dalam %2"
-#: main.cpp:189
+#: komparepart/kompare_part.cpp:555
+#, fuzzy, c-format
+msgid "Viewing diff output from %1"
+msgstr "-n --rcs Keluarkan diff format RCS."
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
#, fuzzy
-msgid "Compare these files or folder"
-msgstr "Bandingkan fail atau direktori ini"
+msgid ""
+"You have made changes to the destination file(s).\n"
+"Would you like to save them?"
+msgstr ""
+"Anda telah membuat perubahan pada destinasi.\n"
+"Anda mahu simpan perubahan?"
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "Simpan Perubahan?"
+
+#: komparepart/kompare_part.cpp:667
+msgid ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are available."
+msgstr ""
+"Tiada fail diff, atau tiada 2 fail yang telah dibandingkan. Oleh itu, tiada "
+"stat dapatditunjukkan."
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr "Statistik Diff"
+
+#: komparepart/kompare_part.cpp:673
+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 ""
+"Statistik:\n"
+"\n"
+"Fail lama %1\n"
+"Fail baru %2\n"
+"\n"
+"Format: %3\n"
+"Number of hunks: %4\n"
+"Jumlah perbezaan: %5"
+
+#: komparepart/kompare_part.cpp:686
+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 ""
+"Statistik:\n"
+"\n"
+"Jumlah fail dalam fail diff: %1\n"
+"Format: %2\n"
+"\n"
+"Fail lama semasa: %3\n"
+"Fail baru semasa: %4\n"
+"\n"
+"Number of hunks: %5\n"
+"Jumlah perbezaan: %6"