updated po files

12 files changed, 374 insertions, 577 deletions

diff --git a/po/cy.po b/po/cy.po
index 9367b5fe..7fca064a 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "POT-Creation-Date: 2005-06-15 17:50+0800\n"
-"PO-Revision-Date: 2005-05-17 08:36-0000\n"
+"PO-Revision-Date: 2005-06-28 21:38-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
 "MIME-Version: 1.0\n"
@@ -159,9 +159,9 @@ msgid "Create media for a whole distribution"
 msgstr "Creu cyfrwng ar gyfer dosbarthiad cyfan"
 
 #: ../edit-urpm-sources.pl:207
-#, fuzzy, c-format
+#, c-format
 msgid "Search this media for updates"
-msgstr "Dewiswch y cyfrwng i'w diweddaru:"
+msgstr "Chwilio'rcyfrwng am ddiweddariadau"
 
 #: ../edit-urpm-sources.pl:218
 #, c-format
@@ -497,9 +497,9 @@ msgid "Enabled?"
 msgstr "Galluogwyd?"
 
 #: ../edit-urpm-sources.pl:882
-#, fuzzy, c-format
+#, c-format
 msgid "Updates?"
-msgstr "Diweddaru"
+msgstr "Diweddariadau?"
 
 #: ../edit-urpm-sources.pl:904
 #, c-format
@@ -1268,7 +1268,7 @@ msgstr "Fersiwn: "
 #: ../rpmdrake:554
 #, c-format
 msgid "Architecture: "
-msgstr ""
+msgstr "Pensaernïaeth:"
 
 #: ../rpmdrake:555
 #, c-format
diff --git a/po/da.po b/po/da.po
index 8d4e59c4..0df659bc 100644
--- a/po/da.po
+++ b/po/da.po
@@ -283,7 +283,8 @@ msgstr "Du skal indsætte mediet for at fortsætte"
 
 #: ../edit-urpm-sources.pl:421
 #, c-format
-msgid "In order to save the changes, you need to insert the medium in the drive."
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr "For at gemme ændringerne skal du indsætte mediet i drevet."
 
 #: ../edit-urpm-sources.pl:443
@@ -318,7 +319,8 @@ msgstr "Værtsnavn for proxy:"
 #: ../edit-urpm-sources.pl:462
 #, c-format
 msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Du kan angive en bruger og en adgangskode for autentifikation af proxy:"
+msgstr ""
+"Du kan angive en bruger og en adgangskode for autentifikation af proxy:"
 
 #: ../edit-urpm-sources.pl:465
 #, c-format
@@ -625,8 +627,7 @@ msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
-"  --changelog-first      vis ændringslog før filliste i "
-"beskrivelsesvinduet"
+"  --changelog-first      vis ændringslog før filliste i beskrivelsesvinduet"
 
 #: ../rpmdrake:33
 #, c-format
@@ -635,18 +636,24 @@ msgstr "  --media=medium1,..     begræns til angivet medie"
 
 #: ../rpmdrake:34
 #, c-format
-msgid "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
-msgstr "  --merge-all-rpmnew     foreslå at flette alle .rpmnew/.rpmsave-filer fundet"
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgstr ""
+"  --merge-all-rpmnew     foreslå at flette alle .rpmnew/.rpmsave-filer fundet"
 
 #: ../rpmdrake:35
 #, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
-msgstr "  --mode=MODE            sæt tilstand (install (standard), remove, update)"
+msgstr ""
+"  --mode=MODE            sæt tilstand (install (standard), remove, update)"
 
 #: ../rpmdrake:36
 #, c-format
-msgid "  --no-confirmation      don't ask first confirmation question in update mode"
-msgstr "  --no-confirmation      spørg ikke det første bekræftelsesspørgsmål i opdateringssilstand"
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
+msgstr ""
+"  --no-confirmation      spørg ikke det første bekræftelsesspørgsmål i "
+"opdateringssilstand"
 
 #: ../rpmdrake:37
 #, c-format
@@ -664,8 +671,8 @@ msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
-"  --parallel=alias,host  vær i parallel-tilstand, brug \"alias\" gruppe, brug \"host"
-"\" maskine til at vise krævede afhængigheder"
+"  --parallel=alias,host  vær i parallel-tilstand, brug \"alias\" gruppe, "
+"brug \"host\" maskine til at vise krævede afhængigheder"
 
 #: ../rpmdrake:40
 #, c-format
@@ -2450,8 +2457,10 @@ msgstr "Hjælp startes i baggrunden"
 
 #: ../rpmdrake.pm:827
 #, c-format
-msgid "The help window has been started, it should appear shortly on your desktop."
-msgstr "Hjælpevinduer er blevet startet, det bør vise sig snart på dit skrivebord."
+msgid ""
+"The help window has been started, it should appear shortly on your desktop."
+msgstr ""
+"Hjælpevinduer er blevet startet, det bør vise sig snart på dit skrivebord."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -2840,4 +2849,3 @@ msgstr "Administration af programmelmedier"
 
 #~ msgid "Program missing"
 #~ msgstr "Program mangler"
-
diff --git a/po/de.po b/po/de.po
index 669d122b..b4b6ae5a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13,18 +13,19 @@
 # Sebastian Deutscher <sebastian_deutscher@web.de>, 2003, 2004.
 # Frank Köster <frank@dueppel13.de>, 2004, 2005.
 # Nicolas Bauer <webmaster@mandrakeusers.de>, 2005.
+# Frank Koester <frank@dueppel13.de>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: de\n"
+"Project-Id-Version: rpmdrake-de\n"
 "POT-Creation-Date: 2005-06-15 17:50+0800\n"
-"PO-Revision-Date: 2005-03-24 17:51+0100\n"
-"Last-Translator: Nicolas Bauer <webmaster@mandrakeusers.de>\n"
-"Language-Team: deutsch <\tI18n-mdk-de@codershome.org>\n"
+"PO-Revision-Date: 2005-07-08 22:43+0200\n"
+"Last-Translator: Frank Koester <frank@dueppel13.de>\n"
+"Language-Team: deutsch\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.10.1\n"
 
 #: ../edit-urpm-sources.pl:66
 #, c-format
@@ -50,7 +51,7 @@ msgstr ""
 "\n"
 "Es gibt zwei Arten von offiziellen Spiegelservern. Sie können Quellen "
 "hinzufügen, welche\n"
-"den kompletten Satz an Paketen Ihrer Disribution (üblicherweise die "
+"den kompletten Satz an Paketen Ihrer Distribution (üblicherweise die "
 "Obermenge,\n"
 "die mit Ihren Standard Installations CDs mitgeliefert werden), oder Quellen, "
 "welche die offiziellen\n"
@@ -169,9 +170,9 @@ msgid "Create media for a whole distribution"
 msgstr "Erzeuge Medien für eine vollständige Distribution"
 
 #: ../edit-urpm-sources.pl:207
-#, fuzzy, c-format
+#, c-format
 msgid "Search this media for updates"
-msgstr "Bitte wählen Sie die zu aktualisierenden Medien:"
+msgstr "Dieses Medium nach Aktualisierungen durchsuchen"
 
 #: ../edit-urpm-sources.pl:218
 #, c-format
@@ -458,7 +459,7 @@ msgstr "Medium"
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
-msgstr ""
+msgstr "Schlüssel"
 
 #: ../edit-urpm-sources.pl:764
 #, c-format
@@ -513,9 +514,9 @@ msgid "Enabled?"
 msgstr "Aktiviert?"
 
 #: ../edit-urpm-sources.pl:882
-#, fuzzy, c-format
+#, c-format
 msgid "Updates?"
-msgstr "Aktualisieren"
+msgstr "Aktualisierungen?"
 
 #: ../edit-urpm-sources.pl:904
 #, c-format
@@ -637,68 +638,76 @@ msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
+"  --changelog-first      changelog vor der  Dateiliste im "
+"Beschreibungsfenster darstellen"
 
 #: ../rpmdrake:33
 #, c-format
 msgid "  --media=medium1,..     limit to given media"
-msgstr ""
+msgstr "  --media=medium1,..     anzugebende Medien begrenzen"
 
 #: ../rpmdrake:34
 #, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
+"  --merge-all-rpmnew     vorschlagen, alle gefundenen .rpmnew/.rpmsave "
+"Dateien zu vereinen"
 
 #: ../rpmdrake:35
 #, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
+"  --mode=MODE            setze Modus (Installation (Vorgabe), Entfernen, "
+"Aktualisierung)"
 
 #: ../rpmdrake:36
 #, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
+"  --no-confirmation      keine Erstbestätigung im Aktualisierungsmodus "
+"abfragen"
 
 #: ../rpmdrake:37
-#, fuzzy, c-format
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
-msgstr "  --update       - Verwende nur Aktualisierungs-Medien.\n"
+msgstr ""
+"  --no-media-update      die Medien nicht bei Inbetriebnahme aktualisieren"
 
 #: ../rpmdrake:38
-#, fuzzy, c-format
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
-msgstr "  --name         - gebe nur Paketnamen aus.\n"
+msgstr "  --no-verify-rpm        die Paketsignaturen nicht überprüfen"
 
 #: ../rpmdrake:39
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
+"  --parallel=alias,host  sind im parallelen Modus, benutze „alias\" Gruppe, "
+"benutze „host\" Rechner zum Anzeigen benötigter Abhängigkeiten"
 
 #: ../rpmdrake:40
 #, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
-msgstr ""
+msgstr "  --pkg-nosel=pkg1,..    nur diese Pakete anzeigen"
 
 #: ../rpmdrake:41
 #, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
-msgstr ""
+msgstr "  --pkg-sel=pkg1,..      diese Pakete vorauswählen"
 
 #: ../rpmdrake:42
-#, fuzzy, c-format
+#, c-format
 msgid "  --root                 force to run as root"
-msgstr ""
-"\n"
-"                      DrakBackup Dämon-Report\n"
-"\n"
+msgstr "  --root                 das Ausführen als root erzwingen"
 
 #: ../rpmdrake:43
 #, c-format
 msgid "  --search=pkg           run search for \"pkg\""
-msgstr ""
+msgstr "  --search=pkg           Suche nach „pkg\" ausführen"
 
 #: ../rpmdrake:164
 #, c-format
@@ -1280,7 +1289,7 @@ msgstr "Version: "
 #: ../rpmdrake:554
 #, c-format
 msgid "Architecture: "
-msgstr ""
+msgstr "Architektur: "
 
 #: ../rpmdrake:555
 #, c-format
@@ -2013,12 +2022,12 @@ msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux Update"
 
 #: ../rpmdrake.pm:123
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
-msgstr "Bitte geben Sie Ihre E-Mail-Adresse ein"
+msgstr "Bitte geben Sie Ihre Berechtigung für den Zugang zum Proxy ein \n"
 
 #: ../rpmdrake.pm:124
-#, fuzzy, c-format
+#, c-format
 msgid "User name:"
 msgstr "Benutzername:"
 
@@ -2741,9 +2750,3 @@ msgstr "Software entfernen"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Paketquellen-Manager"
-
-#~ msgid "Keys"
-#~ msgstr "Schlüssel"
-
-#~ msgid "Rpmdrake %s"
-#~ msgstr "RpmDrake %s"
diff --git a/po/eu.po b/po/eu.po
index 08a79083..4cd850d4 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -12,13 +12,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-eu\n"
 "POT-Creation-Date: 2005-06-15 17:50+0800\n"
-"PO-Revision-Date: 2005-06-12 23:42+0200\n"
+"PO-Revision-Date: 2005-07-18 01:06+0200\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: EUSKARA <itzulpena@euskalgnu.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
+"X-Generator: KBabel 1.10\n"
 
 #: ../edit-urpm-sources.pl:66
 #, c-format
@@ -162,9 +162,9 @@ msgid "Create media for a whole distribution"
 msgstr "Sortu euskarria banaketa oso batentzako"
 
 #: ../edit-urpm-sources.pl:207
-#, fuzzy, c-format
+#, c-format
 msgid "Search this media for updates"
-msgstr "Hautatu eguneratu nahi duzun euskarria:"
+msgstr "Miatu euskarri hau eguneraketa bila"
 
 #: ../edit-urpm-sources.pl:218
 #, c-format
@@ -498,9 +498,9 @@ msgid "Enabled?"
 msgstr "Gaituta?"
 
 #: ../edit-urpm-sources.pl:882
-#, fuzzy, c-format
+#, c-format
 msgid "Updates?"
-msgstr "Eguneratu"
+msgstr "Eguneraketak?"
 
 #: ../edit-urpm-sources.pl:904
 #, c-format
@@ -1272,7 +1272,7 @@ msgstr "Bertsioa: "
 #: ../rpmdrake:554
 #, c-format
 msgid "Architecture: "
-msgstr ""
+msgstr "Arkitektura: "
 
 #: ../rpmdrake:555
 #, c-format
diff --git a/po/he.po b/po/he.po
index df60f121..59c68dea 100644
--- a/po/he.po
+++ b/po/he.po
@@ -284,7 +284,8 @@ msgstr "עליך להכניס את המדיה בכדי להמשיך."
 
 #: ../edit-urpm-sources.pl:421
 #, c-format
-msgid "In order to save the changes, you need to insert the medium in the drive."
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr "בכדי לשמור את השינויים, עליך להכניס את המדיה אל הכונן."
 
 #: ../edit-urpm-sources.pl:443
@@ -623,7 +624,8 @@ msgstr "שימוש: %s [OPTION]..."
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
-msgstr "  --changelog-first      הצג את רשימת השינויים לפני רשימת הקבצים בחלון המידע"
+msgstr ""
+"  --changelog-first      הצג את רשימת השינויים לפני רשימת הקבצים בחלון המידע"
 
 #: ../rpmdrake:33
 #, c-format
@@ -632,8 +634,10 @@ msgstr "  --media=medium1,..     הגבל למקור הנתון"
 
 #: ../rpmdrake:34
 #, c-format
-msgid "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
-msgstr "  --merge-all-rpmnew     אחד את כל הקבצים שיימצאו מסוגl .rpmnew/.rpmsave"
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgstr ""
+"  --merge-all-rpmnew     אחד את כל הקבצים שיימצאו מסוגl .rpmnew/.rpmsave"
 
 #: ../rpmdrake:35
 #, c-format
@@ -642,7 +646,8 @@ msgstr "  --mode=MODE            set mode (install (default), remove, update)"
 
 #: ../rpmdrake:36
 #, c-format
-msgid "  --no-confirmation      don't ask first confirmation question in update mode"
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      אל תשאל את שאלת האימות הראשונה בעת עדכון"
 
 #: ../rpmdrake:37
@@ -2442,7 +2447,8 @@ msgstr "חלון העזרה נפתח ברקע"
 
 #: ../rpmdrake.pm:827
 #, c-format
-msgid "The help window has been started, it should appear shortly on your desktop."
+msgid ""
+"The help window has been started, it should appear shortly on your desktop."
 msgstr "חלון העזרה יפתח עוד מעט של שולחן העבודה שלך"
 
 #: ../grpmi/curl_download/curl_download.xs:86
@@ -2720,4 +2726,3 @@ msgstr "מנהל מקורות תוכנה"
 
 #~ msgid "Rpmdrake %s"
 #~ msgstr "Rpmdrake %s"
-
diff --git a/po/id.po b/po/id.po
index 602fed81..fa1b686e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,7 +1,7 @@
 #
 # Latest versions of po files are at http://www.mandrivalinux.com/l10n/id.php3
 #
-# Mandrakeupdate Bahasa Indonesia
+# Rpmdrake Bahasa Indonesia
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # Copyright (C) 1999 Mandriva
 # Budi Rachmanto <rac@mandrivalinux.org>, 2001-2003
diff --git a/po/is.po b/po/is.po
index 09b34146..b14589ee 100644
--- a/po/is.po
+++ b/po/is.po
@@ -143,7 +143,8 @@ msgstr "óbein slóð að synthesis/hdlist:"
 #: ../edit-urpm-sources.pl:177
 #, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
-msgstr "Ef skilið eftir autt, verður leitað að synthesis/hdlist á líklegum stöðum"
+msgstr ""
+"Ef skilið eftir autt, verður leitað að synthesis/hdlist á líklegum stöðum"
 
 #: ../edit-urpm-sources.pl:182
 #, c-format
@@ -275,7 +276,8 @@ msgstr "Þú verður að setja inn diskinn til að halda áfram"
 
 #: ../edit-urpm-sources.pl:421
 #, c-format
-msgid "In order to save the changes, you need to insert the medium in the drive."
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr "Til að vista breytingar, verður þú að setja miðilinn í drifið."
 
 #: ../edit-urpm-sources.pl:443
@@ -625,7 +627,8 @@ msgstr "  --media=miðill1,..     takmarka við uppgefna miðla"
 
 #: ../rpmdrake:34
 #, c-format
-msgid "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     Gera tillögu um að samræma allar .rpmnew/.rpmsave "
 "skrár sem finnast"
@@ -633,11 +636,13 @@ msgstr ""
 #: ../rpmdrake:35
 #, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
-msgstr "  --mode=Hamur          setja ham (install (sjálfgefið), remove, update)"
+msgstr ""
+"  --mode=Hamur          setja ham (install (sjálfgefið), remove, update)"
 
 #: ../rpmdrake:36
 #, c-format
-msgid "  --no-confirmation      don't ask first confirmation question in update mode"
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      ekki biðja um staðfestingu í uppfærsluham"
 
 #: ../rpmdrake:37
@@ -1937,7 +1942,8 @@ msgid ""
 msgstr ""
 "Velkomin að hugbúnaðar-tiltektar-tólinu \n"
 "\n"
-"Þetta tól hjálpar þér til að velja þá pakka sem þú vilt fjarlægja úr tölvunni."
+"Þetta tól hjálpar þér til að velja þá pakka sem þú vilt fjarlægja úr "
+"tölvunni."
 
 #: ../rpmdrake:1783
 #, c-format
@@ -2435,7 +2441,8 @@ msgstr "Hjálp ræst í bakgrunni"
 
 #: ../rpmdrake.pm:827
 #, c-format
-msgid "The help window has been started, it should appear shortly on your desktop."
+msgid ""
+"The help window has been started, it should appear shortly on your desktop."
 msgstr ""
 "Hjálpargluggi hefur verið ræstur, hann ætti að birtast eftir augnablik á "
 "skjáborðinu."
@@ -2867,4 +2874,3 @@ msgstr "Hugbúnaðar-miðla-tól"
 
 #~ msgid "Development/C++"
 #~ msgstr "Þróun/C++"
-
diff --git a/po/ms.po b/po/ms.po
index f175c694..970245c3 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -24,11 +24,14 @@ msgstr "Pilih jenis media"
 #: ../edit-urpm-sources.pl:67
 #, c-format
 msgid ""
-"This step enables you to add sources from a Mandriva Linux web or FTP mirror.\n"
+"This step enables you to add sources from a Mandriva Linux web or FTP "
+"mirror.\n"
 "\n"
 "There are two kinds of official mirrors. You can choose to add sources that\n"
-"contain the complete set of packages of your distribution (usually a superset\n"
-"of what comes on the standard installation CDs), or sources that provide the\n"
+"contain the complete set of packages of your distribution (usually a "
+"superset\n"
+"of what comes on the standard installation CDs), or sources that provide "
+"the\n"
 "official updates for your distribution. (You can add both, but you'll have\n"
 "to do this in two steps.)"
 msgstr ""
@@ -80,8 +83,7 @@ msgstr "Laluan:"
 msgid "FTP server"
 msgstr "Pelayan FTP"
 
-#: ../edit-urpm-sources.pl:122
-#: ../edit-urpm-sources.pl:123
+#: ../edit-urpm-sources.pl:122 ../edit-urpm-sources.pl:123
 #: ../edit-urpm-sources.pl:390
 #, c-format
 msgid "URL:"
@@ -112,15 +114,12 @@ msgstr "Lungsur..."
 msgid "Login:"
 msgstr "Login:"
 
-#: ../edit-urpm-sources.pl:170
-#: ../edit-urpm-sources.pl:467
-#: ../rpmdrake.pm:124
+#: ../edit-urpm-sources.pl:170 ../edit-urpm-sources.pl:467 ../rpmdrake.pm:124
 #, c-format
 msgid "Password:"
 msgstr "Katalaluan:"
 
-#: ../edit-urpm-sources.pl:175
-#: ../edit-urpm-sources.pl:391
+#: ../edit-urpm-sources.pl:175 ../edit-urpm-sources.pl:391
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Path relatif ke sintesis/hdlist:"
@@ -167,47 +166,25 @@ msgstr "Menambah media:"
 msgid "Type of medium:"
 msgstr "Jenis media:"
 
-#: ../edit-urpm-sources.pl:239
-#: ../edit-urpm-sources.pl:310
-#: ../edit-urpm-sources.pl:397
-#: ../edit-urpm-sources.pl:422
-#: ../edit-urpm-sources.pl:484
-#: ../edit-urpm-sources.pl:565
-#: ../edit-urpm-sources.pl:605
-#: ../edit-urpm-sources.pl:663
-#: ../edit-urpm-sources.pl:802
-#: ../rpmdrake:167
-#: ../rpmdrake:706
-#: ../rpmdrake:1518
-#: ../rpmdrake:1526
-#: ../rpmdrake.pm:554
-#: ../rpmdrake.pm:644
+#: ../edit-urpm-sources.pl:239 ../edit-urpm-sources.pl:310
+#: ../edit-urpm-sources.pl:397 ../edit-urpm-sources.pl:422
+#: ../edit-urpm-sources.pl:484 ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:605 ../edit-urpm-sources.pl:663
+#: ../edit-urpm-sources.pl:802 ../rpmdrake:167 ../rpmdrake:706
+#: ../rpmdrake:1518 ../rpmdrake:1526 ../rpmdrake.pm:554 ../rpmdrake.pm:644
 #: ../rpmdrake.pm:713
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../edit-urpm-sources.pl:241
-#: ../edit-urpm-sources.pl:312
-#: ../edit-urpm-sources.pl:422
-#: ../edit-urpm-sources.pl:474
-#: ../edit-urpm-sources.pl:562
-#: ../edit-urpm-sources.pl:604
-#: ../edit-urpm-sources.pl:656
-#: ../edit-urpm-sources.pl:728
-#: ../edit-urpm-sources.pl:795
-#: ../edit-urpm-sources.pl:848
-#: ../edit-urpm-sources.pl:1008
-#: ../rpmdrake:167
-#: ../rpmdrake:706
-#: ../rpmdrake:723
-#: ../rpmdrake:728
-#: ../rpmdrake:1459
-#: ../rpmdrake:1518
-#: ../rpmdrake:1661
-#: ../rpmdrake.pm:115
-#: ../rpmdrake.pm:236
-#: ../rpmdrake.pm:293
+#: ../edit-urpm-sources.pl:241 ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:474
+#: ../edit-urpm-sources.pl:562 ../edit-urpm-sources.pl:604
+#: ../edit-urpm-sources.pl:656 ../edit-urpm-sources.pl:728
+#: ../edit-urpm-sources.pl:795 ../edit-urpm-sources.pl:848
+#: ../edit-urpm-sources.pl:1008 ../rpmdrake:167 ../rpmdrake:706
+#: ../rpmdrake:723 ../rpmdrake:728 ../rpmdrake:1459 ../rpmdrake:1518
+#: ../rpmdrake:1661 ../rpmdrake.pm:115 ../rpmdrake.pm:236 ../rpmdrake.pm:293
 #: ../rpmdrake.pm:554
 #, c-format
 msgid "Ok"
@@ -268,8 +245,7 @@ msgstr "Menyunting media \"%s\":"
 msgid "Save changes"
 msgstr "Simpan perubahan"
 
-#: ../edit-urpm-sources.pl:409
-#: ../edit-urpm-sources.pl:995
+#: ../edit-urpm-sources.pl:409 ../edit-urpm-sources.pl:995
 #, c-format
 msgid "Proxy..."
 msgstr "Proksi..."
@@ -281,7 +257,8 @@ msgstr ""
 
 #: ../edit-urpm-sources.pl:421
 #, fuzzy, c-format
-msgid "In order to save the changes, you need to insert the medium in the drive."
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr "Masuk dalam."
 
 #: ../edit-urpm-sources.pl:443
@@ -301,7 +278,9 @@ msgstr "Tetapan proksi global"
 
 #: ../edit-urpm-sources.pl:456
 #, fuzzy, c-format
-msgid "If you need a proxy, enter the hostname and an optional port (syntax: <proxyhost[:port]>):"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr "dan<proxyhost[:port]>:"
 
 #: ../edit-urpm-sources.pl:459
@@ -369,17 +348,13 @@ msgstr "Protokol:"
 msgid "Media limit:"
 msgstr "Had hujah"
 
-#: ../edit-urpm-sources.pl:642
-#: ../edit-urpm-sources.pl:649
+#: ../edit-urpm-sources.pl:642 ../edit-urpm-sources.pl:649
 #, c-format
 msgid "Add"
 msgstr "Tambah"
 
-#: ../edit-urpm-sources.pl:643
-#: ../edit-urpm-sources.pl:650
-#: ../edit-urpm-sources.pl:708
-#: ../edit-urpm-sources.pl:973
-#: ../rpmdrake:1181
+#: ../edit-urpm-sources.pl:643 ../edit-urpm-sources.pl:650
+#: ../edit-urpm-sources.pl:708 ../edit-urpm-sources.pl:973 ../rpmdrake:1181
 #, c-format
 msgid "Remove"
 msgstr "Buang"
@@ -414,23 +389,18 @@ msgstr "Had hujah"
 msgid "Command"
 msgstr "Arahan"
 
-#: ../edit-urpm-sources.pl:692
-#: ../rpmdrake:366
-#: ../rpmdrake:384
-#: ../rpmdrake:518
+#: ../edit-urpm-sources.pl:692 ../rpmdrake:366 ../rpmdrake:384 ../rpmdrake:518
 #: ../rpmdrake:634
 #, c-format
 msgid "(none)"
 msgstr "(tiada)"
 
-#: ../edit-urpm-sources.pl:712
-#: ../edit-urpm-sources.pl:977
+#: ../edit-urpm-sources.pl:712 ../edit-urpm-sources.pl:977
 #, c-format
 msgid "Edit"
 msgstr "Ubah"
 
-#: ../edit-urpm-sources.pl:720
-#: ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:983
 #, c-format
 msgid "Add..."
 msgstr "Tambah..."
@@ -440,8 +410,7 @@ msgstr "Tambah..."
 msgid "Manage keys for digital signatures of packages"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:740
-#: ../edit-urpm-sources.pl:883
+#: ../edit-urpm-sources.pl:740 ../edit-urpm-sources.pl:883
 #, c-format
 msgid "Medium"
 msgstr "Sederhana"
@@ -515,8 +484,7 @@ msgstr "  --update       - buat media update.\n"
 msgid "Regenerate hdlist"
 msgstr "bangun hdlist [%s]"
 
-#: ../edit-urpm-sources.pl:916
-#: ../rpmdrake.pm:636
+#: ../edit-urpm-sources.pl:916 ../rpmdrake.pm:636
 #, fuzzy, c-format
 msgid "Please wait, updating media..."
 msgstr "Sila tunggu, menambah media..."
@@ -558,9 +526,7 @@ msgstr ""
 msgid "Help"
 msgstr "Pertolongan"
 
-#: ../edit-urpm-sources.pl:1020
-#: ../gurpmi.addmedia:74
-#: ../rpmdrake:1774
+#: ../edit-urpm-sources.pl:1020 ../gurpmi.addmedia:74 ../rpmdrake:1774
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -612,7 +578,9 @@ msgstr "Penggunaan: %s [PILIHAN]..."
 
 #: ../rpmdrake:32
 #, c-format
-msgid "  --changelog-first      display changelog before filelist in the description window"
+msgid ""
+"  --changelog-first      display changelog before filelist in the "
+"description window"
 msgstr ""
 
 #: ../rpmdrake:33
@@ -622,7 +590,8 @@ msgstr ""
 
 #: ../rpmdrake:34
 #, c-format
-msgid "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
 #: ../rpmdrake:35
@@ -632,7 +601,8 @@ msgstr ""
 
 #: ../rpmdrake:36
 #, c-format
-msgid "  --no-confirmation      don't ask first confirmation question in update mode"
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
 #: ../rpmdrake:37
@@ -647,7 +617,9 @@ msgstr ""
 
 #: ../rpmdrake:39
 #, c-format
-msgid "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host\" machine to show needed deps"
+msgid ""
+"  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
+"\" machine to show needed deps"
 msgstr ""
 
 #: ../rpmdrake:40
@@ -688,10 +660,7 @@ msgstr "normal pengguna on."
 msgid "Accessibility"
 msgstr "Kebolehcapaian"
 
-#: ../rpmdrake:175
-#: ../rpmdrake:176
-#: ../rpmdrake:177
-#: ../rpmdrake:178
+#: ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177 ../rpmdrake:178
 #, fuzzy, c-format
 msgid "Archiving"
 msgstr "Mengarkib"
@@ -711,23 +680,14 @@ msgstr "Menulis CD"
 msgid "Compression"
 msgstr "- Mampatan: %s\n"
 
-#: ../rpmdrake:178
-#: ../rpmdrake:183
-#: ../rpmdrake:195
-#: ../rpmdrake:206
-#: ../rpmdrake:215
-#: ../rpmdrake:227
-#: ../rpmdrake:239
-#: ../rpmdrake:247
+#: ../rpmdrake:178 ../rpmdrake:183 ../rpmdrake:195 ../rpmdrake:206
+#: ../rpmdrake:215 ../rpmdrake:227 ../rpmdrake:239 ../rpmdrake:247
 #: ../rpmdrake:335
 #, c-format
 msgid "Other"
 msgstr "Lain-lain"
 
-#: ../rpmdrake:179
-#: ../rpmdrake:180
-#: ../rpmdrake:181
-#: ../rpmdrake:182
+#: ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181 ../rpmdrake:182
 #: ../rpmdrake:183
 #, fuzzy, c-format
 msgid "Books"
@@ -753,8 +713,7 @@ msgstr ""
 msgid "Literature"
 msgstr ""
 
-#: ../rpmdrake:184
-#: ../rpmdrake:185
+#: ../rpmdrake:184 ../rpmdrake:185
 #, fuzzy, c-format
 msgid "Cluster"
 msgstr "_Gugusan"
@@ -774,22 +733,14 @@ msgstr "Servis sistem"
 msgid "Communications"
 msgstr "Komunikasi"
 
-#: ../rpmdrake:187
-#: ../rpmdrake:190
+#: ../rpmdrake:187 ../rpmdrake:190
 #, c-format
 msgid "Databases"
 msgstr "PangkalanData"
 
-#: ../rpmdrake:188
-#: ../rpmdrake:189
-#: ../rpmdrake:190
-#: ../rpmdrake:191
-#: ../rpmdrake:192
-#: ../rpmdrake:193
-#: ../rpmdrake:194
-#: ../rpmdrake:195
-#: ../rpmdrake:196
-#: ../rpmdrake:197
+#: ../rpmdrake:188 ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191
+#: ../rpmdrake:192 ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195
+#: ../rpmdrake:196 ../rpmdrake:197
 #, c-format
 msgid "Development"
 msgstr "Pemaju"
@@ -854,14 +805,8 @@ msgstr "Kalkulator"
 msgid "File tools"
 msgstr "Alatan Pentadbiran"
 
-#: ../rpmdrake:202
-#: ../rpmdrake:203
-#: ../rpmdrake:204
-#: ../rpmdrake:205
-#: ../rpmdrake:206
-#: ../rpmdrake:207
-#: ../rpmdrake:208
-#: ../rpmdrake:209
+#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
+#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
 #, c-format
 msgid "Games"
 msgstr "Permainan"
@@ -901,14 +846,8 @@ msgstr "Sukan"
 msgid "Strategy"
 msgstr ""
 
-#: ../rpmdrake:210
-#: ../rpmdrake:211
-#: ../rpmdrake:212
-#: ../rpmdrake:213
-#: ../rpmdrake:214
-#: ../rpmdrake:215
-#: ../rpmdrake:216
-#: ../rpmdrake:217
+#: ../rpmdrake:210 ../rpmdrake:211 ../rpmdrake:212 ../rpmdrake:213
+#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
 #, fuzzy, c-format
 msgid "Graphical desktop"
 msgstr "Desktop Default:"
@@ -963,16 +902,9 @@ msgstr "Pemerhatian"
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../rpmdrake:221
-#: ../rpmdrake:222
-#: ../rpmdrake:223
-#: ../rpmdrake:224
-#: ../rpmdrake:225
-#: ../rpmdrake:226
-#: ../rpmdrake:227
-#: ../rpmdrake:228
-#: ../rpmdrake:229
-#: ../rpmdrake:246
+#: ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224
+#: ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#: ../rpmdrake:229 ../rpmdrake:246
 #, c-format
 msgid "Networking"
 msgstr "Rangkaian"
@@ -1032,14 +964,8 @@ msgstr "Kekunci Multimedia"
 msgid "Publishing"
 msgstr "Penerbitan"
 
-#: ../rpmdrake:233
-#: ../rpmdrake:234
-#: ../rpmdrake:235
-#: ../rpmdrake:236
-#: ../rpmdrake:237
-#: ../rpmdrake:238
-#: ../rpmdrake:239
-#: ../rpmdrake:240
+#: ../rpmdrake:233 ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236
+#: ../rpmdrake:237 ../rpmdrake:238 ../rpmdrake:239 ../rpmdrake:240
 #, c-format
 msgid "Sciences"
 msgstr "Sains"
@@ -1089,24 +1015,11 @@ msgstr "Shell"
 msgid "Sound"
 msgstr "Bunyi"
 
-#: ../rpmdrake:243
-#: ../rpmdrake:244
-#: ../rpmdrake:245
-#: ../rpmdrake:246
-#: ../rpmdrake:247
-#: ../rpmdrake:248
-#: ../rpmdrake:249
-#: ../rpmdrake:250
-#: ../rpmdrake:251
-#: ../rpmdrake:252
-#: ../rpmdrake:253
-#: ../rpmdrake:254
-#: ../rpmdrake:255
-#: ../rpmdrake:256
-#: ../rpmdrake:257
-#: ../rpmdrake:258
-#: ../rpmdrake:259
-#: ../rpmdrake:260
+#: ../rpmdrake:243 ../rpmdrake:244 ../rpmdrake:245 ../rpmdrake:246
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255 ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:258
+#: ../rpmdrake:259 ../rpmdrake:260
 #, c-format
 msgid "System"
 msgstr "Sistem"
@@ -1116,12 +1029,8 @@ msgstr "Sistem"
 msgid "Base"
 msgstr "Asas"
 
-#: ../rpmdrake:244
-#: ../rpmdrake:245
-#: ../rpmdrake:246
-#: ../rpmdrake:247
-#: ../rpmdrake:248
-#: ../rpmdrake:249
+#: ../rpmdrake:244 ../rpmdrake:245 ../rpmdrake:246 ../rpmdrake:247
+#: ../rpmdrake:248 ../rpmdrake:249
 #, c-format
 msgid "Configuration"
 msgstr "Penyelarasan"
@@ -1156,10 +1065,7 @@ msgstr "Pembangunan"
 msgid "Deployment"
 msgstr "Pembangunan"
 
-#: ../rpmdrake:252
-#: ../rpmdrake:253
-#: ../rpmdrake:254
-#: ../rpmdrake:255
+#: ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254 ../rpmdrake:255
 #, c-format
 msgid "Fonts"
 msgstr "Font"
@@ -1229,15 +1135,12 @@ msgstr "Permainan"
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:390
-#: ../rpmdrake:535
-#: ../rpmdrake:537
+#: ../rpmdrake:390 ../rpmdrake:535 ../rpmdrake:537
 #, fuzzy, c-format
 msgid "(Not available)"
 msgstr "Bantuan tidak ada"
 
-#: ../rpmdrake:419
-#: ../rpmdrake:499
+#: ../rpmdrake:419 ../rpmdrake:499
 #, c-format
 msgid "Search results"
 msgstr "Hasil carian"
@@ -1247,16 +1150,12 @@ msgstr "Hasil carian"
 msgid "Search results (none)"
 msgstr "Hasil pencarian bagi "
 
-#: ../rpmdrake:430
-#: ../rpmdrake:457
+#: ../rpmdrake:430 ../rpmdrake:457
 #, fuzzy, c-format
 msgid "Please wait, searching..."
 msgstr "Muatan...Sila Tunggu"
 
-#: ../rpmdrake:452
-#: ../rpmdrake:579
-#: ../rpmdrake:1236
-#: ../rpmdrake:1559
+#: ../rpmdrake:452 ../rpmdrake:579 ../rpmdrake:1236 ../rpmdrake:1559
 #: ../rpmdrake:1773
 #, c-format
 msgid "Rpmdrake"
@@ -1267,14 +1166,12 @@ msgstr "Rpmdrake"
 msgid "Stop"
 msgstr "Henti"
 
-#: ../rpmdrake:500
-#: ../rpmdrake:669
+#: ../rpmdrake:500 ../rpmdrake:669
 #, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake:500
-#: ../rpmdrake:669
+#: ../rpmdrake:500 ../rpmdrake:669
 #, c-format
 msgid "Addable"
 msgstr ""
@@ -1359,10 +1256,7 @@ msgstr "Huraian: "
 msgid "No description"
 msgstr "Tiada keterangan"
 
-#: ../rpmdrake:596
-#: ../rpmdrake:719
-#: ../rpmdrake:721
-#: ../rpmdrake:1651
+#: ../rpmdrake:596 ../rpmdrake:719 ../rpmdrake:721 ../rpmdrake:1651
 #, fuzzy, c-format
 msgid "More information on package..."
 msgstr "ralat membaca meklumat pada khidmat %s: %s\n"
@@ -1401,14 +1295,12 @@ msgid "All"
 msgstr "Semua"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:706
-#: ../rpmdrake:711
+#: ../rpmdrake:706 ../rpmdrake:711
 #, fuzzy, c-format
 msgid "More info"
 msgstr "Lebih Maklumat"
 
-#: ../rpmdrake:714
-#: ../rpmdrake:1640
+#: ../rpmdrake:714 ../rpmdrake:1640
 #, fuzzy, c-format
 msgid "Information on packages"
 msgstr "Urus pakej dipasang pada sistem"
@@ -1428,8 +1320,7 @@ msgstr ""
 "Untuk memenuhi kebergantungan,\n"
 "Pakej-pakej berikut akan dihapus:"
 
-#: ../rpmdrake:743
-#: ../rpmdrake:752
+#: ../rpmdrake:743 ../rpmdrake:752
 #, fuzzy, c-format
 msgid "Some packages can't be removed"
 msgstr "Peranti gelungbalik tidak boleh dibuang!"
@@ -1441,8 +1332,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:753
-#: ../rpmdrake:815
+#: ../rpmdrake:753 ../rpmdrake:815
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1481,8 +1371,7 @@ msgid ""
 "%s"
 msgstr "Pakej `%s' tidak boleh diinstal\n"
 
-#: ../rpmdrake:814
-#: ../rpmdrake:1080
+#: ../rpmdrake:814 ../rpmdrake:1080
 #, fuzzy, c-format
 msgid "Some packages need to be removed"
 msgstr "_Kekalkan pakej yang kini tersenarai untuk dibuang"
@@ -1623,10 +1512,7 @@ msgstr ""
 "\n"
 "Adakah anda ingin teruskan (langkui pakej ini)?"
 
-#: ../rpmdrake:1117
-#: ../rpmdrake:1120
-#: ../rpmdrake:1129
-#: ../rpmdrake:1140
+#: ../rpmdrake:1117 ../rpmdrake:1120 ../rpmdrake:1129 ../rpmdrake:1140
 #: ../rpmdrake:1145
 #, c-format
 msgid "/_File"
@@ -1657,21 +1543,17 @@ msgstr "/_Keluar"
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1148
-#: ../rpmdrake:1149
-#: ../rpmdrake:1156
+#: ../rpmdrake:1148 ../rpmdrake:1149 ../rpmdrake:1156
 #, c-format
 msgid "/_Options"
 msgstr "/_Pilihan"
 
-#: ../rpmdrake:1149
-#: ../rpmdrake:1156
+#: ../rpmdrake:1149 ../rpmdrake:1156
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr ""
 
-#: ../rpmdrake:1153
-#: ../rpmdrake:1154
+#: ../rpmdrake:1153 ../rpmdrake:1154
 #, c-format
 msgid "/_Help"
 msgstr "/_Bantuan"
@@ -1786,27 +1668,22 @@ msgstr "Pemasangan selesai"
 msgid "Inspect..."
 msgstr "Gst-inspect"
 
-#: ../rpmdrake:1481
-#: ../rpmdrake:1636
+#: ../rpmdrake:1481 ../rpmdrake:1636
 #, fuzzy, c-format
 msgid "Everything installed successfully"
 msgstr "Pakej berjaya dipasang.."
 
-#: ../rpmdrake:1482
-#: ../rpmdrake:1637
+#: ../rpmdrake:1482 ../rpmdrake:1637
 #, fuzzy, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Semua."
 
-#: ../rpmdrake:1484
-#: ../rpmdrake:1621
+#: ../rpmdrake:1484 ../rpmdrake:1621
 #, fuzzy, c-format
 msgid "Problem during installation"
 msgstr "%s %s pemasangan pada hos %s"
 
-#: ../rpmdrake:1485
-#: ../rpmdrake:1622
-#: ../rpmdrake:1677
+#: ../rpmdrake:1485 ../rpmdrake:1622 ../rpmdrake:1677
 #, fuzzy, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1827,8 +1704,7 @@ msgstr "tidak dapat mengambil pakej asal, batal"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "tidak dapat mengambil pakej asal, batal"
 
-#: ../rpmdrake:1500
-#: ../rpmdrake:1571
+#: ../rpmdrake:1500 ../rpmdrake:1571
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1883,8 +1759,7 @@ msgstr ""
 "\n"
 "Adakah anda hendak meneruskan pemasangan ?"
 
-#: ../rpmdrake:1568
-#: ../rpmdrake:1676
+#: ../rpmdrake:1568 ../rpmdrake:1676
 #, c-format
 msgid "Installation failed"
 msgstr "Instalasi gagal"
@@ -2106,8 +1981,7 @@ msgstr "Jerman"
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake.pm:368
-#: ../rpmdrake.pm:372
+#: ../rpmdrake.pm:368 ../rpmdrake.pm:372
 #, c-format
 msgid "Greece"
 msgstr "Greek"
@@ -2202,10 +2076,7 @@ msgstr "United Kingdom"
 msgid "China"
 msgstr "China"
 
-#: ../rpmdrake.pm:388
-#: ../rpmdrake.pm:389
-#: ../rpmdrake.pm:390
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:388 ../rpmdrake.pm:389 ../rpmdrake.pm:390 ../rpmdrake.pm:391
 #: ../rpmdrake.pm:468
 #, c-format
 msgid "United States"
@@ -2345,7 +2216,8 @@ msgstr "Ralat memasang pakej"
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
-"you should use the Software Media Manager to remove it and re-add it in order\n"
+"you should use the Software Media Manager to remove it and re-add it in "
+"order\n"
 "to reconfigure it, either it is currently unreachable and you should retry\n"
 "later."
 msgstr ""
@@ -2379,8 +2251,7 @@ msgid ""
 "%s"
 msgstr "dimatikan"
 
-#: ../rpmdrake.pm:767
-#: ../rpmdrake.pm:776
+#: ../rpmdrake.pm:767 ../rpmdrake.pm:776
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2412,14 +2283,16 @@ msgstr ""
 #: ../rpmdrake.pm:807
 #, c-format
 msgid ""
-"Your medium `%s', used for updates, does not match the version of %s you're running (%s).\n"
+"Your medium `%s', used for updates, does not match the version of %s you're "
+"running (%s).\n"
 "It will be disabled."
 msgstr ""
 
 #: ../rpmdrake.pm:810
 #, c-format
 msgid ""
-"Your medium `%s', used for updates, does not match the version of Mandriva Linux you're running (%s).\n"
+"Your medium `%s', used for updates, does not match the version of Mandriva "
+"Linux you're running (%s).\n"
 "It will be disabled."
 msgstr ""
 
@@ -2430,7 +2303,8 @@ msgstr "fail bantuan pemasangan dalam pelbagai bahasa"
 
 #: ../rpmdrake.pm:827
 #, fuzzy, c-format
-msgid "The help window has been started, it should appear shortly on your desktop."
+msgid ""
+"The help window has been started, it should appear shortly on your desktop."
 msgstr "on."
 
 #: ../grpmi/curl_download/curl_download.xs:86
@@ -2705,4 +2579,3 @@ msgstr "Tambah dan Buang Perisian"
 #, fuzzy
 msgid "Software Media Manager"
 msgstr "Pengurus tetingkap Sawfish"
-
diff --git a/po/nb.po b/po/nb.po
index 3bf9c664..cbf4b2c8 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -283,7 +283,8 @@ msgstr "Du må sette inn mediumet for å fortsette"
 
 #: ../edit-urpm-sources.pl:421
 #, c-format
-msgid "In order to save the changes, you need to insert the medium in the drive."
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr "For å kunne lagre endringene må du sette inn et medium i stasjonen."
 
 #: ../edit-urpm-sources.pl:443
@@ -355,7 +356,8 @@ msgstr "Legg til en vert"
 #: ../edit-urpm-sources.pl:599
 #, c-format
 msgid "Type in the hostname or IP address of the host to add:"
-msgstr "Skriv inn vertsnavnet eller IP-adressen til verten som skal legges til:"
+msgstr ""
+"Skriv inn vertsnavnet eller IP-adressen til verten som skal legges til:"
 
 #: ../edit-urpm-sources.pl:630
 #, c-format
@@ -626,7 +628,8 @@ msgstr "Bruk: %s [OPSJONER]..."
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
-msgstr "  --changelog-first      vis changelog før filliste i beskrivelsesvinduet"
+msgstr ""
+"  --changelog-first      vis changelog før filliste i beskrivelsesvinduet"
 
 #: ../rpmdrake:33
 #, c-format
@@ -635,7 +638,8 @@ msgstr "  --media=medium1,..     begrense til gitte media"
 
 #: ../rpmdrake:34
 #, c-format
-msgid "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     foreslå å sammenslå alle .rpmnew/.rpmsave-filer "
 "funnet"
@@ -643,11 +647,13 @@ msgstr ""
 #: ../rpmdrake:35
 #, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
-msgstr "  --mode=MODE            sett modus (install (standard), remove, update)"
+msgstr ""
+"  --mode=MODE            sett modus (install (standard), remove, update)"
 
 #: ../rpmdrake:36
 #, c-format
-msgid "  --no-confirmation      don't ask first confirmation question in update mode"
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      ikke spørr etter første bekreftelsesspørsmål i "
 "oppdateringsmodus"
@@ -2360,8 +2366,8 @@ msgstr ""
 "`%s'. Enten så er dette oppdateringsmediet satt opp feil, og isåfall\n"
 "så bør du bruke Programvare-Mediahåndtereren for å fjerne det og legge det "
 "til på nytt for å\n"
-"kunne sette det opp på nytt, eller så er det for øyeblikket "
-"ikke mulig å rekke det\n"
+"kunne sette det opp på nytt, eller så er det for øyeblikket ikke mulig å "
+"rekke det\n"
 "og du bør da prøve på nytt senere."
 
 #: ../rpmdrake.pm:695
@@ -2458,8 +2464,10 @@ msgstr "Hjelp startet opp i bakgrunn"
 
 #: ../rpmdrake.pm:827
 #, c-format
-msgid "The help window has been started, it should appear shortly on your desktop."
-msgstr "Hjelpevinduet har blitt startet, det bør straks dukke opp på ditt skrivebord."
+msgid ""
+"The help window has been started, it should appear shortly on your desktop."
+msgstr ""
+"Hjelpevinduet har blitt startet, det bør straks dukke opp på ditt skrivebord."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -2730,4 +2738,3 @@ msgstr "Fjern programvare"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Programvare-Mediahåndterer"
-
diff --git a/po/nn.po b/po/nn.po
index a0cd408e..773ecdaf 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -278,7 +278,8 @@ msgstr "Du må setja inn mediet før du kan halda fram"
 
 #: ../edit-urpm-sources.pl:421
 #, c-format
-msgid "In order to save the changes, you need to insert the medium in the drive."
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr "For å kunna lagra endringane må setja mediet i stasjonen."
 
 #: ../edit-urpm-sources.pl:443
@@ -619,7 +620,9 @@ msgstr "Bruk: %s [VAL] ..."
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
-msgstr "  --changelog-first      – Vis endringslogg før fillista i skildringsvindauge.n window"
+msgstr ""
+"  --changelog-first      – Vis endringslogg før fillista i "
+"skildringsvindauge.n window"
 
 #: ../rpmdrake:33
 #, c-format
@@ -628,18 +631,25 @@ msgstr "  --media=medium1, ...   – Avgrens til vald medium."
 
 #: ../rpmdrake:34
 #, c-format
-msgid "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
-msgstr "  --merge-all-rpmnew     – Føreslå å slå saman alle .rpmnew- og .rpmsave-filene funne."
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgstr ""
+"  --merge-all-rpmnew     – Føreslå å slå saman alle .rpmnew- og .rpmsave-"
+"filene funne."
 
 #: ../rpmdrake:35
 #, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
-msgstr "  --mode=MODUS           – Vel modus (install (installer – standard), remove (fjern), update (oppdater))."
+msgstr ""
+"  --mode=MODUS           – Vel modus (install (installer – standard), remove "
+"(fjern), update (oppdater))."
 
 #: ../rpmdrake:36
 #, c-format
-msgid "  --no-confirmation      don't ask first confirmation question in update mode"
-msgstr "  --no-confirmation      – Ikkje spør om stadfesting i oppdateringsmodus."
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
+msgstr ""
+"  --no-confirmation      – Ikkje spør om stadfesting i oppdateringsmodus."
 
 #: ../rpmdrake:37
 #, c-format
@@ -656,7 +666,9 @@ msgstr "  --no-verify-rpm        – Ikkje stadfest pakkesignaturar."
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
-msgstr "  --parallel=alias,vert  – Ver i parallellmodus. Bruk «alias»-gruppe og «vert»-maskin for å visa nødvendige avhengnader."
+msgstr ""
+"  --parallel=alias,vert  – Ver i parallellmodus. Bruk «alias»-gruppe og "
+"«vert»-maskin for å visa nødvendige avhengnader."
 
 #: ../rpmdrake:40
 #, c-format
@@ -2439,7 +2451,8 @@ msgstr "Hjelpa er starta opp i bakgrunnen"
 
 #: ../rpmdrake.pm:827
 #, c-format
-msgid "The help window has been started, it should appear shortly on your desktop."
+msgid ""
+"The help window has been started, it should appear shortly on your desktop."
 msgstr "Hjelpevindauget er no starta, og vil snart dukka opp på skrivebordet."
 
 #: ../grpmi/curl_download/curl_download.xs:86
@@ -2711,4 +2724,3 @@ msgstr "Fjern programvare"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Mediehandtering"
-
diff --git a/po/pt.po b/po/pt.po
index b05d7556..ffdf0026 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -158,7 +158,8 @@ msgstr "Localização relativa para o synthesis/hdlist:"
 #: ../edit-urpm-sources.pl:177
 #, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
-msgstr "Se deixado em branco, o synthesis/hdlist será automáticamente verificado"
+msgstr ""
+"Se deixado em branco, o synthesis/hdlist será automáticamente verificado"
 
 #: ../edit-urpm-sources.pl:182
 #, c-format
@@ -290,7 +291,8 @@ msgstr "Precisa inserir a média para continuar"
 
 #: ../edit-urpm-sources.pl:421
 #, c-format
-msgid "In order to save the changes, you need to insert the medium in the drive."
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr "Para gravar as alterações, precisa inserir a média no drive."
 
 #: ../edit-urpm-sources.pl:443
@@ -641,7 +643,8 @@ msgstr "  --media=medium1,..     limita-se ao média indicado"
 
 #: ../rpmdrake:34
 #, c-format
-msgid "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     propõe de combinar todos os fichieros .rpmnew/."
 "rpmsave files encontrados"
@@ -649,11 +652,13 @@ msgstr ""
 #: ../rpmdrake:35
 #, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
-msgstr "  --mode=MODE            põe o  modo (install (por omissão), remove, update)"
+msgstr ""
+"  --mode=MODE            põe o  modo (install (por omissão), remove, update)"
 
 #: ../rpmdrake:36
 #, c-format
-msgid "  --no-confirmation      don't ask first confirmation question in update mode"
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      não pede confirmação em modo actualização"
 
 #: ../rpmdrake:37
@@ -1923,7 +1928,8 @@ msgstr "Nenhum pacote encontrado para instalar."
 #: ../rpmdrake:1668
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Erro irrecuperável: nenhum pacote encontrado para instalação, desculpe."
+msgstr ""
+"Erro irrecuperável: nenhum pacote encontrado para instalação, desculpe."
 
 #: ../rpmdrake:1690
 #, c-format
@@ -2462,7 +2468,8 @@ msgstr "Ajuda executada em 2º plano"
 
 #: ../rpmdrake.pm:827
 #, c-format
-msgid "The help window has been started, it should appear shortly on your desktop."
+msgid ""
+"The help window has been started, it should appear shortly on your desktop."
 msgstr "A janela de ajuda foi iniciada, deverá aparecer em breve no seu ecrã."
 
 #: ../grpmi/curl_download/curl_download.xs:86
@@ -2734,4 +2741,3 @@ msgstr "Remover Software"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Gestor de Médias de Software"
-
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9565a32d..0710e712 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -35,11 +35,14 @@ msgstr "選擇媒體類型"
 #: ../edit-urpm-sources.pl:67
 #, c-format
 msgid ""
-"This step enables you to add sources from a Mandriva Linux web or FTP mirror.\n"
+"This step enables you to add sources from a Mandriva Linux web or FTP "
+"mirror.\n"
 "\n"
 "There are two kinds of official mirrors. You can choose to add sources that\n"
-"contain the complete set of packages of your distribution (usually a superset\n"
-"of what comes on the standard installation CDs), or sources that provide the\n"
+"contain the complete set of packages of your distribution (usually a "
+"superset\n"
+"of what comes on the standard installation CDs), or sources that provide "
+"the\n"
 "official updates for your distribution. (You can add both, but you'll have\n"
 "to do this in two steps.)"
 msgstr ""
@@ -102,8 +105,7 @@ msgstr "路徑："
 msgid "FTP server"
 msgstr "FTP 伺服器"
 
-#: ../edit-urpm-sources.pl:122
-#: ../edit-urpm-sources.pl:123
+#: ../edit-urpm-sources.pl:122 ../edit-urpm-sources.pl:123
 #: ../edit-urpm-sources.pl:390
 #, c-format
 msgid "URL:"
@@ -134,15 +136,12 @@ msgstr "瀏覽..."
 msgid "Login:"
 msgstr "登入："
 
-#: ../edit-urpm-sources.pl:170
-#: ../edit-urpm-sources.pl:467
-#: ../rpmdrake.pm:124
+#: ../edit-urpm-sources.pl:170 ../edit-urpm-sources.pl:467 ../rpmdrake.pm:124
 #, c-format
 msgid "Password:"
 msgstr "密碼："
 
-#: ../edit-urpm-sources.pl:175
-#: ../edit-urpm-sources.pl:391
+#: ../edit-urpm-sources.pl:175 ../edit-urpm-sources.pl:391
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "synthesis/hdlist 檔案的相對路徑："
@@ -191,47 +190,25 @@ msgstr "正在新增一個媒體："
 msgid "Type of medium:"
 msgstr "媒體類別："
 
-#: ../edit-urpm-sources.pl:239
-#: ../edit-urpm-sources.pl:310
-#: ../edit-urpm-sources.pl:397
-#: ../edit-urpm-sources.pl:422
-#: ../edit-urpm-sources.pl:484
-#: ../edit-urpm-sources.pl:565
-#: ../edit-urpm-sources.pl:605
-#: ../edit-urpm-sources.pl:663
-#: ../edit-urpm-sources.pl:802
-#: ../rpmdrake:167
-#: ../rpmdrake:706
-#: ../rpmdrake:1518
-#: ../rpmdrake:1526
-#: ../rpmdrake.pm:554
-#: ../rpmdrake.pm:644
+#: ../edit-urpm-sources.pl:239 ../edit-urpm-sources.pl:310
+#: ../edit-urpm-sources.pl:397 ../edit-urpm-sources.pl:422
+#: ../edit-urpm-sources.pl:484 ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:605 ../edit-urpm-sources.pl:663
+#: ../edit-urpm-sources.pl:802 ../rpmdrake:167 ../rpmdrake:706
+#: ../rpmdrake:1518 ../rpmdrake:1526 ../rpmdrake.pm:554 ../rpmdrake.pm:644
 #: ../rpmdrake.pm:713
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../edit-urpm-sources.pl:241
-#: ../edit-urpm-sources.pl:312
-#: ../edit-urpm-sources.pl:422
-#: ../edit-urpm-sources.pl:474
-#: ../edit-urpm-sources.pl:562
-#: ../edit-urpm-sources.pl:604
-#: ../edit-urpm-sources.pl:656
-#: ../edit-urpm-sources.pl:728
-#: ../edit-urpm-sources.pl:795
-#: ../edit-urpm-sources.pl:848
-#: ../edit-urpm-sources.pl:1008
-#: ../rpmdrake:167
-#: ../rpmdrake:706
-#: ../rpmdrake:723
-#: ../rpmdrake:728
-#: ../rpmdrake:1459
-#: ../rpmdrake:1518
-#: ../rpmdrake:1661
-#: ../rpmdrake.pm:115
-#: ../rpmdrake.pm:236
-#: ../rpmdrake.pm:293
+#: ../edit-urpm-sources.pl:241 ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:474
+#: ../edit-urpm-sources.pl:562 ../edit-urpm-sources.pl:604
+#: ../edit-urpm-sources.pl:656 ../edit-urpm-sources.pl:728
+#: ../edit-urpm-sources.pl:795 ../edit-urpm-sources.pl:848
+#: ../edit-urpm-sources.pl:1008 ../rpmdrake:167 ../rpmdrake:706
+#: ../rpmdrake:723 ../rpmdrake:728 ../rpmdrake:1459 ../rpmdrake:1518
+#: ../rpmdrake:1661 ../rpmdrake.pm:115 ../rpmdrake.pm:236 ../rpmdrake.pm:293
 #: ../rpmdrake.pm:554
 #, c-format
 msgid "Ok"
@@ -292,8 +269,7 @@ msgstr "編輯媒體 \"%s\"："
 msgid "Save changes"
 msgstr "儲存變更"
 
-#: ../edit-urpm-sources.pl:409
-#: ../edit-urpm-sources.pl:995
+#: ../edit-urpm-sources.pl:409 ../edit-urpm-sources.pl:995
 #, c-format
 msgid "Proxy..."
 msgstr "代理伺服器..."
@@ -305,7 +281,8 @@ msgstr "您需要置入媒體以便繼續"
 
 #: ../edit-urpm-sources.pl:421
 #, c-format
-msgid "In order to save the changes, you need to insert the medium in the drive."
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr "為了儲存變更，您需要在磁碟機置入該媒體。"
 
 #: ../edit-urpm-sources.pl:443
@@ -325,8 +302,12 @@ msgstr "全域代理伺服器設定"
 
 #: ../edit-urpm-sources.pl:456
 #, c-format
-msgid "If you need a proxy, enter the hostname and an optional port (syntax: <proxyhost[:port]>):"
-msgstr "如果您需要透過代理伺服器連線，請輸入該主機的名稱與通訊埠號 (語法：<proxyhost [:port]> 例如 proxy.hinet.net:80)："
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"如果您需要透過代理伺服器連線，請輸入該主機的名稱與通訊埠號 (語法：<proxyhost "
+"[:port]> 例如 proxy.hinet.net:80)："
 
 #: ../edit-urpm-sources.pl:459
 #, c-format
@@ -393,17 +374,13 @@ msgstr "通訊協定："
 msgid "Media limit:"
 msgstr "媒體極限："
 
-#: ../edit-urpm-sources.pl:642
-#: ../edit-urpm-sources.pl:649
+#: ../edit-urpm-sources.pl:642 ../edit-urpm-sources.pl:649
 #, c-format
 msgid "Add"
 msgstr "新增"
 
-#: ../edit-urpm-sources.pl:643
-#: ../edit-urpm-sources.pl:650
-#: ../edit-urpm-sources.pl:708
-#: ../edit-urpm-sources.pl:973
-#: ../rpmdrake:1181
+#: ../edit-urpm-sources.pl:643 ../edit-urpm-sources.pl:650
+#: ../edit-urpm-sources.pl:708 ../edit-urpm-sources.pl:973 ../rpmdrake:1181
 #, c-format
 msgid "Remove"
 msgstr "移除"
@@ -438,23 +415,18 @@ msgstr "媒體極限"
 msgid "Command"
 msgstr "指令"
 
-#: ../edit-urpm-sources.pl:692
-#: ../rpmdrake:366
-#: ../rpmdrake:384
-#: ../rpmdrake:518
+#: ../edit-urpm-sources.pl:692 ../rpmdrake:366 ../rpmdrake:384 ../rpmdrake:518
 #: ../rpmdrake:634
 #, c-format
 msgid "(none)"
 msgstr "(無)"
 
-#: ../edit-urpm-sources.pl:712
-#: ../edit-urpm-sources.pl:977
+#: ../edit-urpm-sources.pl:712 ../edit-urpm-sources.pl:977
 #, c-format
 msgid "Edit"
 msgstr "編輯"
 
-#: ../edit-urpm-sources.pl:720
-#: ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:983
 #, c-format
 msgid "Add..."
 msgstr "新增..."
@@ -464,8 +436,7 @@ msgstr "新增..."
 msgid "Manage keys for digital signatures of packages"
 msgstr "管理數位套件簽章鑰匙"
 
-#: ../edit-urpm-sources.pl:740
-#: ../edit-urpm-sources.pl:883
+#: ../edit-urpm-sources.pl:740 ../edit-urpm-sources.pl:883
 #, c-format
 msgid "Medium"
 msgstr "媒體"
@@ -541,8 +512,7 @@ msgstr "更新媒體"
 msgid "Regenerate hdlist"
 msgstr "重新產生 hdlist"
 
-#: ../edit-urpm-sources.pl:916
-#: ../rpmdrake.pm:636
+#: ../edit-urpm-sources.pl:916 ../rpmdrake.pm:636
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "請稍候，更新媒體中..."
@@ -582,9 +552,7 @@ msgstr "全域選項"
 msgid "Help"
 msgstr "輔助說明"
 
-#: ../edit-urpm-sources.pl:1020
-#: ../gurpmi.addmedia:74
-#: ../rpmdrake:1774
+#: ../edit-urpm-sources.pl:1020 ../gurpmi.addmedia:74 ../rpmdrake:1774
 #, c-format
 msgid ""
 "%s\n"
@@ -647,7 +615,9 @@ msgstr "用法：%s [選項]..."
 
 #: ../rpmdrake:32
 #, c-format
-msgid "  --changelog-first      display changelog before filelist in the description window"
+msgid ""
+"  --changelog-first      display changelog before filelist in the "
+"description window"
 msgstr "  --changelog-first      在描述視窗中先顯示更新資訊再顯示檔案列表"
 
 #: ../rpmdrake:33
@@ -657,7 +627,8 @@ msgstr "  --media=medium1,..     限制於給定的媒體"
 
 #: ../rpmdrake:34
 #, c-format
-msgid "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr "  --merge-all-rpmnew     計畫合併所有找到的 .rpmnew/.rpmsave 檔案"
 
 #: ../rpmdrake:35
@@ -667,7 +638,8 @@ msgstr "  --mode=MODE            設定模式 (install (預設值)、remove、up
 
 #: ../rpmdrake:36
 #, c-format
-msgid "  --no-confirmation      don't ask first confirmation question in update mode"
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      在升級模式時不詢問第一個確認問題"
 
 #: ../rpmdrake:37
@@ -682,8 +654,12 @@ msgstr "  --no-verify-rpm        不驗證套件簽章"
 
 #: ../rpmdrake:39
 #, c-format
-msgid "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host\" machine to show needed deps"
-msgstr "  --parallel=alias,host  在同步管理模式下，使用 \"alias\" 別名群組或 \"host\" 主機名稱來顯示相依性"
+msgid ""
+"  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
+"\" machine to show needed deps"
+msgstr ""
+"  --parallel=alias,host  在同步管理模式下，使用 \"alias\" 別名群組或 \"host"
+"\" 主機名稱來顯示相依性"
 
 #: ../rpmdrake:40
 #, c-format
@@ -726,10 +702,7 @@ msgstr ""
 msgid "Accessibility"
 msgstr "輔助功能"
 
-#: ../rpmdrake:175
-#: ../rpmdrake:176
-#: ../rpmdrake:177
-#: ../rpmdrake:178
+#: ../rpmdrake:175 ../rpmdrake:176 ../rpmdrake:177 ../rpmdrake:178
 #, c-format
 msgid "Archiving"
 msgstr "歸檔"
@@ -749,23 +722,14 @@ msgstr "光碟燒錄"
 msgid "Compression"
 msgstr "壓縮"
 
-#: ../rpmdrake:178
-#: ../rpmdrake:183
-#: ../rpmdrake:195
-#: ../rpmdrake:206
-#: ../rpmdrake:215
-#: ../rpmdrake:227
-#: ../rpmdrake:239
-#: ../rpmdrake:247
+#: ../rpmdrake:178 ../rpmdrake:183 ../rpmdrake:195 ../rpmdrake:206
+#: ../rpmdrake:215 ../rpmdrake:227 ../rpmdrake:239 ../rpmdrake:247
 #: ../rpmdrake:335
 #, c-format
 msgid "Other"
 msgstr "其他"
 
-#: ../rpmdrake:179
-#: ../rpmdrake:180
-#: ../rpmdrake:181
-#: ../rpmdrake:182
+#: ../rpmdrake:179 ../rpmdrake:180 ../rpmdrake:181 ../rpmdrake:182
 #: ../rpmdrake:183
 #, c-format
 msgid "Books"
@@ -791,8 +755,7 @@ msgstr "Howtos"
 msgid "Literature"
 msgstr "文獻"
 
-#: ../rpmdrake:184
-#: ../rpmdrake:185
+#: ../rpmdrake:184 ../rpmdrake:185
 #, c-format
 msgid "Cluster"
 msgstr "叢集"
@@ -812,22 +775,14 @@ msgstr "查詢服務"
 msgid "Communications"
 msgstr "通訊"
 
-#: ../rpmdrake:187
-#: ../rpmdrake:190
+#: ../rpmdrake:187 ../rpmdrake:190
 #, c-format
 msgid "Databases"
 msgstr "資料庫"
 
-#: ../rpmdrake:188
-#: ../rpmdrake:189
-#: ../rpmdrake:190
-#: ../rpmdrake:191
-#: ../rpmdrake:192
-#: ../rpmdrake:193
-#: ../rpmdrake:194
-#: ../rpmdrake:195
-#: ../rpmdrake:196
-#: ../rpmdrake:197
+#: ../rpmdrake:188 ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191
+#: ../rpmdrake:192 ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195
+#: ../rpmdrake:196 ../rpmdrake:197
 #, c-format
 msgid "Development"
 msgstr "開發"
@@ -892,14 +847,8 @@ msgstr "模擬器"
 msgid "File tools"
 msgstr "檔案工具"
 
-#: ../rpmdrake:202
-#: ../rpmdrake:203
-#: ../rpmdrake:204
-#: ../rpmdrake:205
-#: ../rpmdrake:206
-#: ../rpmdrake:207
-#: ../rpmdrake:208
-#: ../rpmdrake:209
+#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
+#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
 #, c-format
 msgid "Games"
 msgstr "遊戲"
@@ -939,14 +888,8 @@ msgstr "運動遊戲"
 msgid "Strategy"
 msgstr "戰略遊戲"
 
-#: ../rpmdrake:210
-#: ../rpmdrake:211
-#: ../rpmdrake:212
-#: ../rpmdrake:213
-#: ../rpmdrake:214
-#: ../rpmdrake:215
-#: ../rpmdrake:216
-#: ../rpmdrake:217
+#: ../rpmdrake:210 ../rpmdrake:211 ../rpmdrake:212 ../rpmdrake:213
+#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
 #, c-format
 msgid "Graphical desktop"
 msgstr "圖形化桌面"
@@ -1001,16 +944,9 @@ msgstr "監視"
 msgid "Multimedia"
 msgstr "多媒體"
 
-#: ../rpmdrake:221
-#: ../rpmdrake:222
-#: ../rpmdrake:223
-#: ../rpmdrake:224
-#: ../rpmdrake:225
-#: ../rpmdrake:226
-#: ../rpmdrake:227
-#: ../rpmdrake:228
-#: ../rpmdrake:229
-#: ../rpmdrake:246
+#: ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224
+#: ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#: ../rpmdrake:229 ../rpmdrake:246
 #, c-format
 msgid "Networking"
 msgstr "網路"
@@ -1070,14 +1006,8 @@ msgstr "公鑰"
 msgid "Publishing"
 msgstr "出版"
 
-#: ../rpmdrake:233
-#: ../rpmdrake:234
-#: ../rpmdrake:235
-#: ../rpmdrake:236
-#: ../rpmdrake:237
-#: ../rpmdrake:238
-#: ../rpmdrake:239
-#: ../rpmdrake:240
+#: ../rpmdrake:233 ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236
+#: ../rpmdrake:237 ../rpmdrake:238 ../rpmdrake:239 ../rpmdrake:240
 #, c-format
 msgid "Sciences"
 msgstr "科學"
@@ -1127,24 +1057,11 @@ msgstr "Shells"
 msgid "Sound"
 msgstr "音效"
 
-#: ../rpmdrake:243
-#: ../rpmdrake:244
-#: ../rpmdrake:245
-#: ../rpmdrake:246
-#: ../rpmdrake:247
-#: ../rpmdrake:248
-#: ../rpmdrake:249
-#: ../rpmdrake:250
-#: ../rpmdrake:251
-#: ../rpmdrake:252
-#: ../rpmdrake:253
-#: ../rpmdrake:254
-#: ../rpmdrake:255
-#: ../rpmdrake:256
-#: ../rpmdrake:257
-#: ../rpmdrake:258
-#: ../rpmdrake:259
-#: ../rpmdrake:260
+#: ../rpmdrake:243 ../rpmdrake:244 ../rpmdrake:245 ../rpmdrake:246
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255 ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:258
+#: ../rpmdrake:259 ../rpmdrake:260
 #, c-format
 msgid "System"
 msgstr "系統"
@@ -1154,12 +1071,8 @@ msgstr "系統"
 msgid "Base"
 msgstr "基本套件"
 
-#: ../rpmdrake:244
-#: ../rpmdrake:245
-#: ../rpmdrake:246
-#: ../rpmdrake:247
-#: ../rpmdrake:248
-#: ../rpmdrake:249
+#: ../rpmdrake:244 ../rpmdrake:245 ../rpmdrake:246 ../rpmdrake:247
+#: ../rpmdrake:248 ../rpmdrake:249
 #, c-format
 msgid "Configuration"
 msgstr "設定"
@@ -1194,10 +1107,7 @@ msgstr "部署"
 msgid "Deployment"
 msgstr "部署"
 
-#: ../rpmdrake:252
-#: ../rpmdrake:253
-#: ../rpmdrake:254
-#: ../rpmdrake:255
+#: ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254 ../rpmdrake:255
 #, c-format
 msgid "Fonts"
 msgstr "字型"
@@ -1267,15 +1177,12 @@ msgstr "玩具"
 msgid "Video"
 msgstr "視訊"
 
-#: ../rpmdrake:390
-#: ../rpmdrake:535
-#: ../rpmdrake:537
+#: ../rpmdrake:390 ../rpmdrake:535 ../rpmdrake:537
 #, c-format
 msgid "(Not available)"
 msgstr "(無法使用)"
 
-#: ../rpmdrake:419
-#: ../rpmdrake:499
+#: ../rpmdrake:419 ../rpmdrake:499
 #, c-format
 msgid "Search results"
 msgstr "搜尋結果"
@@ -1285,16 +1192,12 @@ msgstr "搜尋結果"
 msgid "Search results (none)"
 msgstr "搜尋結果 (無)"
 
-#: ../rpmdrake:430
-#: ../rpmdrake:457
+#: ../rpmdrake:430 ../rpmdrake:457
 #, c-format
 msgid "Please wait, searching..."
 msgstr "搜尋中，請稍候..."
 
-#: ../rpmdrake:452
-#: ../rpmdrake:579
-#: ../rpmdrake:1236
-#: ../rpmdrake:1559
+#: ../rpmdrake:452 ../rpmdrake:579 ../rpmdrake:1236 ../rpmdrake:1559
 #: ../rpmdrake:1773
 #, c-format
 msgid "Rpmdrake"
@@ -1305,14 +1208,12 @@ msgstr "Rpmdrake"
 msgid "Stop"
 msgstr "停止"
 
-#: ../rpmdrake:500
-#: ../rpmdrake:669
+#: ../rpmdrake:500 ../rpmdrake:669
 #, c-format
 msgid "Upgradable"
 msgstr "可供更新"
 
-#: ../rpmdrake:500
-#: ../rpmdrake:669
+#: ../rpmdrake:500 ../rpmdrake:669
 #, c-format
 msgid "Addable"
 msgstr "可供加入"
@@ -1397,10 +1298,7 @@ msgstr "描述："
 msgid "No description"
 msgstr "沒有描述"
 
-#: ../rpmdrake:596
-#: ../rpmdrake:719
-#: ../rpmdrake:721
-#: ../rpmdrake:1651
+#: ../rpmdrake:596 ../rpmdrake:719 ../rpmdrake:721 ../rpmdrake:1651
 #, c-format
 msgid "More information on package..."
 msgstr "更多該套件的資訊..."
@@ -1441,14 +1339,12 @@ msgid "All"
 msgstr "全部"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:706
-#: ../rpmdrake:711
+#: ../rpmdrake:706 ../rpmdrake:711
 #, c-format
 msgid "More info"
 msgstr "更多資訊"
 
-#: ../rpmdrake:714
-#: ../rpmdrake:1640
+#: ../rpmdrake:714 ../rpmdrake:1640
 #, c-format
 msgid "Information on packages"
 msgstr "套件資訊"
@@ -1468,8 +1364,7 @@ msgstr ""
 "因為它們的相依性問題，以下的套件也需要移除：\n"
 "\n"
 
-#: ../rpmdrake:743
-#: ../rpmdrake:752
+#: ../rpmdrake:743 ../rpmdrake:752
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "某些套件無法被移除"
@@ -1483,8 +1378,7 @@ msgstr ""
 "移除下面這些套件將會破壞您的系統，抱歉：\n"
 "\n"
 
-#: ../rpmdrake:753
-#: ../rpmdrake:815
+#: ../rpmdrake:753 ../rpmdrake:815
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1530,8 +1424,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:814
-#: ../rpmdrake:1080
+#: ../rpmdrake:814 ../rpmdrake:1080
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "必須移除某些套件"
@@ -1677,10 +1570,7 @@ msgstr ""
 "\n"
 "您確定要繼續嗎？"
 
-#: ../rpmdrake:1117
-#: ../rpmdrake:1120
-#: ../rpmdrake:1129
-#: ../rpmdrake:1140
+#: ../rpmdrake:1117 ../rpmdrake:1120 ../rpmdrake:1129 ../rpmdrake:1140
 #: ../rpmdrake:1145
 #, c-format
 msgid "/_File"
@@ -1711,21 +1601,17 @@ msgstr "/離開 (_Q)"
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1148
-#: ../rpmdrake:1149
-#: ../rpmdrake:1156
+#: ../rpmdrake:1148 ../rpmdrake:1149 ../rpmdrake:1156
 #, c-format
 msgid "/_Options"
 msgstr "/選項 (_O)"
 
-#: ../rpmdrake:1149
-#: ../rpmdrake:1156
+#: ../rpmdrake:1149 ../rpmdrake:1156
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/顯示自動選取的套件 (_S)"
 
-#: ../rpmdrake:1153
-#: ../rpmdrake:1154
+#: ../rpmdrake:1153 ../rpmdrake:1154
 #, c-format
 msgid "/_Help"
 msgstr "/輔助說明 (_H)"
@@ -1852,27 +1738,22 @@ msgstr "安裝完成"
 msgid "Inspect..."
 msgstr "檢查..."
 
-#: ../rpmdrake:1481
-#: ../rpmdrake:1636
+#: ../rpmdrake:1481 ../rpmdrake:1636
 #, c-format
 msgid "Everything installed successfully"
 msgstr "所有項目安裝成功"
 
-#: ../rpmdrake:1482
-#: ../rpmdrake:1637
+#: ../rpmdrake:1482 ../rpmdrake:1637
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "已經成功地安裝您要求的全部套件。"
 
-#: ../rpmdrake:1484
-#: ../rpmdrake:1621
+#: ../rpmdrake:1484 ../rpmdrake:1621
 #, c-format
 msgid "Problem during installation"
 msgstr "安裝時發生問題"
 
-#: ../rpmdrake:1485
-#: ../rpmdrake:1622
-#: ../rpmdrake:1677
+#: ../rpmdrake:1485 ../rpmdrake:1622 ../rpmdrake:1677
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1893,8 +1774,7 @@ msgstr "無法取得來源套件。"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "無法取得來源套件，抱歉。%s"
 
-#: ../rpmdrake:1500
-#: ../rpmdrake:1571
+#: ../rpmdrake:1500 ../rpmdrake:1571
 #, c-format
 msgid ""
 "\n"
@@ -1952,8 +1832,7 @@ msgstr ""
 "\n"
 "您要繼續安裝嗎？"
 
-#: ../rpmdrake:1568
-#: ../rpmdrake:1676
+#: ../rpmdrake:1568 ../rpmdrake:1676
 #, c-format
 msgid "Installation failed"
 msgstr "安裝失敗"
@@ -2195,8 +2074,7 @@ msgstr "德國"
 msgid "Danmark"
 msgstr "丹麥"
 
-#: ../rpmdrake.pm:368
-#: ../rpmdrake.pm:372
+#: ../rpmdrake.pm:368 ../rpmdrake.pm:372
 #, c-format
 msgid "Greece"
 msgstr "希臘"
@@ -2291,10 +2169,7 @@ msgstr "英國"
 msgid "China"
 msgstr "中國"
 
-#: ../rpmdrake.pm:388
-#: ../rpmdrake.pm:389
-#: ../rpmdrake.pm:390
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:388 ../rpmdrake.pm:389 ../rpmdrake.pm:390 ../rpmdrake.pm:391
 #: ../rpmdrake.pm:468
 #, c-format
 msgid "United States"
@@ -2456,7 +2331,8 @@ msgstr "接收套件時發生錯誤"
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
-"you should use the Software Media Manager to remove it and re-add it in order\n"
+"you should use the Software Media Manager to remove it and re-add it in "
+"order\n"
 "to reconfigure it, either it is currently unreachable and you should retry\n"
 "later."
 msgstr ""
@@ -2497,8 +2373,7 @@ msgstr ""
 "錯誤：\n"
 "%s"
 
-#: ../rpmdrake.pm:767
-#: ../rpmdrake.pm:776
+#: ../rpmdrake.pm:767 ../rpmdrake.pm:776
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2533,7 +2408,8 @@ msgstr ""
 #: ../rpmdrake.pm:807
 #, c-format
 msgid ""
-"Your medium `%s', used for updates, does not match the version of %s you're running (%s).\n"
+"Your medium `%s', used for updates, does not match the version of %s you're "
+"running (%s).\n"
 "It will be disabled."
 msgstr ""
 "您用來更新系統的媒體 `%s' 與您正在使用的 %s 版本 (%s) 不符。\n"
@@ -2542,7 +2418,8 @@ msgstr ""
 #: ../rpmdrake.pm:810
 #, c-format
 msgid ""
-"Your medium `%s', used for updates, does not match the version of Mandriva Linux you're running (%s).\n"
+"Your medium `%s', used for updates, does not match the version of Mandriva "
+"Linux you're running (%s).\n"
 "It will be disabled."
 msgstr ""
 "您用來更新系統的媒體 `%s' 與您正在使用的 Mandriva Linux 版本 (%s) 不符。\n"
@@ -2555,7 +2432,8 @@ msgstr "於背景啟動說明"
 
 #: ../rpmdrake.pm:827
 #, c-format
-msgid "The help window has been started, it should appear shortly on your desktop."
+msgid ""
+"The help window has been started, it should appear shortly on your desktop."
 msgstr "說明視窗已經啟動，它將馬上出現於您的桌面。"
 
 #: ../grpmi/curl_download/curl_download.xs:86
@@ -2827,4 +2705,3 @@ msgstr "移除軟體"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "軟體套件媒體管理員"
-