sync with code

1 files changed, 302 insertions, 430 deletions

diff --git a/po/ms.po b/po/ms.po
index 80d26a46..3ee7ff84 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\n"
 "PO-Revision-Date: 2008-02-26 18:30+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -18,8 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gurpmi:30
-#: ../gurpmi2:65
+#: ../gurpmi:30 ../gurpmi2:65
 #, c-format
 msgid "RPM installation"
 msgstr "Pemasangan RPM"
@@ -29,9 +28,7 @@ msgstr "Pemasangan RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45
-#: ../gurpmi2:152
-#: ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -43,13 +40,13 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:73
-#: ../gurpmi:84
+#: ../gurpmi:73 ../gurpmi:84
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -84,8 +81,7 @@ msgstr "_Pasang"
 msgid "_Save"
 msgstr "_Simpan"
 
-#: ../gurpmi:99
-#: ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:152
 #, c-format
 msgid "_Cancel"
 msgstr "_Batal"
@@ -95,12 +91,7 @@ msgstr "_Batal"
 msgid "Choose location to save file"
 msgstr "Pilih lokasi untuk menyimpan fail"
 
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Pilihan tidak diketahui %s"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
 #, c-format
 msgid "No packages specified"
 msgstr "Tiada pakej dinyatakan"
@@ -128,8 +119,7 @@ msgstr "semua telah diinstal"
 msgid "Warning"
 msgstr "Amaran"
 
-#: ../gurpmi2:114
-#: ../urpmi:626
+#: ../gurpmi2:114 ../urpmi:626
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -170,16 +160,16 @@ msgstr ""
 "%s\n"
 "Teruskan?"
 
-#: ../gurpmi2:215
-#: ../urpmi:592
+#: ../gurpmi2:215 ../urpmi:592
 #, fuzzy, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
 msgstr "Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
 
-#: ../gurpmi2:216
-#: ../urpmi:593
+#: ../gurpmi2:216 ../urpmi:593
 #, fuzzy, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
 "%s\n"
@@ -196,14 +186,12 @@ msgstr[1] ""
 msgid "Package installation..."
 msgstr "Pemasangan pakej..."
 
-#: ../gurpmi2:226
-#: ../urpm/main_loop.pm:48
+#: ../gurpmi2:226 ../urpm/main_loop.pm:48
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "tidak dapat mengambil pakej asal, batal"
 
-#: ../gurpmi2:240
-#: ../urpm/install.pm:81
+#: ../gurpmi2:240 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "Menyediakan..."
@@ -213,13 +201,12 @@ msgstr "Menyediakan..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Install pakej `%s' (%s/%s)..."
 
-#: ../gurpmi2:260
-#: ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
 msgstr "Masukkan media \"%s\" ke peranti [%s]"
 
-#: ../gurpmi2:271
+#: ../gurpmi2:275
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Memuatturun pakej `%s'..."
@@ -229,8 +216,7 @@ msgstr "Memuatturun pakej `%s'..."
 msgid "_Done"
 msgstr "_Selesai"
 
-#: ../gurpmi2:296
-#: ../urpm/main_loop.pm:258
+#: ../gurpmi2:296 ../urpm/main_loop.pm:258
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -238,9 +224,7 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../gurpmi2:302
-#: ../urpm/main_loop.pm:196
-#: ../urpm/main_loop.pm:214
+#: ../gurpmi2:302 ../urpm/main_loop.pm:196 ../urpm/main_loop.pm:214
 #: ../urpm/main_loop.pm:232
 #, fuzzy, c-format
 msgid "Installation failed:"
@@ -256,8 +240,7 @@ msgstr "semua telah diinstal"
 msgid "Installation finished"
 msgstr "Pemasangan selesai"
 
-#: ../gurpmi2:310
-#: ../urpme:132
+#: ../gurpmi2:310 ../urpme:132
 #, c-format
 msgid "removing %s"
 msgstr "membuang %s"
@@ -282,7 +265,8 @@ msgstr "   --root <path>  - guna root yang diberi selain dari /\n"
 #: ../rpm-find-leaves:18
 #, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
-msgstr "   -g [kumpulan]   - hadkan keputusan kepada kumpulan yang diberikan.\n"
+msgstr ""
+"   -g [kumpulan]   - hadkan keputusan kepada kumpulan yang diberikan.\n"
 
 #: ../rpm-find-leaves:19
 #, c-format
@@ -294,8 +278,7 @@ msgstr "                    default adalah %s.\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
 
-#: ../rurpmi:11
-#: ../urpmi:269
+#: ../rurpmi:11 ../urpmi:269
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Hanya superuser yang boleh menginstal pakej"
@@ -330,18 +313,13 @@ msgstr "nama fail rpm [%s] tidak sah"
 msgid "retrieving rpm file [%s] ..."
 msgstr "mengambil fail rpm [%s] ..."
 
-#: ../urpm.pm:232
-#: ../urpm/get_pkgs.pm:160
+#: ../urpm.pm:232 ../urpm/get_pkgs.pm:160
 #, c-format
 msgid "...retrieving done"
 msgstr "...capaian selesai"
 
-#: ../urpm.pm:235
-#: ../urpm/download.pm:691
-#: ../urpm/get_pkgs.pm:162
-#: ../urpm/media.pm:771
-#: ../urpm/media.pm:1199
-#: ../urpm/media.pm:1375
+#: ../urpm.pm:235 ../urpm/download.pm:691 ../urpm/get_pkgs.pm:162
+#: ../urpm/media.pm:771 ../urpm/media.pm:1199 ../urpm/media.pm:1375
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...gagal terambil: %s"
@@ -376,8 +354,7 @@ msgstr "ralat pendaftaran pakej setempat"
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:130
-#: ../urpm/args.pm:139
+#: ../urpm/args.pm:130 ../urpm/args.pm:139
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr ""
@@ -402,8 +379,7 @@ msgstr ""
 msgid "Can't use %s without %s"
 msgstr "Tutup Tanpa Simpan"
 
-#: ../urpm/args.pm:441
-#: ../urpm/args.pm:444
+#: ../urpm/args.pm:441 ../urpm/args.pm:444
 #, fuzzy, c-format
 msgid "Can't use %s with %s"
 msgstr "Aksara (dengan ruang):"
@@ -413,12 +389,21 @@ msgstr "Aksara (dengan ruang):"
 msgid "Too many arguments\n"
 msgstr "Main pelbagai jenis permainan solitaire"
 
-#: ../urpm/bug_report.pm:48
-#: ../urpmi:247
+#: ../urpm/bug_report.pm:48 ../urpmi:247
 #, fuzzy, c-format
 msgid "Copying failed"
 msgstr "Sambungan Gagal"
 
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "Fail %s adalah jenis tidak disokong pada masa ini"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "gagal baca fail rpm [%s] dari media \"%s\""
+
 #: ../urpm/cfg.pm:81
 #, fuzzy, c-format
 msgid "syntax error in config file at line %s"
@@ -434,9 +419,7 @@ msgstr "gagal tulis fail konfigurasi [%s]"
 msgid "medium `%s' is defined twice, aborting"
 msgstr ""
 
-#: ../urpm/cfg.pm:250
-#: ../urpm/media.pm:450
-#: ../urpm/media.pm:456
+#: ../urpm/cfg.pm:250 ../urpm/media.pm:450 ../urpm/media.pm:456
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "gagal tulis fail konfigurasi [%s]"
@@ -588,7 +571,8 @@ msgstr ""
 
 #: ../urpm/install.pm:154
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
 #: ../urpm/install.pm:157
@@ -611,8 +595,7 @@ msgstr "tidak dapat memasang pakej %s"
 msgid "removing bad rpm (%s) from %s"
 msgstr "Tapisan From:"
 
-#: ../urpm/install.pm:197
-#: ../urpm/install.pm:254
+#: ../urpm/install.pm:197 ../urpm/install.pm:254
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "Sambungan Gagal"
@@ -657,8 +640,7 @@ msgstr ""
 msgid "No base defined"
 msgstr "Gaya ditakrif pengguna"
 
-#: ../urpm/ldap.pm:172
-#: ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
 #, c-format
 msgid "Cannot connect to ldap uri:"
 msgstr ""
@@ -699,9 +681,7 @@ msgstr ""
 msgid "Do you want to continue installation ?"
 msgstr "Adakah anda pasti untuk menggantung ke cakera?"
 
-#: ../urpm/main_loop.pm:125
-#: ../urpm/main_loop.pm:203
-#: ../urpm/main_loop.pm:221
+#: ../urpm/main_loop.pm:125 ../urpm/main_loop.pm:203 ../urpm/main_loop.pm:221
 #, c-format
 msgid "Installation failed"
 msgstr "Instalasi gagal"
@@ -736,7 +716,12 @@ msgstr "Cuba instalasi tanpa periksa kebergantungan? (y/T) "
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Cuba instalasi lebih keras (--force)? (y/T) "
 
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -750,11 +735,6 @@ msgid_plural "%d installation transactions failed"
 msgstr[0] "Pemasangan sekecil mungkin"
 msgstr[1] "Gagal menerima %s: %s"
 
-#: ../urpm/main_loop.pm:281
-#, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "Pemasangan sekecil mungkin"
-
 #: ../urpm/main_loop.pm:286
 #, c-format
 msgid "Packages are up to date"
@@ -780,6 +760,11 @@ msgstr "semua telah diinstal"
 msgid "Packages %s can not be installed"
 msgstr "semua telah diinstal"
 
+#: ../urpm/main_loop.pm:307
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Pemasangan sekecil mungkin"
+
 #: ../urpm/md5sum.pm:20
 #, fuzzy, c-format
 msgid "examining %s file"
@@ -812,32 +797,10 @@ msgstr "mencuba untuk mengatasi media sedia ada \"%s\", melangkau"
 
 #: ../urpm/media.pm:409
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "terlalu banyak titik sambung utk media removable \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "ambil peranti removable sbg \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+msgid "failed to migrate removable device, ignoring media"
 msgstr ""
 
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "pakai removable peranti lain [%s] untuk \"%s\""
-
-#: ../urpm/media.pm:421
-#: ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "tidak dapat mengambil nama path utk media removable \"%s\""
-
-#: ../urpm/media.pm:452
-#: ../urpm/media.pm:458
+#: ../urpm/media.pm:452 ../urpm/media.pm:458
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "tulis fail konfigurasi [%s]"
@@ -854,7 +817,9 @@ msgstr ""
 
 #: ../urpm/media.pm:525
 #, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
 msgstr ""
 
 #: ../urpm/media.pm:612
@@ -892,12 +857,7 @@ msgstr "membaca pengepala dari media \"%s\""
 msgid "adding medium \"%s\""
 msgstr "Medium Boleh Buang Terlekap"
 
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "gagal mengakses media instalasi pertama"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
@@ -967,15 +927,12 @@ msgstr "periksa file sintesis [%s]"
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "masalah membaca fail sintesis untuk media \"%s\""
 
-#: ../urpm/media.pm:1088
-#: ../urpm/media.pm:1171
+#: ../urpm/media.pm:1088 ../urpm/media.pm:1171
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "Medium Boleh Buang Terlekap"
 
-#: ../urpm/media.pm:1090
-#: ../urpm/media.pm:1145
-#: ../urpm/media.pm:1391
+#: ../urpm/media.pm:1090 ../urpm/media.pm:1145 ../urpm/media.pm:1391
 #, c-format
 msgid "...copying failed"
 msgstr "...gagal menyalin"
@@ -985,8 +942,7 @@ msgstr "...gagal menyalin"
 msgid "copying description file of \"%s\"..."
 msgstr "fail deskripsi \"%s\" sedang disalin"
 
-#: ../urpm/media.pm:1143
-#: ../urpm/media.pm:1175
+#: ../urpm/media.pm:1143 ../urpm/media.pm:1175
 #, c-format
 msgid "...copying done"
 msgstr "...salin selesai"
@@ -1001,8 +957,7 @@ msgstr "salinan [%s] gagal (md5sum tidak sepadan)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "mengira md5sum salinan sumber hdlist (atau sintesis)"
 
-#: ../urpm/media.pm:1212
-#: ../urpm/media.pm:1629
+#: ../urpm/media.pm:1212 ../urpm/media.pm:1629
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "salinan [%s] gagal (md5sum tidak sepadan)"
@@ -1017,14 +972,7 @@ msgstr "dikemaskini pada %(date)s"
 msgid "comparing %s and %s"
 msgstr "&Pengepala dan Footer"
 
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the medium."
-msgstr ""
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "fail hdlist utk media \"%s\" tak dijumpai"
@@ -1044,8 +992,7 @@ msgstr "Fail Sumber 'Ada' (nama perisian)"
 msgid "found probed synthesis as %s"
 msgstr "menjumpai hdlist dikesan (atau sintesis) seperti %s"
 
-#: ../urpm/media.pm:1374
-#: ../urpm/media.pm:1482
+#: ../urpm/media.pm:1374 ../urpm/media.pm:1482
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "fail hdlist utk media \"%s\" tak dijumpai"
@@ -1095,24 +1042,14 @@ msgstr ""
 msgid "getting mirror list from %s"
 msgstr "Pilih dokumen dari senarai:"
 
-#: ../urpm/msg.pm:62
-#: ../urpmi:506
-#: ../urpmi:522
-#: ../urpmi:611
+#: ../urpm/msg.pm:62 ../urpmi:506 ../urpmi:522 ../urpmi:611
 #, c-format
 msgid "Nn"
 msgstr "NnTt"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63
-#: ../urpme:37
-#: ../urpmi:507
-#: ../urpmi:523
-#: ../urpmi:562
-#: ../urpmi:612
-#: ../urpmi:642
-#: ../urpmi:648
-#: ../urpmi.addmedia:139
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:507 ../urpmi:523 ../urpmi:562
+#: ../urpmi:612 ../urpmi:642 ../urpmi:648 ../urpmi.addmedia:139
 #, c-format
 msgid "Yy"
 msgstr "Yy"
@@ -1177,8 +1114,7 @@ msgstr ""
 msgid "GB"
 msgstr ""
 
-#: ../urpm/msg.pm:189
-#: ../urpm/msg.pm:198
+#: ../urpm/msg.pm:189 ../urpm/msg.pm:198
 #, c-format
 msgid "TB"
 msgstr ""
@@ -1203,45 +1139,28 @@ msgstr "memeriksa parallel handler dalam fail [%s]"
 msgid "unable to use parallel option \"%s\""
 msgstr "tidak dapat menggunakan pilihan parallel \"%s\""
 
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "gagal akses media \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
 #, c-format
 msgid "mounting %s"
 msgstr "mounting %s"
 
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
 #, c-format
 msgid "unmounting %s"
 msgstr "unmount %s"
 
-#: ../urpm/removable.pm:112
-#: ../urpm/removable.pm:117
-#: ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "Fail %s adalah jenis tidak disokong pada masa ini"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "gagal baca fail rpm [%s] dari media \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "media ketidaksinambungan \"%s\" bertanda removable, seharusnya tidak"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "gagal akses media \"%s\""
-
-#: ../urpm/search.pm:29
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
 "Copyright (C) 2002-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage: urpmf [options] pattern-expression\n"
 msgstr ""
@@ -1251,367 +1170,288 @@ msgstr ""
 "\n"
 "penggunaan:\n"
 
-#: ../urpm/search.pm:35
-#: ../urpme:45
-#: ../urpmf:35
-#: ../urpmi:74
-#: ../urpmi.addmedia:54
-#: ../urpmi.recover:33
-#: ../urpmi.removemedia:40
-#: ../urpmi.update:32
-#: ../urpmq:45
+#: ../urpm/search.pm:35 ../urpme:45 ../urpmf:35 ../urpmi:74
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - cetak mesej bantuan ini.\n"
 
-#: ../urpm/search.pm:36
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version       - cetak nombor versi alatan ini.\n"
 
-#: ../urpm/search.pm:37
-#: ../urpmf:37
-#: ../urpmi:131
-#: ../urpmq:79
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:131 ../urpmq:79
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
-#: ../urpm/search.pm:38
-#: ../urpmf:38
-#: ../urpmi:76
-#: ../urpmq:49
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:76 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm/search.pm:39
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpm/search.pm:40
-#: ../urpme:52
-#: ../urpmf:40
-#: ../urpmi:111
-#: ../urpmi.addmedia:69
-#: ../urpmi.recover:36
-#: ../urpmi.removemedia:46
-#: ../urpmi.update:46
-#: ../urpmq:69
+#: ../urpm/search.pm:40 ../urpme:52 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:69 ../urpmi.recover:36 ../urpmi.removemedia:46
+#: ../urpmi.update:46 ../urpmq:69
 #, fuzzy, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr "  --root         - guna root lain untuk membuang rpm.\n"
 
-#: ../urpm/search.pm:41
-#: ../urpmf:41
-#: ../urpmi:75
-#: ../urpmq:47
+#: ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
 #, fuzzy, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --update       - guna hanya kemaskini media.\n"
 
-#: ../urpm/search.pm:42
-#: ../urpmf:42
-#: ../urpmi:79
-#: ../urpmq:50
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
 #, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpm/search.pm:43
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --update       - guna hanya kemaskini media.\n"
 
-#: ../urpm/search.pm:44
-#: ../urpmf:44
-#: ../urpmi:80
-#: ../urpmq:51
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:80 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm/search.pm:45
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - jangan cetak baris yang sama.\n"
 
-#: ../urpm/search.pm:46
-#: ../urpmf:46
-#: ../urpmi:77
-#: ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:77 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - guna hanya kemaskini media.\n"
 
-#: ../urpm/search.pm:47
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - mod verbos.\n"
 
-#: ../urpm/search.pm:48
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, fuzzy, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "-i  --ignore-case  Abai perbezaan case dalam kandungan fail."
 
-#: ../urpm/search.pm:49
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "-i  --ignore-case  Abai perbezaan case dalam kandungan fail."
 
-#: ../urpm/search.pm:50
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpm/search.pm:51
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Ungkapan corak:\n"
 
-#: ../urpm/search.pm:52
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpm/search.pm:53
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, fuzzy, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -c             - bersihkan direktori kache header.\n"
 
-#: ../urpm/search.pm:54
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - operator binari AND.\n"
 
-#: ../urpm/search.pm:55
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - operator binari OR.\n"
 
-#: ../urpm/search.pm:56
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unari NOT.\n"
 
-#: ../urpm/search.pm:57
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - kurungan kiri dan kanan.\n"
 
-#: ../urpm/search.pm:58
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Senarai tag:\n"
 
-#: ../urpm/search.pm:59
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - nyatakan format keluaran seperti printf\n"
 
-#: ../urpm/search.pm:60
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   contoh: '%%name:%%files'\n"
 
-#: ../urpm/search.pm:61
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "Rekabentuk Sasaran:"
 
-#: ../urpm/search.pm:62
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "%s %s pemasangan pada hos %s"
 
-#: ../urpm/search.pm:63
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, fuzzy, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "Tarikh/masa bolehubah"
 
-#: ../urpm/search.pm:64
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Semua Fail Imej"
 
-#: ../urpm/search.pm:65
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "Lumpuhkan tag ID3V2"
 
-#: ../urpm/search.pm:66
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "Pelihat Pakej"
 
-#: ../urpm/search.pm:67
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, fuzzy, c-format
 msgid "  --distribution - distribution\n"
 msgstr "Sumber edaran"
 
-#: ../urpm/search.pm:68
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "Saat semenjak permulaan zaman"
 
-#: ../urpm/search.pm:69
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "Pelihat Pakej"
 
-#: ../urpm/search.pm:70
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "Cache Fail Pakej Jauh"
 
-#: ../urpm/search.pm:71
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "Kumpulan"
 
-#: ../urpm/search.pm:72
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "Nama Pakej"
 
-#: ../urpm/search.pm:73
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "Pelihat Pakej"
 
-#: ../urpm/search.pm:74
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "Senarai tag:\n"
 
-#: ../urpm/search.pm:75
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "Tidak dapat menulis tag!"
 
-#: ../urpm/search.pm:76
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "Senarai tag:\n"
 
-#: ../urpm/search.pm:77
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "Senarai tag:\n"
 
-#: ../urpm/search.pm:78
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "% dari saiz normal"
 
-#: ../urpm/search.pm:79
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "nama fail rpm [%s] tidak sah"
 
-#: ../urpm/search.pm:80
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "Senarai tag:\n"
 
-#: ../urpm/search.pm:81
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "Ringkasan"
 
-#: ../urpm/search.pm:82
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "URL:"
 
-#: ../urpm/search.pm:83
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "Vendor:"
 
-#: ../urpm/search.pm:84
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "Cache Fail Pakej Jauh"
 
-#: ../urpm/search.pm:85
-#: ../urpmf:85
-#: ../urpmq:94
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:94
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
 
-#: ../urpm/search.pm:197
-#: ../urpmf:197
+#: ../urpm/search.pm:197 ../urpmf:197
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpm/search.pm:247
-#: ../urpmf:247
-#: ../urpmi:254
-#: ../urpmq:136
+#: ../urpm/search.pm:247 ../urpmf:247 ../urpmi:254 ../urpmq:136
 #, fuzzy, c-format
 msgid "using specific environment on %s\n"
 msgstr "Buat partisyen pada pemacu spesifik (ondisk)"
 
-#: ../urpm/search.pm:290
-#: ../urpmf:290
+#: ../urpm/search.pm:290 ../urpmf:290
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "fail hdlist utk media \"%s\" tak dijumpai"
 
-#: ../urpm/search.pm:297
-#: ../urpmf:297
+#: ../urpm/search.pm:297 ../urpmf:297
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
 
-#: ../urpm/search.pm:304
-#: ../urpmf:306
+#: ../urpm/search.pm:304 ../urpmf:306
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "menulis senarai fail untuk media \"%s\""
@@ -1623,7 +1463,8 @@ msgstr ""
 
 #: ../urpm/select.pm:23
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
 #: ../urpm/select.pm:184
@@ -1631,14 +1472,12 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Tiada pakej bernama %s"
 
-#: ../urpm/select.pm:186
-#: ../urpme:107
+#: ../urpm/select.pm:186 ../urpme:107
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Pakej berikut mengandungi %s: %s"
 
-#: ../urpm/select.pm:495
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:495 ../urpm/select.pm:538
 #, c-format
 msgid "due to missing %s"
 msgstr "kerana kehilangan %s"
@@ -1648,8 +1487,7 @@ msgstr "kerana kehilangan %s"
 msgid "due to already installed %s"
 msgstr "semua telah diinstal"
 
-#: ../urpm/select.pm:497
-#: ../urpm/select.pm:536
+#: ../urpm/select.pm:497 ../urpm/select.pm:536
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "kerana ketidakpuasan %s"
@@ -1709,7 +1547,8 @@ msgstr "Fail untuk menyimpan suntingan:"
 msgid ""
 "urpme version %s\n"
 "Copyright (C) 1999-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -1729,22 +1568,18 @@ msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:48
-#: ../urpmi:104
-#: ../urpmq:65
+#: ../urpme:48 ../urpmi:104 ../urpmq:65
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - paksa instal meskipun beberapa pakej tiada.\n"
 
-#: ../urpme:49
-#: ../urpmi:109
-#: ../urpmq:67
+#: ../urpme:49 ../urpmi:109 ../urpmq:67
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:50
-#: ../urpmi:140
+#: ../urpme:50 ../urpmi:140
 #, fuzzy, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "Tidak dapat menulis tag!"
@@ -1766,9 +1601,7 @@ msgid ""
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:56
-#: ../urpmi:151
-#: ../urpmq:84
+#: ../urpme:56 ../urpmi:151 ../urpmq:84
 #, fuzzy, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "M-x nxml-mode"
@@ -1793,8 +1626,7 @@ msgstr "pakej tidak diketahui"
 msgid "unknown package"
 msgstr "pakej tidak diketahui"
 
-#: ../urpme:113
-#: ../urpmi:536
+#: ../urpme:113 ../urpmi:536
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
@@ -1812,7 +1644,8 @@ msgstr "Memeriksa untuk membuang pakej berikut"
 #: ../urpme:124
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] ""
 "Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
 "%s\n"
@@ -1827,10 +1660,7 @@ msgid_plural "Remove %d packages?"
 msgstr[0] "Pelihat Pakej"
 msgstr[1] "membuang pakej %s"
 
-#: ../urpme:128
-#: ../urpmi:563
-#: ../urpmi:643
-#: ../urpmi.addmedia:142
+#: ../urpme:128 ../urpmi:563 ../urpmi:643 ../urpmi.addmedia:142
 #, c-format
 msgid " (y/N) "
 msgstr " (y/T) "
@@ -1845,7 +1675,8 @@ msgstr "Pembuangan gagal"
 msgid ""
 "urpmi version %s\n"
 "Copyright (C) 1999-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -1857,18 +1688,21 @@ msgstr ""
 
 #: ../urpmi:78
 #, fuzzy, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr "  --update       - guna hanya kemaskini media.\n"
 
 #: ../urpmi:81
 #, c-format
-msgid "  --auto         - non-interactive mode, assume default answers to questions.\n"
+msgid ""
+"  --auto         - non-interactive mode, assume default answers to "
+"questions.\n"
 msgstr ""
 
-#: ../urpmi:82
-#: ../urpmq:52
+#: ../urpmi:82 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
 #: ../urpmi:83
@@ -1886,15 +1720,16 @@ msgstr ""
 msgid "    --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi:86
-#: ../urpmq:53
+#: ../urpmi:86 ../urpmq:53
 #, fuzzy, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
 msgstr "Senarai tag:\n"
 
 #: ../urpmi:87
 #, c-format
-msgid "  --no-uninstall - never ask to uninstall a package, abort the installation.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
 
 #: ../urpmi:88
@@ -1902,8 +1737,7 @@ msgstr ""
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr ""
 
-#: ../urpmi:89
-#: ../urpmq:55
+#: ../urpmi:89 ../urpmq:55
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1955,7 +1789,8 @@ msgstr "  --update       - guna hanya kemaskini media.\n"
 
 #: ../urpmi:103
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr ""
 
 #: ../urpmi:105
@@ -1972,8 +1807,7 @@ msgid ""
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:110
-#: ../urpmq:68
+#: ../urpmi:110 ../urpmq:68
 #, fuzzy, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - guna root lain untuk membuang rpm.\n"
@@ -2017,9 +1851,7 @@ msgstr ""
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr ""
 
-#: ../urpmi:122
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:36
+#: ../urpmi:122 ../urpmi.addmedia:58 ../urpmi.update:36
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
@@ -2031,20 +1863,14 @@ msgid ""
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:125
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:37
-#: ../urpmq:75
+#: ../urpmi:125 ../urpmi.addmedia:59 ../urpmi.update:37 ../urpmq:75
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:127
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:39
-#: ../urpmq:77
+#: ../urpmi:127 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:77
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2067,7 +1893,9 @@ msgstr ""
 
 #: ../urpmi:134
 #, c-format
-msgid "  --test         - only verify if the installation can be achieved correctly.\n"
+msgid ""
+"  --test         - only verify if the installation can be achieved "
+"correctly.\n"
 msgstr ""
 
 #: ../urpmi:135
@@ -2122,8 +1950,7 @@ msgstr "  --noclean      - jaga rpm tidak dipakai dalam kache.\n"
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 
-#: ../urpmi:147
-#: ../urpmq:92
+#: ../urpmi:147 ../urpmq:92
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
@@ -2172,12 +1999,15 @@ msgstr ""
 
 #: ../urpmi:221
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 
 #: ../urpmi:241
 #, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
 
 #: ../urpmi:242
@@ -2228,7 +2058,9 @@ msgstr "Akan Memasang"
 
 #: ../urpmi:455
 #, fuzzy, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
 msgstr ""
 "Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
 "%s\n"
@@ -2254,18 +2086,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:508
-#: ../urpmi:524
+#: ../urpmi:508 ../urpmi:524
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Pemasangan sekecil mungkin"
 
-#: ../urpmi:509
-#: ../urpmi:525
-#: ../urpmi:613
-#: ../urpmi.addmedia:142
+#: ../urpmi:509 ../urpmi:525 ../urpmi:613 ../urpmi.addmedia:142
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/t) "
@@ -2334,7 +2162,8 @@ msgstr ""
 #: ../urpmi:578
 #, fuzzy, c-format
 msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
 "%s\n"
 msgstr ""
 "Anda perlu menjadi root utk install kebergantungan berikutnya:\n"
@@ -2355,21 +2184,19 @@ msgstr ""
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../urpmi:621
-#, fuzzy, c-format
-msgid "Press Enter when ready..."
-msgstr ""
-"Tekan <Enter> untuk mengulangbut sistem anda.\n"
-"\n"
-
-#: ../urpmi:626
+#: ../urpmi:627
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
@@ -2390,7 +2217,7 @@ msgid ""
 "       ftp://<login>:<password>@<host>/<path>\n"
 "       ftp://<host>/<path>\n"
 "       http://<host>/<path>\n"
-"       removable://<path>\n"
+"       cdrom://<path>\n"
 "\n"
 "usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
 "usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2413,23 +2240,17 @@ msgstr ""
 "\n"
 "dan [pilihan] dari\n"
 
-#: ../urpmi.addmedia:55
-#: ../urpmi.update:33
-#: ../urpmq:72
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:72
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - guna wget utk mengambil fail jauh.\n"
 
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:34
-#: ../urpmq:73
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:73
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - guna curl utk mengambil fail jauh.\n"
 
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:35
-#: ../urpmq:74
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:74
 #, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - guna curl utk mengambil fail jauh.\n"
@@ -2443,7 +2264,8 @@ msgstr "  --update       - buat media update.\n"
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
-"                   one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+"                   one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
 msgstr ""
 
 #: ../urpmi.addmedia:66
@@ -2490,8 +2312,7 @@ msgstr ""
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:77
-#: ../urpmi.update:42
+#: ../urpmi.addmedia:77 ../urpmi.update:42
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
@@ -2506,23 +2327,12 @@ msgstr ""
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80
-#: ../urpmi.removemedia:42
-#: ../urpmi.update:49
-#, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - bersihkan direktori kache header.\n"
-
-#: ../urpmi.addmedia:81
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - mod diam.\n"
 
-#: ../urpmi.addmedia:82
-#: ../urpmi.removemedia:45
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:45 ../urpmi.update:53
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - mod verbos.\n"
@@ -2589,7 +2399,8 @@ msgstr "Tambah sempadan dan legapan kepada pilihan"
 msgid ""
 "urpmi.recover version %s\n"
 "Copyright (C) 2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -2611,7 +2422,8 @@ msgstr "  --noclean      - jaga rpm tidak dipakai dalam kache.\n"
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
 #: ../urpmi.recover:38
@@ -2698,8 +2510,7 @@ msgstr ""
 msgid "You must be superuser to do this"
 msgstr ""
 
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Tak dapat membuka fail %s untuk menulis"
@@ -2814,7 +2625,8 @@ msgstr "Hanya superuser yang boleh menginstal pakej"
 #: ../urpmi.update:76
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "tiada apa-apa yang perlu dikemaskini (guna urpmi.addmedia utk tambah media)\n"
+msgstr ""
+"tiada apa-apa yang perlu dikemaskini (guna urpmi.addmedia utk tambah media)\n"
 
 #: ../urpmi.update:94
 #, c-format
@@ -2845,7 +2657,8 @@ msgstr "Media Storan"
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -2857,7 +2670,9 @@ msgstr ""
 
 #: ../urpmq:48
 #, fuzzy, c-format
-msgid "  --searchmedia  - use only the given media to search requested (or updated) packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested (or updated) "
+"packages.\n"
 msgstr "  --update       - guna hanya kemaskini media.\n"
 
 #: ../urpmq:54
@@ -2892,7 +2707,8 @@ msgstr "Ralat mendapatkan senarai pakej yang ada"
 
 #: ../urpmq:62
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
 #: ../urpmq:63
@@ -2902,8 +2718,10 @@ msgstr "  --src          - pakej berikut adalah pakej sumber (sama dgn -s).\n"
 
 #: ../urpmq:64
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - beri semua pakej sumber sebelum muatturun (hanya root).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - beri semua pakej sumber sebelum muatturun (hanya root).\n"
 
 #: ../urpmq:66
 #, fuzzy, c-format
@@ -2924,20 +2742,30 @@ msgstr "&Susunatur Cetakan"
 
 #: ../urpmq:81
 #, fuzzy, c-format
+msgid "  --conflicts    - print conflicts.\n"
+msgstr "Lumpuhkan tag ID3V2"
+
+#: ../urpmq:82
+#, fuzzy, c-format
 msgid "  --provides     - print provides.\n"
 msgstr "&Susunatur Cetakan"
 
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid "  --requires     - print requires.\n"
+msgstr "Senarai tag:\n"
+
+#: ../urpmq:84
 #, fuzzy, c-format
 msgid "  --sourcerpm    - print sourcerpm.\n"
 msgstr "&Susunatur Cetakan"
 
-#: ../urpmq:83
+#: ../urpmq:85
 #, fuzzy, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "&Susunatur Cetakan"
 
-#: ../urpmq:85
+#: ../urpmq:87
 #, fuzzy, c-format
 msgid ""
 "  --requires-recursive, -d\n"
@@ -2996,12 +2824,16 @@ msgstr "  -r             - cetak versi dan keluaran dengan nama juga.\n"
 #: ../urpmq:100
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - pakej berikut adalah pakej sumber (sama dgn --src).\n"
+msgstr ""
+"  -s             - pakej berikut adalah pakej sumber (sama dgn --src).\n"
 
 #: ../urpmq:101
 #, c-format
-msgid "  -u             - remove package if a more recent version is already installed.\n"
-msgstr "  -u             - buang pakej jika versi lebih terkini telah dipasang.\n"
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u             - buang pakej jika versi lebih terkini telah dipasang.\n"
 
 #: ../urpmq:102
 #, c-format
@@ -3011,7 +2843,9 @@ msgstr "  -y             - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
 #: ../urpmq:103
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
-msgstr "  -Y             - seperti -y, tetapi memaksa untuk memadan tidak kira huruf besar atau kecil.\n"
+msgstr ""
+"  -Y             - seperti -y, tetapi memaksa untuk memadan tidak kira huruf "
+"besar atau kecil.\n"
 
 #: ../urpmq:104
 #, c-format
@@ -3023,7 +2857,12 @@ msgstr "  dicarikan nama atau fail rpm yg tertera pada baris perintah.\n"
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmq:360
+#: ../urpmq:206
+#, c-format
+msgid "use -l to list files"
+msgstr ""
+
+#: ../urpmq:363
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
 msgstr ""
@@ -3035,12 +2874,14 @@ msgstr ""
 
 #: ../urpmq:364
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 
 #: ../urpmq:365
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 
 #: ../urpmq:429
@@ -3048,3 +2889,34 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Tiada log perubahan dijumpai\n"
 
+#~ msgid "Unknown option %s"
+#~ msgstr "Pilihan tidak diketahui %s"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "terlalu banyak titik sambung utk media removable \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "ambil peranti removable sbg \"%s\""
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "pakai removable peranti lain [%s] untuk \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "tidak dapat mengambil nama path utk media removable \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "gagal mengakses media instalasi pertama"
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "media ketidaksinambungan \"%s\" bertanda removable, seharusnya tidak"
+
+#, fuzzy
+#~ msgid "Press Enter when ready..."
+#~ msgstr ""
+#~ "Tekan <Enter> untuk mengulangbut sistem anda.\n"
+#~ "\n"
+
+#~ msgid "  -c             - clean headers cache directory.\n"
+#~ msgstr "  -c             - bersihkan direktori kache header.\n"