updated po files

author: Pablo Saratxaga <pablo@mandriva.com> 2004-02-22 11:33:24 +0000
committer: Pablo Saratxaga <pablo@mandriva.com> 2004-02-22 11:33:24 +0000
commit: 7264d0f26440b845e9813235f61db8ee7e3b3563 (patch)
tree: 992e9a13ff78729eefc4c733b99c12a36f3b8bc4
parent: f8e03b891b600c61b007ae8147e98a9900dd4ca6 (diff)
download: rpmdrake-7264d0f26440b845e9813235f61db8ee7e3b3563.tar
rpmdrake-7264d0f26440b845e9813235f61db8ee7e3b3563.tar.gz
rpmdrake-7264d0f26440b845e9813235f61db8ee7e3b3563.tar.bz2
rpmdrake-7264d0f26440b845e9813235f61db8ee7e3b3563.tar.xz
rpmdrake-7264d0f26440b845e9813235f61db8ee7e3b3563.zip
7 files changed, 8883 insertions, 8664 deletions
diff --git a/po/cy.po b/po/cy.po
index cf62fdb1..9b3ed007 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -9,1956 +9,1989 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2004-02-20 17:29+0100\n"
-"PO-Revision-Date: 2004-02-11 20:25-0000\n"
+"POT-Creation-Date: 2004-02-20 20:53+0100\n"
+"PO-Revision-Date: 2004-02-20 20:09-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:61
 #, c-format
-msgid "Enlightenment"
-msgstr "Enlightenment"
+msgid "Add a medium"
+msgstr "Ychwanegu cyfrwng"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:62
 #, c-format
-msgid "Remote access"
-msgstr "Mynediad pell"
+msgid "Local files"
+msgstr "Ffeiliau lleol"
 
-#: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:62
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Arhoswch, diweddaru cyfrwng..."
+msgid "Path:"
+msgstr "Llwybr:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:63
 #, c-format
-msgid "FVWM based"
-msgstr "FVWM seiliedig"
+msgid "FTP server"
+msgstr "Gweinydd FTP"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:63 ../edit-urpm-sources.pl:64
+#: ../edit-urpm-sources.pl:66 ../edit-urpm-sources.pl:196
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:64
 #, c-format
-msgid "Python"
-msgstr "Python"
+msgid "HTTP server"
+msgstr "Gweinydd HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:65
 #, c-format
-msgid "Upgradable"
-msgstr "Diweddariadwy"
+msgid "Removable device"
+msgstr "Dyfais symudol"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:65
 #, c-format
-msgid "everything was installed correctly"
-msgstr "gosodwyd popeth yn llwyddiannus"
+msgid "Path or mount point:"
+msgstr "Llwybr neu bwynt gosod:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:66 ../rpmdrake:707
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr "Gwirio llofnodion pecynnau ..."
+msgid "Security updates"
+msgstr "Diweddariadau diogelwch"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:78
 #, c-format
-msgid "File transfer"
-msgstr "Trosglwyddo ffeiliau"
+msgid "Browse..."
+msgstr "Pori..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:80
 #, c-format
-msgid "KDE and Qt"
-msgstr "KDE a Qt"
+msgid "Choose a mirror..."
+msgstr "Dewis drych..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:107
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Mae angen llanw o leiaf y ddau gofnod cyntaf"
+msgid "Login:"
+msgstr "Mewngofnod:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:107 ../edit-urpm-sources.pl:240
 #, c-format
-msgid "Type of medium:"
-msgstr "Math o gyfrwng:"
+msgid "Password:"
+msgstr "Cyfrinair:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:112
 #, c-format
-msgid "Copying file for medium `%s'..."
-msgstr "Copïo ffeil fel ar gyfer cyfrwng '%s'..."
+msgid "Name:"
+msgstr "Enw:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:116 ../edit-urpm-sources.pl:197
 #, c-format
-msgid "France"
-msgstr "Ffrainc"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Llwybr perthynol i synthesis/hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:117
 #, c-format
-msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Rhaid i mi gysylltu â'r drych i gael y diweddariad diogelwch diweddaraf.\n"
-"Gwiriwch fod y rhyngrwyd yn rhedeg.\n"
-"\n"
-"Ydi hi'n iawn parhau?"
+msgid "If left blank, synthesis/hdlist will be automatically probed"
+msgstr "Os fydd yn cael ei adael yn wag"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:125
 #, c-format
-msgid "Search results"
-msgstr "Canlyniadau'r chwilio"
+msgid "You need to fill up at least the two first entries."
+msgstr "Mae angen llanw o leiaf y ddau gofnod cyntaf"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:129
 #, c-format
-msgid "Graphical desktop"
-msgstr "Bwrdd gwaith graffigol"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Mae yna gyfrwng o'r enw yna eisoes, hoffech chi\n"
+"ei amnewid?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:138
 #, c-format
-msgid "Yes"
-msgstr "Iawn"
+msgid "Adding a medium:"
+msgstr "Ychwanegu cyfrwng:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:139
 #, c-format
-msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
-msgstr ""
-"Mae'r gosod wedi gorffen;%s.\n"
-"\n"
-"Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
-"mae modd eu harchwilio i weithredu arnynt:"
+msgid "Type of medium:"
+msgstr "Math o gyfrwng:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:143 ../edit-urpm-sources.pl:211
+#: ../edit-urpm-sources.pl:244 ../edit-urpm-sources.pl:317
+#: ../edit-urpm-sources.pl:355 ../edit-urpm-sources.pl:396
+#: ../edit-urpm-sources.pl:453 ../edit-urpm-sources.pl:517
+#: ../edit-urpm-sources.pl:554 ../edit-urpm-sources.pl:660 ../rpmdrake:88
+#: ../rpmdrake:511 ../rpmdrake:525 ../rpmdrake:529 ../rpmdrake:1084
+#: ../rpmdrake:1145 ../rpmdrake.pm:125 ../rpmdrake.pm:168 ../rpmdrake.pm:353
 #, c-format
-msgid "Edit a parallel group"
-msgstr "Golygu grwp paralel"
+msgid "Ok"
+msgstr "Iawn"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:159 ../edit-urpm-sources.pl:205
+#: ../edit-urpm-sources.pl:211 ../edit-urpm-sources.pl:251
+#: ../edit-urpm-sources.pl:322 ../edit-urpm-sources.pl:356
+#: ../edit-urpm-sources.pl:403 ../edit-urpm-sources.pl:522 ../rpmdrake:88
+#: ../rpmdrake:511 ../rpmdrake:1145 ../rpmdrake:1151 ../rpmdrake.pm:353
+#: ../rpmdrake.pm:458
 #, c-format
-msgid ""
-"There was a problem adding medium:\n"
-"\n"
-"%s"
-msgstr ""
-"Digwyddodd anhawster wrth ychwanegu cyfrwng:\n"
-"\n"
-"%s"
+msgid "Cancel"
+msgstr "Dileu"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:177
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Sut i ddewis drych gyda llaw."
+msgid "Please wait, removing medium..."
+msgstr "Arhoswch, tynnu cyfrwng..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:190
 #, c-format
-msgid "Publishing"
-msgstr "Cyhoeddi"
+msgid "Edit a medium"
+msgstr "Golygu'r cyfrwng"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:194
 #, c-format
-msgid "Remove key"
-msgstr "Tynnu allwedd"
+msgid "Editing medium \"%s\":"
+msgstr "Golygu ffynhonnell \"%s\":"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:200
 #, c-format
-msgid "Package installation..."
-msgstr "Gosod pecynnau..."
+msgid "Save changes"
+msgstr "Cadw newidiadau"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:209
 #, c-format
-msgid "GNOME and GTK+"
-msgstr "GNOME a GTK+"
+msgid "You need to insert the medium to continue"
+msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:210
 #, c-format
-msgid "Select the media you wish to update:"
-msgstr "Dewiswch y cyfrwng i'w diweddaru:"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Er mwyn cadw'r newidiadau, rhaid gosod y cyfrwng yn y gyrrwr."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:226
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Tynnu Pecynnau Meddalwedd"
+msgid "Configure proxies"
+msgstr "Ffurfweddu'r dirprwyon"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:232
 #, c-format
-msgid "Shells"
-msgstr "Cregyn"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Os oes angen dirprwy arnoch, rhowch enw gwesteiwr a phorth dewisol "
+"(cystrawen: <proxyhost[:port]>):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:234
 #, c-format
-msgid "Chemistry"
-msgstr "Cemeg"
+msgid "Proxy hostname:"
+msgstr "Enw gwesteiwr y dirprwy:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:236
 #, c-format
-msgid "Choose a key for adding to the medium %s"
-msgstr "Dewis bysell ti ychwanegu at gyfrwng %s"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Mae modd i chi enwi defnyddiwr /cyfrinair ar gyfer dilysiad dirprwy:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:238
 #, c-format
-msgid "Add a key"
-msgstr "Ychwanegu allwedd"
+msgid "User:"
+msgstr "Defnyddiwr:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:292
 #, c-format
-msgid "True type"
-msgstr "True type"
+msgid "Add a parallel group"
+msgstr "Ychwanegu grwp paralel"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:292
 #, c-format
-msgid "Base"
-msgstr "Sail"
+msgid "Edit a parallel group"
+msgstr "Golygu grwp paralel"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:303
 #, c-format
-msgid "Graphics"
-msgstr "Graffigau"
+msgid "Add a medium limit"
+msgstr "Ychwanegu terfyn cyfrwng"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:313
 #, c-format
-msgid "Italy"
-msgstr "Yr Eidal"
+msgid "Choose a medium for adding in the media limit:"
+msgstr "Dewiswch gyfrwng i ychwanegu at derfyn y cyfrwng:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:347
 #, c-format
-msgid ""
-"You are launching this program as a normal user.\n"
-"You will not be able to perform modifications on the system,\n"
-"but you may still browse the existing database."
-msgstr ""
-"Rydych yn cychwyn y rhaglen fel defnyddiwr cyffredin.\n"
-"Ni fydd modd i chi greu newidiadau i'r system.\n"
-"ond bydd modd i chi bori'r gronfa ddata presennol."
+msgid "Add a host"
+msgstr "Y&chwanegu gwestai:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:351
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Mae angen un o'r pecynnau canlynol:"
+msgid "Type in the hostname or IP address of the host to add:"
+msgstr "Teipiwch enw gwesteiwr neu IP y gwestai i'w ychwanegu:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:375
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Editing parallel group \"%s\":"
+msgstr "Golygu grwp paralel\"%s\":"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:377
 #, c-format
-msgid "Information on packages"
-msgstr "Gwybodaeth am becynnau"
+msgid "Group name:"
+msgstr "Enw grwp:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:378
 #, c-format
-msgid "Proxy..."
-msgstr "Dirprwy..."
+msgid "Protocol:"
+msgstr "Protocol:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:380
 #, c-format
-msgid "Russia"
-msgstr "Rwsia"
+msgid "Media limit:"
+msgstr "Terfyn cyfrwng:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:385 ../edit-urpm-sources.pl:392
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Os oes angen dirprwy arnoch, rhowch enw gwesteiwr a phorth dewisol "
-"(cystrawen: <proxyhost[:port]>):"
+msgid "Add"
+msgstr "Ychwanegu"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:386 ../edit-urpm-sources.pl:393
+#: ../edit-urpm-sources.pl:442 ../edit-urpm-sources.pl:643 ../rpmdrake:909
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
-"eu dad-ddewis nawr:\n"
+msgid "Remove"
+msgstr "Tynnu"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:387
 #, c-format
-msgid "Add a key..."
-msgstr "Ychwanegu allwedd..."
+msgid "Hosts:"
+msgstr "Gwesteion:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:417
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Ffurfweddu urpmi paralel (dosbarthiad gweithredol o urpmi)"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Sound"
-msgstr "Sain"
-
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid "Changelog:\n"
-msgstr "Cofnod Newid:\n"
+msgid "Group"
+msgstr "Grwp"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Mae angen i mi gysylltu â safle gwe MandrakeSoft i gael y rhestr\n"
-"drychau. Gwiriwch fod eich rhwydwaith yn rhedeg.\n"
-"\n"
-"Ydi hi'n iawn parhau?"
+msgid "Protocol"
+msgstr "Protocol"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Arhoswch, chwilio..."
+msgid "Media limit"
+msgstr "Terfyn cyfrwng"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:421
 #, c-format
 msgid "Command"
 msgstr "Gorchymyn"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../gurpmi.addmedia:1
+#: ../edit-urpm-sources.pl:431 ../rpmdrake:252 ../rpmdrake:269 ../rpmdrake:380
+#: ../rpmdrake:449
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Ydi hi'n iawn parhau?"
+msgid "(none)"
+msgstr "(dim)"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:444 ../edit-urpm-sources.pl:645
 #, c-format
-msgid "Literature"
-msgstr "Llenyddiaeth"
+msgid "Edit"
+msgstr "Golygu"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:449 ../edit-urpm-sources.pl:647
 #, c-format
-msgid "Initializing..."
-msgstr "Ymgychwyn..."
+msgid "Add..."
+msgstr "Ychwanegu..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:461
 #, c-format
-msgid "Emulators"
-msgstr "Efelychwyr"
+msgid "Manage keys for digital signatures of packages"
+msgstr "Rheoli allweddi pecynnau digidol "
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:465 ../edit-urpm-sources.pl:585
 #, c-format
-msgid "Password:"
-msgstr "Cyfrinair:"
+msgid "Medium"
+msgstr "Cyfrwng"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:470
 #, c-format
-msgid "Software Packages Installation"
-msgstr "Gosod Pecynnau Meddalwedd"
+msgid "Keys"
+msgstr "Allweddi"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:489
 #, c-format
-msgid "in descriptions"
-msgstr "disgrifiadau"
+msgid "no name found, key doesn't exist in rpm keyring!"
+msgstr "heb ganfod enw,nid yw'r allwedd yn bodoli yn nghylch allwedd rpm"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:503
 #, c-format
-msgid " failed!"
-msgstr " methwyd!"
+msgid "Add a key"
+msgstr "Ychwanegu allwedd"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:513
 #, c-format
-msgid "All packages, by update availability"
-msgstr "Pob pecyn, yn ôl diweddariad"
+msgid "Choose a key for adding to the medium %s"
+msgstr "Dewis bysell ti ychwanegu at gyfrwng %s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:534
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
+msgid "Remove a key"
+msgstr "Tynnu allwedd"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:535
 #, c-format
-msgid "Packaging"
-msgstr "Pecynnu"
+msgid ""
+"Are you sure you want to remove the key %s from medium %s?\n"
+"(name of the key: %s)"
+msgstr ""
+"Ydych chi'n siwr eich bod eisiau tynnu allwedd %s o gyfrwng %s?\n"
+"(enw'r allwedd: %s)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:548
 #, c-format
-msgid "Configure media"
-msgstr "Ffurfweddu'r cyfrwng"
+msgid "Add a key..."
+msgstr "Ychwanegu allwedd..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:550
 #, c-format
-msgid "United States"
-msgstr "Yr Unol Daleithiau"
+msgid "Remove key"
+msgstr "Tynnu allwedd"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:562
 #, c-format
-msgid "Greece"
-msgstr "Groeg"
+msgid "Configure media"
+msgstr "Ffurfweddu'r cyfrwng"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:584
 #, c-format
-msgid "GNOME"
-msgstr "GNOME"
+msgid "Enabled?"
+msgstr "Galluogwyd?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:595
 #, c-format
-msgid "Monitoring"
-msgstr "Monitro"
+msgid "Update medium"
+msgstr "Diweddaru'r cyfrwng"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:595
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Regenerate hdlist"
+msgstr "Atgynhyrchu rhestr"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:607 ../rpmdrake.pm:421
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "Nid oes modd gosod rhai pecynnau"
+msgid "Please wait, updating media..."
+msgstr "Arhoswch, diweddaru cyfrwng..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:611
 #, c-format
-msgid ""
-"The help window has been started, it should appear shortly on your desktop."
-msgstr ""
-"Mae'r ffenestr cymorth wedi ei hagor, dylai ymddangos ar eich bwrdd gwaith "
-"cyn hir."
+msgid "Please wait, generating hdlist..."
+msgstr "Arhoswch, cynhyrchu hdlist..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:649
 #, c-format
-msgid "No mirror"
-msgstr "Dim drych"
+msgid "Update..."
+msgstr "Diweddau..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:650
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ail lwytho'r rhestr pecynnau"
+msgid "Manage keys..."
+msgstr "Rheoli allweddi"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:651
 #, c-format
-msgid "Poland"
-msgstr "Gwlad Pwyl"
+msgid "Proxy..."
+msgstr "Dirprwy..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:652
 #, c-format
-msgid "Path or mount point:"
-msgstr "Llwybr neu bwynt gosod:"
+msgid "Parallel..."
+msgstr "Paralel..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:655 ../rpmdrake:901
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau o safle gwe MandrakeSoft."
+msgid "Help"
+msgstr "Cymorth"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:657 ../rpmdrake:904
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Dewis drych..."
+msgid "Help launched in background"
+msgstr "Cymorth wedi ei gychwyn yn y cefndir"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:658 ../rpmdrake:905
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr "Rhybudd:"
+"The help window has been started, it should appear shortly on your desktop."
+msgstr ""
+"Mae'r ffenestr cymorth wedi ei hagor, dylai ymddangos ar eich bwrdd gwaith "
+"cyn hir."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:669 ../gurpmi.addmedia:75 ../rpmdrake:1338
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Maint dewiswyd: %d MB"
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:672
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Arhoswch, darllen cronfa ddata'r pecynnau..."
+msgid ""
+"Welcome to the Software Media Manager!\n"
+"\n"
+"This tool will help you configure the packages media you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Croeso i'r Rheolwr Cyfrwng Pecynnau!\n"
+"\n"
+"Bydd yr offeryn yn eich cynorthwyo i ffurfweddu cyfrwng y pecynnau\n"
+"rydych am eu defnyddio ar eich cyfrifiadur. Byddant ar gael i'w gosod fel\n"
+"pecynnau newydd neu er mwyn diweddaru."
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:684
 #, c-format
-msgid "Add a medium"
-msgstr "Ychwanegu cyfrwng"
+msgid ""
+"Packages database is locked. Please close other applications\n"
+"working with packages database (do you have another media\n"
+"manager on another desktop, or are you currently installing\n"
+"packages as well?)."
+msgstr ""
+"Mae cronfa ddata'r pecynnau wedi cau. Ceuwch raglenni eraill\n"
+"sy'n gweithio ar y gronfa ddata (oes gennych chi reolwr cyfrwng\n"
+"arall ar fwrdd gwaith arall, neu a ydych yn gosod pecynnau\n"
+" eraill hefyd?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:70
 #, c-format
-msgid "Update medium"
-msgstr "Diweddaru'r cyfrwng"
+msgid "Unable to add medium, wrong or missing arguments"
+msgstr "Methu ychwanegu cyfrwng, ymresymiadau anghywir neu goll."
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:78
 #, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Er mwyn cadw'r newidiadau, rhaid gosod y cyfrwng yn y gyrrwr."
+"You are about to add a new packages medium, `%s'.\n"
+"That means you will be able to add new software packages\n"
+"to your system from that new medium."
+msgstr ""
+"Rydych ar fin gosod cyfrwng pecynnau newydd, %s'.\n"
+"Mae hyn yn golygu y bydd modd gosod pecynnau meddalwedd\n"
+"newydd i'ch system o'r cyfrwng hwnnw."
 
-#: ../rpmdrake:1
+#: ../gurpmi.addmedia:87
 #, c-format
-msgid "All packages, by size"
-msgstr "Pob pecyn, yn ôl maint"
+msgid "Successfully added medium `%s'."
+msgstr "Llwyddiant wrth ychwanegu cyfrwng '%s'"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:85
+#, c-format
+msgid "Running in user mode"
+msgstr "Rhedeg ym modd defnyddiwr"
+
+#: ../rpmdrake:86
 #, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+"You are launching this program as a normal user.\n"
+"You will not be able to perform modifications on the system,\n"
+"but you may still browse the existing database."
 msgstr ""
-"Digwyddodd gwall wrth dynnu pecyn:\n"
-"\n"
-"%s"
+"Rydych yn cychwyn y rhaglen fel defnyddiwr cyffredin.\n"
+"Ni fydd modd i chi greu newidiadau i'r system.\n"
+"ond bydd modd i chi bori'r gronfa ddata presennol."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:93
 #, c-format
-msgid "Examining file of medium `%s'..."
-msgstr "Archwilio ffeil cyfrwng '%s'..."
+msgid "Accessibility"
+msgstr "Hygyrchedd"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:94 ../rpmdrake:95 ../rpmdrake:96 ../rpmdrake:97 ../rpmdrake:98
+#: ../rpmdrake:99 ../rpmdrake:100 ../rpmdrake:101 ../rpmdrake:102
+#: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
+#: ../rpmdrake:107 ../rpmdrake:108 ../rpmdrake:109
 #, c-format
-msgid "Path:"
-msgstr "Llwybr:"
+msgid "System"
+msgstr "System"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:94
 #, c-format
-msgid "IRC"
-msgstr "IRC"
+msgid "Servers"
+msgstr "Gweinyddion"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:95
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
+msgid "Kernel and hardware"
+msgstr "Cnewyllyn a chaledwedd."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:96
 #, c-format
-msgid "Protocol:"
-msgstr "Protocol:"
+msgid "Libraries"
+msgstr "Llyfrgelloedd"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:97
 #, c-format
-msgid "C"
-msgstr "C"
+msgid "XFree86"
+msgstr "XFree86"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:98 ../rpmdrake:99 ../rpmdrake:100 ../rpmdrake:101
 #, c-format
-msgid "Other"
-msgstr "Arall"
+msgid "Fonts"
+msgstr "Ffontiau"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:98
 #, c-format
-msgid "Sweden"
-msgstr "Sweden"
+msgid "Console"
+msgstr "Consol"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:99
 #, c-format
-msgid "Boards"
-msgstr "Byrddau"
+msgid "True type"
+msgstr "True type"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:100
 #, c-format
-msgid "Austria"
-msgstr "Awstria"
+msgid "Type1"
+msgstr "Math 1"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:101
 #, c-format
-msgid "Faqs"
-msgstr "Cwestiynau poblogaidd"
+msgid "X11 bitmap"
+msgstr "Didfap X11"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:102
 #, c-format
-msgid "Info..."
-msgstr "Gwybodaeth..."
+msgid "Base"
+msgstr "Sail"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
+#: ../rpmdrake:107 ../rpmdrake:108
 #, c-format
-msgid "Inspect..."
-msgstr "Archwilio..."
+msgid "Configuration"
+msgstr "Ffurfweddu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:103
 #, c-format
-msgid "Japan"
-msgstr "Siapan"
+msgid "Hardware"
+msgstr "Caledwedd"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:104
 #, c-format
-msgid "Summary: "
-msgstr "Crynodeb: "
+msgid "Packaging"
+msgstr "Pecynnu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:105 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
+#: ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154 ../rpmdrake:155
+#: ../rpmdrake:156 ../rpmdrake:157
 #, c-format
-msgid "Backup"
-msgstr "Wrth Gefn"
+msgid "Networking"
+msgstr "Rhwydweithio"
+
+#: ../rpmdrake:106
+#, c-format
+msgid "Printing"
+msgstr "Argraffu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:107
 #, c-format
 msgid "Boot and Init"
 msgstr "Cychwyn ac Ymgychwyn"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:108 ../rpmdrake:119 ../rpmdrake:127 ../rpmdrake:139
+#: ../rpmdrake:144 ../rpmdrake:157 ../rpmdrake:171 ../rpmdrake:176
+#: ../rpmdrake:230
 #, c-format
-msgid "FTP server"
-msgstr "Gweinydd FTP"
+msgid "Other"
+msgstr "Arall"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:109
 #, c-format
-msgid "Remove .%s"
-msgstr "Tynnu .%s"
+msgid "Internationalization"
+msgstr "Rhyngwladoli"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112 ../rpmdrake:113
+#: ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116 ../rpmdrake:117
+#: ../rpmdrake:118 ../rpmdrake:119
 #, c-format
-msgid "Importance: "
-msgstr "Pwysigrwydd: "
+msgid "Development"
+msgstr "Datblygiad"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:110
 #, c-format
-msgid "WWW"
-msgstr "WWW"
+msgid "Kernel"
+msgstr "Cnewyllyn"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:111 ../rpmdrake:129
 #, c-format
-msgid "Unable to create medium."
-msgstr "Methu creu cyfrwng."
+msgid "Databases"
+msgstr "Cronfeydd Data"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:112
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Cafodd y pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
-"\n"
-"%s\n"
-"\n"
-"Ydi hi'n iawn parhau?"
+msgid "Perl"
+msgstr "Perl"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:113
 #, c-format
-msgid ""
-"Welcome to the Software Media Manager!\n"
-"\n"
-"This tool will help you configure the packages media you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Croeso i'r Rheolwr Cyfrwng Pecynnau!\n"
-"\n"
-"Bydd yr offeryn yn eich cynorthwyo i ffurfweddu cyfrwng y pecynnau\n"
-"rydych am eu defnyddio ar eich cyfrifiadur. Byddant ar gael i'w gosod fel\n"
-"pecynnau newydd neu er mwyn diweddaru."
+msgid "Python"
+msgstr "Python"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:114
 #, c-format
-msgid "Medium"
-msgstr "Cyfrwng"
+msgid "C"
+msgstr "C"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:115
 #, c-format
-msgid "Size: "
-msgstr "Maint: "
+msgid "C++"
+msgstr "C++"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:116
 #, c-format
-msgid "Office"
-msgstr "Swyddfa"
+msgid "Java"
+msgstr "Java"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:117
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Gosodwyd popeth yn llwyddiannus"
+msgid "GNOME and GTK+"
+msgstr "GNOME a GTK+"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:118
 #, c-format
-msgid "Add a parallel group"
-msgstr "Ychwanegu grwp paralel"
+msgid "KDE and Qt"
+msgstr "KDE a Qt"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:120 ../rpmdrake:121 ../rpmdrake:122 ../rpmdrake:123
+#: ../rpmdrake:124 ../rpmdrake:125 ../rpmdrake:126 ../rpmdrake:127
 #, c-format
-msgid "Update media"
-msgstr "Diweddaru'r cyfrwng"
+msgid "Sciences"
+msgstr "Gwyddorau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:120
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Gosod pecyn `%s' (%s/%s)..."
+msgid "Astronomy"
+msgstr "Astroleg"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:121
 #, c-format
-msgid "Parallel..."
-msgstr "Paralel..."
+msgid "Biology"
+msgstr "Bywydeg"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:122
 #, c-format
-msgid "in names"
-msgstr "enwau"
+msgid "Chemistry"
+msgstr "Cemeg"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:123
 #, c-format
-msgid "Not selected"
-msgstr "Heb ei ddewis"
+msgid "Computer science"
+msgstr "Gwyddor Cyfrifiadureg"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:124
 #, c-format
-msgid "Problem during installation"
-msgstr "Anhawster wrth osod"
+msgid "Geosciences"
+msgstr "Gwyddorau Daear"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:125
 #, c-format
-msgid "Terminals"
-msgstr "Terfynellau"
+msgid "Mathematics"
+msgstr "Mathemateg"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:126
 #, c-format
-msgid "Kernel and hardware"
-msgstr "Cnewyllyn a chaledwedd."
+msgid "Physics"
+msgstr "Ffiseg"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:128
 #, c-format
-msgid "Edit"
-msgstr "Golygu"
+msgid "Communications"
+msgstr "Cyfathrebu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:130
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
+msgid "Editors"
+msgstr "Golygyddion"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:131
 #, c-format
-msgid "Australia"
-msgstr "Awstralia"
+msgid "Emulators"
+msgstr "Efelychwyr"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
+#: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
 #, c-format
-msgid "Security updates"
-msgstr "Diweddariadau diogelwch"
+msgid "Games"
+msgstr "Gemau"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:132
 #, c-format
-msgid "Korea"
-msgstr "Corea"
+msgid "Adventure"
+msgstr "Antur"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:133
 #, c-format
-msgid "Examining remote file of medium `%s'..."
-msgstr "Archwilio ffeil bell y cyfrwng '%s'..."
+msgid "Arcade"
+msgstr "Arcêd"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:134
 #, c-format
-msgid "All packages, by group"
-msgstr "Pob pecyn, yn ôl grwp"
+msgid "Boards"
+msgstr "Byrddau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:135
 #, c-format
-msgid "Kernel"
-msgstr "Cnewyllyn"
+msgid "Cards"
+msgstr "Cardiau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:136
 #, c-format
-msgid "Console"
-msgstr "Consol"
+msgid "Puzzles"
+msgstr "Posau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:137
 #, c-format
-msgid "C++"
-msgstr "C++"
+msgid "Sports"
+msgstr "Chwaraeon"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:138
 #, c-format
-msgid "Netherlands"
-msgstr "Yr Iseldiroedd"
+msgid "Strategy"
+msgstr "Strategaeth"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:140
 #, c-format
-msgid "Search results (none)"
-msgstr "Canlyniadau'r chwilio (dim)"
+msgid "Toys"
+msgstr "Teganau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143 ../rpmdrake:144
 #, c-format
-msgid "Adventure"
-msgstr "Antur"
+msgid "Archiving"
+msgstr "Archifo"
+
+#: ../rpmdrake:141
+#, c-format
+msgid "Compression"
+msgstr "Cywasgiad"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:142
 #, c-format
 msgid "Cd burning"
 msgstr "Llosgi CD"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:143
 #, c-format
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Croeso i'r offeryn gosod meddalwedd!\n"
-"\n"
-"Mae eich system Linux Mandrake yn dod gyda rhai miloedd o becynnau\n"
-"meddalwedd ar CDROM neu DVD.  Bydd yr offeryn hwn yn eich cynorthwyo\n"
-"i ddewis pa feddalwedd rydych am ei osod ar eich cyfrifiadur."
+msgid "Backup"
+msgstr "Wrth Gefn"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:145
 #, c-format
-msgid "Stop"
-msgstr "Atal"
+msgid "Monitoring"
+msgstr "Monitro"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:146
 #, c-format
-msgid "Biology"
-msgstr "Bywydeg"
+msgid "Sound"
+msgstr "Sain"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:147
 #, c-format
-msgid "Please wait, generating hdlist..."
-msgstr "Arhoswch, cynhyrchu hdlist..."
+msgid "Graphics"
+msgstr "Graffigau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:148
 #, c-format
-msgid "Mathematics"
-msgstr "Mathemateg"
+msgid "Video"
+msgstr "Fideo"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:149
 #, c-format
-msgid "Internationalization"
-msgstr "Rhyngwladoli"
+msgid "File transfer"
+msgstr "Trosglwyddo ffeiliau"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:150
 #, c-format
-msgid "Edit a medium"
-msgstr "Golygu'r cyfrwng"
+msgid "IRC"
+msgstr "IRC"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:151
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"Mae yna gyfrwng o'r enw yna eisoes, hoffech chi\n"
-"ei amnewid?"
+msgid "Instant messaging"
+msgstr "Negesu Chwim"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:152
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"I fodloni dibyniaethau, mae angen gosod y pecyn(nau) canlynol\n"
-"hefyd:\n"
-"\n"
+msgid "Chat"
+msgstr "Sgwrs"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:153
 #, c-format
-msgid "HTTP server"
-msgstr "Gweinydd HTTP"
+msgid "News"
+msgstr "Newyddion"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:154
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Gwall anadferadwy: dim pecyn wedi ei ganfod ar gyfer y gosod."
+msgid "Mail"
+msgstr "E-bost"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:155
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "Nid oes modd tynnu rhai pecynnau"
+msgid "WWW"
+msgstr "WWW"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:156
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s"
-msgstr ""
-"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
-"\n"
-"%s"
+msgid "Remote access"
+msgstr "Mynediad pell"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:158
 #, c-format
-msgid "Finland"
-msgstr "Ffindir"
+msgid "Office"
+msgstr "Swyddfa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:159
 #, c-format
-msgid "X11 bitmap"
-msgstr "Didfap X11"
+msgid "Publishing"
+msgstr "Cyhoeddi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:160
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Methu ychwanegu cyfrwng"
+msgid "Terminals"
+msgstr "Terfynellau"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:161
 #, c-format
-msgid "Media limit:"
-msgstr "Terfyn cyfrwng:"
+msgid "Shells"
+msgstr "Cregyn"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:162
 #, c-format
-msgid "More information on package..."
-msgstr "Rhagor o wybodaeth ar becyn..."
+msgid "File tools"
+msgstr "Offer ffeilio"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:163
 #, c-format
-msgid "Save changes"
-msgstr "Cadw newidiadau"
+msgid "Text tools"
+msgstr "Offer testun"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166 ../rpmdrake:167
+#: ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170 ../rpmdrake:171
 #, c-format
-msgid "Instant messaging"
-msgstr "Negesu Chwim"
+msgid "Graphical desktop"
+msgstr "Bwrdd gwaith graffigol"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:164
 #, c-format
-msgid "News"
-msgstr "Newyddion"
+msgid "GNOME"
+msgstr "GNOME"
 
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../rpmdrake:165
 #, c-format
-msgid "More info"
-msgstr "Rhagor o wybodaeth"
+msgid "Icewm"
+msgstr "Icewm"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:166
 #, c-format
-msgid "Search"
-msgstr "Chwilio"
+msgid "FVWM based"
+msgstr "FVWM seiliedig"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:167
 #, c-format
-msgid "Computer books"
-msgstr "Llyfrau cyfrifiadurol"
+msgid "KDE"
+msgstr "KDE"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:168
 #, c-format
-msgid "If left blank, synthesis/hdlist will be automatically probed"
-msgstr "Os fydd yn cael ei adael yn wag"
+msgid "Sawfish"
+msgstr "Sawfish"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:169
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Methu canfod drych addas.\n"
-"\n"
-"Gall fod amryw o resymau; y mwyaf tebygol yw'r achos pan nad\n"
-"yw pensaernïaeth eich prosesydd yn cael ei gynnal gan Diweddariadau\n"
-"Swyddogol Mandrake Linux."
+msgid "WindowMaker"
+msgstr "WindowMaker"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:170
 #, c-format
-msgid "Spain"
-msgstr "Sbaen"
+msgid "Enlightenment"
+msgstr "Enlightenment"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175
+#: ../rpmdrake:176
 #, c-format
-msgid "Already existing update media"
-msgstr "Cyfrwng diweddaru sy'n bod eisoes"
+msgid "Books"
+msgstr "Llyfrau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:172
 #, c-format
-msgid "Files:\n"
-msgstr "Ffeiliau:\n"
+msgid "Howtos"
+msgstr "Howtos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:173
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Methu estyn pecynnau ffynhonnell."
+msgid "Faqs"
+msgstr "Cwestiynau poblogaidd"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:174
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Mae modd i chi enwi defnyddiwr /cyfrinair ar gyfer dilysiad dirprwy:"
+msgid "Computer books"
+msgstr "Llyfrau cyfrifiadurol"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:175
 #, c-format
-msgid "Chat"
-msgstr "Sgwrs"
+msgid "Literature"
+msgstr "Llenyddiaeth"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:275 ../rpmdrake:637 ../rpmdrake:638
 #, c-format
-msgid "Update"
-msgstr "Diweddaru"
+msgid "(Not available)"
+msgstr "(Dim ar gael)"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:303 ../rpmdrake:361
 #, c-format
-msgid "Additional packages needed"
-msgstr "Pecynnau ychwanegol angenrheidiol"
+msgid "Search results"
+msgstr "Canlyniadau'r chwilio"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:303
 #, c-format
-msgid "Running in user mode"
-msgstr "Rhedeg ym modd defnyddiwr"
+msgid "Search results (none)"
+msgstr "Canlyniadau'r chwilio (dim)"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:313 ../rpmdrake:324
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Media Manager, and then add a `Security\n"
-"updates' medium.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Cewch ddewis eich drych eich hun, i wneud hynny\n"
-"cychwynnwch y Rheolwr Cyfryngau Meddalwedd, ac ychwanegu\n"
-"cyfrwng 'Diweddariadau Diogelwch'.\n"
-"\n"
-"Yna ailgychwynnwch MandrakeUpdate."
+msgid "Please wait, searching..."
+msgstr "Arhoswch, chwilio..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:327
 #, c-format
-msgid "Adding a medium:"
-msgstr "Ychwanegu cyfrwng:"
+msgid "Stop"
+msgstr "Atal"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:362 ../rpmdrake:478
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Oherwydd eu dibyniaethau, rhaid tynnu'r pecynnau canlynol \n"
-"hefyd: \n"
-"\n"
+msgid "Upgradable"
+msgstr "Diweddariadwy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:362 ../rpmdrake:478
 #, c-format
-msgid ""
-"You already have at least one update medium configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Media Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Mae gennych onleiaf un cyfrwng diweddaru wedi ei ffurfweddu,\n"
-"ond mae nhw i gyd wedi eu hanalluogi. Dylech redeg y Rheolwr\n"
-"Cyfrwng Meddalwedd i alluogi o leiaf un (gwirio yn y colofn Galluogi)\n"
-"\n"
-"\n"
-"Yna ailgychwyn mandrakeUpdate."
+msgid "Addable"
+msgstr "Ychwanegadwy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:364
 #, c-format
-msgid "Find:"
-msgstr "Canfod:"
+msgid "Selected"
+msgstr "Dewiswyd"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:364
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Arhoswch, rhestri pecynnau..."
+msgid "Not selected"
+msgstr "Heb ei ddewis"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:398
 #, c-format
-msgid "All"
-msgstr "Popeth"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:416 ../rpmdrake:520 ../rpmdrake:522
 #, c-format
-msgid "XFree86"
-msgstr "XFree86"
+msgid "More information on package..."
+msgstr "Rhagor o wybodaeth ar becyn..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:417
 #, c-format
-msgid "Normal information"
-msgstr "Gwybodaeth arferol"
+msgid "Please choose"
+msgstr "Dewiswch"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:417
 #, c-format
-msgid "Removable device"
-msgstr "Dyfais symudol"
+msgid "One of the following packages is needed:"
+msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:437
 #, c-format
-msgid "Preparing packages installation..."
-msgstr "Paratoi pecynnau i'w gosod..."
+msgid "Please wait, listing packages..."
+msgstr "Arhoswch, rhestri pecynnau..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:451
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Arhoswch, tynnu'r pecynnau..."
+msgid "No update"
+msgstr "Dim diweddariad"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:452
 #, c-format
-msgid "Login:"
-msgstr "Mewngofnod:"
+msgid ""
+"The list of updates is empty. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+"Mae'r rhestr diweddariadau'n wag. Mae hyn yn golygu un ai\n"
+"nad oes diweddariad ar gyfer y pecynnau ar eich cyfrifiadur,\n"
+"neu rydych wedi eu gosod i gyd yn barod."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:472
 #, c-format
-msgid "Belgium"
-msgstr "Gwlad Belg"
+msgid "All"
+msgstr "Popeth"
 
-#: ../rpmdrake:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:511 ../rpmdrake:514
 #, c-format
-msgid "File tools"
-msgstr "Offer ffeilio"
+msgid "More info"
+msgstr "Rhagor o wybodaeth"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:515
 #, c-format
-msgid "Configure proxies"
-msgstr "Ffurfweddu'r dirprwyon"
+msgid "Information on packages"
+msgstr "Gwybodaeth am becynnau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:537
 #, c-format
-msgid "Printing"
-msgstr "Argraffu"
+msgid "Some additional packages need to be removed"
+msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:538
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "Cychwyn llwytho %s i lawr..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Oherwydd eu dibyniaethau, rhaid tynnu'r pecynnau canlynol \n"
+"hefyd: \n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:544 ../rpmdrake:553
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Digwyddodd gwall terfynol:%s."
+msgid "Some packages can't be removed"
+msgstr "Nid oes modd tynnu rhai pecynnau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:545
 #, c-format
-msgid "Fatal error"
-msgstr "Gwall terfynol"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:554 ../rpmdrake:607
 #, c-format
-msgid "Leaves only, sorted by install date"
-msgstr "Gadael, yn ôl dyddiad gosod"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
+"eu dad-ddewis nawr:\n"
+
+#: ../rpmdrake:577
+#, c-format
+msgid "Additional packages needed"
+msgstr "Pecynnau ychwanegol angenrheidiol"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:578
 #, c-format
 msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
-"Errors:\n"
-"%s"
 msgstr ""
-"Methu diweddaru'r cyfrwng; bydd yn cael ei anablu'n awtomatig.\n"
+"I fodloni dibyniaethau, mae angen gosod y pecyn(nau) canlynol\n"
+"hefyd:\n"
 "\n"
-"Gwallau:\n"
-"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:592
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Nid oes modd gosod rhai pecynnau"
+
+#: ../rpmdrake:593
 #, c-format
 msgid ""
-"The list of updates is empty. This means that either there is\n"
-"no available update for the packages installed on your computer,\n"
-"or you already installed all of them."
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
 msgstr ""
-"Mae'r rhestr diweddariadau'n wag. Mae hyn yn golygu un ai\n"
-"nad oes diweddariad ar gyfer y pecynnau ar eich cyfrifiadur,\n"
-"neu rydych wedi eu gosod i gyd yn barod."
+"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:606 ../rpmdrake:858
 #, c-format
-msgid "Geosciences"
-msgstr "Gwyddorau Daear"
+msgid "Some packages need to be removed"
+msgstr "Rhaid tynnu rhai pecynnau"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:625
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Dewiswch ddrych"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:627
 #, c-format
-msgid "Communications"
-msgstr "Cyfathrebu"
+msgid "Selected size: %d MB"
+msgstr "Maint dewiswyd: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:635
 #, c-format
-msgid "Editing parallel group \"%s\":"
-msgstr "Golygu grwp paralel\"%s\":"
+msgid "Files:\n"
+msgstr "Ffeiliau:\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:638
 #, c-format
-msgid "Configuration"
-msgstr "Ffurfweddu"
+msgid "Changelog:\n"
+msgstr "Cofnod Newid:\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:640
 #, c-format
-msgid "Reason for update: "
-msgstr "Rheswm am y diweddariad:"
+msgid "Medium: "
+msgstr "Cyfrwng:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:642
 #, c-format
-msgid "Remove"
-msgstr "Tynnu"
+msgid "Currently installed version: "
+msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:646
 #, c-format
-msgid "Portugal"
-msgstr "Portiwgal"
+msgid "Name: "
+msgstr "Enw: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:647
 #, c-format
-msgid "Czech Republic"
-msgstr "Gweriniaeth Tsiec"
+msgid "Version: "
+msgstr "Fersiwn: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:648
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Rhaid tynnu rhai pecynnau"
+msgid "Size: "
+msgstr "Maint: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:648
 #, c-format
-msgid "Problem during removal"
-msgstr "Problem wrth dynnu"
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:650
 #, c-format
-msgid "WindowMaker"
-msgstr "WindowMaker"
+msgid "Importance: "
+msgstr "Pwysigrwydd: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:652
 #, c-format
-msgid "Help launched in background"
-msgstr "Cymorth wedi ei gychwyn yn y cefndir"
+msgid "Summary: "
+msgstr "Crynodeb: "
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake:654
 #, c-format
-msgid "Unable to add medium, wrong or missing arguments"
-msgstr "Methu ychwanegu cyfrwng, ymresymiadau anghywir neu goll."
+msgid "Reason for update: "
+msgstr "Rheswm am y diweddariad:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:656
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Digwyddodd anhawster wrth osod pecyn:\n"
-"\n"
-"%s"
+msgid "Description: "
+msgstr "Disgrifiadau: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:707
 #, c-format
-msgid "No package found for installation."
-msgstr "Heb ganfod pecyn i'w osod"
+msgid "Bugfixes updates"
+msgstr "Diweddariad cywiro gwallau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:707
 #, c-format
-msgid "Type1"
-msgstr "Math 1"
+msgid "Normal updates"
+msgstr "Diweddariadau arferol"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:724
 #, c-format
-msgid "Medium: "
-msgstr "Cyfrwng:"
+msgid "Mandrake choices"
+msgstr "Dewisiadau Mandrake"
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake:725
 #, c-format
-msgid "Successfully added medium `%s'."
-msgstr "Llwyddiant wrth ychwanegu cyfrwng '%s'"
+msgid "All packages, alphabetical"
+msgstr "Pob pecyn, trefn yr wyddor"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:731
 #, c-format
-msgid "Strategy"
-msgstr "Strategaeth"
+msgid "All packages, by group"
+msgstr "Pob pecyn, yn ôl grwp"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:731
 #, c-format
-msgid "Description: "
-msgstr "Disgrifiadau: "
+msgid "All packages, by size"
+msgstr "Pob pecyn, yn ôl maint"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:732
 #, c-format
-msgid "Archiving"
-msgstr "Archifo"
+msgid "All packages, by selection state"
+msgstr "Pob pecyn, yn ôl dyddiad dewis"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:733
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "All packages, by medium repository"
+msgstr "Pob pecyn, yn ôl yn ôl ffynhonnell eu storfa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:733
 #, c-format
-msgid "System"
-msgstr "System"
+msgid "All packages, by update availability"
+msgstr "Pob pecyn, yn ôl diweddariad"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:734
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
+msgid "Leaves only, sorted by install date"
+msgstr "Gadael, yn ôl dyddiad gosod"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Servers"
-msgstr "Gweinyddion"
+msgid "in names"
+msgstr "enwau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Puzzles"
-msgstr "Posau"
+msgid "in descriptions"
+msgstr "disgrifiadau"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Local files"
-msgstr "Ffeiliau lleol"
+msgid "in file names"
+msgstr "mewn enwau ffeil"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:796
 #, c-format
-msgid "Choose a medium for adding in the media limit:"
-msgstr "Dewiswch gyfrwng i ychwanegu at derfyn y cyfrwng:"
+msgid "Reset the selection"
+msgstr "Ailosod y dewis"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:796
 #, c-format
-msgid "Addable"
-msgstr "Ychwanegadwy"
+msgid "Reload the packages list"
+msgstr "Ail lwytho'r rhestr pecynnau"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:797 ../rpmdrake.pm:443
 #, c-format
-msgid "Keys"
-msgstr "Allweddi"
+msgid "Update media"
+msgstr "Diweddaru'r cyfrwng"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:822
 #, c-format
-msgid "Please choose"
-msgstr "Dewiswch"
+msgid "Normal information"
+msgstr "Gwybodaeth arferol"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:822
 #, c-format
-msgid "Databases"
-msgstr "Cronfeydd Data"
+msgid "Maximum information"
+msgstr "Gwybodaeth lawn"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:842
 #, c-format
-msgid ""
-"Are you sure you want to remove the key %s from medium %s?\n"
-"(name of the key: %s)"
-msgstr ""
-"Ydych chi'n siwr eich bod eisiau tynnu allwedd %s o gyfrwng %s?\n"
-"(enw'r allwedd: %s)"
+msgid "You need to select some packages first."
+msgstr "Rhaid dewis rhai pecynnau'n gyntaf."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:847
 #, c-format
-msgid "Name: "
-msgstr "Enw: "
+msgid "Too many packages are selected"
+msgstr "Mae gormod o becynnau wedi eu dewis"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:848
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Enw gwesteiwr y dirprwy:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr "Rhybudd:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:859
 #, c-format
 msgid ""
-"The following packages have bad signatures:\n"
+"The following packages have to be removed for others to be upgraded:\n"
 "\n"
 "%s\n"
 "\n"
-"Do you want to continue installation?"
+"Is it ok to continue?"
 msgstr ""
-"Mae gan y pecynnau canlynol lofnod gwallus:\n"
+"Cafodd y pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "\n"
 "%s\n"
 "\n"
-"Ydi hi'n iawn parhau gyda'r gosod?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Archwilio %s"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Hosts:"
-msgstr "Gwesteion:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Video"
-msgstr "Fideo"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Perl"
-msgstr "Perl"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Normal updates"
-msgstr "Diweddariadau arferol"
+"Ydi hi'n iawn parhau?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:884
 #, c-format
-msgid "Manage keys..."
-msgstr "Rheoli allweddi"
+msgid "Software Packages Removal"
+msgstr "Tynnu Pecynnau Meddalwedd"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:885
 #, c-format
-msgid "Maximum information"
-msgstr "Gwybodaeth lawn"
+msgid "Mandrake Update"
+msgstr "Diweddaru Mandrake"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:886
 #, c-format
-msgid "Selected"
-msgstr "Dewiswyd"
+msgid "Software Packages Installation"
+msgstr "Gosod Pecynnau Meddalwedd"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:893
 #, c-format
-msgid "Computer science"
-msgstr "Gwyddor Cyfrifiadureg"
+msgid "Find:"
+msgstr "Canfod:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:898
 #, c-format
-msgid "Fonts"
-msgstr "Ffontiau"
+msgid "Search"
+msgstr "Chwilio"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:909
 #, c-format
-msgid "Hardware"
-msgstr "Caledwedd"
+msgid "Install"
+msgstr "Gosod"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:911
 #, c-format
 msgid "Quit"
 msgstr "Gadael"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:938
 #, c-format
-msgid "Version: "
-msgstr "Fersiwn: "
+msgid "Fatal error"
+msgstr "Gwall terfynol"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:939
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Defnyddio .%s fel y brif ffeil"
+msgid "A fatal error occurred: %s."
+msgstr "Digwyddodd gwall terfynol:%s."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:947
 #, c-format
-msgid "Norway"
-msgstr "Norwy"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Rhaid i mi gysylltu â'r drych i gael y diweddariad diogelwch diweddaraf.\n"
+"Gwiriwch fod y rhyngrwyd yn rhedeg.\n"
+"\n"
+"Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:956
 #, c-format
-msgid "Israel"
-msgstr "Israel"
+msgid "Already existing update media"
+msgstr "Cyfrwng diweddaru sy'n bod eisoes"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:957
 #, c-format
-msgid "China"
-msgstr "Tsiena"
+msgid ""
+"You already have at least one update medium configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Media Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Mae gennych onleiaf un cyfrwng diweddaru wedi ei ffurfweddu,\n"
+"ond mae nhw i gyd wedi eu hanalluogi. Dylech redeg y Rheolwr\n"
+"Cyfrwng Meddalwedd i alluogi o leiaf un (gwirio yn y colofn Galluogi)\n"
+"\n"
+"\n"
+"Yna ailgychwyn mandrakeUpdate."
+
+#: ../rpmdrake:967
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Sut i ddewis drych gyda llaw."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:968
 #, c-format
 msgid ""
-"Welcome to the software removal tool!\n"
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Media Manager, and then add a `Security\n"
+"updates' medium.\n"
 "\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Croeso i'r offeryn tynnu meddalwedd!\n"
+"Cewch ddewis eich drych eich hun, i wneud hynny\n"
+"cychwynnwch y Rheolwr Cyfryngau Meddalwedd, ac ychwanegu\n"
+"cyfrwng 'Diweddariadau Diogelwch'.\n"
 "\n"
-"Bydd yr offeryn hwn yn eich cynorthwyo o ddewis pa feddalwedd rydych\n"
-"am ei dynnu oddi ar eich cyfrifiadur."
+"Yna ailgychwynnwch MandrakeUpdate."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:996
 #, c-format
-msgid "(Not available)"
-msgstr "(Dim ar gael)"
+msgid "Please wait, finding available packages..."
+msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1029
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Diweddariad cywiro gwallau"
+msgid "Inspecting %s"
+msgstr "Archwilio %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1048
 #, c-format
-msgid "Java"
-msgstr "Java"
+msgid "changes:"
+msgstr "newidiadau:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1052
 #, c-format
-msgid "Update..."
-msgstr "Diweddau..."
+msgid "Remove .%s"
+msgstr "Tynnu .%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1054
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
+msgid "Use .%s as main file"
+msgstr "Defnyddio .%s fel y brif ffeil"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1056
 #, c-format
-msgid "Cancel"
-msgstr "Dileu"
+msgid "Do nothing"
+msgstr "Gwneud dim"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1068
 #, c-format
-msgid "Sciences"
-msgstr "Gwyddorau"
+msgid "Installation finished"
+msgstr "Gorffennodd y gosodiad"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1078
 #, c-format
-msgid "Enabled?"
-msgstr "Galluogwyd?"
+msgid "Inspect..."
+msgstr "Archwilio..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1104 ../rpmdrake:1229
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Pob pecyn, trefn yr wyddor"
+msgid "Everything installed successfully"
+msgstr "Gosodwyd popeth yn llwyddiannus"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1105 ../rpmdrake:1230
 #, c-format
-msgid "Mandrake choices"
-msgstr "Dewisiadau Mandrake"
+msgid "All requested packages were installed successfully."
+msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1107 ../rpmdrake:1214
 #, c-format
-msgid "Toys"
-msgstr "Teganau"
+msgid "Problem during installation"
+msgstr "Anhawster wrth osod"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1108 ../rpmdrake:1215 ../rpmdrake:1244
 #, c-format
-msgid "Installation finished"
-msgstr "Gorffennodd y gosodiad"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Digwyddodd anhawster wrth osod pecyn:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1129
 #, c-format
-msgid " done."
-msgstr " gorffen.."
+msgid "Unable to get source packages."
+msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1130
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Methu estyn pecynnau ffynhonnell, %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1131 ../rpmdrake:1187
 #, c-format
 msgid ""
-"Unable to add medium, errors reported:\n"
 "\n"
+"\n"
+"Error(s) reported:\n"
 "%s"
 msgstr ""
-"Methu ychwanegu cyfrwng, gwallau:\n"
 "\n"
+"\n"
+"Gwall(au) wedi eu hadrodd:\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1138
 #, c-format
-msgid "no name found, key doesn't exist in rpm keyring!"
-msgstr "heb ganfod enw,nid yw'r allwedd yn bodoli yn nghylch allwedd rpm"
+msgid "Package installation..."
+msgstr "Gosod pecynnau..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1138
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Mae gormod o becynnau wedi eu dewis"
+msgid "Initializing..."
+msgstr "Ymgychwyn..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1143
 #, c-format
-msgid "Physics"
-msgstr "Ffiseg"
+msgid "Change medium"
+msgstr "Newid cyfrwng"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1144
 #, c-format
-msgid "Do nothing"
-msgstr "Gwneud dim"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Rhowch gyfrwng \"%s\" i fewn i ddyfais [%s]"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1149
 #, c-format
-msgid "Danmark"
-msgstr "Denmarc"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1168
 #, c-format
-msgid "Error during download"
-msgstr "Gwall wrth lwytho i lawr"
+msgid "Verifying packages signatures..."
+msgstr "Gwirio llofnodion pecynnau ..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1177
 #, c-format
-msgid "Mail"
-msgstr "E-bost"
+msgid ""
+"The following packages have bad signatures:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
+msgstr ""
+"Mae gan y pecynnau canlynol lofnod gwallus:\n"
+"\n"
+"%s\n"
+"\n"
+"Ydi hi'n iawn parhau gyda'r gosod?"
+
+#: ../rpmdrake:1184 ../rpmdrake:1243
+#, c-format
+msgid "Installation failed"
+msgstr "Methodd y gosodiad"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1185
 #, c-format
 msgid ""
-"Packages database is locked. Please close other applications\n"
-"working with packages database (do you have another media\n"
-"manager on another desktop, or are you currently installing\n"
-"packages as well?)."
+"Installation failed, some files are missing:\n"
+"%s\n"
+"\n"
+"You may want to update your media database."
 msgstr ""
+"Methodd y gosod, mae rhai ffeiliau ar goll.\n"
+"%s\n"
+"\n"
+"Efallai'r hoffech ddiweddaru eich cronfa ddata o gyfryngau."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1199
 #, c-format
-msgid "Help"
-msgstr "Cymorth"
+msgid "Preparing packages installation..."
+msgstr "Paratoi pecynnau i'w gosod..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1202
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Methu estyn pecynnau ffynhonnell, %s"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1227
 #, c-format
-msgid "Sports"
-msgstr "Chwaraeon"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"Mae'r gosod wedi gorffen;%s.\n"
+"\n"
+"Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
+"mae modd eu harchwilio i weithredu arnynt:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1227
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "everything was installed correctly"
+msgstr "gosodwyd popeth yn llwyddiannus"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1234
 #, c-format
-msgid "Protocol"
-msgstr "Protocol"
+msgid "No package found for installation."
+msgstr "Heb ganfod pecyn i'w osod"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1235
 #, c-format
-msgid "(none)"
-msgstr "(dim)"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Gwall anadferadwy: dim pecyn wedi ei ganfod ar gyfer y gosod."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1257
 #, c-format
-msgid "All packages, by medium repository"
-msgstr "Pob pecyn, yn ôl yn ôl ffynhonnell eu storfa"
+msgid "Please wait, reading packages database..."
+msgstr "Arhoswch, darllen cronfa ddata'r pecynnau..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1304
 #, c-format
-msgid "Germany"
-msgstr "Yr Almaen"
+msgid "Please wait, removing packages..."
+msgstr "Arhoswch, tynnu'r pecynnau..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1309
 #, c-format
-msgid "Compression"
-msgstr "Cywasgiad"
+msgid "Problem during removal"
+msgstr "Problem wrth dynnu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1310
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Llwytho '%s' i lawr, amser yn weddill:%s, cyflymdra:%s"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Digwyddodd gwall wrth dynnu pecyn:\n"
+"\n"
+"%s"
 
-#. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1342
 #, c-format
-msgid "%s from medium %s"
-msgstr "%s o gyfrwng %s"
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+"Croeso i'r offeryn tynnu meddalwedd!\n"
+"\n"
+"Bydd yr offeryn hwn yn eich cynorthwyo o ddewis pa feddalwedd rydych\n"
+"am ei dynnu oddi ar eich cyfrifiadur."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1347
 #, c-format
-msgid "Add a host"
-msgstr "Y&chwanegu gwestai:"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Croeso i MandrakeUpdate!\n"
+"Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
+"ar eich cyfrifiadur."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1352
 #, c-format
-msgid "Development"
-msgstr "Datblygiad"
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Croeso i'r offeryn gosod meddalwedd!\n"
+"\n"
+"Mae eich system Linux Mandrake yn dod gyda rhai miloedd o becynnau\n"
+"meddalwedd ar CDROM neu DVD.  Bydd yr offeryn hwn yn eich cynorthwyo\n"
+"i ddewis pa feddalwedd rydych am ei osod ar eich cyfrifiadur."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:121
 #, c-format
-msgid "No"
-msgstr "Na"
+msgid "Yes"
+msgstr "Iawn"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:123
 #, c-format
-msgid "Media limit"
-msgstr "Terfyn cyfrwng"
+msgid "No"
+msgstr "Na"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:159
 #, c-format
-msgid "Install"
-msgstr "Gosod"
+msgid "Info..."
+msgstr "Gwybodaeth..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:214
 #, c-format
-msgid "Add..."
-msgstr "Ychwanegu..."
+msgid "Austria"
+msgstr "Awstria"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:215
 #, c-format
-msgid "Change medium"
-msgstr "Newid cyfrwng"
+msgid "Australia"
+msgstr "Awstralia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:216
 #, c-format
-msgid "Reset the selection"
-msgstr "Ailosod y dewis"
+msgid "Belgium"
+msgstr "Gwlad Belg"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:217
 #, c-format
-msgid "Mandrake Update"
-msgstr "Diweddaru Mandrake"
+msgid "Brazil"
+msgstr "Brasil"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:218
 #, c-format
-msgid "in file names"
-msgstr "mewn enwau ffeil"
+msgid "Canada"
+msgstr "Canada"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:219
 #, c-format
-msgid "Books"
-msgstr "Llyfrau"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:220
 #, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
-msgstr ""
-"Cafwyd gwall wrth lwytho'r rhestr drych i lawr:\n"
-"\n"
-"%s\n"
-"Nid yw'r rhwydwaith, neu safle MandrakeSoft, ar gael.\n"
-"Ceisiwch eto."
+msgid "Czech Republic"
+msgstr "Gweriniaeth Tsiec"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:221
 #, c-format
-msgid "Howtos"
-msgstr "Howtos"
+msgid "Germany"
+msgstr "Yr Almaen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:222
 #, c-format
-msgid "Icewm"
-msgstr "Icewm"
+msgid "Danmark"
+msgstr "Denmarc"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:223 ../rpmdrake.pm:227
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"\n"
-"You may want to update your media database."
-msgstr ""
-"Methodd y gosod, mae rhai ffeiliau ar goll.\n"
-"%s\n"
-"\n"
-"Efallai'r hoffech ddiweddaru eich cronfa ddata o gyfryngau."
+msgid "Greece"
+msgstr "Groeg"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:224
 #, c-format
-msgid "Libraries"
-msgstr "Llyfrgelloedd"
+msgid "Spain"
+msgstr "Sbaen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:225
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
-"\n"
+msgid "Finland"
+msgstr "Ffindir"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:226
 #, c-format
-msgid "Brazil"
-msgstr "Brasil"
+msgid "France"
+msgstr "Ffrainc"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:228
 #, c-format
-msgid "Installation failed"
-msgstr "Methodd y gosodiad"
+msgid "Israel"
+msgstr "Israel"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:229
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Gwall(au) wedi eu hadrodd:\n"
-"%s"
+msgid "Italy"
+msgstr "Yr Eidal"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:230
 #, c-format
-msgid "Manage keys for digital signatures of packages"
-msgstr "Rheoli allweddi pecynnau digidol "
+msgid "Japan"
+msgstr "Siapan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:231
 #, c-format
-msgid "Currently installed version: "
-msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
+msgid "Korea"
+msgstr "Corea"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:232
 #, c-format
-msgid "Games"
-msgstr "Gemau"
+msgid "Netherlands"
+msgstr "Yr Iseldiroedd"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:233
 #, c-format
-msgid "Astronomy"
-msgstr "Astroleg"
+msgid "Norway"
+msgstr "Norwy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:234
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Rhowch gyfrwng \"%s\" i fewn i ddyfais [%s]"
+msgid "Poland"
+msgstr "Gwlad Pwyl"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:235
 #, c-format
-msgid "You need to select some packages first."
-msgstr "Rhaid dewis rhai pecynnau'n gyntaf."
+msgid "Portugal"
+msgstr "Portiwgal"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:236
 #, c-format
-msgid "All packages, by selection state"
-msgstr "Pob pecyn, yn ôl dyddiad dewis"
+msgid "Russia"
+msgstr "Rwsia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:237
 #, c-format
-msgid "Name:"
-msgstr "Enw:"
+msgid "Sweden"
+msgstr "Sweden"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:238
 #, c-format
-msgid "KDE"
-msgstr "KDE"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:239
 #, c-format
-msgid "No update"
-msgstr "Dim diweddariad"
+msgid "United Kingdom"
+msgstr "Y Deyrnas Unedig"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:240
 #, c-format
-msgid "Networking"
-msgstr "Rhwydweithio"
+msgid "China"
+msgstr "Tsiena"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:241 ../rpmdrake.pm:242 ../rpmdrake.pm:243 ../rpmdrake.pm:244
+#: ../rpmdrake.pm:295
 #, c-format
-msgid "Ok"
-msgstr "Iawn"
+msgid "United States"
+msgstr "Yr Unol Daleithiau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:305
 #, c-format
-msgid "Text tools"
-msgstr "Offer testun"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Mae angen i mi gysylltu â safle gwe MandrakeSoft i gael y rhestr\n"
+"drychau. Gwiriwch fod eich rhwydwaith yn rhedeg.\n"
+"\n"
+"Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:309
 #, c-format
-msgid "Cards"
-msgstr "Cardiau"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau o safle gwe MandrakeSoft."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:315
 #, c-format
-msgid "Sawfish"
-msgstr "Sawfish"
+msgid "Error during download"
+msgstr "Gwall wrth lwytho i lawr"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:316
 #, c-format
-msgid "Group name:"
-msgstr "Enw grwp:"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
+"Cafwyd gwall wrth lwytho'r rhestr drych i lawr:\n"
+"\n"
+"%s\n"
+"Nid yw'r rhwydwaith, neu safle MandrakeSoft, ar gael.\n"
+"Ceisiwch eto."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:324
 #, c-format
-msgid "Type in the hostname or IP address of the host to add:"
-msgstr "Teipiwch enw gwesteiwr neu IP y gwestai i'w ychwanegu:"
+msgid "No mirror"
+msgstr "Dim drych"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:325
 #, c-format
-msgid "Arcade"
-msgstr "Arcêd"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Methu canfod drych addas.\n"
+"\n"
+"Gall fod amryw o resymau; y mwyaf tebygol yw'r achos pan nad\n"
+"yw pensaernïaeth eich prosesydd yn cael ei gynnal gan Diweddariadau\n"
+"Swyddogol Mandrake Linux."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:342
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Please choose the desired mirror."
+msgstr "Dewiswch ddrych"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:383
 #, c-format
-msgid "Editing medium \"%s\":"
-msgstr "Golygu ffynhonnell \"%s\":"
+msgid "Copying file for medium `%s'..."
+msgstr "Copïo ffeil fel ar gyfer cyfrwng '%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:386
 #, c-format
-msgid "Add a medium limit"
-msgstr "Ychwanegu terfyn cyfrwng"
+msgid "Examining file of medium `%s'..."
+msgstr "Archwilio ffeil cyfrwng '%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:389
 #, c-format
-msgid "Group"
-msgstr "Grwp"
+msgid "Examining remote file of medium `%s'..."
+msgstr "Archwilio ffeil bell y cyfrwng '%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:393
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Arhoswch, tynnu cyfrwng..."
+msgid " done."
+msgstr " gorffen.."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:397
 #, c-format
-msgid "Accessibility"
-msgstr "Hygyrchedd"
+msgid " failed!"
+msgstr " methwyd!"
 
-#: ../rpmdrake:1
+#. -PO: We're downloading the said file from the said medium
+#: ../rpmdrake.pm:401
 #, c-format
-msgid "changes:"
-msgstr "newidiadau:"
+msgid "%s from medium %s"
+msgstr "%s o gyfrwng %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:405
 #, c-format
-msgid "Add"
-msgstr "Ychwanegu"
+msgid "Starting download of `%s'..."
+msgstr "Cychwyn llwytho %s i lawr..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:409
 #, c-format
-msgid "Regenerate hdlist"
-msgstr "Atgynhyrchu rhestr"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Llwytho '%s' i lawr, amser yn weddill:%s, cyflymdra:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:412
 #, c-format
-msgid "Editors"
-msgstr "Golygyddion"
+msgid "Download of `%s', speed:%s"
+msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:449
 #, c-format
-msgid "United Kingdom"
-msgstr "Y Deyrnas Unedig"
+msgid "Select the media you wish to update:"
+msgstr "Dewiswch y cyfrwng i'w diweddaru:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:453
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Llwybr perthynol i synthesis/hdlist:"
+msgid "Update"
+msgstr "Diweddaru"
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake.pm:465
 #, c-format
 msgid ""
-"You are about to add a new packages medium, `%s'.\n"
-"That means you will be able to add new software packages\n"
-"to your system from that new medium."
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
-"Rydych ar fin gosod cyfrwng pecynnau newydd, %s'.\n"
-"Mae hyn yn golygu y bydd modd gosod pecynnau meddalwedd\n"
-"newydd i'ch system o'r cyfrwng hwnnw."
+"Methu diweddaru'r cyfrwng; bydd yn cael ei anablu'n awtomatig.\n"
+"\n"
+"Gwallau:\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:482 ../rpmdrake.pm:487
 #, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Unable to add medium, errors reported:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+"%s"
 msgstr ""
-"Croeso i MandrakeUpdate!\n"
-"Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
-"ar eich cyfrifiadur."
+"Methu ychwanegu cyfrwng, gwallau:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:498
 #, c-format
-msgid "Remove a key"
-msgstr "Tynnu allwedd"
+msgid "Unable to create medium."
+msgstr "Methu creu cyfrwng."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:503
 #, c-format
-msgid "User:"
-msgstr "Defnyddiwr:"
+msgid "Failure when adding medium"
+msgstr "Methu ychwanegu cyfrwng"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:504
 #, c-format
-msgid "Browse..."
-msgstr "Pori..."
+msgid ""
+"There was a problem adding medium:\n"
+"\n"
+"%s"
+msgstr ""
+"Digwyddodd anhawster wrth ychwanegu cyfrwng:\n"
+"\n"
+"%s"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/da.po b/po/da.po
index 9340de00..c77f2a46 100644
--- a/po/da.po
+++ b/po/da.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
-"POT-Creation-Date: 2004-02-20 17:29+0100\n"
+"POT-Creation-Date: 2004-02-20 20:53+0100\n"
 "PO-Revision-Date: 2004-02-21 20:06+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <<dansk@klid.dk>>\n"
@@ -22,1955 +22,1988 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:61
 #, c-format
-msgid "Enlightenment"
-msgstr "Enlightenment"
+msgid "Add a medium"
+msgstr "Tilføj et medie"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:62
 #, c-format
-msgid "Remote access"
-msgstr "Fjernadgang"
+msgid "Local files"
+msgstr "Lokale filer"
 
-#: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:62
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Vent venligst, opdaterer medie..."
+msgid "Path:"
+msgstr "Sti:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:63
 #, c-format
-msgid "FVWM based"
-msgstr "FVWM baseret"
+msgid "FTP server"
+msgstr "FTP-server"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:63 ../edit-urpm-sources.pl:64
+#: ../edit-urpm-sources.pl:66 ../edit-urpm-sources.pl:196
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:64
 #, c-format
-msgid "Python"
-msgstr "Python"
+msgid "HTTP server"
+msgstr "HTTP-server"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:65
 #, c-format
-msgid "Upgradable"
-msgstr "Kan opdateres"
+msgid "Removable device"
+msgstr "Udskiftelig enhed"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:65
 #, c-format
-msgid "everything was installed correctly"
-msgstr "alting blev installeret korrekt"
+msgid "Path or mount point:"
+msgstr "sti eller monteringspunkt:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:66 ../rpmdrake:707
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr "Efterprøver pakkeunderskrifter..."
+msgid "Security updates"
+msgstr "Sikkerhedsopdateringer"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:78
 #, c-format
-msgid "File transfer"
-msgstr "Filoverførsel"
+msgid "Browse..."
+msgstr "Gennemse..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:80
 #, c-format
-msgid "KDE and Qt"
-msgstr "KDE og Qt"
+msgid "Choose a mirror..."
+msgstr "Vælg et spejl..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:107
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Du skal udfylde i det mindste de to første indgange."
+msgid "Login:"
+msgstr "Login:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:107 ../edit-urpm-sources.pl:240
 #, c-format
-msgid "Type of medium:"
-msgstr "Medietype:"
+msgid "Password:"
+msgstr "Adgangskode:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:112
 #, c-format
-msgid "Copying file for medium `%s'..."
-msgstr "Kopierer fil for medie `%s'..."
+msgid "Name:"
+msgstr "Navn:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:116 ../edit-urpm-sources.pl:197
 #, c-format
-msgid "France"
-msgstr "Frankrig"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relativ sti til syntese eller hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:117
 #, c-format
-msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Må kontakte spejlet for at hente de seneste opdateringspakker.\n"
-"Kontrollér venligst at dit netværk er startet.\n"
-"\n"
-"Er det O.k. at fortsætte?"
+msgid "If left blank, synthesis/hdlist will be automatically probed"
+msgstr "Hvis ladt være, vil synthesis/hdlist automatisk blive søgt efter"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:125
 #, c-format
-msgid "Search results"
-msgstr "Søgeresultater"
+msgid "You need to fill up at least the two first entries."
+msgstr "Du skal udfylde i det mindste de to første indgange."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:129
 #, c-format
-msgid "Graphical desktop"
-msgstr "Grafisk skrivebord"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Der er allerede et medie med dette navn, ønsker du\n"
+"virkelig at erstatte dette?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:138
 #, c-format
-msgid "Yes"
-msgstr "Ja"
+msgid "Adding a medium:"
+msgstr "Tilføjer et medie:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:139
 #, c-format
-msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
-msgstr ""
-"Installationen er færdig; %s.\n"
-"\n"
-"Nogen konfigurationsfiler blev oprette som '.rpmnew' eller '.rpmsave',\n"
-"du kan nu kigge på nogen for at tage aktion:"
+msgid "Type of medium:"
+msgstr "Medietype:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:143 ../edit-urpm-sources.pl:211
+#: ../edit-urpm-sources.pl:244 ../edit-urpm-sources.pl:317
+#: ../edit-urpm-sources.pl:355 ../edit-urpm-sources.pl:396
+#: ../edit-urpm-sources.pl:453 ../edit-urpm-sources.pl:517
+#: ../edit-urpm-sources.pl:554 ../edit-urpm-sources.pl:660 ../rpmdrake:88
+#: ../rpmdrake:511 ../rpmdrake:525 ../rpmdrake:529 ../rpmdrake:1084
+#: ../rpmdrake:1145 ../rpmdrake.pm:125 ../rpmdrake.pm:168 ../rpmdrake.pm:353
 #, c-format
-msgid "Edit a parallel group"
-msgstr "Redigér en parallel gruppe"
+msgid "Ok"
+msgstr "O.k."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:159 ../edit-urpm-sources.pl:205
+#: ../edit-urpm-sources.pl:211 ../edit-urpm-sources.pl:251
+#: ../edit-urpm-sources.pl:322 ../edit-urpm-sources.pl:356
+#: ../edit-urpm-sources.pl:403 ../edit-urpm-sources.pl:522 ../rpmdrake:88
+#: ../rpmdrake:511 ../rpmdrake:1145 ../rpmdrake:1151 ../rpmdrake.pm:353
+#: ../rpmdrake.pm:458
 #, c-format
-msgid ""
-"There was a problem adding medium:\n"
-"\n"
-"%s"
-msgstr ""
-"Der opstod et problem ved tilføjelse af medie:\n"
-"\n"
-"%s"
+msgid "Cancel"
+msgstr "Annullér"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:177
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Hvordan du manuelt vælger dit spejl"
+msgid "Please wait, removing medium..."
+msgstr "Vent venligst, fjerner medie..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:190
 #, c-format
-msgid "Publishing"
-msgstr "Publicering"
+msgid "Edit a medium"
+msgstr "Redigér et medie"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:194
 #, c-format
-msgid "Remove key"
-msgstr "Fjern nøgle"
+msgid "Editing medium \"%s\":"
+msgstr "Redigerer medie '%s':"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:200
 #, c-format
-msgid "Package installation..."
-msgstr "Installation af pakker"
+msgid "Save changes"
+msgstr "Gem ændringer"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:209
 #, c-format
-msgid "GNOME and GTK+"
-msgstr "GNOME og GTK+"
+msgid "You need to insert the medium to continue"
+msgstr "Du skal indsætte mediet for at fortsætte"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:210
 #, c-format
-msgid "Select the media you wish to update:"
-msgstr "Venligst vælg det medie du ønsker at opdatere:"
+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."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:226
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Fjernelse af programpakker"
+msgid "Configure proxies"
+msgstr "Konfigurér proxyer"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:232
 #, c-format
-msgid "Shells"
-msgstr "Skaller"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Hvis du har brug for en proxy, skal du indtaste værtsnavnet og eventuelt en "
+"port (syntaks: <proxyvært[:port]>):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:234
 #, c-format
-msgid "Chemistry"
-msgstr "Kemi"
+msgid "Proxy hostname:"
+msgstr "Værtsnavn for proxy:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:236
 #, c-format
-msgid "Choose a key for adding to the medium %s"
-msgstr "Vælg en nøgle at tilføje i mediet %s"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Du kan angive en bruger og en adgangskode for autentifikation af proxy:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:238
 #, c-format
-msgid "Add a key"
-msgstr "Tilføj en nøgle"
+msgid "User:"
+msgstr "Bruger:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:292
 #, c-format
-msgid "True type"
-msgstr "True type"
+msgid "Add a parallel group"
+msgstr "Tilføj en parallel gruppe"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:292
 #, c-format
-msgid "Base"
-msgstr "Base"
+msgid "Edit a parallel group"
+msgstr "Redigér en parallel gruppe"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:303
 #, c-format
-msgid "Graphics"
-msgstr "Grafik"
+msgid "Add a medium limit"
+msgstr "Tilføj en mediegrænse"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:313
 #, c-format
-msgid "Italy"
-msgstr "Italien"
+msgid "Choose a medium for adding in the media limit:"
+msgstr "Vælg et medie at tilføje i mediebegrænsningen"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:347
 #, c-format
-msgid ""
-"You are launching this program as a normal user.\n"
-"You will not be able to perform modifications on the system,\n"
-"but you may still browse the existing database."
-msgstr ""
-"Du er ved at starte programmet som en almindelig bruger\n"
-"Du vil ikke kunne udføre ændringer på systemet,\n"
-"men du vil alligevel kunne kigge på den eksisterende database."
+msgid "Add a host"
+msgstr "Tilføj en vært"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:351
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "En af følgende pakker behøves:"
+msgid "Type in the hostname or IP address of the host to add:"
+msgstr "Indtast værtsnavnet eller ip-adressen der skal tilføjes:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:375
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Editing parallel group \"%s\":"
+msgstr "Redigerer parallel gruppe '%s':"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:377
 #, c-format
-msgid "Information on packages"
-msgstr "Information om pakker"
+msgid "Group name:"
+msgstr "Gruppenavn:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:378
 #, c-format
-msgid "Proxy..."
-msgstr "Proxy..."
+msgid "Protocol:"
+msgstr "Protokol:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:380
 #, c-format
-msgid "Russia"
-msgstr "Rusland"
+msgid "Media limit:"
+msgstr "Mediegrænse: "
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:385 ../edit-urpm-sources.pl:392
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Hvis du har brug for en proxy, skal du indtaste værtsnavnet og eventuelt en "
-"port (syntaks: <proxyvært[:port]>):"
+msgid "Add"
+msgstr "Tilføj"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:386 ../edit-urpm-sources.pl:393
+#: ../edit-urpm-sources.pl:442 ../edit-urpm-sources.pl:643 ../rpmdrake:909
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"På grund af deres afhængigheder skal følgende pakker\n"
-"afmarkeres nu:\n"
-"\n"
+msgid "Remove"
+msgstr "Fjern"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:387
 #, c-format
-msgid "Add a key..."
-msgstr "Tilføj en nøgle..."
+msgid "Hosts:"
+msgstr "Værter:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:417
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Konfigurér parallel urpmi (distribueret udførelse af urpmi)"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Sound"
-msgstr "Lyd"
-
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid "Changelog:\n"
-msgstr "Ændringslog:\n"
+msgid "Group"
+msgstr "Gruppe"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Må kontakte MandrakeSofts websted for at hente spejllisten.\n"
-"Kontrollér venligst at dit netværk er startet.\n"
-"\n"
-"Er det O.k. at fortsætte?"
+msgid "Protocol"
+msgstr "Protokol"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Vent venligst, søger..."
+msgid "Media limit"
+msgstr "Medie-begrænsking"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:421
 #, c-format
 msgid "Command"
 msgstr "Kommando"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../gurpmi.addmedia:1
+#: ../edit-urpm-sources.pl:431 ../rpmdrake:252 ../rpmdrake:269 ../rpmdrake:380
+#: ../rpmdrake:449
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Er det O.k. at fortsætte?"
+msgid "(none)"
+msgstr "(ingen)"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:444 ../edit-urpm-sources.pl:645
 #, c-format
-msgid "Literature"
-msgstr "Litteratur"
+msgid "Edit"
+msgstr "Redigér"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:449 ../edit-urpm-sources.pl:647
 #, c-format
-msgid "Initializing..."
-msgstr "Initialiserer..."
+msgid "Add..."
+msgstr "Tilføj..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:461
 #, c-format
-msgid "Emulators"
-msgstr "Emulatorer"
+msgid "Manage keys for digital signatures of packages"
+msgstr "Administrér nøgler for digitale underskrifter på pakker"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:465 ../edit-urpm-sources.pl:585
 #, c-format
-msgid "Password:"
-msgstr "Adgangskode:"
+msgid "Medium"
+msgstr "Medie"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:470
 #, c-format
-msgid "Software Packages Installation"
-msgstr "Installation af programpakker"
+msgid "Keys"
+msgstr "Nøgler"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:489
 #, c-format
-msgid "in descriptions"
-msgstr "i beskrivelser"
+msgid "no name found, key doesn't exist in rpm keyring!"
+msgstr "intet navn fundet, nøgle eksisterer ikke i rpm-nøglering!"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:503
 #, c-format
-msgid " failed!"
-msgstr " mislykkedes!"
+msgid "Add a key"
+msgstr "Tilføj en nøgle"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:513
 #, c-format
-msgid "All packages, by update availability"
-msgstr "Alle pakker, efter opdateringstilgængelighed"
+msgid "Choose a key for adding to the medium %s"
+msgstr "Vælg en nøgle at tilføje i mediet %s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:534
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Nogle yderligere pakker skal fjernes"
+msgid "Remove a key"
+msgstr "Fjern en nøgle"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:535
 #, c-format
-msgid "Packaging"
-msgstr "Pakning"
+msgid ""
+"Are you sure you want to remove the key %s from medium %s?\n"
+"(name of the key: %s)"
+msgstr ""
+"Er du sikker på at du vil fjerne nøglen %s fra mediet %s?\n"
+"(navn på nøglen: %s)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:548
 #, c-format
-msgid "Configure media"
-msgstr "Konfigurér medier"
+msgid "Add a key..."
+msgstr "Tilføj en nøgle..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:550
 #, c-format
-msgid "United States"
-msgstr "U.S.A."
+msgid "Remove key"
+msgstr "Fjern nøgle"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:562
 #, c-format
-msgid "Greece"
-msgstr "Grækenland"
+msgid "Configure media"
+msgstr "Konfigurér medier"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:584
 #, c-format
-msgid "GNOME"
-msgstr "GNOME"
+msgid "Enabled?"
+msgstr "Aktiveret?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:595
 #, c-format
-msgid "Monitoring"
-msgstr "Overvåger"
+msgid "Update medium"
+msgstr "Opdatér medie"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:595
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Regenerate hdlist"
+msgstr "Genskab hdlist"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:607 ../rpmdrake.pm:421
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "Visse pakker kan ikke installeres"
+msgid "Please wait, updating media..."
+msgstr "Vent venligst, opdaterer medie..."
+
+#: ../edit-urpm-sources.pl:611
+#, c-format
+msgid "Please wait, generating hdlist..."
+msgstr "Vent venligst, opdaterer hdlist..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:649
 #, 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 "Update..."
+msgstr "Opdatér..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:650
 #, c-format
-msgid "No mirror"
-msgstr "Intet spejl"
+msgid "Manage keys..."
+msgstr "Administrér nøgler..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:651
 #, c-format
-msgid "Reload the packages list"
-msgstr "Genindlæs pakkelisten"
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:652
 #, c-format
-msgid "Poland"
-msgstr "Polen"
+msgid "Parallel..."
+msgstr "Parallel..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:655 ../rpmdrake:901
 #, c-format
-msgid "Path or mount point:"
-msgstr "sti eller monteringspunkt:"
+msgid "Help"
+msgstr "Hjælp"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:657 ../rpmdrake:904
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Vent venligst, henter spejladresser fra MandrakeSofts websted."
+msgid "Help launched in background"
+msgstr "Hjælp startes i baggrunden"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:658 ../rpmdrake:905
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Vælg et spejl..."
+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."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:669 ../gurpmi.addmedia:75 ../rpmdrake:1338
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"%s\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"Advarsel: det ser ud til at du prøver på at tilføje så mange pakker at dit "
-"filsystem kan løbe tør for fri diskplads, under eller efter "
-"pakkeinstallationen; dette er særlig farligt og bør overvejes omhyggeligt.\n"
+"%s\n"
 "\n"
-"Ønsker du virkeligt at installere alle de valgte pakker?"
+"Er det O.k. at fortsætte?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:672
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Valgt størrelse: %d MB"
+msgid ""
+"Welcome to the Software Media Manager!\n"
+"\n"
+"This tool will help you configure the packages media you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Velkommen til administration af pakkemedier!\n"
+"\n"
+"Dette værktøj hjælper dig med at konfigurere pakkemedierne du ønsker at "
+"bruge\n"
+"på maskinen. De vil derefter være tilgængelige så du kan installere nye\n"
+"programmer eller udføre opdateringer."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:684
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Vent venligst, læser pakkedatabase..."
+msgid ""
+"Packages database is locked. Please close other applications\n"
+"working with packages database (do you have another media\n"
+"manager on another desktop, or are you currently installing\n"
+"packages as well?)."
+msgstr ""
+"Pakke-databasen er låst. Luk andre programmer som\n"
+"arbejder på pakke-databasen (har du en anden medie-administrator\n"
+"på en anden maskine, eller er du også i øjeblikket i færd med at installere\n"
+"pakker?)."
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:70
 #, c-format
-msgid "Add a medium"
-msgstr "Tilføj et medie"
+msgid "Unable to add medium, wrong or missing arguments"
+msgstr "Kunne ikke tilføje medie, forkert eller manglende argumenter"
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:78
 #, c-format
-msgid "Update medium"
-msgstr "Opdatér medie"
+msgid ""
+"You are about to add a new packages medium, `%s'.\n"
+"That means you will be able to add new software packages\n"
+"to your system from that new medium."
+msgstr ""
+"Du er ved at tilføje et nyt pakkemedie, '%s'.\n"
+"Dette betyder at du vil kunne tilføje nye programpakker\n"
+"til dit system fra dette nye medie."
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:87
 #, c-format
-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."
+msgid "Successfully added medium `%s'."
+msgstr "Tilføjelse af medie '%s' gennemført."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:85
 #, c-format
-msgid "All packages, by size"
-msgstr "Alle pakker, efter størrelse"
+msgid "Running in user mode"
+msgstr "Kører i brugertilstand"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:86
 #, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+"You are launching this program as a normal user.\n"
+"You will not be able to perform modifications on the system,\n"
+"but you may still browse the existing database."
 msgstr ""
-"Der opstod et problem under fjernelsen af pakker:\n"
-"\n"
-"%s"
+"Du er ved at starte programmet som en almindelig bruger\n"
+"Du vil ikke kunne udføre ændringer på systemet,\n"
+"men du vil alligevel kunne kigge på den eksisterende database."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:93
 #, c-format
-msgid "Examining file of medium `%s'..."
-msgstr "Undersøger fil fra medie '%s'..."
+msgid "Accessibility"
+msgstr "Tilgængelighed"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:94 ../rpmdrake:95 ../rpmdrake:96 ../rpmdrake:97 ../rpmdrake:98
+#: ../rpmdrake:99 ../rpmdrake:100 ../rpmdrake:101 ../rpmdrake:102
+#: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
+#: ../rpmdrake:107 ../rpmdrake:108 ../rpmdrake:109
 #, c-format
-msgid "Path:"
-msgstr "Sti:"
+msgid "System"
+msgstr "System"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:94
 #, c-format
-msgid "IRC"
-msgstr "IRC"
+msgid "Servers"
+msgstr "Servere"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:95
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Henter pakke `%s' (%s/%s)..."
+msgid "Kernel and hardware"
+msgstr "Kerne og udstyr"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:96
 #, c-format
-msgid "Protocol:"
-msgstr "Protokol:"
+msgid "Libraries"
+msgstr "Biblioteker"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:97
 #, c-format
-msgid "C"
-msgstr "C"
+msgid "XFree86"
+msgstr "XFree86"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:98 ../rpmdrake:99 ../rpmdrake:100 ../rpmdrake:101
 #, c-format
-msgid "Other"
-msgstr "Andet"
+msgid "Fonts"
+msgstr "Skrifttyper"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:98
 #, c-format
-msgid "Sweden"
-msgstr "Sverige"
+msgid "Console"
+msgstr "Konsol"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:99
 #, c-format
-msgid "Boards"
-msgstr "Bræt"
+msgid "True type"
+msgstr "True type"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:100
 #, c-format
-msgid "Austria"
-msgstr "Østrig"
+msgid "Type1"
+msgstr "Type1"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:101
 #, c-format
-msgid "Faqs"
-msgstr "OSS"
+msgid "X11 bitmap"
+msgstr "X11 bitmap"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:102
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "Base"
+msgstr "Base"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
+#: ../rpmdrake:107 ../rpmdrake:108
 #, c-format
-msgid "Inspect..."
-msgstr "Undersøg..."
+msgid "Configuration"
+msgstr "Konfigurering"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:103
 #, c-format
-msgid "Japan"
-msgstr "Japan"
+msgid "Hardware"
+msgstr "Udstyr"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:104
 #, c-format
-msgid "Summary: "
-msgstr "Resumé: "
+msgid "Packaging"
+msgstr "Pakning"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:105 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
+#: ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154 ../rpmdrake:155
+#: ../rpmdrake:156 ../rpmdrake:157
 #, c-format
-msgid "Backup"
-msgstr "Sikkerhedskopi"
+msgid "Networking"
+msgstr "Netværk"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:106
+#, c-format
+msgid "Printing"
+msgstr "Udskrift"
+
+#: ../rpmdrake:107
 #, c-format
 msgid "Boot and Init"
 msgstr "Opstart og initialisering"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:108 ../rpmdrake:119 ../rpmdrake:127 ../rpmdrake:139
+#: ../rpmdrake:144 ../rpmdrake:157 ../rpmdrake:171 ../rpmdrake:176
+#: ../rpmdrake:230
 #, c-format
-msgid "FTP server"
-msgstr "FTP-server"
+msgid "Other"
+msgstr "Andet"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:109
 #, c-format
-msgid "Remove .%s"
-msgstr "Fjern .%s"
+msgid "Internationalization"
+msgstr "Internationalisering"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112 ../rpmdrake:113
+#: ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116 ../rpmdrake:117
+#: ../rpmdrake:118 ../rpmdrake:119
 #, c-format
-msgid "Importance: "
-msgstr "Vigtighed: "
+msgid "Development"
+msgstr "Udvikling"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:110
 #, c-format
-msgid "WWW"
-msgstr "WWW"
+msgid "Kernel"
+msgstr "Kerne"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:111 ../rpmdrake:129
 #, c-format
-msgid "Unable to create medium."
-msgstr "Kan ikke lave medie."
+msgid "Databases"
+msgstr "Databaser"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:112
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Følgende pakker skal fjernes for at andre skal kunne opgraderes:\n"
-"\n"
-"%s\n"
-"\n"
-"Er det O.k. at fortsætte?"
+msgid "Perl"
+msgstr "Perl"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:113
 #, c-format
-msgid ""
-"Welcome to the Software Media Manager!\n"
-"\n"
-"This tool will help you configure the packages media you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Velkommen til administration af pakkemedier!\n"
-"\n"
-"Dette værktøj hjælper dig med at konfigurere pakkemedierne du ønsker at "
-"bruge\n"
-"på maskinen. De vil derefter være tilgængelige så du kan installere nye\n"
-"programmer eller udføre opdateringer."
+msgid "Python"
+msgstr "Python"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:114
 #, c-format
-msgid "Medium"
-msgstr "Medie"
+msgid "C"
+msgstr "C"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:115
 #, c-format
-msgid "Size: "
-msgstr "Størrelse: "
+msgid "C++"
+msgstr "C++"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:116
 #, c-format
-msgid "Office"
-msgstr "Kontor"
+msgid "Java"
+msgstr "Java"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:117
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Alting installeret uden problemer"
+msgid "GNOME and GTK+"
+msgstr "GNOME og GTK+"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:118
 #, c-format
-msgid "Add a parallel group"
-msgstr "Tilføj en parallel gruppe"
+msgid "KDE and Qt"
+msgstr "KDE og Qt"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:120 ../rpmdrake:121 ../rpmdrake:122 ../rpmdrake:123
+#: ../rpmdrake:124 ../rpmdrake:125 ../rpmdrake:126 ../rpmdrake:127
 #, c-format
-msgid "Update media"
-msgstr "Opdatér medier"
+msgid "Sciences"
+msgstr "Naturvidenskab"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:120
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installerer pakke `%s' (%s/%s)..."
+msgid "Astronomy"
+msgstr "Astronomi"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:121
 #, c-format
-msgid "Parallel..."
-msgstr "Parallel..."
+msgid "Biology"
+msgstr "Biologi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:122
 #, c-format
-msgid "in names"
-msgstr "i navne"
+msgid "Chemistry"
+msgstr "Kemi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:123
 #, c-format
-msgid "Not selected"
-msgstr "Ikke valgt"
+msgid "Computer science"
+msgstr "Datalogi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:124
 #, c-format
-msgid "Problem during installation"
-msgstr "Problem ved installationen"
+msgid "Geosciences"
+msgstr "Geologi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:125
 #, c-format
-msgid "Terminals"
-msgstr "Terminaler"
+msgid "Mathematics"
+msgstr "Matematik"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:126
 #, c-format
-msgid "Kernel and hardware"
-msgstr "Kerne og udstyr"
+msgid "Physics"
+msgstr "Fysik"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:128
 #, c-format
-msgid "Edit"
-msgstr "Redigér"
+msgid "Communications"
+msgstr "Kommunikation"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:130
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Valgt: %d MB / Fri diskplads: %d MB"
+msgid "Editors"
+msgstr "Redigering"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:131
 #, c-format
-msgid "Australia"
-msgstr "Australien"
+msgid "Emulators"
+msgstr "Emulatorer"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
+#: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
 #, c-format
-msgid "Security updates"
-msgstr "Sikkerhedsopdateringer"
+msgid "Games"
+msgstr "Spil"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:132
 #, c-format
-msgid "Korea"
-msgstr "Korea"
+msgid "Adventure"
+msgstr "Æventyr"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:133
 #, c-format
-msgid "Examining remote file of medium `%s'..."
-msgstr "Undersøger ekstern fil for medie '%s'..."
+msgid "Arcade"
+msgstr "Arkade"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:134
 #, c-format
-msgid "All packages, by group"
-msgstr "Alle pakker, efter gruppe"
+msgid "Boards"
+msgstr "Bræt"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:135
 #, c-format
-msgid "Kernel"
-msgstr "Kerne"
+msgid "Cards"
+msgstr "Kort"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:136
 #, c-format
-msgid "Console"
-msgstr "Konsol"
+msgid "Puzzles"
+msgstr "Gåder"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:137
 #, c-format
-msgid "C++"
-msgstr "C++"
+msgid "Sports"
+msgstr "Sport"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:138
 #, c-format
-msgid "Netherlands"
-msgstr "Holland"
+msgid "Strategy"
+msgstr "Strategi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:140
 #, c-format
-msgid "Search results (none)"
-msgstr "Søgeresultater (ingen)"
+msgid "Toys"
+msgstr "Legetøj"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143 ../rpmdrake:144
 #, c-format
-msgid "Adventure"
-msgstr "Æventyr"
+msgid "Archiving"
+msgstr "Arkivering"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:141
+#, c-format
+msgid "Compression"
+msgstr "Komprimering"
+
+#: ../rpmdrake:142
 #, c-format
 msgid "Cd burning"
 msgstr "Cd-brænding"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:143
 #, c-format
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Velkommen til værktøjet til programinstallation!\n"
-"\n"
-"Mandrake Linux-systemet distribueres med flere tusind programpakker\n"
-"på cd-rom eller dvd. Dette værktøj hjælper dig med at vælge hvilke "
-"programmer\n"
-"du vil installere på maskinen."
+msgid "Backup"
+msgstr "Sikkerhedskopi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:145
 #, c-format
-msgid "Stop"
-msgstr "Stop"
+msgid "Monitoring"
+msgstr "Overvåger"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:146
 #, c-format
-msgid "Biology"
-msgstr "Biologi"
+msgid "Sound"
+msgstr "Lyd"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:147
 #, c-format
-msgid "Please wait, generating hdlist..."
-msgstr "Vent venligst, opdaterer hdlist..."
+msgid "Graphics"
+msgstr "Grafik"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:148
 #, c-format
-msgid "Mathematics"
-msgstr "Matematik"
+msgid "Video"
+msgstr "Video"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:149
 #, c-format
-msgid "Internationalization"
-msgstr "Internationalisering"
+msgid "File transfer"
+msgstr "Filoverførsel"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:150
 #, c-format
-msgid "Edit a medium"
-msgstr "Redigér et medie"
+msgid "IRC"
+msgstr "IRC"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:151
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"Der er allerede et medie med dette navn, ønsker du\n"
-"virkelig at erstatte dette?"
+msgid "Instant messaging"
+msgstr "Øjeblikkelig besked"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:152
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"For at opfylde afhængigheder skal følgende pakker også installeres:\n"
-"\n"
+msgid "Chat"
+msgstr "Chat"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:153
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP-server"
+msgid "News"
+msgstr "Nyheder"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:154
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Alvorlig fejl: ingen pakke fundet til installation. Beklager."
+msgid "Mail"
+msgstr "Post"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:155
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "Visse pakker kan ikke fjernes"
+msgid "WWW"
+msgstr "WWW"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:156
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s"
-msgstr ""
-"Desværre, de følgende pakker kan ikke vælges:\n"
-"\n"
-"%s"
+msgid "Remote access"
+msgstr "Fjernadgang"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:158
 #, c-format
-msgid "Finland"
-msgstr "Finland"
+msgid "Office"
+msgstr "Kontor"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:159
 #, c-format
-msgid "X11 bitmap"
-msgstr "X11 bitmap"
+msgid "Publishing"
+msgstr "Publicering"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:160
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Fejl ved tilføjelse af medie"
+msgid "Terminals"
+msgstr "Terminaler"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:161
 #, c-format
-msgid "Media limit:"
-msgstr "Mediegrænse: "
+msgid "Shells"
+msgstr "Skaller"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:162
 #, c-format
-msgid "More information on package..."
-msgstr "Mere information om pakken..."
+msgid "File tools"
+msgstr "Filværktøjer"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:163
 #, c-format
-msgid "Save changes"
-msgstr "Gem ændringer"
+msgid "Text tools"
+msgstr "Tekstværktøjer"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166 ../rpmdrake:167
+#: ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170 ../rpmdrake:171
 #, c-format
-msgid "Instant messaging"
-msgstr "Øjeblikkelig besked"
+msgid "Graphical desktop"
+msgstr "Grafisk skrivebord"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:164
 #, c-format
-msgid "News"
-msgstr "Nyheder"
+msgid "GNOME"
+msgstr "GNOME"
 
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../rpmdrake:165
 #, c-format
-msgid "More info"
-msgstr "Mere info"
+msgid "Icewm"
+msgstr "Icewm"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:166
 #, c-format
-msgid "Search"
-msgstr "Søg"
+msgid "FVWM based"
+msgstr "FVWM baseret"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:167
 #, c-format
-msgid "Computer books"
-msgstr "Edb-bøger"
+msgid "KDE"
+msgstr "KDE"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:168
 #, c-format
-msgid "If left blank, synthesis/hdlist will be automatically probed"
-msgstr "Hvis ladt være, vil synthesis/hdlist automatisk blive søgt efter"
+msgid "Sawfish"
+msgstr "Sawfish"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:169
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Kan ikke finde noget passende spejl.\n"
-"\n"
-"Det kan være mange årsager til dette problem; det mest almindelige er\n"
-"når arkitekturen på din processor ikke understøttes af\n"
-"Mandrake Linux' officielle opdateringer."
+msgid "WindowMaker"
+msgstr "WindowMaker"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:170
 #, c-format
-msgid "Spain"
-msgstr "Spanien"
+msgid "Enlightenment"
+msgstr "Enlightenment"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175
+#: ../rpmdrake:176
 #, c-format
-msgid "Already existing update media"
-msgstr "Allerede eksisterende opdateringsmedier"
+msgid "Books"
+msgstr "Bøger"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:172
 #, c-format
-msgid "Files:\n"
-msgstr "Filer:\n"
+msgid "Howtos"
+msgstr "Opskrifter"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:173
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Kunne ikke hente kildepakker."
+msgid "Faqs"
+msgstr "OSS"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:174
 #, 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:"
+msgid "Computer books"
+msgstr "Edb-bøger"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:175
 #, c-format
-msgid "Chat"
-msgstr "Chat"
+msgid "Literature"
+msgstr "Litteratur"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:275 ../rpmdrake:637 ../rpmdrake:638
 #, c-format
-msgid "Update"
-msgstr "Opdatér"
+msgid "(Not available)"
+msgstr "(Ingen tilgængelig)"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:303 ../rpmdrake:361
 #, c-format
-msgid "Additional packages needed"
-msgstr "Yderligere pakker behøves"
+msgid "Search results"
+msgstr "Søgeresultater"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:303
 #, c-format
-msgid "Running in user mode"
-msgstr "Kører i brugertilstand"
+msgid "Search results (none)"
+msgstr "Søgeresultater (ingen)"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:313 ../rpmdrake:324
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Media Manager, and then add a `Security\n"
-"updates' medium.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Du kan også vælge dit ønskede spejl manuelt; for at gøre dette skal du "
-"starte Administrationen af programmedier, og dernæst tilføje et medie til "
-"'Sikkerhedsopdateringer'.\n"
-"\n"
-"Derefter skal MandrakeUpdate genstartes."
+msgid "Please wait, searching..."
+msgstr "Vent venligst, søger..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:327
 #, c-format
-msgid "Adding a medium:"
-msgstr "Tilføjer et medie:"
+msgid "Stop"
+msgstr "Stop"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:362 ../rpmdrake:478
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"På grund af deres afhængigheder vil disse pakker også blive fjernet:\n"
-"\n"
+msgid "Upgradable"
+msgstr "Kan opdateres"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:362 ../rpmdrake:478
 #, c-format
-msgid ""
-"You already have at least one update medium configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Media Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Du har allerede mindst ét opdateringsmedie konfigureret, men de\n"
-"er alle deaktiveret i øjeblikket. Du bør køre Administrationen\n"
-"for programmedier for at aktivere mindst ét. (Markér det i Aktiveret?-"
-"kolonnen\n"
-"\n"
-"Derefter skal MandrakeUpdate genstartes."
+msgid "Addable"
+msgstr "Kan tilføjes"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:364
 #, c-format
-msgid "Find:"
-msgstr "Find:"
+msgid "Selected"
+msgstr "Valgt"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:364
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Vent venligst, lister pakker..."
+msgid "Not selected"
+msgstr "Ikke valgt"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:398
 #, c-format
-msgid "All"
-msgstr "Alt"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:416 ../rpmdrake:520 ../rpmdrake:522
 #, c-format
-msgid "XFree86"
-msgstr "XFree86"
+msgid "More information on package..."
+msgstr "Mere information om pakken..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:417
 #, c-format
-msgid "Normal information"
-msgstr "Normal information"
+msgid "Please choose"
+msgstr "Vælg"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:417
 #, c-format
-msgid "Removable device"
-msgstr "Udskiftelig enhed"
+msgid "One of the following packages is needed:"
+msgstr "En af følgende pakker behøves:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:437
 #, c-format
-msgid "Preparing packages installation..."
-msgstr "Forbereder installation af pakker"
+msgid "Please wait, listing packages..."
+msgstr "Vent venligst, lister pakker..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:451
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Vent venligst, fjerner pakker..."
+msgid "No update"
+msgstr "Ingen opdatering"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:452
 #, c-format
-msgid "Login:"
-msgstr "Login:"
+msgid ""
+"The list of updates is empty. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+"Listen over opdateringer er tom. Dette betyder at der ikke\n"
+"findes nogen tilgængelige opdateringer for programmerne installeret\n"
+"på maskinen eller at du allerede har installeret dem alle."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:472
 #, c-format
-msgid "Belgium"
-msgstr "Belgien"
+msgid "All"
+msgstr "Alt"
 
-#: ../rpmdrake:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:511 ../rpmdrake:514
 #, c-format
-msgid "File tools"
-msgstr "Filværktøjer"
+msgid "More info"
+msgstr "Mere info"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:515
 #, c-format
-msgid "Configure proxies"
-msgstr "Konfigurér proxyer"
+msgid "Information on packages"
+msgstr "Information om pakker"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:537
 #, c-format
-msgid "Printing"
-msgstr "Udskrift"
+msgid "Some additional packages need to be removed"
+msgstr "Nogle yderligere pakker skal fjernes"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:538
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "Starter hentning af `%s'..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"På grund af deres afhængigheder vil disse pakker også blive fjernet:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:544 ../rpmdrake:553
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "En fatal fejl skete: %s."
+msgid "Some packages can't be removed"
+msgstr "Visse pakker kan ikke fjernes"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:545
 #, c-format
-msgid "Fatal error"
-msgstr "fatal fejl"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Desværre, fjernelse af disse pakker ville ødelægge systemet:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:554 ../rpmdrake:607
 #, c-format
-msgid "Leaves only, sorted by install date"
-msgstr "Kun blade, sorteret efter installeringsdato"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"På grund af deres afhængigheder skal følgende pakker\n"
+"afmarkeres nu:\n"
+"\n"
+
+#: ../rpmdrake:577
+#, c-format
+msgid "Additional packages needed"
+msgstr "Yderligere pakker behøves"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:578
 #, c-format
 msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
-"Errors:\n"
-"%s"
 msgstr ""
-"Kan ikke opdatere medie; det vil automatisk være deaktiveret.\n"
+"For at opfylde afhængigheder skal følgende pakker også installeres:\n"
 "\n"
-"Fejl:\n"
-"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:592
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Visse pakker kan ikke installeres"
+
+#: ../rpmdrake:593
 #, c-format
 msgid ""
-"The list of updates is empty. This means that either there is\n"
-"no available update for the packages installed on your computer,\n"
-"or you already installed all of them."
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
 msgstr ""
-"Listen over opdateringer er tom. Dette betyder at der ikke\n"
-"findes nogen tilgængelige opdateringer for programmerne installeret\n"
-"på maskinen eller at du allerede har installeret dem alle."
+"Desværre, de følgende pakker kan ikke vælges:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:606 ../rpmdrake:858
 #, c-format
-msgid "Geosciences"
-msgstr "Geologi"
+msgid "Some packages need to be removed"
+msgstr "Visse pakker skal fjernes"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:625
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Vælg ønsket spejl."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Valgt: %d MB / Fri diskplads: %d MB"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:627
 #, c-format
-msgid "Communications"
-msgstr "Kommunikation"
+msgid "Selected size: %d MB"
+msgstr "Valgt størrelse: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:635
 #, c-format
-msgid "Editing parallel group \"%s\":"
-msgstr "Redigerer parallel gruppe '%s':"
+msgid "Files:\n"
+msgstr "Filer:\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:638
 #, c-format
-msgid "Configuration"
-msgstr "Konfigurering"
+msgid "Changelog:\n"
+msgstr "Ændringslog:\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:640
 #, c-format
-msgid "Reason for update: "
-msgstr "Årsag til opdatering: "
+msgid "Medium: "
+msgstr "Medie: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:642
 #, c-format
-msgid "Remove"
-msgstr "Fjern"
+msgid "Currently installed version: "
+msgstr "Nuværende installeret version: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:646
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid "Name: "
+msgstr "Navn: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:647
 #, c-format
-msgid "Czech Republic"
-msgstr "Tjekkiet"
+msgid "Version: "
+msgstr "Version: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:648
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Visse pakker skal fjernes"
+msgid "Size: "
+msgstr "Størrelse: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:648
 #, c-format
-msgid "Problem during removal"
-msgstr "Problem ved fjernelse"
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:650
 #, c-format
-msgid "WindowMaker"
-msgstr "WindowMaker"
+msgid "Importance: "
+msgstr "Vigtighed: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:652
 #, c-format
-msgid "Help launched in background"
-msgstr "Hjælp startes i baggrunden"
+msgid "Summary: "
+msgstr "Resumé: "
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake:654
 #, c-format
-msgid "Unable to add medium, wrong or missing arguments"
-msgstr "Kunne ikke tilføje medie, forkert eller manglende argumenter"
+msgid "Reason for update: "
+msgstr "Årsag til opdatering: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:656
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Der opstod et problem under installationen:\n"
-"\n"
-"%s"
+msgid "Description: "
+msgstr "Beskrivelse: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:707
 #, c-format
-msgid "No package found for installation."
-msgstr "Ingen pakke fundet til installation."
+msgid "Bugfixes updates"
+msgstr "Fejlretningsopdateringer"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:707
 #, c-format
-msgid "Type1"
-msgstr "Type1"
+msgid "Normal updates"
+msgstr "Normale opdateringer"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:724
 #, c-format
-msgid "Medium: "
-msgstr "Medie: "
+msgid "Mandrake choices"
+msgstr "Mandrake-valg"
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake:725
 #, c-format
-msgid "Successfully added medium `%s'."
-msgstr "Tilføjelse af medie '%s' gennemført."
+msgid "All packages, alphabetical"
+msgstr "Alle pakker, alfabetisk"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:731
 #, c-format
-msgid "Strategy"
-msgstr "Strategi"
+msgid "All packages, by group"
+msgstr "Alle pakker, efter gruppe"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:731
 #, c-format
-msgid "Description: "
-msgstr "Beskrivelse: "
+msgid "All packages, by size"
+msgstr "Alle pakker, efter størrelse"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:732
 #, c-format
-msgid "Archiving"
-msgstr "Arkivering"
+msgid "All packages, by selection state"
+msgstr "Alle pakker, efter valgstatus"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:733
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "All packages, by medium repository"
+msgstr "Alle pakker, efter medielagringsplads"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:733
 #, c-format
-msgid "System"
-msgstr "System"
+msgid "All packages, by update availability"
+msgstr "Alle pakker, efter opdateringstilgængelighed"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:734
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Alle ønskede pakker blev installeret uden problemer."
+msgid "Leaves only, sorted by install date"
+msgstr "Kun blade, sorteret efter installeringsdato"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Servers"
-msgstr "Servere"
+msgid "in names"
+msgstr "i navne"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Puzzles"
-msgstr "Gåder"
+msgid "in descriptions"
+msgstr "i beskrivelser"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Local files"
-msgstr "Lokale filer"
+msgid "in file names"
+msgstr "i filnavne"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:796
 #, c-format
-msgid "Choose a medium for adding in the media limit:"
-msgstr "Vælg et medie at tilføje i mediebegrænsningen"
+msgid "Reset the selection"
+msgstr "Nulstil det valgte"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:796
 #, c-format
-msgid "Addable"
-msgstr "Kan tilføjes"
+msgid "Reload the packages list"
+msgstr "Genindlæs pakkelisten"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:797 ../rpmdrake.pm:443
 #, c-format
-msgid "Keys"
-msgstr "Nøgler"
+msgid "Update media"
+msgstr "Opdatér medier"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:822
 #, c-format
-msgid "Please choose"
-msgstr "Vælg"
+msgid "Normal information"
+msgstr "Normal information"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:822
 #, c-format
-msgid "Databases"
-msgstr "Databaser"
+msgid "Maximum information"
+msgstr "Mest information"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:842
 #, c-format
-msgid ""
-"Are you sure you want to remove the key %s from medium %s?\n"
-"(name of the key: %s)"
-msgstr ""
-"Er du sikker på at du vil fjerne nøglen %s fra mediet %s?\n"
-"(navn på nøglen: %s)"
+msgid "You need to select some packages first."
+msgstr "Du skal vælge nogen pakker først."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:847
 #, c-format
-msgid "Name: "
-msgstr "Navn: "
+msgid "Too many packages are selected"
+msgstr "For mange pakker er valgt"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:848
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Værtsnavn for proxy:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Advarsel: det ser ud til at du prøver på at tilføje så mange pakker at dit "
+"filsystem kan løbe tør for fri diskplads, under eller efter "
+"pakkeinstallationen; dette er særlig farligt og bør overvejes omhyggeligt.\n"
+"\n"
+"Ønsker du virkeligt at installere alle de valgte pakker?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:859
 #, c-format
 msgid ""
-"The following packages have bad signatures:\n"
+"The following packages have to be removed for others to be upgraded:\n"
 "\n"
 "%s\n"
 "\n"
-"Do you want to continue installation?"
+"Is it ok to continue?"
 msgstr ""
-"Følgende pakker har dårlige underskrifter:\n"
+"Følgende pakker skal fjernes for at andre skal kunne opgraderes:\n"
 "\n"
 "%s\n"
 "\n"
-"Ønsker du at fortsætte installeringen?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Undersøger %s"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Hentning af `%s', hastighed:%s"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Hosts:"
-msgstr "Værter:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Video"
-msgstr "Video"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Perl"
-msgstr "Perl"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Normal updates"
-msgstr "Normale opdateringer"
+"Er det O.k. at fortsætte?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:884
 #, c-format
-msgid "Manage keys..."
-msgstr "Administrér nøgler..."
+msgid "Software Packages Removal"
+msgstr "Fjernelse af programpakker"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:885
 #, c-format
-msgid "Maximum information"
-msgstr "Mest information"
+msgid "Mandrake Update"
+msgstr "Mandrake Opdatér"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:886
 #, c-format
-msgid "Selected"
-msgstr "Valgt"
+msgid "Software Packages Installation"
+msgstr "Installation af programpakker"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:893
 #, c-format
-msgid "Computer science"
-msgstr "Datalogi"
+msgid "Find:"
+msgstr "Find:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:898
 #, c-format
-msgid "Fonts"
-msgstr "Skrifttyper"
+msgid "Search"
+msgstr "Søg"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:909
 #, c-format
-msgid "Hardware"
-msgstr "Udstyr"
+msgid "Install"
+msgstr "Installér"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:911
 #, c-format
 msgid "Quit"
 msgstr "Afslut"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:938
 #, c-format
-msgid "Version: "
-msgstr "Version: "
+msgid "Fatal error"
+msgstr "fatal fejl"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:939
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Brug .%s som hovedfil"
+msgid "A fatal error occurred: %s."
+msgstr "En fatal fejl skete: %s."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:947
 #, c-format
-msgid "Norway"
-msgstr "Norge"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Må kontakte spejlet for at hente de seneste opdateringspakker.\n"
+"Kontrollér venligst at dit netværk er startet.\n"
+"\n"
+"Er det O.k. at fortsætte?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:956
 #, c-format
-msgid "Israel"
-msgstr "Israel"
+msgid "Already existing update media"
+msgstr "Allerede eksisterende opdateringsmedier"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:957
 #, c-format
-msgid "China"
-msgstr "Kina"
+msgid ""
+"You already have at least one update medium configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Media Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Du har allerede mindst ét opdateringsmedie konfigureret, men de\n"
+"er alle deaktiveret i øjeblikket. Du bør køre Administrationen\n"
+"for programmedier for at aktivere mindst ét. (Markér det i Aktiveret?-"
+"kolonnen\n"
+"\n"
+"Derefter skal MandrakeUpdate genstartes."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:967
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Hvordan du manuelt vælger dit spejl"
+
+#: ../rpmdrake:968
 #, c-format
 msgid ""
-"Welcome to the software removal tool!\n"
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Media Manager, and then add a `Security\n"
+"updates' medium.\n"
 "\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Velkommen til værktøjet til fjernelse af pakker!\n"
+"Du kan også vælge dit ønskede spejl manuelt; for at gøre dette skal du "
+"starte Administrationen af programmedier, og dernæst tilføje et medie til "
+"'Sikkerhedsopdateringer'.\n"
 "\n"
-"Dette værktøj hjælper dig med at vælge hvilke programmer du vil fjerne fra\n"
-"maskinen."
+"Derefter skal MandrakeUpdate genstartes."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:996
 #, c-format
-msgid "(Not available)"
-msgstr "(Ingen tilgængelig)"
+msgid "Please wait, finding available packages..."
+msgstr "Vent venligst, finder tilgængelige pakker..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1029
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Fejlretningsopdateringer"
+msgid "Inspecting %s"
+msgstr "Undersøger %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1048
 #, c-format
-msgid "Java"
-msgstr "Java"
+msgid "changes:"
+msgstr "ændringer:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1052
 #, c-format
-msgid "Update..."
-msgstr "Opdatér..."
+msgid "Remove .%s"
+msgstr "Fjern .%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1054
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Vent venligst, finder tilgængelige pakker..."
+msgid "Use .%s as main file"
+msgstr "Brug .%s som hovedfil"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1056
 #, c-format
-msgid "Cancel"
-msgstr "Annullér"
+msgid "Do nothing"
+msgstr "Gør ingenting"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1068
 #, c-format
-msgid "Sciences"
-msgstr "Naturvidenskab"
+msgid "Installation finished"
+msgstr "Installationen færdig"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1078
 #, c-format
-msgid "Enabled?"
-msgstr "Aktiveret?"
+msgid "Inspect..."
+msgstr "Undersøg..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1104 ../rpmdrake:1229
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Alle pakker, alfabetisk"
+msgid "Everything installed successfully"
+msgstr "Alting installeret uden problemer"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1105 ../rpmdrake:1230
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake-valg"
+msgid "All requested packages were installed successfully."
+msgstr "Alle ønskede pakker blev installeret uden problemer."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1107 ../rpmdrake:1214
 #, c-format
-msgid "Toys"
-msgstr "Legetøj"
+msgid "Problem during installation"
+msgstr "Problem ved installationen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1108 ../rpmdrake:1215 ../rpmdrake:1244
 #, c-format
-msgid "Installation finished"
-msgstr "Installationen færdig"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Der opstod et problem under installationen:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1129
 #, c-format
-msgid " done."
-msgstr " færdig."
+msgid "Unable to get source packages."
+msgstr "Kunne ikke hente kildepakker."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1130
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Du skal indsætte mediet for at fortsætte"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Desværre, kunne ikke hente kildepakker. %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1131 ../rpmdrake:1187
 #, c-format
 msgid ""
-"Unable to add medium, errors reported:\n"
 "\n"
+"\n"
+"Error(s) reported:\n"
 "%s"
 msgstr ""
-"Kunne ikke tilføje medie; rapporterede fejl:\n"
 "\n"
+"\n"
+"Fejl rapporteret:\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1138
 #, c-format
-msgid "no name found, key doesn't exist in rpm keyring!"
-msgstr "intet navn fundet, nøgle eksisterer ikke i rpm-nøglering!"
+msgid "Package installation..."
+msgstr "Installation af pakker"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1138
 #, c-format
-msgid "Too many packages are selected"
-msgstr "For mange pakker er valgt"
+msgid "Initializing..."
+msgstr "Initialiserer..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1143
 #, c-format
-msgid "Physics"
-msgstr "Fysik"
+msgid "Change medium"
+msgstr "Skift media"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1144
 #, c-format
-msgid "Do nothing"
-msgstr "Gør ingenting"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Indsæt venligst mediet med navnet \"%s\" i enhed [%s]"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1149
 #, c-format
-msgid "Danmark"
-msgstr "Danmark"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Henter pakke `%s' (%s/%s)..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1168
 #, c-format
-msgid "Error during download"
-msgstr "Fejl under hentning"
+msgid "Verifying packages signatures..."
+msgstr "Efterprøver pakkeunderskrifter..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1177
 #, c-format
-msgid "Mail"
-msgstr "Post"
+msgid ""
+"The following packages have bad signatures:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
+msgstr ""
+"Følgende pakker har dårlige underskrifter:\n"
+"\n"
+"%s\n"
+"\n"
+"Ønsker du at fortsætte installeringen?"
+
+#: ../rpmdrake:1184 ../rpmdrake:1243
+#, c-format
+msgid "Installation failed"
+msgstr "Installationen mislykkedes"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1185
 #, c-format
 msgid ""
-"Packages database is locked. Please close other applications\n"
-"working with packages database (do you have another media\n"
-"manager on another desktop, or are you currently installing\n"
-"packages as well?)."
+"Installation failed, some files are missing:\n"
+"%s\n"
+"\n"
+"You may want to update your media database."
 msgstr ""
-"Pakke-databasen er låst. Luk andre programmer som\n"
-"arbejder på pakke-databasen (har du en anden medie-administrator\n"
-"på en anden maskine, eller er du også i øjeblikket i færd med at installere\n"
-"pakker?)."
+"Installationen mislykkedes, visse filer mangler:\n"
+"%s\n"
+"\n"
+"Du skal måske opdatere din mediedatabase."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1199
 #, c-format
-msgid "Help"
-msgstr "Hjælp"
+msgid "Preparing packages installation..."
+msgstr "Forbereder installation af pakker"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1202
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Desværre, kunne ikke hente kildepakker. %s"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installerer pakke `%s' (%s/%s)..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1227
 #, c-format
-msgid "Sports"
-msgstr "Sport"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"Installationen er færdig; %s.\n"
+"\n"
+"Nogen konfigurationsfiler blev oprette som '.rpmnew' eller '.rpmsave',\n"
+"du kan nu kigge på nogen for at tage aktion:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1227
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "everything was installed correctly"
+msgstr "alting blev installeret korrekt"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1234
 #, c-format
-msgid "Protocol"
-msgstr "Protokol"
+msgid "No package found for installation."
+msgstr "Ingen pakke fundet til installation."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1235
 #, c-format
-msgid "(none)"
-msgstr "(ingen)"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Alvorlig fejl: ingen pakke fundet til installation. Beklager."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1257
 #, c-format
-msgid "All packages, by medium repository"
-msgstr "Alle pakker, efter medielagringsplads"
+msgid "Please wait, reading packages database..."
+msgstr "Vent venligst, læser pakkedatabase..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1304
 #, c-format
-msgid "Germany"
-msgstr "Tyskland"
+msgid "Please wait, removing packages..."
+msgstr "Vent venligst, fjerner pakker..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1309
 #, c-format
-msgid "Compression"
-msgstr "Komprimering"
+msgid "Problem during removal"
+msgstr "Problem ved fjernelse"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1310
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Hentning af `%s', resterende tid:%s, hastighed:%s"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Der opstod et problem under fjernelsen af pakker:\n"
+"\n"
+"%s"
 
-#. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1342
 #, c-format
-msgid "%s from medium %s"
-msgstr "%s fra medie %s"
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+"Velkommen til værktøjet til fjernelse af pakker!\n"
+"\n"
+"Dette værktøj hjælper dig med at vælge hvilke programmer du vil fjerne fra\n"
+"maskinen."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1347
 #, c-format
-msgid "Add a host"
-msgstr "Tilføj en vært"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Velkommen til MandrakeUpdate!\n"
+"\n"
+"Dette værktøj hjælper dig med at vælge opdateringerne du vil\n"
+"installere på maskinen."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1352
 #, c-format
-msgid "Development"
-msgstr "Udvikling"
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Velkommen til værktøjet til programinstallation!\n"
+"\n"
+"Mandrake Linux-systemet distribueres med flere tusind programpakker\n"
+"på cd-rom eller dvd. Dette værktøj hjælper dig med at vælge hvilke "
+"programmer\n"
+"du vil installere på maskinen."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:121
 #, c-format
-msgid "No"
-msgstr "Nej"
+msgid "Yes"
+msgstr "Ja"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:123
 #, c-format
-msgid "Media limit"
-msgstr "Medie-begrænsking"
+msgid "No"
+msgstr "Nej"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:159
 #, c-format
-msgid "Install"
-msgstr "Installér"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:214
 #, c-format
-msgid "Add..."
-msgstr "Tilføj..."
+msgid "Austria"
+msgstr "Østrig"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:215
 #, c-format
-msgid "Change medium"
-msgstr "Skift media"
+msgid "Australia"
+msgstr "Australien"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:216
 #, c-format
-msgid "Reset the selection"
-msgstr "Nulstil det valgte"
+msgid "Belgium"
+msgstr "Belgien"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:217
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Opdatér"
+msgid "Brazil"
+msgstr "Brasilien"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:218
 #, c-format
-msgid "in file names"
-msgstr "i filnavne"
+msgid "Canada"
+msgstr "Canada"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:219
 #, c-format
-msgid "Books"
-msgstr "Bøger"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:220
 #, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
-msgstr ""
-"Der opstod en fejl ved hentning af spejllisten:\n"
-"\n"
-"%s\n"
-"Netværket eller MandrakeSofts websted kan være utilgængelige.\n"
-"Forsøg igen senere."
+msgid "Czech Republic"
+msgstr "Tjekkiet"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:221
 #, c-format
-msgid "Howtos"
-msgstr "Opskrifter"
+msgid "Germany"
+msgstr "Tyskland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:222
 #, c-format
-msgid "Icewm"
-msgstr "Icewm"
+msgid "Danmark"
+msgstr "Danmark"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:223 ../rpmdrake.pm:227
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"\n"
-"You may want to update your media database."
-msgstr ""
-"Installationen mislykkedes, visse filer mangler:\n"
-"%s\n"
-"\n"
-"Du skal måske opdatere din mediedatabase."
+msgid "Greece"
+msgstr "Grækenland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:224
 #, c-format
-msgid "Libraries"
-msgstr "Biblioteker"
+msgid "Spain"
+msgstr "Spanien"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:225
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Desværre, fjernelse af disse pakker ville ødelægge systemet:\n"
-"\n"
+msgid "Finland"
+msgstr "Finland"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:226
 #, c-format
-msgid "Brazil"
-msgstr "Brasilien"
+msgid "France"
+msgstr "Frankrig"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:228
 #, c-format
-msgid "Installation failed"
-msgstr "Installationen mislykkedes"
+msgid "Israel"
+msgstr "Israel"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:229
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Fejl rapporteret:\n"
-"%s"
+msgid "Italy"
+msgstr "Italien"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:230
 #, c-format
-msgid "Manage keys for digital signatures of packages"
-msgstr "Administrér nøgler for digitale underskrifter på pakker"
+msgid "Japan"
+msgstr "Japan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:231
 #, c-format
-msgid "Currently installed version: "
-msgstr "Nuværende installeret version: "
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:232
 #, c-format
-msgid "Games"
-msgstr "Spil"
+msgid "Netherlands"
+msgstr "Holland"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:233
 #, c-format
-msgid "Astronomy"
-msgstr "Astronomi"
+msgid "Norway"
+msgstr "Norge"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:234
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Indsæt venligst mediet med navnet \"%s\" i enhed [%s]"
+msgid "Poland"
+msgstr "Polen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:235
 #, c-format
-msgid "You need to select some packages first."
-msgstr "Du skal vælge nogen pakker først."
+msgid "Portugal"
+msgstr "Portugal"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:236
 #, c-format
-msgid "All packages, by selection state"
-msgstr "Alle pakker, efter valgstatus"
+msgid "Russia"
+msgstr "Rusland"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:237
 #, c-format
-msgid "Name:"
-msgstr "Navn:"
+msgid "Sweden"
+msgstr "Sverige"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:238
 #, c-format
-msgid "KDE"
-msgstr "KDE"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:239
 #, c-format
-msgid "No update"
-msgstr "Ingen opdatering"
+msgid "United Kingdom"
+msgstr "Storbritannien"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:240
 #, c-format
-msgid "Networking"
-msgstr "Netværk"
+msgid "China"
+msgstr "Kina"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:241 ../rpmdrake.pm:242 ../rpmdrake.pm:243 ../rpmdrake.pm:244
+#: ../rpmdrake.pm:295
 #, c-format
-msgid "Ok"
-msgstr "O.k."
+msgid "United States"
+msgstr "U.S.A."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:305
 #, c-format
-msgid "Text tools"
-msgstr "Tekstværktøjer"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Må kontakte MandrakeSofts websted for at hente spejllisten.\n"
+"Kontrollér venligst at dit netværk er startet.\n"
+"\n"
+"Er det O.k. at fortsætte?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:309
 #, c-format
-msgid "Cards"
-msgstr "Kort"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Vent venligst, henter spejladresser fra MandrakeSofts websted."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:315
 #, c-format
-msgid "Sawfish"
-msgstr "Sawfish"
+msgid "Error during download"
+msgstr "Fejl under hentning"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:316
 #, c-format
-msgid "Group name:"
-msgstr "Gruppenavn:"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
+"Der opstod en fejl ved hentning af spejllisten:\n"
+"\n"
+"%s\n"
+"Netværket eller MandrakeSofts websted kan være utilgængelige.\n"
+"Forsøg igen senere."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:324
 #, c-format
-msgid "Type in the hostname or IP address of the host to add:"
-msgstr "Indtast værtsnavnet eller ip-adressen der skal tilføjes:"
+msgid "No mirror"
+msgstr "Intet spejl"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:325
 #, c-format
-msgid "Arcade"
-msgstr "Arkade"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Kan ikke finde noget passende spejl.\n"
+"\n"
+"Det kan være mange årsager til dette problem; det mest almindelige er\n"
+"når arkitekturen på din processor ikke understøttes af\n"
+"Mandrake Linux' officielle opdateringer."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:342
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Please choose the desired mirror."
+msgstr "Vælg ønsket spejl."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:383
 #, c-format
-msgid "Editing medium \"%s\":"
-msgstr "Redigerer medie '%s':"
+msgid "Copying file for medium `%s'..."
+msgstr "Kopierer fil for medie `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:386
 #, c-format
-msgid "Add a medium limit"
-msgstr "Tilføj en mediegrænse"
+msgid "Examining file of medium `%s'..."
+msgstr "Undersøger fil fra medie '%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:389
 #, c-format
-msgid "Group"
-msgstr "Gruppe"
+msgid "Examining remote file of medium `%s'..."
+msgstr "Undersøger ekstern fil for medie '%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:393
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Vent venligst, fjerner medie..."
+msgid " done."
+msgstr " færdig."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:397
 #, c-format
-msgid "Accessibility"
-msgstr "Tilgængelighed"
+msgid " failed!"
+msgstr " mislykkedes!"
 
-#: ../rpmdrake:1
+#. -PO: We're downloading the said file from the said medium
+#: ../rpmdrake.pm:401
 #, c-format
-msgid "changes:"
-msgstr "ændringer:"
+msgid "%s from medium %s"
+msgstr "%s fra medie %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:405
 #, c-format
-msgid "Add"
-msgstr "Tilføj"
+msgid "Starting download of `%s'..."
+msgstr "Starter hentning af `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:409
 #, c-format
-msgid "Regenerate hdlist"
-msgstr "Genskab hdlist"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Hentning af `%s', resterende tid:%s, hastighed:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:412
 #, c-format
-msgid "Editors"
-msgstr "Redigering"
+msgid "Download of `%s', speed:%s"
+msgstr "Hentning af `%s', hastighed:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:449
 #, c-format
-msgid "United Kingdom"
-msgstr "Storbritannien"
+msgid "Select the media you wish to update:"
+msgstr "Venligst vælg det medie du ønsker at opdatere:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:453
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relativ sti til syntese eller hdlist:"
+msgid "Update"
+msgstr "Opdatér"
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake.pm:465
 #, c-format
 msgid ""
-"You are about to add a new packages medium, `%s'.\n"
-"That means you will be able to add new software packages\n"
-"to your system from that new medium."
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
-"Du er ved at tilføje et nyt pakkemedie, '%s'.\n"
-"Dette betyder at du vil kunne tilføje nye programpakker\n"
-"til dit system fra dette nye medie."
+"Kan ikke opdatere medie; det vil automatisk være deaktiveret.\n"
+"\n"
+"Fejl:\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:482 ../rpmdrake.pm:487
 #, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Unable to add medium, errors reported:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+"%s"
 msgstr ""
-"Velkommen til MandrakeUpdate!\n"
+"Kunne ikke tilføje medie; rapporterede fejl:\n"
 "\n"
-"Dette værktøj hjælper dig med at vælge opdateringerne du vil\n"
-"installere på maskinen."
+"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:498
 #, c-format
-msgid "Remove a key"
-msgstr "Fjern en nøgle"
+msgid "Unable to create medium."
+msgstr "Kan ikke lave medie."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:503
 #, c-format
-msgid "User:"
-msgstr "Bruger:"
+msgid "Failure when adding medium"
+msgstr "Fejl ved tilføjelse af medie"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:504
 #, c-format
-msgid "Browse..."
-msgstr "Gennemse..."
+msgid ""
+"There was a problem adding medium:\n"
+"\n"
+"%s"
+msgstr ""
+"Der opstod et problem ved tilføjelse af medie:\n"
+"\n"
+"%s"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -2345,4 +2378,3 @@ msgstr "Administration af programmelmedier"
 
 #~ msgid "Program missing"
 #~ msgstr "Program mangler"
-
diff --git a/po/es.po b/po/es.po
index f0736f75..2dcbe562 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"POT-Creation-Date: 2004-02-20 17:29+0100\n"
+"POT-Creation-Date: 2004-02-20 20:53+0100\n"
 "PO-Revision-Date: 2004-02-21 08:51-0300\n"
 "Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -22,1963 +22,1996 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:61
 #, c-format
-msgid "Enlightenment"
-msgstr "Enlightenment"
+msgid "Add a medium"
+msgstr "Agregar un soporte"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:62
 #, c-format
-msgid "Remote access"
-msgstr "Acceso remoto"
+msgid "Local files"
+msgstr "Archivos locales"
 
-#: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:62
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Por favor espere, actualizando soportes..."
+msgid "Path:"
+msgstr "Ruta:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:63
 #, c-format
-msgid "FVWM based"
-msgstr "Basado en FVWM"
+msgid "FTP server"
+msgstr "Servidor FTP"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:63 ../edit-urpm-sources.pl:64
+#: ../edit-urpm-sources.pl:66 ../edit-urpm-sources.pl:196
 #, c-format
-msgid "Canada"
-msgstr "Canadá"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:64
 #, c-format
-msgid "Python"
-msgstr "Python"
+msgid "HTTP server"
+msgstr "Servidor HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:65
 #, c-format
-msgid "Upgradable"
-msgstr "Actualizable"
+msgid "Removable device"
+msgstr "Dispositivo removible"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:65
 #, c-format
-msgid "everything was installed correctly"
-msgstr "se instaló todo correctamente"
+msgid "Path or mount point:"
+msgstr "Ruta o punto de montaje:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:66 ../rpmdrake:707
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr "Verificando las firmas de los paquetes..."
+msgid "Security updates"
+msgstr "Actualizaciones de seguridad"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:78
 #, c-format
-msgid "File transfer"
-msgstr "Transferencia de archivos"
+msgid "Browse..."
+msgstr "Examinar..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:80
 #, c-format
-msgid "KDE and Qt"
-msgstr "KDE y QT"
+msgid "Choose a mirror..."
+msgstr "Elija un sitio de réplica..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:107
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Debe completar al menos las dos primeras entradas."
+msgid "Login:"
+msgstr "Cuenta:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:107 ../edit-urpm-sources.pl:240
 #, c-format
-msgid "Type of medium:"
-msgstr "Tipo de soporte:"
+msgid "Password:"
+msgstr "Contraseña:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:112
 #, c-format
-msgid "Copying file for medium `%s'..."
-msgstr "Copiando archivo para soporte `%s'..."
+msgid "Name:"
+msgstr "Nombre:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:116 ../edit-urpm-sources.pl:197
 #, c-format
-msgid "France"
-msgstr "Francia"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Ruta relativa de synthesis/hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:117
 #, c-format
-msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Necesito contactar al sitio de réplica para obtener los últimos paquetes "
-"actualizados.\n"
-"Por favor, verifique que su conexión de red está activa.\n"
-"\n"
-"¿Desea continuar?"
+msgid "If left blank, synthesis/hdlist will be automatically probed"
+msgstr "Si se deja vacío, se buscará automáticamente synthesis/hdlist"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:125
 #, c-format
-msgid "Search results"
-msgstr "Resultados de la búsqueda"
+msgid "You need to fill up at least the two first entries."
+msgstr "Debe completar al menos las dos primeras entradas."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:129
 #, c-format
-msgid "Graphical desktop"
-msgstr "Entorno gráfico"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Ya hay un soporte con ese nombre, ¿realmente\n"
+"desea reemplazarlo?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:138
 #, c-format
-msgid "Yes"
-msgstr "Sí"
+msgid "Adding a medium:"
+msgstr "Agregando un soporte:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:139
 #, c-format
-msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
-msgstr ""
-"Finalizó la instalación; %s.\n"
-"\n"
-"Algunos archivos de configuración se crearon como `.rpmnew' o `.rpmsave',\n"
-"ahora puede inspeccionar algunos para poder tomar acción:"
+msgid "Type of medium:"
+msgstr "Tipo de soporte:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:143 ../edit-urpm-sources.pl:211
+#: ../edit-urpm-sources.pl:244 ../edit-urpm-sources.pl:317
+#: ../edit-urpm-sources.pl:355 ../edit-urpm-sources.pl:396
+#: ../edit-urpm-sources.pl:453 ../edit-urpm-sources.pl:517
+#: ../edit-urpm-sources.pl:554 ../edit-urpm-sources.pl:660 ../rpmdrake:88
+#: ../rpmdrake:511 ../rpmdrake:525 ../rpmdrake:529 ../rpmdrake:1084
+#: ../rpmdrake:1145 ../rpmdrake.pm:125 ../rpmdrake.pm:168 ../rpmdrake.pm:353
 #, c-format
-msgid "Edit a parallel group"
-msgstr "Editar un grupo paralelo"
+msgid "Ok"
+msgstr "Aceptar"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:159 ../edit-urpm-sources.pl:205
+#: ../edit-urpm-sources.pl:211 ../edit-urpm-sources.pl:251
+#: ../edit-urpm-sources.pl:322 ../edit-urpm-sources.pl:356
+#: ../edit-urpm-sources.pl:403 ../edit-urpm-sources.pl:522 ../rpmdrake:88
+#: ../rpmdrake:511 ../rpmdrake:1145 ../rpmdrake:1151 ../rpmdrake.pm:353
+#: ../rpmdrake.pm:458
 #, c-format
-msgid ""
-"There was a problem adding medium:\n"
-"\n"
-"%s"
-msgstr ""
-"Hubo un problema añadiendo soporte:\n"
-"\n"
-"%s"
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:177
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Cómo elegir manualmente su sitio de réplica"
+msgid "Please wait, removing medium..."
+msgstr "Por favor espere, quitando soporte..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:190
 #, c-format
-msgid "Publishing"
-msgstr "Edición"
+msgid "Edit a medium"
+msgstr "Editar un soporte"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:194
 #, c-format
-msgid "Remove key"
-msgstr "Quitar clave"
+msgid "Editing medium \"%s\":"
+msgstr "Editando soporte \"%s\":"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:200
 #, c-format
-msgid "Package installation..."
-msgstr "Instalación de paquete..."
+msgid "Save changes"
+msgstr "Guardar cambios"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:209
 #, c-format
-msgid "GNOME and GTK+"
-msgstr "GNOME y GTK+"
+msgid "You need to insert the medium to continue"
+msgstr "Necesita insertar el soporte para continuar"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:210
 #, c-format
-msgid "Select the media you wish to update:"
-msgstr "Seleccione los soportes que desea actualizar:"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Para guardar los cambios, necesita insertar el soporte en la unidad."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:226
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Quitar paquetes de software"
+msgid "Configure proxies"
+msgstr "Configurar proxies"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:232
 #, c-format
-msgid "Shells"
-msgstr "Shells"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Si necesita un proxy, ingrese el nombre del host y un puerto opcional "
+"(sintaxis: <host_proxy[:puerto]>):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:234
 #, c-format
-msgid "Chemistry"
-msgstr "Química"
+msgid "Proxy hostname:"
+msgstr "Nombre de host del proxy:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:236
 #, c-format
-msgid "Choose a key for adding to the medium %s"
-msgstr "Elija una clave para añadir al soporte %s"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Puede especificar un usuario/contraseña para la autenticación del proxy:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:238
 #, c-format
-msgid "Add a key"
-msgstr "Añadir una clave"
+msgid "User:"
+msgstr "Usuario:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:292
 #, c-format
-msgid "True type"
-msgstr "True Type"
+msgid "Add a parallel group"
+msgstr "Añadir un grupo paralelo"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:292
 #, c-format
-msgid "Base"
-msgstr "Base"
+msgid "Edit a parallel group"
+msgstr "Editar un grupo paralelo"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:303
 #, c-format
-msgid "Graphics"
-msgstr "Gráficos"
+msgid "Add a medium limit"
+msgstr "Agregar un límite de soportes"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:313
 #, c-format
-msgid "Italy"
-msgstr "Italia"
+msgid "Choose a medium for adding in the media limit:"
+msgstr "Elija un soporte para añadir al límite de soportes:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:347
 #, c-format
-msgid ""
-"You are launching this program as a normal user.\n"
-"You will not be able to perform modifications on the system,\n"
-"but you may still browse the existing database."
-msgstr ""
-"Está iniciando este programa como usuario no privilegiado.\n"
-"No podrá realizar modificaciones en el sistema,\n"
-"pero puede navegar por la base de datos de paquetes."
+msgid "Add a host"
+msgstr "Agregar un host"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:351
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Se necesita uno de los paquetes siguientes:"
+msgid "Type in the hostname or IP address of the host to add:"
+msgstr "Ingrese el nombre del host o la dirección IP del host a añadir:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:375
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Editing parallel group \"%s\":"
+msgstr "Editando grupo paralelo \"%s\":"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:377
 #, c-format
-msgid "Information on packages"
-msgstr "Información sobre paquetes"
+msgid "Group name:"
+msgstr "Nombre del grupo:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:378
 #, c-format
-msgid "Proxy..."
-msgstr "Proxy..."
+msgid "Protocol:"
+msgstr "Protocolo:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:380
 #, c-format
-msgid "Russia"
-msgstr "Rusia"
+msgid "Media limit:"
+msgstr "Límite de soportes:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:385 ../edit-urpm-sources.pl:392
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Si necesita un proxy, ingrese el nombre del host y un puerto opcional "
-"(sintaxis: <host_proxy[:puerto]>):"
+msgid "Add"
+msgstr "Agregar"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:386 ../edit-urpm-sources.pl:393
+#: ../edit-urpm-sources.pl:442 ../edit-urpm-sources.pl:643 ../rpmdrake:909
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Debido a sus dependencias, ahora se debe deseleccionar el o los\n"
-"paquetes siguientes:\n"
-"\n"
+msgid "Remove"
+msgstr "Quitar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:387
 #, c-format
-msgid "Add a key..."
-msgstr "Agregar una clave"
+msgid "Hosts:"
+msgstr "Hosts:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:417
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Configurar urpmi paralelo (ejecución distribuída de urpmi)"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Sound"
-msgstr "Sonido"
-
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid "Changelog:\n"
-msgstr "Cambios:\n"
+msgid "Group"
+msgstr "Grupo"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Necesito contactar al sitio web de MandrakeSoft para obtener la lista de\n"
-"sitios de réplica. Por favor, verifique que su conexión de red está activa.\n"
-"\n"
-"¿Desea continuar?"
+msgid "Protocol"
+msgstr "Protocolo"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Por favor espere, buscando ..."
+msgid "Media limit"
+msgstr "Límite de soportes"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:421
 #, c-format
 msgid "Command"
 msgstr "Comando"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../gurpmi.addmedia:1
+#: ../edit-urpm-sources.pl:431 ../rpmdrake:252 ../rpmdrake:269 ../rpmdrake:380
+#: ../rpmdrake:449
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"¿Desea continuar? "
+msgid "(none)"
+msgstr "(ninguno)"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:444 ../edit-urpm-sources.pl:645
 #, c-format
-msgid "Literature"
-msgstr "Literatura"
+msgid "Edit"
+msgstr "Editar"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:449 ../edit-urpm-sources.pl:647
 #, c-format
-msgid "Initializing..."
-msgstr "Inicializando..."
+msgid "Add..."
+msgstr "Agregar..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:461
 #, c-format
-msgid "Emulators"
-msgstr "Emuladores"
+msgid "Manage keys for digital signatures of packages"
+msgstr "Administrar claves para las firmas digitales de los paquetes"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:465 ../edit-urpm-sources.pl:585
 #, c-format
-msgid "Password:"
-msgstr "Contraseña:"
+msgid "Medium"
+msgstr "Soporte"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:470
 #, c-format
-msgid "Software Packages Installation"
-msgstr "Instalación de paquetes de software"
+msgid "Keys"
+msgstr "Claves"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:489
 #, c-format
-msgid "in descriptions"
-msgstr "en descripciones"
+msgid "no name found, key doesn't exist in rpm keyring!"
+msgstr ""
+"no se encontró nombre, ¡la clave no existe en el anillo de claves de rpm!"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:503
 #, c-format
-msgid " failed!"
-msgstr "¡falló!"
+msgid "Add a key"
+msgstr "Añadir una clave"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:513
 #, c-format
-msgid "All packages, by update availability"
-msgstr "Todos los paquetes, por disponibilidad de actualización"
+msgid "Choose a key for adding to the medium %s"
+msgstr "Elija una clave para añadir al soporte %s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:534
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Se necesitan quitar algunos paquetes adicionales"
+msgid "Remove a key"
+msgstr "Quitar una clave"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:535
 #, c-format
-msgid "Packaging"
-msgstr "Empaquetado"
+msgid ""
+"Are you sure you want to remove the key %s from medium %s?\n"
+"(name of the key: %s)"
+msgstr ""
+"¿Está seguro que desea quitar la clave %s del soporte %s?\n"
+"(nombre de la clave: %s)"
+
+#: ../edit-urpm-sources.pl:548
+#, c-format
+msgid "Add a key..."
+msgstr "Agregar una clave"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:550
+#, c-format
+msgid "Remove key"
+msgstr "Quitar clave"
+
+#: ../edit-urpm-sources.pl:562
 #, c-format
 msgid "Configure media"
 msgstr "Configurar soportes"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:584
 #, c-format
-msgid "United States"
-msgstr "Estados Unidos"
+msgid "Enabled?"
+msgstr "¿Habilitada?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:595
 #, c-format
-msgid "Greece"
-msgstr "Grecia"
+msgid "Update medium"
+msgstr "Actualizar soporte"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:595
 #, c-format
-msgid "GNOME"
-msgstr "GNOME"
+msgid "Regenerate hdlist"
+msgstr "Volver a generar hdlist"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:607 ../rpmdrake.pm:421
 #, c-format
-msgid "Monitoring"
-msgstr "Monitoreo"
+msgid "Please wait, updating media..."
+msgstr "Por favor espere, actualizando soportes..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:611
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Please wait, generating hdlist..."
+msgstr "Por favor espere, generando hdlist..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:649
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "Algunos paquetes no se pueden instalar"
+msgid "Update..."
+msgstr "Actualizar..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:650
 #, c-format
-msgid "The help window has been started, it should appear shortly on your desktop."
-msgstr ""
-"La ventana de ayuda ha sido iniciada, debería aparecer pronto en su "
-"escritorio."
+msgid "Manage keys..."
+msgstr "Administrar claves..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:651
 #, c-format
-msgid "No mirror"
-msgstr "Sin sitio de réplica"
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:652
 #, c-format
-msgid "Reload the packages list"
-msgstr "Recargar la lista de paquetes"
+msgid "Parallel..."
+msgstr "Paralelo..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:655 ../rpmdrake:901
 #, c-format
-msgid "Poland"
-msgstr "Polonia"
+msgid "Help"
+msgstr "Ayuda"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:657 ../rpmdrake:904
 #, c-format
-msgid "Path or mount point:"
-msgstr "Ruta o punto de montaje:"
+msgid "Help launched in background"
+msgstr "Ayuda lanzada en segundo plano"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:658 ../rpmdrake:905
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgid ""
+"The help window has been started, it should appear shortly on your desktop."
 msgstr ""
-"Por favor espere, descargando las direcciones de los sitios de réplica desde "
-"el sitio web de MandrakeSoft."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Elija un sitio de réplica..."
+"La ventana de ayuda ha sido iniciada, debería aparecer pronto en su "
+"escritorio."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:669 ../gurpmi.addmedia:75 ../rpmdrake:1338
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"%s\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"Atención: parece que está intentando añadir tantos\n"
-"paquetes que su sistema de archivos puede quedarse sin espacio libre en el "
-"disco duro,\n"
-"durante o despues de la instalación de los paquetes; esto es "
-"particularmente\n"
-"peligroso y debería ser considerado con cuidado.\n"
+"%s\n"
 "\n"
-"¿Realmente quiere instalar los paquetes seleccionados?"
+"¿Desea continuar? "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:672
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Tamaño seleccionado: %d MB"
+msgid ""
+"Welcome to the Software Media Manager!\n"
+"\n"
+"This tool will help you configure the packages media you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"¡Bienvenido al Administrador de soportes de software!\n"
+"\n"
+"Esta herramienta lo ayudará a configurar los soportes de paquetes que desea\n"
+"utilizar en su computadora. Luego, los mismos estarán disponibles para\n"
+"instalar paquetes de software nuevos o realizar actualizaciones."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:684
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Por favor espere, leyendo la base de datos de paquetes..."
+msgid ""
+"Packages database is locked. Please close other applications\n"
+"working with packages database (do you have another media\n"
+"manager on another desktop, or are you currently installing\n"
+"packages as well?)."
+msgstr ""
+"La base de datos de paquetes está trabada. Por favor, cierre otras\n"
+"aplicaciones que trabajen con la misma (¿tiene algún otro\n"
+"administrador de soportes en otro escritorio, o está instalando\n"
+"paquetes en este instante?)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:70
 #, c-format
-msgid "Add a medium"
-msgstr "Agregar un soporte"
+msgid "Unable to add medium, wrong or missing arguments"
+msgstr "No se puede añadir un soporte, faltan argumentos o son erróneos"
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:78
 #, c-format
-msgid "Update medium"
-msgstr "Actualizar soporte"
+msgid ""
+"You are about to add a new packages medium, `%s'.\n"
+"That means you will be able to add new software packages\n"
+"to your system from that new medium."
+msgstr ""
+"Está a punto de añadir un soporte de paquetes nuevo, `%s'.\n"
+"Esto significa que podrá añadir paquetes de software nuevos\n"
+"a su sistema desde dicho soporte nuevo."
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:87
 #, c-format
-msgid "In order to save the changes, you need to insert the medium in the drive."
-msgstr "Para guardar los cambios, necesita insertar el soporte en la unidad."
+msgid "Successfully added medium `%s'."
+msgstr "Soporte `%s' añadido satisfactoriamente."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:85
 #, c-format
-msgid "All packages, by size"
-msgstr "Todos los paquetes, por tamaño"
+msgid "Running in user mode"
+msgstr "Ejecutando en modo usuario"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:86
 #, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+"You are launching this program as a normal user.\n"
+"You will not be able to perform modifications on the system,\n"
+"but you may still browse the existing database."
 msgstr ""
-"Hubo un error durante la desinstalación de los paquetes:\n"
-"\n"
-"%s"
+"Está iniciando este programa como usuario no privilegiado.\n"
+"No podrá realizar modificaciones en el sistema,\n"
+"pero puede navegar por la base de datos de paquetes."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:93
 #, c-format
-msgid "Examining file of medium `%s'..."
-msgstr "Examinando archivo de soporte `%s'..."
+msgid "Accessibility"
+msgstr "Accesibilidad"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:94 ../rpmdrake:95 ../rpmdrake:96 ../rpmdrake:97 ../rpmdrake:98
+#: ../rpmdrake:99 ../rpmdrake:100 ../rpmdrake:101 ../rpmdrake:102
+#: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
+#: ../rpmdrake:107 ../rpmdrake:108 ../rpmdrake:109
 #, c-format
-msgid "Path:"
-msgstr "Ruta:"
+msgid "System"
+msgstr "Sistema"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:94
 #, c-format
-msgid "IRC"
-msgstr "IRC"
+msgid "Servers"
+msgstr "Servidores"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:95
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Descargando el paquete «%s» (%s/%s)..."
+msgid "Kernel and hardware"
+msgstr "Núcleo y hardware"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:96
 #, c-format
-msgid "Protocol:"
-msgstr "Protocolo:"
+msgid "Libraries"
+msgstr "Bibliotecas"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:97
 #, c-format
-msgid "C"
-msgstr "C"
+msgid "XFree86"
+msgstr "XFree86"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:98 ../rpmdrake:99 ../rpmdrake:100 ../rpmdrake:101
 #, c-format
-msgid "Other"
-msgstr "Otro"
+msgid "Fonts"
+msgstr "Tipografías"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:98
 #, c-format
-msgid "Sweden"
-msgstr "Suecia"
+msgid "Console"
+msgstr "Consola"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:99
 #, c-format
-msgid "Boards"
-msgstr "Tableros"
+msgid "True type"
+msgstr "True Type"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:100
 #, c-format
-msgid "Austria"
-msgstr "Austria"
+msgid "Type1"
+msgstr "Type1"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:101
 #, c-format
-msgid "Faqs"
-msgstr "Faqs"
+msgid "X11 bitmap"
+msgstr "Bitmap X11"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:102
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "Base"
+msgstr "Base"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
+#: ../rpmdrake:107 ../rpmdrake:108
 #, c-format
-msgid "Inspect..."
-msgstr "Inspeccionar..."
+msgid "Configuration"
+msgstr "Configuración"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:103
 #, c-format
-msgid "Japan"
-msgstr "Japón"
+msgid "Hardware"
+msgstr "Hardware"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:104
 #, c-format
-msgid "Summary: "
-msgstr "Resumen: "
+msgid "Packaging"
+msgstr "Empaquetado"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:105 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
+#: ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154 ../rpmdrake:155
+#: ../rpmdrake:156 ../rpmdrake:157
 #, c-format
-msgid "Backup"
-msgstr "Copia de respaldo"
+msgid "Networking"
+msgstr "Red"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:106
+#, c-format
+msgid "Printing"
+msgstr "Impresión"
+
+#: ../rpmdrake:107
 #, c-format
 msgid "Boot and Init"
 msgstr "Arranque e Init"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:108 ../rpmdrake:119 ../rpmdrake:127 ../rpmdrake:139
+#: ../rpmdrake:144 ../rpmdrake:157 ../rpmdrake:171 ../rpmdrake:176
+#: ../rpmdrake:230
 #, c-format
-msgid "FTP server"
-msgstr "Servidor FTP"
+msgid "Other"
+msgstr "Otro"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:109
 #, c-format
-msgid "Remove .%s"
-msgstr "Quitar .%s"
+msgid "Internationalization"
+msgstr "Internacionalización"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112 ../rpmdrake:113
+#: ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116 ../rpmdrake:117
+#: ../rpmdrake:118 ../rpmdrake:119
 #, c-format
-msgid "Importance: "
-msgstr "Importancia: "
+msgid "Development"
+msgstr "Desarollo"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:110
 #, c-format
-msgid "WWW"
-msgstr "WWW"
+msgid "Kernel"
+msgstr "Núcleo"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:111 ../rpmdrake:129
 #, c-format
-msgid "Unable to create medium."
-msgstr "No se puede crear el soporte."
+msgid "Databases"
+msgstr "Bases de datos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:112
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
-"\n"
-"%s\n"
-"\n"
-"¿Desea continuar?"
+msgid "Perl"
+msgstr "Perl"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:113
 #, c-format
-msgid ""
-"Welcome to the Software Media Manager!\n"
-"\n"
-"This tool will help you configure the packages media you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"¡Bienvenido al Administrador de soportes de software!\n"
-"\n"
-"Esta herramienta lo ayudará a configurar los soportes de paquetes que desea\n"
-"utilizar en su computadora. Luego, los mismos estarán disponibles para\n"
-"instalar paquetes de software nuevos o realizar actualizaciones."
+msgid "Python"
+msgstr "Python"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:114
 #, c-format
-msgid "Medium"
-msgstr "Soporte"
+msgid "C"
+msgstr "C"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:115
 #, c-format
-msgid "Size: "
-msgstr "Tamaño: "
+msgid "C++"
+msgstr "C++"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:116
 #, c-format
-msgid "Office"
-msgstr "Ofimática"
+msgid "Java"
+msgstr "Java"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:117
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Se instaló todo satisfactoriamente"
+msgid "GNOME and GTK+"
+msgstr "GNOME y GTK+"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:118
 #, c-format
-msgid "Add a parallel group"
-msgstr "Añadir un grupo paralelo"
+msgid "KDE and Qt"
+msgstr "KDE y QT"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:120 ../rpmdrake:121 ../rpmdrake:122 ../rpmdrake:123
+#: ../rpmdrake:124 ../rpmdrake:125 ../rpmdrake:126 ../rpmdrake:127
 #, c-format
-msgid "Update media"
-msgstr "Actualizar soportes"
+msgid "Sciences"
+msgstr "Ciencias"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:120
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalando el paquete «%s» (%s/%s)..."
+msgid "Astronomy"
+msgstr "Astronomía"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:121
 #, c-format
-msgid "Parallel..."
-msgstr "Paralelo..."
+msgid "Biology"
+msgstr "Biología"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:122
 #, c-format
-msgid "in names"
-msgstr "en nombres"
+msgid "Chemistry"
+msgstr "Química"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:123
 #, c-format
-msgid "Not selected"
-msgstr "No seleccionado"
+msgid "Computer science"
+msgstr "Ciencias de la computación"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:124
 #, c-format
-msgid "Problem during installation"
-msgstr "Problema durante la instalación"
+msgid "Geosciences"
+msgstr "Geociencias"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:125
 #, c-format
-msgid "Terminals"
-msgstr "Terminales"
+msgid "Mathematics"
+msgstr "Matemáticas"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:126
 #, c-format
-msgid "Kernel and hardware"
-msgstr "Núcleo y hardware"
+msgid "Physics"
+msgstr "Física"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:128
 #, c-format
-msgid "Edit"
-msgstr "Editar"
+msgid "Communications"
+msgstr "Comunicaciones"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:130
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Seleccionado: %d MB / Disponible en disco: %d MB"
+msgid "Editors"
+msgstr "Editores"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:131
 #, c-format
-msgid "Australia"
-msgstr "Australia"
+msgid "Emulators"
+msgstr "Emuladores"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
+#: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
 #, c-format
-msgid "Security updates"
-msgstr "Actualizaciones de seguridad"
+msgid "Games"
+msgstr "Juegos"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:132
 #, c-format
-msgid "Korea"
-msgstr "Corea"
+msgid "Adventure"
+msgstr "Aventura"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:133
 #, c-format
-msgid "Examining remote file of medium `%s'..."
-msgstr "Examinando archivo remoto de soporte `%s'..."
+msgid "Arcade"
+msgstr "Arcade"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:134
 #, c-format
-msgid "All packages, by group"
-msgstr "Todos los paquetes, por grupo"
+msgid "Boards"
+msgstr "Tableros"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:135
 #, c-format
-msgid "Kernel"
-msgstr "Núcleo"
+msgid "Cards"
+msgstr "Naipes"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:136
 #, c-format
-msgid "Console"
-msgstr "Consola"
+msgid "Puzzles"
+msgstr "Rompecabezas"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:137
 #, c-format
-msgid "C++"
-msgstr "C++"
+msgid "Sports"
+msgstr "Deportes"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:138
 #, c-format
-msgid "Netherlands"
-msgstr "Países Bajos"
+msgid "Strategy"
+msgstr "Estrategia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:140
 #, c-format
-msgid "Search results (none)"
-msgstr "Resultados de la búsqueda (ninguno)"
+msgid "Toys"
+msgstr "Juguetes"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143 ../rpmdrake:144
 #, c-format
-msgid "Adventure"
-msgstr "Aventura"
+msgid "Archiving"
+msgstr "Archivado"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:141
+#, c-format
+msgid "Compression"
+msgstr "Compresión"
+
+#: ../rpmdrake:142
 #, c-format
 msgid "Cd burning"
 msgstr "Grabación de CD"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:143
 #, c-format
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"¡Bienvenido a la herramienta de instalación de software!\n"
-"\n"
-"Su sistema Mandrake Linux viene con varios miles de paquetes de software en\n"
-"CDROM o DVD. Esta herramienta lo ayudará a elegir el software que desea\n"
-"instalar en su computadora."
+msgid "Backup"
+msgstr "Copia de respaldo"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:145
 #, c-format
-msgid "Stop"
-msgstr "Detener"
+msgid "Monitoring"
+msgstr "Monitoreo"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:146
 #, c-format
-msgid "Biology"
-msgstr "Biología"
+msgid "Sound"
+msgstr "Sonido"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:147
 #, c-format
-msgid "Please wait, generating hdlist..."
-msgstr "Por favor espere, generando hdlist..."
+msgid "Graphics"
+msgstr "Gráficos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:148
 #, c-format
-msgid "Mathematics"
-msgstr "Matemáticas"
+msgid "Video"
+msgstr "Vídeo"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:149
 #, c-format
-msgid "Internationalization"
-msgstr "Internacionalización"
+msgid "File transfer"
+msgstr "Transferencia de archivos"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:150
 #, c-format
-msgid "Edit a medium"
-msgstr "Editar un soporte"
+msgid "IRC"
+msgstr "IRC"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:151
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"Ya hay un soporte con ese nombre, ¿realmente\n"
-"desea reemplazarlo?"
+msgid "Instant messaging"
+msgstr "Mensajería instantánea"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:152
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Para satisfacer las dependencias, también se debe instalar el o los\n"
-"paquetes siguientes:\n"
-"\n"
+msgid "Chat"
+msgstr "Chat"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:153
 #, c-format
-msgid "HTTP server"
-msgstr "Servidor HTTP"
+msgid "News"
+msgstr "Noticias"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:154
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Error no recuperable: no se encontró paquete para instalar, lo siento."
+msgid "Mail"
+msgstr "Correo"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:155
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "No se pueden quitar algunos paquetes"
+msgid "WWW"
+msgstr "WWW"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:156
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s"
-msgstr ""
-"Lo siento, no se pueden seleccionar los paquetes siguientes:\n"
-"\n"
-"%s"
+msgid "Remote access"
+msgstr "Acceso remoto"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:158
 #, c-format
-msgid "Finland"
-msgstr "Finlandia"
+msgid "Office"
+msgstr "Ofimática"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:159
 #, c-format
-msgid "X11 bitmap"
-msgstr "Bitmap X11"
+msgid "Publishing"
+msgstr "Edición"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:160
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Fallo al añadir soporte"
+msgid "Terminals"
+msgstr "Terminales"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:161
 #, c-format
-msgid "Media limit:"
-msgstr "Límite de soportes:"
+msgid "Shells"
+msgstr "Shells"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:162
 #, c-format
-msgid "More information on package..."
-msgstr "Más información sobre el paquete..."
+msgid "File tools"
+msgstr "Herramientas de archivo"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:163
 #, c-format
-msgid "Save changes"
-msgstr "Guardar cambios"
+msgid "Text tools"
+msgstr "Herramientas de texto"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166 ../rpmdrake:167
+#: ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170 ../rpmdrake:171
 #, c-format
-msgid "Instant messaging"
-msgstr "Mensajería instantánea"
+msgid "Graphical desktop"
+msgstr "Entorno gráfico"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:164
 #, c-format
-msgid "News"
-msgstr "Noticias"
+msgid "GNOME"
+msgstr "GNOME"
 
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../rpmdrake:165
 #, c-format
-msgid "More info"
-msgstr "Más información"
+msgid "Icewm"
+msgstr "Icewm"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:166
 #, c-format
-msgid "Search"
-msgstr "Buscar"
+msgid "FVWM based"
+msgstr "Basado en FVWM"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:167
 #, c-format
-msgid "Computer books"
-msgstr "Libros de computación"
+msgid "KDE"
+msgstr "KDE"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:168
 #, c-format
-msgid "If left blank, synthesis/hdlist will be automatically probed"
-msgstr "Si se deja vacío, se buscará automáticamente synthesis/hdlist"
+msgid "Sawfish"
+msgstr "Sawfish"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:169
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"No puedo encontrar un sitio de réplica adecuado.\n"
-"\n"
-"Pueden haber muchas razones para este problema; la más común es cuando la\n"
-"arquitectura de su procesador no está soportada por las Actualizaciones\n"
-"Oficiales de Mandrake Linux."
+msgid "WindowMaker"
+msgstr "WindowMaker"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:170
 #, c-format
-msgid "Spain"
-msgstr "España"
+msgid "Enlightenment"
+msgstr "Enlightenment"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175
+#: ../rpmdrake:176
 #, c-format
-msgid "Already existing update media"
-msgstr "Soporte de actualizaciones existente"
+msgid "Books"
+msgstr "Libros"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:172
 #, c-format
-msgid "Files:\n"
-msgstr "Archivos:\n"
+msgid "Howtos"
+msgstr "COMOs"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:173
 #, c-format
-msgid "Unable to get source packages."
-msgstr "No se pueden obtener los paquetes de la fuente."
+msgid "Faqs"
+msgstr "Faqs"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:174
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Puede especificar un usuario/contraseña para la autenticación del proxy:"
+msgid "Computer books"
+msgstr "Libros de computación"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:175
 #, c-format
-msgid "Chat"
-msgstr "Chat"
+msgid "Literature"
+msgstr "Literatura"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:275 ../rpmdrake:637 ../rpmdrake:638
 #, c-format
-msgid "Update"
-msgstr "Actualizar"
+msgid "(Not available)"
+msgstr "(No disponible)"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:303 ../rpmdrake:361
 #, c-format
-msgid "Additional packages needed"
-msgstr "Se necesitan paquetes adicionales"
+msgid "Search results"
+msgstr "Resultados de la búsqueda"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:303
 #, c-format
-msgid "Running in user mode"
-msgstr "Ejecutando en modo usuario"
+msgid "Search results (none)"
+msgstr "Resultados de la búsqueda (ninguno)"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:313 ../rpmdrake:324
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Media Manager, and then add a `Security\n"
-"updates' medium.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"También puede elegir manualmente su sitio de réplica: para esto,\n"
-"lance el Administrador de soportes de software, y luego añada una\n"
-"fuente de 'Actualizaciones de seguridad'.\n"
-"\n"
-"Luego, vuelva a iniciar MandrakeUpdate. "
+msgid "Please wait, searching..."
+msgstr "Por favor espere, buscando ..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:327
 #, c-format
-msgid "Adding a medium:"
-msgstr "Agregando un soporte:"
+msgid "Stop"
+msgstr "Detener"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:362 ../rpmdrake:478
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Debido a sus dependencias, también se debe quitar el o los paquetes\n"
-"siguientes:\n"
-"\n"
+msgid "Upgradable"
+msgstr "Actualizable"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:362 ../rpmdrake:478
 #, c-format
-msgid ""
-"You already have at least one update medium configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Media Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Ya tiene configurado al menos un soporte de actualizaciones, pero\n"
-"todos están deshabilitados en este momento. Debería ejecutar el\n"
-"Administrador de soportes de software para habilitar al menos uno\n"
-"(márquelo en la columna ¿Habilitado?)\n"
-"\n"
-"Luego, vuelva a iniciar MandrakeUpdate. "
+msgid "Addable"
+msgstr "Agregable"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:364
 #, c-format
-msgid "Find:"
-msgstr "Encontrar:"
+msgid "Selected"
+msgstr "Seleccionado"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:364
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Por favor espere, listando paquetes..."
+msgid "Not selected"
+msgstr "No seleccionado"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:398
 #, c-format
-msgid "All"
-msgstr "Todo"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:416 ../rpmdrake:520 ../rpmdrake:522
 #, c-format
-msgid "XFree86"
-msgstr "XFree86"
+msgid "More information on package..."
+msgstr "Más información sobre el paquete..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:417
 #, c-format
-msgid "Normal information"
-msgstr "Información normal"
+msgid "Please choose"
+msgstr "Por favor, elija"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:417
 #, c-format
-msgid "Removable device"
-msgstr "Dispositivo removible"
+msgid "One of the following packages is needed:"
+msgstr "Se necesita uno de los paquetes siguientes:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:437
 #, c-format
-msgid "Preparing packages installation..."
-msgstr "Preparando instalación de paquetes..."
+msgid "Please wait, listing packages..."
+msgstr "Por favor espere, listando paquetes..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:451
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Por favor espere, quitando paquetes..."
+msgid "No update"
+msgstr "Sin actualizaciones"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:452
 #, c-format
-msgid "Login:"
-msgstr "Cuenta:"
+msgid ""
+"The list of updates is empty. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+"La lista de actualizaciones está vacía. Esto significa que, o bien no hay\n"
+"actualizaciones disponibles para los paquetes instalados en su computadora,\n"
+"o bien ya los instaló a todos."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:472
 #, c-format
-msgid "Belgium"
-msgstr "Bélgica"
+msgid "All"
+msgstr "Todo"
 
-#: ../rpmdrake:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:511 ../rpmdrake:514
 #, c-format
-msgid "File tools"
-msgstr "Herramientas de archivo"
+msgid "More info"
+msgstr "Más información"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:515
 #, c-format
-msgid "Configure proxies"
-msgstr "Configurar proxies"
+msgid "Information on packages"
+msgstr "Información sobre paquetes"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:537
 #, c-format
-msgid "Printing"
-msgstr "Impresión"
+msgid "Some additional packages need to be removed"
+msgstr "Se necesitan quitar algunos paquetes adicionales"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:538
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "Comenzando descarga de «%s»..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Debido a sus dependencias, también se debe quitar el o los paquetes\n"
+"siguientes:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:544 ../rpmdrake:553
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Ocurrió un error fatal: %s."
+msgid "Some packages can't be removed"
+msgstr "No se pueden quitar algunos paquetes"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:545
 #, c-format
-msgid "Fatal error"
-msgstr "Error fatal"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Eliminando estos paquetes podria estropear su sistema, lo siento:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:554 ../rpmdrake:607
 #, c-format
-msgid "Leaves only, sorted by install date"
-msgstr "Sólo hojas, clasificadas por fecha de instalación"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Debido a sus dependencias, ahora se debe deseleccionar el o los\n"
+"paquetes siguientes:\n"
+"\n"
+
+#: ../rpmdrake:577
+#, c-format
+msgid "Additional packages needed"
+msgstr "Se necesitan paquetes adicionales"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:578
 #, c-format
 msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
-"Errors:\n"
-"%s"
 msgstr ""
-"No se puede actualizar el soporte; se deshabilitará automáticamente.\n"
+"Para satisfacer las dependencias, también se debe instalar el o los\n"
+"paquetes siguientes:\n"
 "\n"
-"Errores:\n"
-"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:592
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Algunos paquetes no se pueden instalar"
+
+#: ../rpmdrake:593
 #, c-format
 msgid ""
-"The list of updates is empty. This means that either there is\n"
-"no available update for the packages installed on your computer,\n"
-"or you already installed all of them."
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
 msgstr ""
-"La lista de actualizaciones está vacía. Esto significa que, o bien no hay\n"
-"actualizaciones disponibles para los paquetes instalados en su computadora,\n"
-"o bien ya los instaló a todos."
+"Lo siento, no se pueden seleccionar los paquetes siguientes:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:606 ../rpmdrake:858
 #, c-format
-msgid "Geosciences"
-msgstr "Geociencias"
+msgid "Some packages need to be removed"
+msgstr "Se necesita quitar algunos paquetes"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:625
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Por favor, elija el sitio de réplica deseado."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Seleccionado: %d MB / Disponible en disco: %d MB"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:627
 #, c-format
-msgid "Communications"
-msgstr "Comunicaciones"
+msgid "Selected size: %d MB"
+msgstr "Tamaño seleccionado: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:635
 #, c-format
-msgid "Editing parallel group \"%s\":"
-msgstr "Editando grupo paralelo \"%s\":"
+msgid "Files:\n"
+msgstr "Archivos:\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:638
 #, c-format
-msgid "Configuration"
-msgstr "Configuración"
+msgid "Changelog:\n"
+msgstr "Cambios:\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:640
 #, c-format
-msgid "Reason for update: "
-msgstr "Razón para actualizar: "
+msgid "Medium: "
+msgstr "Soporte: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:642
 #, c-format
-msgid "Remove"
-msgstr "Quitar"
+msgid "Currently installed version: "
+msgstr "Versión actualmente instalada: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:646
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid "Name: "
+msgstr "Nombre: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:647
 #, c-format
-msgid "Czech Republic"
-msgstr "República Checa"
+msgid "Version: "
+msgstr "Versión: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:648
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Se necesita quitar algunos paquetes"
+msgid "Size: "
+msgstr "Tamaño: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:648
 #, c-format
-msgid "Problem during removal"
-msgstr "Problema durante la eliminación"
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:650
 #, c-format
-msgid "WindowMaker"
-msgstr "WindowMaker"
+msgid "Importance: "
+msgstr "Importancia: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:652
 #, c-format
-msgid "Help launched in background"
-msgstr "Ayuda lanzada en segundo plano"
+msgid "Summary: "
+msgstr "Resumen: "
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake:654
 #, c-format
-msgid "Unable to add medium, wrong or missing arguments"
-msgstr "No se puede añadir un soporte, faltan argumentos o son erróneos"
+msgid "Reason for update: "
+msgstr "Razón para actualizar: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:656
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Hubo un problema durante la instalación:\n"
-"\n"
-"%s"
+msgid "Description: "
+msgstr "Descripción: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:707
 #, c-format
-msgid "No package found for installation."
-msgstr "No se encontró paquete para instalar."
+msgid "Bugfixes updates"
+msgstr "Actualizaciones que corrigen bugs"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:707
 #, c-format
-msgid "Type1"
-msgstr "Type1"
+msgid "Normal updates"
+msgstr "Actualizaciones normales"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:724
 #, c-format
-msgid "Medium: "
-msgstr "Soporte: "
+msgid "Mandrake choices"
+msgstr "Selecciones de Mandrake"
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake:725
 #, c-format
-msgid "Successfully added medium `%s'."
-msgstr "Soporte `%s' añadido satisfactoriamente."
+msgid "All packages, alphabetical"
+msgstr "Todos los paquetes, alfabético"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:731
 #, c-format
-msgid "Strategy"
-msgstr "Estrategia"
+msgid "All packages, by group"
+msgstr "Todos los paquetes, por grupo"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:731
 #, c-format
-msgid "Description: "
-msgstr "Descripción: "
+msgid "All packages, by size"
+msgstr "Todos los paquetes, por tamaño"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:732
 #, c-format
-msgid "Archiving"
-msgstr "Archivado"
+msgid "All packages, by selection state"
+msgstr "Todos los paquetes, por estado de la selección"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:733
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "All packages, by medium repository"
+msgstr "Todos los paquetes, por repositorio de soporte"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:733
 #, c-format
-msgid "System"
-msgstr "Sistema"
+msgid "All packages, by update availability"
+msgstr "Todos los paquetes, por disponibilidad de actualización"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:734
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Se instalaron satisfactoriamente todos los paquetes pedidos."
+msgid "Leaves only, sorted by install date"
+msgstr "Sólo hojas, clasificadas por fecha de instalación"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Servers"
-msgstr "Servidores"
+msgid "in names"
+msgstr "en nombres"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Puzzles"
-msgstr "Rompecabezas"
+msgid "in descriptions"
+msgstr "en descripciones"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Local files"
-msgstr "Archivos locales"
+msgid "in file names"
+msgstr "en nombres de archivo"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:796
 #, c-format
-msgid "Choose a medium for adding in the media limit:"
-msgstr "Elija un soporte para añadir al límite de soportes:"
+msgid "Reset the selection"
+msgstr "Reiniciar la selección"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:796
 #, c-format
-msgid "Addable"
-msgstr "Agregable"
+msgid "Reload the packages list"
+msgstr "Recargar la lista de paquetes"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:797 ../rpmdrake.pm:443
 #, c-format
-msgid "Keys"
-msgstr "Claves"
+msgid "Update media"
+msgstr "Actualizar soportes"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:822
 #, c-format
-msgid "Please choose"
-msgstr "Por favor, elija"
+msgid "Normal information"
+msgstr "Información normal"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:822
 #, c-format
-msgid "Databases"
-msgstr "Bases de datos"
+msgid "Maximum information"
+msgstr "Información máxima"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:842
 #, c-format
-msgid ""
-"Are you sure you want to remove the key %s from medium %s?\n"
-"(name of the key: %s)"
-msgstr ""
-"¿Está seguro que desea quitar la clave %s del soporte %s?\n"
-"(nombre de la clave: %s)"
+msgid "You need to select some packages first."
+msgstr "Primero debe seleccionar algunos paquetes."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:847
 #, c-format
-msgid "Name: "
-msgstr "Nombre: "
+msgid "Too many packages are selected"
+msgstr "Se han seleccionado demasiados paquetes."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:848
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Nombre de host del proxy:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Atención: parece que está intentando añadir tantos\n"
+"paquetes que su sistema de archivos puede quedarse sin espacio libre en el "
+"disco duro,\n"
+"durante o despues de la instalación de los paquetes; esto es "
+"particularmente\n"
+"peligroso y debería ser considerado con cuidado.\n"
+"\n"
+"¿Realmente quiere instalar los paquetes seleccionados?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:859
 #, c-format
 msgid ""
-"The following packages have bad signatures:\n"
+"The following packages have to be removed for others to be upgraded:\n"
 "\n"
 "%s\n"
 "\n"
-"Do you want to continue installation?"
+"Is it ok to continue?"
 msgstr ""
-"Los paquetes siguientes tienen firmas no válidas:\n"
+"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
 "\n"
 "%s\n"
 "\n"
-"¿Desea continuar con la instalación?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Inspeccionando %s"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Descarga de `%s', velocidad:%s"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Hosts:"
-msgstr "Hosts:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Video"
-msgstr "Vídeo"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Perl"
-msgstr "Perl"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Normal updates"
-msgstr "Actualizaciones normales"
+"¿Desea continuar?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:884
 #, c-format
-msgid "Manage keys..."
-msgstr "Administrar claves..."
+msgid "Software Packages Removal"
+msgstr "Quitar paquetes de software"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:885
 #, c-format
-msgid "Maximum information"
-msgstr "Información máxima"
+msgid "Mandrake Update"
+msgstr "Actualización de Mandrake"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:886
 #, c-format
-msgid "Selected"
-msgstr "Seleccionado"
+msgid "Software Packages Installation"
+msgstr "Instalación de paquetes de software"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:893
 #, c-format
-msgid "Computer science"
-msgstr "Ciencias de la computación"
+msgid "Find:"
+msgstr "Encontrar:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:898
 #, c-format
-msgid "Fonts"
-msgstr "Tipografías"
+msgid "Search"
+msgstr "Buscar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:909
 #, c-format
-msgid "Hardware"
-msgstr "Hardware"
+msgid "Install"
+msgstr "Instalar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:911
 #, c-format
 msgid "Quit"
 msgstr "Salir"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:938
 #, c-format
-msgid "Version: "
-msgstr "Versión: "
+msgid "Fatal error"
+msgstr "Error fatal"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:939
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Usar .%s como archivo principal"
+msgid "A fatal error occurred: %s."
+msgstr "Ocurrió un error fatal: %s."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:947
 #, c-format
-msgid "Norway"
-msgstr "Noruega"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Necesito contactar al sitio de réplica para obtener los últimos paquetes "
+"actualizados.\n"
+"Por favor, verifique que su conexión de red está activa.\n"
+"\n"
+"¿Desea continuar?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:956
 #, c-format
-msgid "Israel"
-msgstr "Israel"
+msgid "Already existing update media"
+msgstr "Soporte de actualizaciones existente"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:957
 #, c-format
-msgid "China"
-msgstr "China"
+msgid ""
+"You already have at least one update medium configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Media Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Ya tiene configurado al menos un soporte de actualizaciones, pero\n"
+"todos están deshabilitados en este momento. Debería ejecutar el\n"
+"Administrador de soportes de software para habilitar al menos uno\n"
+"(márquelo en la columna ¿Habilitado?)\n"
+"\n"
+"Luego, vuelva a iniciar MandrakeUpdate. "
+
+#: ../rpmdrake:967
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Cómo elegir manualmente su sitio de réplica"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:968
 #, c-format
 msgid ""
-"Welcome to the software removal tool!\n"
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Media Manager, and then add a `Security\n"
+"updates' medium.\n"
 "\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+"Then, restart MandrakeUpdate."
 msgstr ""
-"¡Bienvenido a la herramienta para quitar software!\n"
+"También puede elegir manualmente su sitio de réplica: para esto,\n"
+"lance el Administrador de soportes de software, y luego añada una\n"
+"fuente de 'Actualizaciones de seguridad'.\n"
 "\n"
-"Esta herramienta lo ayudará a elegir el software que desea quitar de su "
-"computadora."
+"Luego, vuelva a iniciar MandrakeUpdate. "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:996
 #, c-format
-msgid "(Not available)"
-msgstr "(No disponible)"
+msgid "Please wait, finding available packages..."
+msgstr "Por favor espere, encontrando los paquetes disponibles..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1029
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Actualizaciones que corrigen bugs"
+msgid "Inspecting %s"
+msgstr "Inspeccionando %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1048
 #, c-format
-msgid "Java"
-msgstr "Java"
+msgid "changes:"
+msgstr "cambios:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1052
 #, c-format
-msgid "Update..."
-msgstr "Actualizar..."
+msgid "Remove .%s"
+msgstr "Quitar .%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1054
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Por favor espere, encontrando los paquetes disponibles..."
+msgid "Use .%s as main file"
+msgstr "Usar .%s como archivo principal"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1056
 #, c-format
-msgid "Cancel"
-msgstr "Cancelar"
+msgid "Do nothing"
+msgstr "Hacer nada"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1068
 #, c-format
-msgid "Sciences"
-msgstr "Ciencias"
+msgid "Installation finished"
+msgstr "Finalizó la instalación"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1078
 #, c-format
-msgid "Enabled?"
-msgstr "¿Habilitada?"
+msgid "Inspect..."
+msgstr "Inspeccionar..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1104 ../rpmdrake:1229
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Todos los paquetes, alfabético"
+msgid "Everything installed successfully"
+msgstr "Se instaló todo satisfactoriamente"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1105 ../rpmdrake:1230
 #, c-format
-msgid "Mandrake choices"
-msgstr "Selecciones de Mandrake"
+msgid "All requested packages were installed successfully."
+msgstr "Se instalaron satisfactoriamente todos los paquetes pedidos."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1107 ../rpmdrake:1214
 #, c-format
-msgid "Toys"
-msgstr "Juguetes"
+msgid "Problem during installation"
+msgstr "Problema durante la instalación"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1108 ../rpmdrake:1215 ../rpmdrake:1244
 #, c-format
-msgid "Installation finished"
-msgstr "Finalizó la instalación"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Hubo un problema durante la instalación:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1129
 #, c-format
-msgid " done."
-msgstr "hecho."
+msgid "Unable to get source packages."
+msgstr "No se pueden obtener los paquetes de la fuente."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1130
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Necesita insertar el soporte para continuar"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "No se pueden obtener paquetes fuente, lo siento. %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1131 ../rpmdrake:1187
 #, c-format
 msgid ""
-"Unable to add medium, errors reported:\n"
 "\n"
+"\n"
+"Error(s) reported:\n"
 "%s"
 msgstr ""
-"No se puede añadir soporte, errores reportados:\n"
 "\n"
+"\n"
+"Error(es) reportados:\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1138
 #, c-format
-msgid "no name found, key doesn't exist in rpm keyring!"
-msgstr "no se encontró nombre, ¡la clave no existe en el anillo de claves de rpm!"
+msgid "Package installation..."
+msgstr "Instalación de paquete..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1138
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Se han seleccionado demasiados paquetes."
+msgid "Initializing..."
+msgstr "Inicializando..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1143
 #, c-format
-msgid "Physics"
-msgstr "Física"
+msgid "Change medium"
+msgstr "Cambiar el soporte"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1144
 #, c-format
-msgid "Do nothing"
-msgstr "Hacer nada"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Por favor inserte el soporte denominado \"%s\" en el dispositivo [%s]"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1149
 #, c-format
-msgid "Danmark"
-msgstr "Dinamarca"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Descargando el paquete «%s» (%s/%s)..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1168
 #, c-format
-msgid "Error during download"
-msgstr "Error durante la descarga"
+msgid "Verifying packages signatures..."
+msgstr "Verificando las firmas de los paquetes..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1177
 #, c-format
-msgid "Mail"
-msgstr "Correo"
+msgid ""
+"The following packages have bad signatures:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
+msgstr ""
+"Los paquetes siguientes tienen firmas no válidas:\n"
+"\n"
+"%s\n"
+"\n"
+"¿Desea continuar con la instalación?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1184 ../rpmdrake:1243
+#, c-format
+msgid "Installation failed"
+msgstr "Falló la instalación"
+
+#: ../rpmdrake:1185
 #, c-format
 msgid ""
-"Packages database is locked. Please close other applications\n"
-"working with packages database (do you have another media\n"
-"manager on another desktop, or are you currently installing\n"
-"packages as well?)."
+"Installation failed, some files are missing:\n"
+"%s\n"
+"\n"
+"You may want to update your media database."
 msgstr ""
-"La base de datos de paquetes está trabada. Por favor, cierre otras\n"
-"aplicaciones que trabajen con la misma (¿tiene algún otro\n"
-"administrador de soportes en otro escritorio, o está instalando\n"
-"paquetes en este instante?)"
+"Falló la instalación, faltan algunos archivos:\n"
+"%s\n"
+"\n"
+"Puede que desee actualizar la base de datos de sus soportes."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1199
 #, c-format
-msgid "Help"
-msgstr "Ayuda"
+msgid "Preparing packages installation..."
+msgstr "Preparando instalación de paquetes..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1202
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "No se pueden obtener paquetes fuente, lo siento. %s"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalando el paquete «%s» (%s/%s)..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1227
 #, c-format
-msgid "Sports"
-msgstr "Deportes"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"Finalizó la instalación; %s.\n"
+"\n"
+"Algunos archivos de configuración se crearon como `.rpmnew' o `.rpmsave',\n"
+"ahora puede inspeccionar algunos para poder tomar acción:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1227
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "everything was installed correctly"
+msgstr "se instaló todo correctamente"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1234
 #, c-format
-msgid "Protocol"
-msgstr "Protocolo"
+msgid "No package found for installation."
+msgstr "No se encontró paquete para instalar."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1235
 #, c-format
-msgid "(none)"
-msgstr "(ninguno)"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Error no recuperable: no se encontró paquete para instalar, lo siento."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1257
 #, c-format
-msgid "All packages, by medium repository"
-msgstr "Todos los paquetes, por repositorio de soporte"
+msgid "Please wait, reading packages database..."
+msgstr "Por favor espere, leyendo la base de datos de paquetes..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1304
 #, c-format
-msgid "Germany"
-msgstr "Alemania"
+msgid "Please wait, removing packages..."
+msgstr "Por favor espere, quitando paquetes..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1309
 #, c-format
-msgid "Compression"
-msgstr "Compresión"
+msgid "Problem during removal"
+msgstr "Problema durante la eliminación"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1310
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Descarga de `%s', faltan:%s, velocidad:%s"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Hubo un error durante la desinstalación de los paquetes:\n"
+"\n"
+"%s"
 
-#. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1342
 #, c-format
-msgid "%s from medium %s"
-msgstr "%s de soporte %s"
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+"¡Bienvenido a la herramienta para quitar software!\n"
+"\n"
+"Esta herramienta lo ayudará a elegir el software que desea quitar de su "
+"computadora."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1347
 #, c-format
-msgid "Add a host"
-msgstr "Agregar un host"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"¡Bienvenido a MandrakeUpdate!\n"
+"\n"
+"Esta herramienta lo ayudará a elegir las actualizaciones que desea instalar "
+"en su computadora."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1352
 #, c-format
-msgid "Development"
-msgstr "Desarollo"
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"¡Bienvenido a la herramienta de instalación de software!\n"
+"\n"
+"Su sistema Mandrake Linux viene con varios miles de paquetes de software en\n"
+"CDROM o DVD. Esta herramienta lo ayudará a elegir el software que desea\n"
+"instalar en su computadora."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:121
 #, c-format
-msgid "No"
-msgstr "No"
+msgid "Yes"
+msgstr "Sí"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:123
 #, c-format
-msgid "Media limit"
-msgstr "Límite de soportes"
+msgid "No"
+msgstr "No"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:159
 #, c-format
-msgid "Install"
-msgstr "Instalar"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:214
 #, c-format
-msgid "Add..."
-msgstr "Agregar..."
+msgid "Austria"
+msgstr "Austria"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:215
 #, c-format
-msgid "Change medium"
-msgstr "Cambiar el soporte"
+msgid "Australia"
+msgstr "Australia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:216
 #, c-format
-msgid "Reset the selection"
-msgstr "Reiniciar la selección"
+msgid "Belgium"
+msgstr "Bélgica"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:217
 #, c-format
-msgid "Mandrake Update"
-msgstr "Actualización de Mandrake"
+msgid "Brazil"
+msgstr "Brasil"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:218
 #, c-format
-msgid "in file names"
-msgstr "en nombres de archivo"
+msgid "Canada"
+msgstr "Canadá"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:219
 #, c-format
-msgid "Books"
-msgstr "Libros"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:220
 #, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
-msgstr ""
-"Hubo un error descargando la lista de sitios de réplica:\n"
-"\n"
-"%s\n"
-"Tal vez no está disponible la red, o el sitio web de MandrakeSoft.\n"
-"Por favor, intente nuevamente más tarde."
+msgid "Czech Republic"
+msgstr "República Checa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:221
 #, c-format
-msgid "Howtos"
-msgstr "COMOs"
+msgid "Germany"
+msgstr "Alemania"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:222
 #, c-format
-msgid "Icewm"
-msgstr "Icewm"
+msgid "Danmark"
+msgstr "Dinamarca"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:223 ../rpmdrake.pm:227
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"\n"
-"You may want to update your media database."
-msgstr ""
-"Falló la instalación, faltan algunos archivos:\n"
-"%s\n"
-"\n"
-"Puede que desee actualizar la base de datos de sus soportes."
+msgid "Greece"
+msgstr "Grecia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:224
 #, c-format
-msgid "Libraries"
-msgstr "Bibliotecas"
+msgid "Spain"
+msgstr "España"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:225
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Eliminando estos paquetes podria estropear su sistema, lo siento:\n"
-"\n"
+msgid "Finland"
+msgstr "Finlandia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:226
 #, c-format
-msgid "Brazil"
-msgstr "Brasil"
+msgid "France"
+msgstr "Francia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:228
 #, c-format
-msgid "Installation failed"
-msgstr "Falló la instalación"
+msgid "Israel"
+msgstr "Israel"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:229
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Error(es) reportados:\n"
-"%s"
+msgid "Italy"
+msgstr "Italia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:230
 #, c-format
-msgid "Manage keys for digital signatures of packages"
-msgstr "Administrar claves para las firmas digitales de los paquetes"
+msgid "Japan"
+msgstr "Japón"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:231
 #, c-format
-msgid "Currently installed version: "
-msgstr "Versión actualmente instalada: "
+msgid "Korea"
+msgstr "Corea"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:232
 #, c-format
-msgid "Games"
-msgstr "Juegos"
+msgid "Netherlands"
+msgstr "Países Bajos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:233
 #, c-format
-msgid "Astronomy"
-msgstr "Astronomía"
+msgid "Norway"
+msgstr "Noruega"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:234
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Por favor inserte el soporte denominado \"%s\" en el dispositivo [%s]"
+msgid "Poland"
+msgstr "Polonia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:235
 #, c-format
-msgid "You need to select some packages first."
-msgstr "Primero debe seleccionar algunos paquetes."
+msgid "Portugal"
+msgstr "Portugal"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:236
 #, c-format
-msgid "All packages, by selection state"
-msgstr "Todos los paquetes, por estado de la selección"
+msgid "Russia"
+msgstr "Rusia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:237
 #, c-format
-msgid "Name:"
-msgstr "Nombre:"
+msgid "Sweden"
+msgstr "Suecia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:238
 #, c-format
-msgid "KDE"
-msgstr "KDE"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:239
 #, c-format
-msgid "No update"
-msgstr "Sin actualizaciones"
+msgid "United Kingdom"
+msgstr "Reino Unido"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:240
 #, c-format
-msgid "Networking"
-msgstr "Red"
+msgid "China"
+msgstr "China"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:241 ../rpmdrake.pm:242 ../rpmdrake.pm:243 ../rpmdrake.pm:244
+#: ../rpmdrake.pm:295
 #, c-format
-msgid "Ok"
-msgstr "Aceptar"
+msgid "United States"
+msgstr "Estados Unidos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:305
 #, c-format
-msgid "Text tools"
-msgstr "Herramientas de texto"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Necesito contactar al sitio web de MandrakeSoft para obtener la lista de\n"
+"sitios de réplica. Por favor, verifique que su conexión de red está activa.\n"
+"\n"
+"¿Desea continuar?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:309
 #, c-format
-msgid "Cards"
-msgstr "Naipes"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Por favor espere, descargando las direcciones de los sitios de réplica desde "
+"el sitio web de MandrakeSoft."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:315
 #, c-format
-msgid "Sawfish"
-msgstr "Sawfish"
+msgid "Error during download"
+msgstr "Error durante la descarga"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:316
 #, c-format
-msgid "Group name:"
-msgstr "Nombre del grupo:"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
+"Hubo un error descargando la lista de sitios de réplica:\n"
+"\n"
+"%s\n"
+"Tal vez no está disponible la red, o el sitio web de MandrakeSoft.\n"
+"Por favor, intente nuevamente más tarde."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:324
 #, c-format
-msgid "Type in the hostname or IP address of the host to add:"
-msgstr "Ingrese el nombre del host o la dirección IP del host a añadir:"
+msgid "No mirror"
+msgstr "Sin sitio de réplica"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:325
 #, c-format
-msgid "Arcade"
-msgstr "Arcade"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"No puedo encontrar un sitio de réplica adecuado.\n"
+"\n"
+"Pueden haber muchas razones para este problema; la más común es cuando la\n"
+"arquitectura de su procesador no está soportada por las Actualizaciones\n"
+"Oficiales de Mandrake Linux."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:342
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Please choose the desired mirror."
+msgstr "Por favor, elija el sitio de réplica deseado."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:383
 #, c-format
-msgid "Editing medium \"%s\":"
-msgstr "Editando soporte \"%s\":"
+msgid "Copying file for medium `%s'..."
+msgstr "Copiando archivo para soporte `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:386
 #, c-format
-msgid "Add a medium limit"
-msgstr "Agregar un límite de soportes"
+msgid "Examining file of medium `%s'..."
+msgstr "Examinando archivo de soporte `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:389
 #, c-format
-msgid "Group"
-msgstr "Grupo"
+msgid "Examining remote file of medium `%s'..."
+msgstr "Examinando archivo remoto de soporte `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:393
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Por favor espere, quitando soporte..."
+msgid " done."
+msgstr "hecho."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:397
 #, c-format
-msgid "Accessibility"
-msgstr "Accesibilidad"
+msgid " failed!"
+msgstr "¡falló!"
 
-#: ../rpmdrake:1
+#. -PO: We're downloading the said file from the said medium
+#: ../rpmdrake.pm:401
 #, c-format
-msgid "changes:"
-msgstr "cambios:"
+msgid "%s from medium %s"
+msgstr "%s de soporte %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:405
 #, c-format
-msgid "Add"
-msgstr "Agregar"
+msgid "Starting download of `%s'..."
+msgstr "Comenzando descarga de «%s»..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:409
 #, c-format
-msgid "Regenerate hdlist"
-msgstr "Volver a generar hdlist"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Descarga de `%s', faltan:%s, velocidad:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:412
 #, c-format
-msgid "Editors"
-msgstr "Editores"
+msgid "Download of `%s', speed:%s"
+msgstr "Descarga de `%s', velocidad:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:449
 #, c-format
-msgid "United Kingdom"
-msgstr "Reino Unido"
+msgid "Select the media you wish to update:"
+msgstr "Seleccione los soportes que desea actualizar:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:453
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Ruta relativa de synthesis/hdlist:"
+msgid "Update"
+msgstr "Actualizar"
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake.pm:465
 #, c-format
 msgid ""
-"You are about to add a new packages medium, `%s'.\n"
-"That means you will be able to add new software packages\n"
-"to your system from that new medium."
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
-"Está a punto de añadir un soporte de paquetes nuevo, `%s'.\n"
-"Esto significa que podrá añadir paquetes de software nuevos\n"
-"a su sistema desde dicho soporte nuevo."
+"No se puede actualizar el soporte; se deshabilitará automáticamente.\n"
+"\n"
+"Errores:\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:482 ../rpmdrake.pm:487
 #, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Unable to add medium, errors reported:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+"%s"
 msgstr ""
-"¡Bienvenido a MandrakeUpdate!\n"
+"No se puede añadir soporte, errores reportados:\n"
 "\n"
-"Esta herramienta lo ayudará a elegir las actualizaciones que desea instalar "
-"en su computadora."
+"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:498
 #, c-format
-msgid "Remove a key"
-msgstr "Quitar una clave"
+msgid "Unable to create medium."
+msgstr "No se puede crear el soporte."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:503
 #, c-format
-msgid "User:"
-msgstr "Usuario:"
+msgid "Failure when adding medium"
+msgstr "Fallo al añadir soporte"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:504
 #, c-format
-msgid "Browse..."
-msgstr "Examinar..."
+msgid ""
+"There was a problem adding medium:\n"
+"\n"
+"%s"
+msgstr ""
+"Hubo un problema añadiendo soporte:\n"
+"\n"
+"%s"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -2667,4 +2700,3 @@ msgstr "Administrador de soportes de software"
 #~ msgid "grpmi error: you must be superuser!\n"
 #~ msgstr ""
 #~ "error grpmi: ¡Vd. debe ser superusuario (root) para usar el programa!\n"
-
diff --git a/po/he.po b/po/he.po
index 5818b7b5..6109b830 100644
--- a/po/he.po
+++ b/po/he.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-he\n"
-"POT-Creation-Date: 2004-02-20 17:29+0100\n"
-"PO-Revision-Date: 2004-01-17 17:43+0200\n"
+"POT-Creation-Date: 2004-02-20 20:53+0100\n"
+"PO-Revision-Date: 2004-02-22 00:04+0200\n"
 "Last-Translator: dovix <dovix2003@yahoo.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -22,1942 +22,1980 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:61
 #, c-format
-msgid "Enlightenment"
-msgstr "Enlightenment"
+msgid "Add a medium"
+msgstr "הוספת מאגר"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:62
 #, c-format
-msgid "Remote access"
-msgstr "גישה מרחוק"
+msgid "Local files"
+msgstr "קבצים מקומיים"
 
-#: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:62
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "נא להמתין בעת עדכון המאגר..."
+msgid "Path:"
+msgstr "נתיב:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:63
 #, c-format
-msgid "FVWM based"
-msgstr "מבוסס FVWM "
+msgid "FTP server"
+msgstr "שרת FTP"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:63 ../edit-urpm-sources.pl:64
+#: ../edit-urpm-sources.pl:66 ../edit-urpm-sources.pl:196
 #, c-format
-msgid "Canada"
-msgstr "קנדה"
+msgid "URL:"
+msgstr "כתובת (URL):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:64
 #, c-format
-msgid "Python"
-msgstr "Python"
+msgid "HTTP server"
+msgstr "שרת HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:65
 #, c-format
-msgid "Upgradable"
-msgstr "ניתנות לשדרוג"
+msgid "Removable device"
+msgstr "התקן ניתן להסרה"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:65
 #, c-format
-msgid "everything was installed correctly"
-msgstr "הכל הותקן בצורה תקינה."
+msgid "Path or mount point:"
+msgstr "נתיב או נקודת עיגון (mount point) : "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:66 ../rpmdrake:707
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr "מוודא חתימות של חבילות...."
+msgid "Security updates"
+msgstr "עדכוני אבטחה"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:78
 #, c-format
-msgid "File transfer"
-msgstr "העברת קובץ..."
+msgid "Browse..."
+msgstr "דפדוף..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:80
 #, c-format
-msgid "KDE and Qt"
-msgstr "KDE ו-QT"
+msgid "Choose a mirror..."
+msgstr "בחירת אתר מראה..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:107
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "עליך למלא לפחות את שתי הכניסות הראשונות."
+msgid "Login:"
+msgstr "שם משתמש:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:107 ../edit-urpm-sources.pl:240
 #, c-format
-msgid "Type of medium:"
-msgstr "סוג המאגר:"
+msgid "Password:"
+msgstr "סיסמה:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:112
 #, c-format
-msgid "Copying file for medium `%s'..."
-msgstr "העתקת קובץ עבור המאגר `%s'.."
+msgid "Name:"
+msgstr "שם:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:116 ../edit-urpm-sources.pl:197
 #, c-format
-msgid "France"
-msgstr "צרפת"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "הנתיב לקובץ synthesis/hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:117
 #, c-format
-msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"יש צורך להתחבר לאתר המראה על מנת לייבא את החבילות המעודכנות.\n"
-"נא לבדוק שהמחשב שלך מחובר לרשת.\n"
-"\n"
-"האם ניתן להמשיך?"
+msgid "If left blank, synthesis/hdlist will be automatically probed"
+msgstr "אם ריק, synthesis/hdlist ייבדק אוטומטית."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:125
 #, c-format
-msgid "Search results"
-msgstr "תוצאות חיפוש"
+msgid "You need to fill up at least the two first entries."
+msgstr "עליך למלא לפחות את שתי הכניסות הראשונות."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:129
 #, c-format
-msgid "Graphical desktop"
-msgstr "שולחן עבודה גרפי"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"כבר יש מאגר בשם זה, האם ברצונך \n"
+"להחליף אותו ?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:138
 #, c-format
-msgid "Yes"
-msgstr "כן"
+msgid "Adding a medium:"
+msgstr "הוספת מאגר:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:139
 #, c-format
-msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
-msgstr ""
-"ההתקנה הסתיימה; %s.\n"
-"\n"
-"נוצרו מספר קבצי הגדרות בשם, `.rpmnew' או `.rpmsave'\n"
-"יש באפשרותך לעיין בהם בכדי להשלים את עדכון המערכת שלך:"
+msgid "Type of medium:"
+msgstr "סוג המאגר:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:143 ../edit-urpm-sources.pl:211
+#: ../edit-urpm-sources.pl:244 ../edit-urpm-sources.pl:317
+#: ../edit-urpm-sources.pl:355 ../edit-urpm-sources.pl:396
+#: ../edit-urpm-sources.pl:453 ../edit-urpm-sources.pl:517
+#: ../edit-urpm-sources.pl:554 ../edit-urpm-sources.pl:660 ../rpmdrake:88
+#: ../rpmdrake:511 ../rpmdrake:525 ../rpmdrake:529 ../rpmdrake:1084
+#: ../rpmdrake:1145 ../rpmdrake.pm:125 ../rpmdrake.pm:168 ../rpmdrake.pm:353
 #, c-format
-msgid "Edit a parallel group"
-msgstr "ערוך קבוצה מקבילה"
+msgid "Ok"
+msgstr "אישור"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem adding medium:\n"
-"\n"
-"%s"
-msgstr ""
-"אירעה שגיאה בעת ההתקנה :\n"
-"\n"
-"%s"
+#: ../edit-urpm-sources.pl:159 ../edit-urpm-sources.pl:205
+#: ../edit-urpm-sources.pl:211 ../edit-urpm-sources.pl:251
+#: ../edit-urpm-sources.pl:322 ../edit-urpm-sources.pl:356
+#: ../edit-urpm-sources.pl:403 ../edit-urpm-sources.pl:522 ../rpmdrake:88
+#: ../rpmdrake:511 ../rpmdrake:1145 ../rpmdrake:1151 ../rpmdrake.pm:353
+#: ../rpmdrake.pm:458
+#, c-format
+msgid "Cancel"
+msgstr "ביטול"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:177
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "איך לבחור את אתר המראה באופן ידני"
+msgid "Please wait, removing medium..."
+msgstr "נא להמתין בעת הסרת המאגר..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:190
 #, c-format
-msgid "Publishing"
-msgstr "פרסום"
+msgid "Edit a medium"
+msgstr "עריכת מאגר"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:194
 #, c-format
-msgid "Remove key"
-msgstr "הסרת מפתח"
+msgid "Editing medium \"%s\":"
+msgstr "עריכת מאגר \"%s\":"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:200
 #, c-format
-msgid "Package installation..."
-msgstr "מתקין חבילות...."
+msgid "Save changes"
+msgstr "שמירת שינויים"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:209
 #, c-format
-msgid "GNOME and GTK+"
-msgstr "GNOME ו-GTK+"
+msgid "You need to insert the medium to continue"
+msgstr "עליך להכניס את המדיה בכדי להמשיך."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:210
 #, c-format
-msgid "Select the media you wish to update:"
-msgstr "נא לבחור את המאגרים אותם ברצונך לעדכן:"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "בכדי לשמור את השינויים, עליך להכניס את המדיה אל הכונן."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:226
 #, c-format
-msgid "Software Packages Removal"
-msgstr "הסרת חבילות תוכנה"
+msgid "Configure proxies"
+msgstr "הגדרת שרתים מתווכים"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:232
 #, c-format
-msgid "Shells"
-msgstr "מסופים"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"אם נדרשת הגדרת שרת מתווך, יש להגדיר את שם המחשב המארח ויציאה (port) "
+"אופציונלית (תחביר:: <proxyhost[:port]>):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:234
 #, c-format
-msgid "Chemistry"
-msgstr "כימיה"
+msgid "Proxy hostname:"
+msgstr "שם המארח של השרת המתווך:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:236
 #, c-format
-msgid "Choose a key for adding to the medium %s"
-msgstr "נא לבחור מפתח להוספה למאגר %s."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "באפשרותך לספק שם משתמש/ססמה לצורך אימות בשרת המתווך:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:238
 #, c-format
-msgid "Add a key"
-msgstr "הוספת מפתח"
+msgid "User:"
+msgstr "משתמש: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:292
 #, c-format
-msgid "True type"
-msgstr "True type"
+msgid "Add a parallel group"
+msgstr "הוסף קבוצה מקבילה"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:292
 #, c-format
-msgid "Base"
-msgstr "בסיס"
+msgid "Edit a parallel group"
+msgstr "ערוך קבוצה מקבילה"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:303
 #, c-format
-msgid "Graphics"
-msgstr "גרפיקה"
+msgid "Add a medium limit"
+msgstr "הוספת גבול מאגר"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:313
 #, c-format
-msgid "Italy"
-msgstr "איטליה"
+msgid "Choose a medium for adding in the media limit:"
+msgstr "בחר מאגר להוספה בהגבלת מדיה"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:347
 #, c-format
-msgid ""
-"You are launching this program as a normal user.\n"
-"You will not be able to perform modifications on the system,\n"
-"but you may still browse the existing database."
-msgstr ""
-"התכנית הזאת מופעלת מחשבון משתמש רגיל.\n"
-"לא יתאפשר לך לבצע שינויים במערכת,\n"
-"אבל כן יתאפשר עיון במסד הנתונים הקיים."
+msgid "Add a host"
+msgstr "הוסף מארח"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:351
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "נדרשת אחת החבילות הבאות:"
+msgid "Type in the hostname or IP address of the host to add:"
+msgstr "כתוב את שם המארח או כתובת IP להוספה:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:375
 #, c-format
-msgid "URL:"
-msgstr "כתובת (URL):"
+msgid "Editing parallel group \"%s\":"
+msgstr "עריכת קבוצה מקבילית \"%s\":"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:377
 #, c-format
-msgid "Information on packages"
-msgstr "מידע על החבילות"
+msgid "Group name:"
+msgstr "שם קבוצה:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:378
 #, c-format
-msgid "Proxy..."
-msgstr "שרת מתווך...."
+msgid "Protocol:"
+msgstr "פרוטוקול"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:380
 #, c-format
-msgid "Russia"
-msgstr "רוסיה"
+msgid "Media limit:"
+msgstr "הגבלת המאגר:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:385 ../edit-urpm-sources.pl:392
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"אם נדרשת הגדרת שרת מתווך, יש להגדיר את שם המחשב המארח ויציאה (port) "
-"אופציונלית (תחביר:: <proxyhost[:port]>):"
+msgid "Add"
+msgstr "הוספה"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:386 ../edit-urpm-sources.pl:393
+#: ../edit-urpm-sources.pl:442 ../edit-urpm-sources.pl:643 ../rpmdrake:909
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"בחירת החבילה או החבילות הבאות יבוטל כעת עקב תלויות\n"
-"\n"
-"\n"
+msgid "Remove"
+msgstr "הסרה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:387
 #, c-format
-msgid "Add a key..."
-msgstr "הוספה מפתח..."
+msgid "Hosts:"
+msgstr "מארחים:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:417
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "הגדרת urpmi מקבילי (הרצה מבוזרת של urpmi)"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid "Sound"
-msgstr "שמע"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Changelog:\n"
-msgstr "רשימת שינויים:\n"
+msgid "Group"
+msgstr "קבוצה"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"יש צורך להתחבר לאתר MandrakeSoft על מנת לייבא את רשימת אתרי המראה.\n"
-"כדאי לבדוק שהמחשב שלך מחובר לרשת.\n"
-"\n"
-"האם ניתן להמשיך?"
+msgid "Protocol"
+msgstr "פרוטוקול"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid "Please wait, searching..."
-msgstr "נא להמתין בעת החיפוש..."
+msgid "Media limit"
+msgstr "הגבלת מאגר"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:421
 #, c-format
 msgid "Command"
 msgstr "פקודה"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../gurpmi.addmedia:1
+#: ../edit-urpm-sources.pl:431 ../rpmdrake:252 ../rpmdrake:269 ../rpmdrake:380
+#: ../rpmdrake:449
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"האם להמשיך ?"
+msgid "(none)"
+msgstr "(כלום)"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:444 ../edit-urpm-sources.pl:645
 #, c-format
-msgid "Literature"
-msgstr "ספרות"
+msgid "Edit"
+msgstr "עריכה"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:449 ../edit-urpm-sources.pl:647
 #, c-format
-msgid "Initializing..."
-msgstr "מאתחל..."
+msgid "Add..."
+msgstr "הוספה..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:461
 #, c-format
-msgid "Emulators"
-msgstr "מדמים (התקני הדמיה)"
+msgid "Manage keys for digital signatures of packages"
+msgstr "נהל מפתחות עבור חתימות דיגיטאליות של חבילות"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:465 ../edit-urpm-sources.pl:585
 #, c-format
-msgid "Password:"
-msgstr "סיסמה:"
+msgid "Medium"
+msgstr "מאגר"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:470
 #, c-format
-msgid "Software Packages Installation"
-msgstr "התקנה של חבילות תוכנה."
+msgid "Keys"
+msgstr "מפתחות"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:489
 #, c-format
-msgid "in descriptions"
-msgstr "בתיאורים"
+msgid "no name found, key doesn't exist in rpm keyring!"
+msgstr "שם לא נמצא, המפתח לא נמצא ברשת המפתחות של RPM!"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:503
 #, c-format
-msgid " failed!"
-msgstr " נכשל!"
+msgid "Add a key"
+msgstr "הוספת מפתח"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:513
 #, c-format
-msgid "All packages, by update availability"
-msgstr "כל החבילות על פי נגישות עדכון"
+msgid "Choose a key for adding to the medium %s"
+msgstr "נא לבחור מפתח להוספה למאגר %s."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:534
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "יש צורך להסיר מספר חבילות נוספות"
+msgid "Remove a key"
+msgstr "הסרת מפתח"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:535
 #, c-format
-msgid "Packaging"
-msgstr "אריזה"
+msgid ""
+"Are you sure you want to remove the key %s from medium %s?\n"
+"(name of the key: %s)"
+msgstr ""
+"האם באמת למחוק את המפחת %s ממאגר %s\n"
+"(שם המפתח %s)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:548
 #, c-format
-msgid "Configure media"
-msgstr "הגדרת מאגרים"
+msgid "Add a key..."
+msgstr "הוספה מפתח..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:550
 #, c-format
-msgid "United States"
-msgstr "ארה\"ב"
+msgid "Remove key"
+msgstr "הסרת מפתח"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:562
 #, c-format
-msgid "Greece"
-msgstr "יוון"
+msgid "Configure media"
+msgstr "הגדרת מאגרים"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:584
 #, c-format
-msgid "GNOME"
-msgstr "GNOME"
+msgid "Enabled?"
+msgstr "מופעל?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:595
 #, c-format
-msgid "Monitoring"
-msgstr "בקרה"
+msgid "Update medium"
+msgstr "עדכון מאגר/ים"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:595
 #, c-format
-msgid "Costa Rica"
-msgstr "קוסטה-ריקה"
+msgid "Regenerate hdlist"
+msgstr "צור מחדש hdlist"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:607 ../rpmdrake.pm:421
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "מספר חבילות לא ניתנות להתקנה"
+msgid "Please wait, updating media..."
+msgstr "נא להמתין בעת עדכון המאגר..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:611
 #, c-format
-msgid ""
-"The help window has been started, it should appear shortly on your desktop."
-msgstr "חלון העזרה יפתח עוד מעט של שולחן העבודה שלך"
+msgid "Please wait, generating hdlist..."
+msgstr "נא להמתין; יוצר את hdlist...."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:649
 #, c-format
-msgid "No mirror"
-msgstr "אין אתה מראה"
+msgid "Update..."
+msgstr "עדכון..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:650
 #, c-format
-msgid "Reload the packages list"
-msgstr "טעינה מחדש של רשימת החבילות"
+msgid "Manage keys..."
+msgstr "ניהול מפתחות..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:651
 #, c-format
-msgid "Poland"
-msgstr "פולין"
+msgid "Proxy..."
+msgstr "שרת מתווך...."
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:652
 #, c-format
-msgid "Path or mount point:"
-msgstr "נתיב או נקודת חיבור (mount point) : "
+msgid "Parallel..."
+msgstr "מקבילי....."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:655 ../rpmdrake:901
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr " נא להמתין בעת הורדת כתובות אתרי מראה מאתר MandrakeSoft"
+msgid "Help"
+msgstr "עזרה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:657 ../rpmdrake:904
 #, c-format
-msgid "Choose a mirror..."
-msgstr "בחירת אתר מראה..."
+msgid "Help launched in background"
+msgstr "חלון העזרה נפתח ברקע"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:658 ../rpmdrake:905
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"The help window has been started, it should appear shortly on your desktop."
+msgstr "חלון העזרה יפתח עוד מעט של שולחן העבודה שלך"
+
+#: ../edit-urpm-sources.pl:669 ../gurpmi.addmedia:75 ../rpmdrake:1338
+#, c-format
+msgid ""
+"%s\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"אזהרה! נראה שכמות החבילות שאתה מבקש להתקין עלולה לגרום\n"
-"לכך שהכונן הקשיח יתמלא לחלוטין; מצב מסוכן במיוחד \n"
-"שיש להימנע ממנו.\n"
+"%s\n"
 "\n"
-"האם אכן ברצונך להתקין את כל החבילות שבחרת ?"
+"האם להמשיך ?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:672
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "גודל נבחר: %d MB"
+msgid ""
+"Welcome to the Software Media Manager!\n"
+"\n"
+"This tool will help you configure the packages media you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"ברוך בואך ל\"מנהל מאגרי התכנה\"\n"
+"\n"
+"כלי זה יעזור לך להגדיר את מאגרי התכנה להתקנת חבילות שבהן ברצונך להשתמש\n"
+"במחשב זה. מאגרים אלו ישמשו להתקנת חבילות תוכנה חדשות או על-מנת לעדכן\n"
+"את המערכת."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:684
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "נא להמתין בעת קריאת מסד הנתונים של החבילות..."
+msgid ""
+"Packages database is locked. Please close other applications\n"
+"working with packages database (do you have another media\n"
+"manager on another desktop, or are you currently installing\n"
+"packages as well?)."
+msgstr ""
+"בסיס נתוני החבילות נעול. עליך לסגור יישומים אחרים\n"
+"הניגשים לבסיס נתוני החבילות (האם יש לך מנהל מקורות\n"
+"נוסף או שולחן עבודה אחר, שגם בו הנך מתקין חבילות\n"
+"כלשהן?)."
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:70
 #, c-format
-msgid "Add a medium"
-msgstr "הוספת מאגר"
+msgid "Unable to add medium, wrong or missing arguments"
+msgstr "אין אפשרות להוסיף מקור זה, בשל נתונים שגויים ו/או חסרים"
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:78
 #, c-format
-msgid "Update medium"
-msgstr "עדכון מאגר/ים"
+msgid ""
+"You are about to add a new packages medium, `%s'.\n"
+"That means you will be able to add new software packages\n"
+"to your system from that new medium."
+msgstr ""
+"הוספת המקור '%s' תאפשר לך להתקין חבילות תוכנה\n"
+"חדשות למערכת שלך ממקור זה."
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:87
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "בכדי לשמור את השינויים, עליך להכניס את המדיה אל הכונן."
+msgid "Successfully added medium `%s'."
+msgstr "המקור '%s' נוסף בהצלחה."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:85
 #, c-format
-msgid "All packages, by size"
-msgstr "כל החבילות, לפי גודל"
+msgid "Running in user mode"
+msgstr "רץ במצב משתמש"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:86
 #, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+"You are launching this program as a normal user.\n"
+"You will not be able to perform modifications on the system,\n"
+"but you may still browse the existing database."
 msgstr ""
-"ארעה שגיאה בעת התקנת החבילות:\n"
-"\n"
-"%s"
+"התכנית הזאת מופעלת מחשבון משתמש רגיל.\n"
+"לא יתאפשר לך לבצע שינויים במערכת,\n"
+"אבל כן יתאפשר עיון במסד הנתונים הקיים."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:93
 #, c-format
-msgid "Examining file of medium `%s'..."
-msgstr "בחינת קובץ ממאגר `%s'..."
+msgid "Accessibility"
+msgstr "נגישות"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:94 ../rpmdrake:95 ../rpmdrake:96 ../rpmdrake:97 ../rpmdrake:98
+#: ../rpmdrake:99 ../rpmdrake:100 ../rpmdrake:101 ../rpmdrake:102
+#: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
+#: ../rpmdrake:107 ../rpmdrake:108 ../rpmdrake:109
 #, c-format
-msgid "Path:"
-msgstr "נתיב:"
+msgid "System"
+msgstr "מערכת"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:94
 #, c-format
-msgid "IRC"
-msgstr "IRC"
+msgid "Servers"
+msgstr "שרתים"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:95
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "מוריד את החבילה %s' (%s/%s)"
+msgid "Kernel and hardware"
+msgstr "חומרה וגרעין"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:96
 #, c-format
-msgid "Protocol:"
-msgstr "פרוטוקול"
+msgid "Libraries"
+msgstr "ספריות"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:97
 #, c-format
-msgid "C"
-msgstr "C"
+msgid "XFree86"
+msgstr "XFree86"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:98 ../rpmdrake:99 ../rpmdrake:100 ../rpmdrake:101
 #, c-format
-msgid "Other"
-msgstr "אחר"
+msgid "Fonts"
+msgstr "גופנים"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:98
 #, c-format
-msgid "Sweden"
-msgstr "שוודיה"
+msgid "Console"
+msgstr "מסוף"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:99
 #, c-format
-msgid "Boards"
-msgstr "לוחות"
+msgid "True type"
+msgstr "True type"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:100
 #, c-format
-msgid "Austria"
-msgstr "אוסטריה"
+msgid "Type1"
+msgstr "Type1"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:101
 #, c-format
-msgid "Faqs"
-msgstr "שאלות ותשובות"
+msgid "X11 bitmap"
+msgstr "תמונת X11"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:102
 #, c-format
-msgid "Info..."
-msgstr "מידע..."
+msgid "Base"
+msgstr "בסיס"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
+#: ../rpmdrake:107 ../rpmdrake:108
 #, c-format
-msgid "Inspect..."
-msgstr "בחינה ...."
+msgid "Configuration"
+msgstr "הגדרות"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:103
 #, c-format
-msgid "Japan"
-msgstr "יפן"
+msgid "Hardware"
+msgstr "חומרה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:104
 #, c-format
-msgid "Summary: "
-msgstr "סיכום:"
+msgid "Packaging"
+msgstr "אריזה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:105 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
+#: ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154 ../rpmdrake:155
+#: ../rpmdrake:156 ../rpmdrake:157
 #, c-format
-msgid "Backup"
-msgstr "גיבוי"
+msgid "Networking"
+msgstr "עבודה ברשת"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:106
+#, c-format
+msgid "Printing"
+msgstr "הדפסה"
+
+#: ../rpmdrake:107
 #, c-format
 msgid "Boot and Init"
 msgstr "אתחול"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:108 ../rpmdrake:119 ../rpmdrake:127 ../rpmdrake:139
+#: ../rpmdrake:144 ../rpmdrake:157 ../rpmdrake:171 ../rpmdrake:176
+#: ../rpmdrake:230
 #, c-format
-msgid "FTP server"
-msgstr "שרת FTP"
+msgid "Other"
+msgstr "אחר"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:109
 #, c-format
-msgid "Remove .%s"
-msgstr "הסרת .%s"
+msgid "Internationalization"
+msgstr "בנאום"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112 ../rpmdrake:113
+#: ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116 ../rpmdrake:117
+#: ../rpmdrake:118 ../rpmdrake:119
 #, c-format
-msgid "Importance: "
-msgstr "חשיבות : "
+msgid "Development"
+msgstr "פיתוח"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:110
 #, c-format
-msgid "WWW"
-msgstr "WWW"
+msgid "Kernel"
+msgstr "גרעין"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:111 ../rpmdrake:129
 #, c-format
-msgid "Unable to create medium."
-msgstr "יצירת המאגר נכשלה."
+msgid "Databases"
+msgstr "בסיסי נתונים"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:112
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"החבילות הבאות יוסרו על מנת לאפשר שדרוג של חבילות אחרות:\n"
-"\n"
-"%s\n"
-"\n"
-"הודעה זו עלולה להתקבל באם מוגדר מאגר לא מתאים למערכת שלך. האם להמשיך ?"
+msgid "Perl"
+msgstr "Perl"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:113
 #, c-format
-msgid ""
-"Welcome to the Software Media Manager!\n"
-"\n"
-"This tool will help you configure the packages media you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"ברוך בואך ל\"מנהל מאגרי התכנה\"\n"
-"\n"
-"כלי זה יעזור לך להגדיר את מאגרי התכנה להתקנת חבילות שבהן ברצונך להשתמש\n"
-"במחשב זה. מאגרים אלו ישמשו להתקנת חבילות תוכנה חדשות או על-מנת לעדכן\n"
-"את המערכת."
+msgid "Python"
+msgstr "Python"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:114
 #, c-format
-msgid "Medium"
-msgstr "מאגר"
+msgid "C"
+msgstr "C"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:115
 #, c-format
-msgid "Size: "
-msgstr "גודל : "
+msgid "C++"
+msgstr "C++"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:116
 #, c-format
-msgid "Office"
-msgstr "משרד"
+msgid "Java"
+msgstr "Java"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:117
 #, c-format
-msgid "Everything installed successfully"
-msgstr "הכל הותקן בהצלחה."
+msgid "GNOME and GTK+"
+msgstr "GNOME ו-GTK+"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:118
 #, c-format
-msgid "Add a parallel group"
-msgstr "הוסף קבוצה מקבילה"
+msgid "KDE and Qt"
+msgstr "KDE ו-QT"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:120 ../rpmdrake:121 ../rpmdrake:122 ../rpmdrake:123
+#: ../rpmdrake:124 ../rpmdrake:125 ../rpmdrake:126 ../rpmdrake:127
 #, c-format
-msgid "Update media"
-msgstr "עדכון מאגר/ים"
+msgid "Sciences"
+msgstr "מדעים"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:120
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "מתקין את החבילה %s' (%s/%s)"
+msgid "Astronomy"
+msgstr "אסטרונומיה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:121
 #, c-format
-msgid "Parallel..."
-msgstr "מקבילי....."
+msgid "Biology"
+msgstr "ביולוגיה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:122
 #, c-format
-msgid "in names"
-msgstr "בשמות"
+msgid "Chemistry"
+msgstr "כימיה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:123
 #, c-format
-msgid "Not selected"
-msgstr "לא מסומן"
+msgid "Computer science"
+msgstr "מדעי המחשב"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:124
 #, c-format
-msgid "Problem during installation"
-msgstr "התגלו בעיות תוך כדי ההתקנה "
+msgid "Geosciences"
+msgstr "מדעי כדוה\"א"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:125
 #, c-format
-msgid "Terminals"
-msgstr "מסופים"
+msgid "Mathematics"
+msgstr "מתמטיקה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:126
 #, c-format
-msgid "Kernel and hardware"
-msgstr "חומרה וגרעין"
+msgid "Physics"
+msgstr "פיזיקה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:128
 #, c-format
-msgid "Edit"
-msgstr "עריכה"
+msgid "Communications"
+msgstr "תקשורת"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:130
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "גודל נבחר : %d MB /מקום פנוי : %d MB"
+msgid "Editors"
+msgstr "עורכים"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:131
 #, c-format
-msgid "Australia"
-msgstr "אוסטרליה"
+msgid "Emulators"
+msgstr "אמולטורים"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
+#: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
 #, c-format
-msgid "Security updates"
-msgstr "עדכוני אבטחה"
+msgid "Games"
+msgstr "משחקים"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:132
 #, c-format
-msgid "Korea"
-msgstr "קוריאה"
+msgid "Adventure"
+msgstr "הרפתקאות"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:133
 #, c-format
-msgid "Examining remote file of medium `%s'..."
-msgstr "בחינת קובץ מרוחק במאגר `%s'..."
+msgid "Arcade"
+msgstr "משחקי Arcade"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:134
 #, c-format
-msgid "All packages, by group"
-msgstr "כל החבילות, לפי קבוצה"
+msgid "Boards"
+msgstr "לוחות"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:135
 #, c-format
-msgid "Kernel"
-msgstr "גרעין"
+msgid "Cards"
+msgstr "קלפים"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:136
 #, c-format
-msgid "Console"
-msgstr "מסוף"
+msgid "Puzzles"
+msgstr "תצרף"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:137
 #, c-format
-msgid "C++"
-msgstr "C++"
+msgid "Sports"
+msgstr "ספורט"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:138
 #, c-format
-msgid "Netherlands"
-msgstr "הולנד"
+msgid "Strategy"
+msgstr "אסטרטגיה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:140
 #, c-format
-msgid "Search results (none)"
-msgstr "תוצאות חיפוש (כלום)"
+msgid "Toys"
+msgstr "צעצועים"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143 ../rpmdrake:144
 #, c-format
-msgid "Adventure"
-msgstr "הרפתקאות"
+msgid "Archiving"
+msgstr "כיווץ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:141
+#, c-format
+msgid "Compression"
+msgstr "דחיסה"
+
+#: ../rpmdrake:142
 #, c-format
 msgid "Cd burning"
 msgstr "צריבה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:143
 #, c-format
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"ברוך בואך לכלי העזר להתקנת חבילות תוכנה!\n"
-"\n"
-"מערכת ה-Linux Mandrake שלך באה עם כמה אלפי חבילות תוכנה \n"
-"בתקליטור או בDVD. כלי זה יעזור לך לבחור \n"
-"אילו חבילות תוכנה הנך רוצה להתקין במחשב שלך."
+msgid "Backup"
+msgstr "גיבוי"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:145
 #, c-format
-msgid "Stop"
-msgstr "עצור"
+msgid "Monitoring"
+msgstr "בקרה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:146
 #, c-format
-msgid "Biology"
-msgstr "ביולוגיה"
+msgid "Sound"
+msgstr "שמע"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:147
 #, c-format
-msgid "Please wait, generating hdlist..."
-msgstr "נא להמתין; יוצר את hdlist...."
+msgid "Graphics"
+msgstr "גרפיקה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:148
 #, c-format
-msgid "Mathematics"
-msgstr "מתמטיקה"
+msgid "Video"
+msgstr "וידאו"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:149
 #, c-format
-msgid "Internationalization"
-msgstr "בנאום"
+msgid "File transfer"
+msgstr "העברת קובץ..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:150
 #, c-format
-msgid "Edit a medium"
-msgstr "עריכת מאגר"
+msgid "IRC"
+msgstr "IRC"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:151
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"כבר יש מאגר בשם זה, האם ברצונך \n"
-"להחליף אותו ?"
+msgid "Instant messaging"
+msgstr "מסרים מיידים"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:152
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"בכדי לענות על התלויות, החבילות הבאות יותקנו גם הן: \n"
-"\n"
-"\n"
+msgid "Chat"
+msgstr "צ'אט"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:153
 #, c-format
-msgid "HTTP server"
-msgstr "שרת HTTP"
+msgid "News"
+msgstr "חדשות"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:154
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "שגיאה חמורה: לא נמצא חבילה להתקנה, מצטער."
+msgid "Mail"
+msgstr "דוא\"ל"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:155
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "כמה חבילות לא יכלו להיות מוסרות"
+msgid "WWW"
+msgstr "WWW"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:156
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s"
-msgstr ""
-"מצטער, אין באפשרותך לבחור את החבילה או החבילות הבאות:\n"
-"\n"
-"%s"
+msgid "Remote access"
+msgstr "גישה מרחוק"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:158
 #, c-format
-msgid "Finland"
-msgstr "פינלנד"
+msgid "Office"
+msgstr "משרד"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:159
 #, c-format
-msgid "X11 bitmap"
-msgstr "תמונת X11"
+msgid "Publishing"
+msgstr "פרסום"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:160
 #, c-format
-msgid "Failure when adding medium"
-msgstr ""
+msgid "Terminals"
+msgstr "מסופים"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:161
 #, c-format
-msgid "Media limit:"
-msgstr "הגבלת המאגר:"
+msgid "Shells"
+msgstr "מסופים"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:162
 #, c-format
-msgid "More information on package..."
-msgstr "עוד מידע על החבילות..."
+msgid "File tools"
+msgstr "כלי ניהול קבצים"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:163
 #, c-format
-msgid "Save changes"
-msgstr "שמירת שינויים"
+msgid "Text tools"
+msgstr "כלי עיבוד טקסט"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166 ../rpmdrake:167
+#: ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170 ../rpmdrake:171
 #, c-format
-msgid "Instant messaging"
-msgstr "מסרים מיידים"
+msgid "Graphical desktop"
+msgstr "שולחן עבודה גרפי"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:164
 #, c-format
-msgid "News"
-msgstr "חדשות"
+msgid "GNOME"
+msgstr "GNOME"
 
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../rpmdrake:165
 #, c-format
-msgid "More info"
-msgstr "עוד מידע "
+msgid "Icewm"
+msgstr "Icewm"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:166
 #, c-format
-msgid "Search"
-msgstr "חיפוש"
+msgid "FVWM based"
+msgstr "מבוסס FVWM "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:167
 #, c-format
-msgid "Computer books"
-msgstr "ספרים על מחשוב"
+msgid "KDE"
+msgstr "KDE"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:168
 #, c-format
-msgid "If left blank, synthesis/hdlist will be automatically probed"
-msgstr "אם ריק, synthesis/hdlist ייבדק אוטומטית."
+msgid "Sawfish"
+msgstr "Sawfish"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:169
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"אין אפשרות למצוא אתר מראה מתאים.\n"
-"\n"
-"ישנן מספר סיבות אפשריות לבעיה זו; הנפוצה בהן היא שארכיטקטורת\n"
-"המעבד הראשי במחשב שלך לא נתמכת על-ידי העדכונים הרשמיים של Mandrake Linux."
+msgid "WindowMaker"
+msgstr "WindowMaker"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:170
 #, c-format
-msgid "Spain"
-msgstr "ספרד"
+msgid "Enlightenment"
+msgstr "Enlightenment"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175
+#: ../rpmdrake:176
 #, c-format
-msgid "Already existing update media"
-msgstr "כבר קיים מקור לעדכונים"
+msgid "Books"
+msgstr "ספרים"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:172
 #, c-format
-msgid "Files:\n"
-msgstr "קבצים:\n"
+msgid "Howtos"
+msgstr "מדריכים"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:173
 #, c-format
-msgid "Unable to get source packages."
-msgstr "לא יכול לקבל את חבילות המקור."
+msgid "Faqs"
+msgstr "שאלות ותשובות"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:174
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "באפשרותך לספק שם משתמש/ססמה לצורך אימות בשרת המתווך:"
+msgid "Computer books"
+msgstr "ספרים על מחשוב"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:175
 #, c-format
-msgid "Chat"
-msgstr "צ'אט"
+msgid "Literature"
+msgstr "ספרות"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:275 ../rpmdrake:637 ../rpmdrake:638
 #, c-format
-msgid "Update"
-msgstr "עדכון"
+msgid "(Not available)"
+msgstr "(לא-זמין)"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:303 ../rpmdrake:361
 #, c-format
-msgid "Additional packages needed"
-msgstr "חבילות נוספות נדרשות"
+msgid "Search results"
+msgstr "תוצאות חיפוש"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:303
 #, c-format
-msgid "Running in user mode"
-msgstr "רץ במצב משתמש"
+msgid "Search results (none)"
+msgstr "תוצאות חיפוש (כלום)"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:313 ../rpmdrake:324
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Media Manager, and then add a `Security\n"
-"updates' medium.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"יש באפשרותך לבחור את אתר המראה המבוקש באופן ידני. לצורך זה,\n"
-"יש להפעיל את היישום \"מנהל מאגרי תוכנה\", ולהוסיף את מאגר התכנה\n"
-"'עדכוני אבטחה'.\n"
-"\n"
-"לאחר מכן, יש להריץ מחדש את MandrakeUpdate."
+msgid "Please wait, searching..."
+msgstr "נא להמתין בעת החיפוש..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:327
 #, c-format
-msgid "Adding a medium:"
-msgstr "הוספת מאגר:"
+msgid "Stop"
+msgstr "עצור"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:362 ../rpmdrake:478
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"יש להסיר את החבילה/ות הבאה/ות בשל התלויות שלהן:\n"
-"\n"
+msgid "Upgradable"
+msgstr "ניתנות לשדרוג"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:362 ../rpmdrake:478
 #, c-format
-msgid ""
-"You already have at least one update medium configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Media Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"יש לך לפחות מאגר אחד לעדכונים מוגדר, אבל\n"
-"כל המאגרים כרגע מבוטלים. אתה צריך להריץ את מנהל \n"
-"מאגרי התכנה ולאפשר לפחות מאגר אחד (בדוק את העמודה של אישור )\n"
-"\n"
-"ואז התחל את MandrakeUpdate מחדש."
+msgid "Addable"
+msgstr "ניתנות להוספה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:364
 #, c-format
-msgid "Find:"
-msgstr "חיפוש:"
+msgid "Selected"
+msgstr "נבחרה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:364
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "נא להמתין בעת הכנת רשימת חבילות..."
+msgid "Not selected"
+msgstr "לא מסומן"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:398
 #, c-format
-msgid "All"
-msgstr "הכל"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:416 ../rpmdrake:520 ../rpmdrake:522
 #, c-format
-msgid "XFree86"
-msgstr "XFree86"
+msgid "More information on package..."
+msgstr "עוד מידע על החבילות..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:417
 #, c-format
-msgid "Normal information"
-msgstr "מידע רגיל"
+msgid "Please choose"
+msgstr "נא לבחור"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:417
 #, c-format
-msgid "Removable device"
-msgstr "התקן ניתן להסרה"
+msgid "One of the following packages is needed:"
+msgstr "נדרשת אחת החבילות הבאות:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:437
 #, c-format
-msgid "Preparing packages installation..."
-msgstr "מכין חבילות להתקנה..."
+msgid "Please wait, listing packages..."
+msgstr "נא להמתין בעת הכנת רשימת חבילות..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:451
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "נא להמתין בעת הסרת החבילות..."
+msgid "No update"
+msgstr "לא לעדכן"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:452
 #, c-format
-msgid "Login:"
-msgstr "שם משתמש:"
+msgid ""
+"The list of updates is empty. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+"רשימת העדכונים ריקה. מצב זה יכול לקרות אם\n"
+"אין עדכונים זמינים עבור החבילות המותקנות במחשבך,\n"
+"או שכבר התקנת את כל העדכונים."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:472
 #, c-format
-msgid "Belgium"
-msgstr "בלגיה"
+msgid "All"
+msgstr "הכל"
 
-#: ../rpmdrake:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:511 ../rpmdrake:514
 #, c-format
-msgid "File tools"
-msgstr "כלי ניהול קבצים"
+msgid "More info"
+msgstr "עוד מידע "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:515
 #, c-format
-msgid "Configure proxies"
-msgstr "הגדרת שרתים מתווכים"
+msgid "Information on packages"
+msgstr "מידע על החבילות"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:537
 #, c-format
-msgid "Printing"
-msgstr "הדפסה"
+msgid "Some additional packages need to be removed"
+msgstr "יש צורך להסיר מספר חבילות נוספות"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:538
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "מתחיל להוריד את %s..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"יש להסיר את החבילה/ות הבאה/ות בשל התלויות שלהן:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:544 ../rpmdrake:553
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "שגיאה חמורה אירעה : %s."
+msgid "Some packages can't be removed"
+msgstr "כמה חבילות לא יכלו להיות מוסרות"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:545
 #, c-format
-msgid "Fatal error"
-msgstr "שגיאה חמורה"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"הסרת החבילות הבאות, תהרוס לך את המערכת. מצטער: \n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:554 ../rpmdrake:607
 #, c-format
-msgid "Leaves only, sorted by install date"
-msgstr "ענפים בלבד, ממוין עפ\"י תאריך התקנה"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"בחירת החבילה או החבילות הבאות יבוטל כעת עקב תלויות\n"
+"\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:577
+#, c-format
+msgid "Additional packages needed"
+msgstr "חבילות נוספות נדרשות"
+
+#: ../rpmdrake:578
 #, c-format
 msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
-"Errors:\n"
-"%s"
 msgstr ""
-"עדכון המאגר נכשל, מאגר זה יבוטל באופן אוטומטי.\n"
+"בכדי לענות על התלויות, החבילות הבאות יותקנו גם הן: \n"
+"\n"
 "\n"
-"שגיאות:\n"
-"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:592
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "מספר חבילות לא ניתנות להתקנה"
+
+#: ../rpmdrake:593
 #, c-format
 msgid ""
-"The list of updates is empty. This means that either there is\n"
-"no available update for the packages installed on your computer,\n"
-"or you already installed all of them."
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
 msgstr ""
-"רשימת העדכונים ריקה. מצב זה יכול לקרות אם\n"
-"אין עדכונים זמינים עבור החבילות המותקנות במחשבך,\n"
-"או שכבר התקנת את כל העדכונים."
+"מצטער, אין באפשרותך לבחור את החבילה או החבילות הבאות:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:606 ../rpmdrake:858
 #, c-format
-msgid "Geosciences"
-msgstr "מדעי כדוה\"א"
+msgid "Some packages need to be removed"
+msgstr "יש להסיר מספר חבילות"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:625
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "נא לבחור את אתר המראה אליו ברצונך להתחבר."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "גודל נבחר : %d MB /מקום פנוי : %d MB"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:627
 #, c-format
-msgid "Communications"
-msgstr "תקשורת"
+msgid "Selected size: %d MB"
+msgstr "גודל נבחר: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:635
 #, c-format
-msgid "Editing parallel group \"%s\":"
-msgstr "עריכת קבוצה מקבילית \"%s\":"
+msgid "Files:\n"
+msgstr "קבצים:\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:638
 #, c-format
-msgid "Configuration"
-msgstr "הגדרות"
+msgid "Changelog:\n"
+msgstr "רשימת שינויים:\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:640
 #, c-format
-msgid "Reason for update: "
-msgstr "סיבת העדכון: "
+msgid "Medium: "
+msgstr "מאגר: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:642
 #, c-format
-msgid "Remove"
-msgstr "הסרה"
+msgid "Currently installed version: "
+msgstr "הגרסה המותקנת כרגע: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:646
 #, c-format
-msgid "Portugal"
-msgstr "פורטוגל"
+msgid "Name: "
+msgstr "שם: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:647
 #, c-format
-msgid "Czech Republic"
-msgstr "הרפובליקה הצ'כית"
+msgid "Version: "
+msgstr "גרסה: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:648
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "יש להסיר מספר חבילות"
+msgid "Size: "
+msgstr "גודל : "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:648
 #, c-format
-msgid "Problem during removal"
-msgstr "בעיה בזמן ההסרה"
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:650
 #, c-format
-msgid "WindowMaker"
-msgstr "WindowMaker"
+msgid "Importance: "
+msgstr "חשיבות : "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:652
 #, c-format
-msgid "Help launched in background"
-msgstr "חלון העזרה נפתח ברקע"
+msgid "Summary: "
+msgstr "סיכום:"
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake:654
 #, c-format
-msgid "Unable to add medium, wrong or missing arguments"
-msgstr ""
+msgid "Reason for update: "
+msgstr "סיבת העדכון: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:656
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"אירעה שגיאה בעת ההתקנה :\n"
-"\n"
-"%s"
+msgid "Description: "
+msgstr "תיאור: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:707
 #, c-format
-msgid "No package found for installation."
-msgstr "לא נמצאה חבילה להתקנה"
+msgid "Bugfixes updates"
+msgstr "עדכונים באגים"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:707
 #, c-format
-msgid "Type1"
-msgstr "Type1"
+msgid "Normal updates"
+msgstr "עדכונים רגילים"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:724
 #, c-format
-msgid "Medium: "
-msgstr "מאגר: "
+msgid "Mandrake choices"
+msgstr "בחירות Mandrake"
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake:725
 #, c-format
-msgid "Successfully added medium `%s'."
-msgstr ""
+msgid "All packages, alphabetical"
+msgstr "כל החבילות, ע\"פי סדר האלף-בית"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:731
 #, c-format
-msgid "Strategy"
-msgstr "אסטרטגיה"
+msgid "All packages, by group"
+msgstr "כל החבילות, לפי קבוצה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:731
 #, c-format
-msgid "Description: "
-msgstr "תיאור: "
+msgid "All packages, by size"
+msgstr "כל החבילות, לפי גודל"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:732
 #, c-format
-msgid "Archiving"
-msgstr "כיווץ"
+msgid "All packages, by selection state"
+msgstr "כל החבילות, על פי מצב בחירה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:733
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "All packages, by medium repository"
+msgstr "כל החבילות, לפי מאגר "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:733
 #, c-format
-msgid "System"
-msgstr "מערכת"
+msgid "All packages, by update availability"
+msgstr "כל החבילות על פי נגישות עדכון"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:734
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "כל החבילות המבוקשות הותקנו בהצלחה."
+msgid "Leaves only, sorted by install date"
+msgstr "ענפים בלבד, ממוין עפ\"י תאריך התקנה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Servers"
-msgstr "שרתים"
+msgid "in names"
+msgstr "בשמות"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Puzzles"
-msgstr "תצרף"
+msgid "in descriptions"
+msgstr "בתיאורים"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Local files"
-msgstr "קבצים מקומיים"
+msgid "in file names"
+msgstr "בשמות קבצים"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:796
 #, c-format
-msgid "Choose a medium for adding in the media limit:"
-msgstr "בחר מאגר להוספה בהגבלת מדיה"
+msgid "Reset the selection"
+msgstr "איפוס הבחירה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:796
 #, c-format
-msgid "Addable"
-msgstr "ניתנות להוספה"
+msgid "Reload the packages list"
+msgstr "טעינה מחדש של רשימת החבילות"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:797 ../rpmdrake.pm:443
 #, c-format
-msgid "Keys"
-msgstr "מפתחות"
+msgid "Update media"
+msgstr "עדכון מאגר/ים"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:822
 #, c-format
-msgid "Please choose"
-msgstr "נא לבחור"
+msgid "Normal information"
+msgstr "מידע רגיל"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:822
 #, c-format
-msgid "Databases"
-msgstr "בסיסי נתונים"
+msgid "Maximum information"
+msgstr "מידע מיריבי"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:842
 #, c-format
-msgid ""
-"Are you sure you want to remove the key %s from medium %s?\n"
-"(name of the key: %s)"
-msgstr ""
-"האם באמת למחוק את המפחת %s ממאגר %s\n"
-"(שם המפתח %s)"
+msgid "You need to select some packages first."
+msgstr "יש לבחור חבילות קודם"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:847
 #, c-format
-msgid "Name: "
-msgstr "שם: "
+msgid "Too many packages are selected"
+msgstr "נבחרו יותר מדי חבילות"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:848
 #, c-format
-msgid "Proxy hostname:"
-msgstr "שם המארח של השרת המתווך:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"אזהרה! נראה שכמות החבילות שאתה מבקש להתקין עלולה לגרום\n"
+"לכך שהכונן הקשיח יתמלא לחלוטין; מצב מסוכן במיוחד \n"
+"שיש להימנע ממנו.\n"
+"\n"
+"האם אכן ברצונך להתקין את כל החבילות שבחרת ?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:859
 #, c-format
 msgid ""
-"The following packages have bad signatures:\n"
+"The following packages have to be removed for others to be upgraded:\n"
 "\n"
 "%s\n"
 "\n"
-"Do you want to continue installation?"
+"Is it ok to continue?"
 msgstr ""
-"לחבילות הללו יש חתימה לא תקינה\n"
+"החבילות הבאות יוסרו על מנת לאפשר שדרוג של חבילות אחרות:\n"
 "\n"
 "%s\n"
 "\n"
-"האם להמשיך את ההתקנה?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "בוחן את %s"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "הורדה של `%s' במהירות: %s"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Hosts:"
-msgstr "מארחים:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Video"
-msgstr "וידאו"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Perl"
-msgstr "Perl"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Normal updates"
-msgstr "עדכונים רגילים"
+"הודעה זו עלולה להתקבל באם מוגדר מאגר לא מתאים למערכת שלך. האם להמשיך ?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:884
 #, c-format
-msgid "Manage keys..."
-msgstr "ניהול מפתחות..."
+msgid "Software Packages Removal"
+msgstr "הסרת חבילות תוכנה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:885
 #, c-format
-msgid "Maximum information"
-msgstr "מידע מיריבי"
+msgid "Mandrake Update"
+msgstr "עדכון Mandrake"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:886
 #, c-format
-msgid "Selected"
-msgstr "נבחרה"
+msgid "Software Packages Installation"
+msgstr "התקנה של חבילות תוכנה."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:893
 #, c-format
-msgid "Computer science"
-msgstr "מדעי המחשב"
+msgid "Find:"
+msgstr "חיפוש:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:898
 #, c-format
-msgid "Fonts"
-msgstr "גופנים"
+msgid "Search"
+msgstr "חיפוש"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:909
 #, c-format
-msgid "Hardware"
-msgstr "חומרה"
+msgid "Install"
+msgstr "התקנה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:911
 #, c-format
 msgid "Quit"
 msgstr "יציאה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:938
 #, c-format
-msgid "Version: "
-msgstr "גרסה: "
+msgid "Fatal error"
+msgstr "שגיאה חמורה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:939
 #, c-format
-msgid "Use .%s as main file"
-msgstr "שימוש ב .%s כקובץ ראשי"
+msgid "A fatal error occurred: %s."
+msgstr "שגיאה חמורה אירעה : %s."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:947
 #, c-format
-msgid "Norway"
-msgstr "נורווגיה"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"יש צורך להתחבר לאתר המראה על מנת לייבא את החבילות המעודכנות.\n"
+"נא לבדוק שהמחשב שלך מחובר לרשת.\n"
+"\n"
+"האם ניתן להמשיך?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:956
 #, c-format
-msgid "Israel"
-msgstr "ישראל"
+msgid "Already existing update media"
+msgstr "כבר קיים מקור לעדכונים"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:957
 #, c-format
-msgid "China"
-msgstr "סין"
+msgid ""
+"You already have at least one update medium configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Media Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"יש לך לפחות מאגר אחד לעדכונים מוגדר, אבל\n"
+"כל המאגרים כרגע מבוטלים. אתה צריך להריץ את מנהל \n"
+"מאגרי התכנה ולאפשר לפחות מאגר אחד (בדוק את העמודה של אישור )\n"
+"\n"
+"ואז התחל את MandrakeUpdate מחדש."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:967
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "איך לבחור את אתר המראה באופן ידני"
+
+#: ../rpmdrake:968
 #, c-format
 msgid ""
-"Welcome to the software removal tool!\n"
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Media Manager, and then add a `Security\n"
+"updates' medium.\n"
 "\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+"Then, restart MandrakeUpdate."
 msgstr ""
-"ברוך בואך לכלי העזר להסרת חבילות תוכנה!\n"
+"יש באפשרותך לבחור את אתר המראה המבוקש באופן ידני. לצורך זה,\n"
+"יש להפעיל את היישום \"מנהל מאגרי תוכנה\", ולהוסיף את מאגר התכנה\n"
+"'עדכוני אבטחה'.\n"
 "\n"
-"כלי זה יעזור לך לבחור איזה חבילות אתה רוצה להסיר מהמחשב שלך."
+"לאחר מכן, יש להריץ מחדש את MandrakeUpdate."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:996
 #, c-format
-msgid "(Not available)"
-msgstr "(לא-זמין)"
+msgid "Please wait, finding available packages..."
+msgstr "נא להמתין בעת חיפוש חבילות זמינות..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1029
 #, c-format
-msgid "Bugfixes updates"
-msgstr "עדכונים באגים"
+msgid "Inspecting %s"
+msgstr "בוחן את %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1048
 #, c-format
-msgid "Java"
-msgstr "Java"
+msgid "changes:"
+msgstr "שינויים:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1052
 #, c-format
-msgid "Update..."
-msgstr "עדכון..."
+msgid "Remove .%s"
+msgstr "הסרת .%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1054
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "נא להמתין בעת חיפוש חבילות זמינות..."
+msgid "Use .%s as main file"
+msgstr "שימוש ב .%s כקובץ ראשי"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1056
 #, c-format
-msgid "Cancel"
-msgstr "ביטול"
+msgid "Do nothing"
+msgstr "לא לעשות כלום"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1068
 #, c-format
-msgid "Sciences"
-msgstr "מדעים"
+msgid "Installation finished"
+msgstr "ההתקנה הסתיימה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1078
 #, c-format
-msgid "Enabled?"
-msgstr "מופעל?"
+msgid "Inspect..."
+msgstr "בחינה ...."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1104 ../rpmdrake:1229
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "כל החבילות, ע\"פי סדר האלף-בית"
+msgid "Everything installed successfully"
+msgstr "הכל הותקן בהצלחה."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1105 ../rpmdrake:1230
 #, c-format
-msgid "Mandrake choices"
-msgstr "בחירות Mandrake"
+msgid "All requested packages were installed successfully."
+msgstr "כל החבילות המבוקשות הותקנו בהצלחה."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1107 ../rpmdrake:1214
 #, c-format
-msgid "Toys"
-msgstr "צעצועים"
+msgid "Problem during installation"
+msgstr "התגלו בעיות תוך כדי ההתקנה "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1108 ../rpmdrake:1215 ../rpmdrake:1244
 #, c-format
-msgid "Installation finished"
-msgstr "ההתקנה הסתיימה"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"אירעה שגיאה בעת ההתקנה :\n"
+"\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1129
 #, c-format
-msgid " done."
-msgstr " סיום."
+msgid "Unable to get source packages."
+msgstr "לא יכול לקבל את חבילות המקור."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1130
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "עליך להכניס את המדיה בכדי להמשיך."
+msgid "Unable to get source packages, sorry. %s"
+msgstr "לא יכול לקבל את חבילות המקור, מצטער. %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1131 ../rpmdrake:1187
 #, c-format
 msgid ""
-"Unable to add medium, errors reported:\n"
 "\n"
+"\n"
+"Error(s) reported:\n"
 "%s"
 msgstr ""
+"\n"
+"\n"
+"דו\"ח שגיאות:\n"
+"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1138
 #, c-format
-msgid "no name found, key doesn't exist in rpm keyring!"
-msgstr "שם לא נמצא, המפתח לא נמצא ברשת המפתחות של RPM!"
+msgid "Package installation..."
+msgstr "מתקין חבילות...."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1138
 #, c-format
-msgid "Too many packages are selected"
-msgstr "נבחרו יותר מדי חבילות"
+msgid "Initializing..."
+msgstr "מאתחל..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1143
 #, c-format
-msgid "Physics"
-msgstr "פיזיקה"
+msgid "Change medium"
+msgstr "החלפת מדיה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1144
 #, c-format
-msgid "Do nothing"
-msgstr "לא לעשות כלום"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "נא להכניס את המדיה בשם \"%s\" להתקן [%s]"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1149
 #, c-format
-msgid "Danmark"
-msgstr "דנמרק"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "מוריד את החבילה %s' (%s/%s)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1168
 #, c-format
-msgid "Error during download"
-msgstr "שגיאה בזמן הורדה"
+msgid "Verifying packages signatures..."
+msgstr "מוודא חתימות של חבילות...."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1177
 #, c-format
-msgid "Mail"
-msgstr "דוא\"ל"
+msgid ""
+"The following packages have bad signatures:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
+msgstr ""
+"לחבילות הללו יש חתימה לא תקינה\n"
+"\n"
+"%s\n"
+"\n"
+"האם להמשיך את ההתקנה?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1184 ../rpmdrake:1243
+#, c-format
+msgid "Installation failed"
+msgstr "התקנה נכשלה"
+
+#: ../rpmdrake:1185
 #, c-format
 msgid ""
-"Packages database is locked. Please close other applications\n"
-"working with packages database (do you have another media\n"
-"manager on another desktop, or are you currently installing\n"
-"packages as well?)."
+"Installation failed, some files are missing:\n"
+"%s\n"
+"\n"
+"You may want to update your media database."
 msgstr ""
+"ההתקנה נכשלה, כמה קבצים חסרים.\n"
+"%s\n"
+"\n"
+"יתכן שעליך לעדכן את בסיס הנתונים של מאגרי התכנה."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1199
 #, c-format
-msgid "Help"
-msgstr "עזרה"
+msgid "Preparing packages installation..."
+msgstr "מכין חבילות להתקנה..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1202
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "לא יכול לקבל את חבילות המקור, מצטער. %s"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "מתקין את החבילה %s' (%s/%s)"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1227
 #, c-format
-msgid "Sports"
-msgstr "ספורט"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"ההתקנה הסתיימה; %s.\n"
+"\n"
+"נוצרו מספר קבצי הגדרות בשם, `.rpmnew' או `.rpmsave'\n"
+"יש באפשרותך לעיין בהם בכדי להשלים את עדכון המערכת שלך:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1227
 #, c-format
-msgid "Taiwan"
-msgstr "טיוואן"
+msgid "everything was installed correctly"
+msgstr "הכל הותקן בצורה תקינה."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1234
 #, c-format
-msgid "Protocol"
-msgstr "פרוטוקול"
+msgid "No package found for installation."
+msgstr "לא נמצאה חבילה להתקנה"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1235
 #, c-format
-msgid "(none)"
-msgstr "(כלום)"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "שגיאה חמורה: לא נמצא חבילה להתקנה, מצטער."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1257
 #, c-format
-msgid "All packages, by medium repository"
-msgstr "כל החבילות, לפי מאגר "
+msgid "Please wait, reading packages database..."
+msgstr "נא להמתין בעת קריאת מסד הנתונים של החבילות..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1304
 #, c-format
-msgid "Germany"
-msgstr "גרמניה"
+msgid "Please wait, removing packages..."
+msgstr "נא להמתין בעת הסרת החבילות..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1309
 #, c-format
-msgid "Compression"
-msgstr "דחיסה"
+msgid "Problem during removal"
+msgstr "בעיה בזמן ההסרה"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1310
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "הורדה של `%s', זמן נותר:%s, במהירות: %s"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"ארעה שגיאה בעת התקנת החבילות:\n"
+"\n"
+"%s"
 
-#. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1342
 #, c-format
-msgid "%s from medium %s"
-msgstr "%s ממאגר %s"
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+"ברוך בואך לכלי העזר להסרת חבילות תוכנה!\n"
+"\n"
+"כלי זה יעזור לך לבחור איזה חבילות אתה רוצה להסיר מהמחשב שלך."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1347
 #, c-format
-msgid "Add a host"
-msgstr "הוסף מארח"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"ברוך בואך ל- MandrakeUpdate!\n"
+"\n"
+"כלי זה יעזור לך לבחור את העדכונים שהנך רוצה להתקין על המחשב שלך."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1352
 #, c-format
-msgid "Development"
-msgstr "פיתוח"
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"ברוך בואך לכלי העזר להתקנת חבילות תוכנה!\n"
+"\n"
+"מערכת ה-Linux Mandrake שלך באה עם כמה אלפי חבילות תוכנה \n"
+"בתקליטור או בDVD. כלי זה יעזור לך לבחור \n"
+"אילו חבילות תוכנה הנך רוצה להתקין במחשב שלך."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:121
 #, c-format
-msgid "No"
-msgstr "לא"
+msgid "Yes"
+msgstr "כן"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:123
 #, c-format
-msgid "Media limit"
-msgstr "הגבלת מאגר"
+msgid "No"
+msgstr "לא"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:159
 #, c-format
-msgid "Install"
-msgstr "התקנה"
+msgid "Info..."
+msgstr "מידע..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:214
 #, c-format
-msgid "Add..."
-msgstr "הוספה..."
+msgid "Austria"
+msgstr "אוסטריה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:215
 #, c-format
-msgid "Change medium"
-msgstr "החלפת מדיה"
+msgid "Australia"
+msgstr "אוסטרליה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:216
 #, c-format
-msgid "Reset the selection"
-msgstr "איפוס הבחירה"
+msgid "Belgium"
+msgstr "בלגיה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:217
 #, c-format
-msgid "Mandrake Update"
-msgstr "עדכון Mandrake"
+msgid "Brazil"
+msgstr "ברזיל"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:218
 #, c-format
-msgid "in file names"
-msgstr "בשמות קבצים"
+msgid "Canada"
+msgstr "קנדה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:219
 #, c-format
-msgid "Books"
-msgstr "ספרים"
+msgid "Costa Rica"
+msgstr "קוסטה-ריקה"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:220
 #, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
-msgstr ""
-"חלה שגיאה בעת הורדת רשימת אתרי המראה:\n"
-"\n"
-"%s\n"
-"יתכן והרשת, או האתר של MandrakeSoft אינם זמינים.\n"
-"נא לנסות שוב מאוחר יותר."
+msgid "Czech Republic"
+msgstr "הרפובליקה הצ'כית"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:221
 #, c-format
-msgid "Howtos"
-msgstr "מדריכים"
+msgid "Germany"
+msgstr "גרמניה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:222
 #, c-format
-msgid "Icewm"
-msgstr "Icewm"
+msgid "Danmark"
+msgstr "דנמרק"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:223 ../rpmdrake.pm:227
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"\n"
-"You may want to update your media database."
-msgstr ""
-"ההתקנה נכשלה, כמה קבצים חסרים.\n"
-"%s\n"
-"\n"
-"יתכן שעליך לעדכן את בסיס הנתונים של מאגרי התכנה."
+msgid "Greece"
+msgstr "יוון"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:224
 #, c-format
-msgid "Libraries"
-msgstr "ספריות"
+msgid "Spain"
+msgstr "ספרד"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:225
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"הסרת החבילות הבאות, תהרוס לך את המערכת. מצטער: \n"
-"\n"
+msgid "Finland"
+msgstr "פינלנד"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:226
 #, c-format
-msgid "Brazil"
-msgstr "ברזיל"
+msgid "France"
+msgstr "צרפת"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:228
 #, c-format
-msgid "Installation failed"
-msgstr "התקנה נכשלה"
+msgid "Israel"
+msgstr "ישראל"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:229
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"דו\"ח שגיאות:\n"
-"%s"
+msgid "Italy"
+msgstr "איטליה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:230
 #, c-format
-msgid "Manage keys for digital signatures of packages"
-msgstr "נהל מפתחות עבור חתימות דיגיטאליות של חבילות"
+msgid "Japan"
+msgstr "יפן"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:231
 #, c-format
-msgid "Currently installed version: "
-msgstr "הגרסה המותקנת כרגע: "
+msgid "Korea"
+msgstr "קוריאה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:232
 #, c-format
-msgid "Games"
-msgstr "משחקים"
+msgid "Netherlands"
+msgstr "הולנד"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:233
 #, c-format
-msgid "Astronomy"
-msgstr "אסטרונומיה"
+msgid "Norway"
+msgstr "נורווגיה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:234
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "נא להכניס את המדיה בשם \"%s\" להתקן [%s]"
+msgid "Poland"
+msgstr "פולין"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:235
 #, c-format
-msgid "You need to select some packages first."
-msgstr "יש לבחור חבילות קודם"
+msgid "Portugal"
+msgstr "פורטוגל"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:236
 #, c-format
-msgid "All packages, by selection state"
-msgstr "כל החבילות, על פי מצב בחירה"
+msgid "Russia"
+msgstr "רוסיה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:237
 #, c-format
-msgid "Name:"
-msgstr "שם:"
+msgid "Sweden"
+msgstr "שוודיה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:238
 #, c-format
-msgid "KDE"
-msgstr "KDE"
+msgid "Taiwan"
+msgstr "טיוואן"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:239
 #, c-format
-msgid "No update"
-msgstr "לא לעדכן"
+msgid "United Kingdom"
+msgstr "בריטניה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:240
 #, c-format
-msgid "Networking"
-msgstr "עבודה ברשת"
+msgid "China"
+msgstr "סין"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:241 ../rpmdrake.pm:242 ../rpmdrake.pm:243 ../rpmdrake.pm:244
+#: ../rpmdrake.pm:295
 #, c-format
-msgid "Ok"
-msgstr "אישור"
+msgid "United States"
+msgstr "ארה\"ב"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:305
 #, c-format
-msgid "Text tools"
-msgstr "כלי עיבוד טקסט"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"יש צורך להתחבר לאתר MandrakeSoft על מנת לייבא את רשימת אתרי המראה.\n"
+"כדאי לבדוק שהמחשב שלך מחובר לרשת.\n"
+"\n"
+"האם ניתן להמשיך?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:309
 #, c-format
-msgid "Cards"
-msgstr "קלפים"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr " נא להמתין בעת הורדת כתובות אתרי מראה מאתר MandrakeSoft"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:315
 #, c-format
-msgid "Sawfish"
-msgstr "Sawfish"
+msgid "Error during download"
+msgstr "שגיאה בזמן הורדה"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:316
 #, c-format
-msgid "Group name:"
-msgstr "שם קבוצה:"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
+"חלה שגיאה בעת הורדת רשימת אתרי המראה:\n"
+"\n"
+"%s\n"
+"יתכן והרשת, או האתר של MandrakeSoft אינם זמינים.\n"
+"נא לנסות שוב מאוחר יותר."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:324
 #, c-format
-msgid "Type in the hostname or IP address of the host to add:"
-msgstr "כתוב את שם המארח או כתובת IP להוספה:"
+msgid "No mirror"
+msgstr "אין אתה מראה"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:325
 #, c-format
-msgid "Arcade"
-msgstr "משחקי Arcade"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"אין אפשרות למצוא אתר מראה מתאים.\n"
+"\n"
+"ישנן מספר סיבות אפשריות לבעיה זו; הנפוצה בהן היא שארכיטקטורת\n"
+"המעבד הראשי במחשב שלך לא נתמכת על-ידי העדכונים הרשמיים של Mandrake Linux."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:342
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Please choose the desired mirror."
+msgstr "נא לבחור את אתר המראה אליו ברצונך להתחבר."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:383
 #, c-format
-msgid "Editing medium \"%s\":"
-msgstr "עריכת מאגר \"%s\":"
+msgid "Copying file for medium `%s'..."
+msgstr "העתקת קובץ עבור המאגר `%s'.."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:386
 #, c-format
-msgid "Add a medium limit"
-msgstr "הוספת גבול מאגר"
+msgid "Examining file of medium `%s'..."
+msgstr "בחינת קובץ ממאגר `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:389
 #, c-format
-msgid "Group"
-msgstr "קבוצה"
+msgid "Examining remote file of medium `%s'..."
+msgstr "בחינת קובץ מרוחק במאגר `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:393
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "נא להמתין בעת הסרת המאגר..."
+msgid " done."
+msgstr " סיום."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:397
 #, c-format
-msgid "Accessibility"
-msgstr "נגישות"
+msgid " failed!"
+msgstr " נכשל!"
 
-#: ../rpmdrake:1
+#. -PO: We're downloading the said file from the said medium
+#: ../rpmdrake.pm:401
 #, c-format
-msgid "changes:"
-msgstr "שינויים:"
+msgid "%s from medium %s"
+msgstr "%s ממאגר %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:405
 #, c-format
-msgid "Add"
-msgstr "הוספה"
+msgid "Starting download of `%s'..."
+msgstr "מתחיל להוריד את %s..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:409
 #, c-format
-msgid "Regenerate hdlist"
-msgstr "צור מחדש hdlist"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "הורדה של `%s', זמן נותר:%s, במהירות: %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:412
 #, c-format
-msgid "Editors"
-msgstr "עורכים"
+msgid "Download of `%s', speed:%s"
+msgstr "הורדה של `%s' במהירות: %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:449
 #, c-format
-msgid "United Kingdom"
-msgstr "בריטניה"
+msgid "Select the media you wish to update:"
+msgstr "נא לבחור את המאגרים אותם ברצונך לעדכן:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:453
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "הנתיב לקובץ synthesis/hdlist:"
+msgid "Update"
+msgstr "עדכון"
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake.pm:465
 #, c-format
 msgid ""
-"You are about to add a new packages medium, `%s'.\n"
-"That means you will be able to add new software packages\n"
-"to your system from that new medium."
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
+"עדכון המאגר נכשל, מאגר זה יבוטל באופן אוטומטי.\n"
+"\n"
+"שגיאות:\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:482 ../rpmdrake.pm:487
 #, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Unable to add medium, errors reported:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+"%s"
 msgstr ""
-"ברוך בואך ל- MandrakeUpdate!\n"
+"אין אפשרות להוסיף מקור זה, בשל השגיאות הבאות:\n"
 "\n"
-"כלי זה יעזור לך לבחור את העדכונים שהנך רוצה להתקין על המחשב שלך."
+"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:498
 #, c-format
-msgid "Remove a key"
-msgstr "הסרת מפתח"
+msgid "Unable to create medium."
+msgstr "יצירת המאגר נכשלה."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:503
 #, c-format
-msgid "User:"
-msgstr "משתמש: "
+msgid "Failure when adding medium"
+msgstr "חלה שגיאה בעת הוספת מקור"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:504
 #, c-format
-msgid "Browse..."
-msgstr "דפדוף..."
+msgid ""
+"There was a problem adding medium:\n"
+"\n"
+"%s"
+msgstr ""
+"אירעה שגיאה בעת הוספת מקור:\n"
+"\n"
+"%s"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
diff --git a/po/pt.po b/po/pt.po
index ef6c0571..4bebc9f7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
-"POT-Creation-Date: 2004-02-20 17:29+0100\n"
+"POT-Creation-Date: 2004-02-20 20:53+0100\n"
 "PO-Revision-Date: 2004-02-21 21:43+0100\n"
 "Last-Translator: Jose Jorge <jjorge@free.fr>\n"
 "Language-Team: português <pt@li.org>\n"
@@ -26,1959 +26,1991 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:61
 #, c-format
-msgid "Enlightenment"
-msgstr "Enlightenment"
+msgid "Add a medium"
+msgstr "Adicionar um média"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:62
 #, c-format
-msgid "Remote access"
-msgstr "Acesso remoto"
+msgid "Local files"
+msgstr "Ficheiros Locais"
 
-#: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:62
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Por favor aguarde, a actualizar o média..."
+msgid "Path:"
+msgstr "Caminho:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:63
 #, c-format
-msgid "FVWM based"
-msgstr "Baseado em FVWM"
+msgid "FTP server"
+msgstr "Servidor FTP"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:63 ../edit-urpm-sources.pl:64
+#: ../edit-urpm-sources.pl:66 ../edit-urpm-sources.pl:196
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:64
 #, c-format
-msgid "Python"
-msgstr "Python"
+msgid "HTTP server"
+msgstr "Servidor HTTP"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:65
 #, c-format
-msgid "Upgradable"
-msgstr "Actualizar"
+msgid "Removable device"
+msgstr "Dispositivo amovível"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:65
 #, c-format
-msgid "everything was installed correctly"
-msgstr "foi tudo bem instalado"
+msgid "Path or mount point:"
+msgstr "Caminho ou ponto de montagem:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:66 ../rpmdrake:707
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr "A verificar a assinaturas dos pacotes..."
+msgid "Security updates"
+msgstr "Actualizações de segurança"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:78
 #, c-format
-msgid "File transfer"
-msgstr "Transferência de ficheiros"
+msgid "Browse..."
+msgstr "Navegar..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:80
 #, c-format
-msgid "KDE and Qt"
-msgstr "KDE e Qt"
+msgid "Choose a mirror..."
+msgstr "Escolha um espelho..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:107
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Necessita preencher pelo menos as duas primeiras entradas."
+msgid "Login:"
+msgstr "Utilizador:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:107 ../edit-urpm-sources.pl:240
 #, c-format
-msgid "Type of medium:"
-msgstr "Tipo de média :"
+msgid "Password:"
+msgstr "Senha:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:112
 #, c-format
-msgid "Copying file for medium `%s'..."
-msgstr "A copiar o ficheiro para o média `%s'..."
+msgid "Name:"
+msgstr "Nome:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:116 ../edit-urpm-sources.pl:197
 #, c-format
-msgid "France"
-msgstr "França"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Caminho relativo para síntese/hdlist:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:117
 #, c-format
-msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Preciso contactar o servidor espelho para obter os últimos pacotes\n"
-"actualizados. Por favor verifique que a sua rede está a funcionar.\n"
-"\n"
-"Posso continuar?"
+msgid "If left blank, synthesis/hdlist will be automatically probed"
+msgstr "Se for deixado branco, synthesis/hdlist são automáticamente procurados"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:125
 #, c-format
-msgid "Search results"
-msgstr "Resultados da Pesquisa"
+msgid "You need to fill up at least the two first entries."
+msgstr "Necessita preencher pelo menos as duas primeiras entradas."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:129
 #, c-format
-msgid "Graphical desktop"
-msgstr "Ecrã gráfico"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Já existe um média com este nome, quere\n"
+"substituir-lo mesmo?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:138
 #, c-format
-msgid "Yes"
-msgstr "Sim"
+msgid "Adding a medium:"
+msgstr "A adicionar um média :"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:139
 #, c-format
-msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
-msgstr ""
-"A instalação acabou; %s.\n"
-"\n"
-"Alguns ficheiros de configuração foram criados como `.rpmnew' ou\n"
-"`.rpmsave', pode agora verificá-los para agir em conformidade:"
+msgid "Type of medium:"
+msgstr "Tipo de média :"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:143 ../edit-urpm-sources.pl:211
+#: ../edit-urpm-sources.pl:244 ../edit-urpm-sources.pl:317
+#: ../edit-urpm-sources.pl:355 ../edit-urpm-sources.pl:396
+#: ../edit-urpm-sources.pl:453 ../edit-urpm-sources.pl:517
+#: ../edit-urpm-sources.pl:554 ../edit-urpm-sources.pl:660 ../rpmdrake:88
+#: ../rpmdrake:511 ../rpmdrake:525 ../rpmdrake:529 ../rpmdrake:1084
+#: ../rpmdrake:1145 ../rpmdrake.pm:125 ../rpmdrake.pm:168 ../rpmdrake.pm:353
 #, c-format
-msgid "Edit a parallel group"
-msgstr "Editar um grupo paralelo"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:159 ../edit-urpm-sources.pl:205
+#: ../edit-urpm-sources.pl:211 ../edit-urpm-sources.pl:251
+#: ../edit-urpm-sources.pl:322 ../edit-urpm-sources.pl:356
+#: ../edit-urpm-sources.pl:403 ../edit-urpm-sources.pl:522 ../rpmdrake:88
+#: ../rpmdrake:511 ../rpmdrake:1145 ../rpmdrake:1151 ../rpmdrake.pm:353
+#: ../rpmdrake.pm:458
 #, c-format
-msgid ""
-"There was a problem adding medium:\n"
-"\n"
-"%s"
-msgstr ""
-"Ocorreu um problema enquanto adicionava o média :\n"
-"\n"
-"%s"
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:177
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Como escolher manualmente o seu espelho"
+msgid "Please wait, removing medium..."
+msgstr "Por favor aguarde, a remover o média..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:190
 #, c-format
-msgid "Publishing"
-msgstr "Publicar"
+msgid "Edit a medium"
+msgstr "Editar um média"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:194
 #, c-format
-msgid "Remove key"
-msgstr "Apagar chave"
+msgid "Editing medium \"%s\":"
+msgstr "A editar o média \"%s\" :"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:200
 #, c-format
-msgid "Package installation..."
-msgstr "A instalar os pacotes..."
+msgid "Save changes"
+msgstr "Gravar alterações"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:209
 #, c-format
-msgid "GNOME and GTK+"
-msgstr "GNOME e GTK+"
+msgid "You need to insert the medium to continue"
+msgstr "Necessita inserir o média para continuar"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:210
 #, c-format
-msgid "Select the media you wish to update:"
-msgstr "Seleccione os médias que deseja actualizar :"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Para gravar as mudanças, necessita inserir o média no leitor."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:226
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Remover Pacotes de Programas"
+msgid "Configure proxies"
+msgstr "Configurar os proxies"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:232
 #, c-format
-msgid "Shells"
-msgstr "Consolas"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Se precisa de um proxy, escreva o nome do servidor e em opção a porta "
+"(sintaxe <servidorproxy[:porta]>):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:234
 #, c-format
-msgid "Chemistry"
-msgstr "Química"
+msgid "Proxy hostname:"
+msgstr "Nome do servidor proxy:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:236
 #, c-format
-msgid "Choose a key for adding to the medium %s"
-msgstr "Escolha uma chave a adicionar ao média %s"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Pode indicar um utilizador/senha para a autenticação no proxy :"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:238
 #, c-format
-msgid "Add a key"
-msgstr "Adicionar uma chave"
+msgid "User:"
+msgstr "Utilizador:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:292
 #, c-format
-msgid "True type"
-msgstr "True type"
+msgid "Add a parallel group"
+msgstr "Adicionar um grupo paralelo"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:292
 #, c-format
-msgid "Base"
-msgstr "Base"
+msgid "Edit a parallel group"
+msgstr "Editar um grupo paralelo"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:303
 #, c-format
-msgid "Graphics"
-msgstr "Gráficos"
+msgid "Add a medium limit"
+msgstr "Adicionar um limite de média"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:313
 #, c-format
-msgid "Italy"
-msgstr "Itália"
+msgid "Choose a medium for adding in the media limit:"
+msgstr "Escolha um média a adicionar ao limite de média :"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:347
 #, c-format
-msgid ""
-"You are launching this program as a normal user.\n"
-"You will not be able to perform modifications on the system,\n"
-"but you may still browse the existing database."
-msgstr ""
-"Você lançou este programa como utilizador normal.\n"
-"Não vai poder operar mudanças no sistema, mas\n"
-"poderá examinar a base de dados actual."
+msgid "Add a host"
+msgstr "Adicionar um anfitrião"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:351
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Um dos pacotes seguintes é preciso:"
+msgid "Type in the hostname or IP address of the host to add:"
+msgstr "Escreva o nome ou o endereço IP do anfitrião a adicionar :"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:375
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Editing parallel group \"%s\":"
+msgstr "Edição do grupo paralelo \"%s\" :"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:377
 #, c-format
-msgid "Information on packages"
-msgstr "Informação sobre os pacotes..."
+msgid "Group name:"
+msgstr "Nome do grupo :"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:378
 #, c-format
-msgid "Proxy..."
-msgstr "Proxy..."
+msgid "Protocol:"
+msgstr "Protocolo :"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:380
 #, c-format
-msgid "Russia"
-msgstr "Rússia"
+msgid "Media limit:"
+msgstr "Limite do média :"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:385 ../edit-urpm-sources.pl:392
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Se precisa de um proxy, escreva o nome do servidor e em opção a porta "
-"(sintaxe <servidorproxy[:porta]>):"
+msgid "Add"
+msgstr "Adicionar"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:386 ../edit-urpm-sources.pl:393
+#: ../edit-urpm-sources.pl:442 ../edit-urpm-sources.pl:643 ../rpmdrake:909
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Por forma a satisfazer as dependências,estes pacotes devem ser\n"
-"de-seleccionados agora:\n"
-"\n"
+msgid "Remove"
+msgstr "Remover"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:387
 #, c-format
-msgid "Add a key..."
-msgstr "Adicionar uma chave ..."
+msgid "Hosts:"
+msgstr "Anfitriões :"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:417
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Configurar urpmi paralelo (execução distribuída do urpmi)"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Sound"
-msgstr "Som"
-
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid "Changelog:\n"
-msgstr "Evolução:\n"
+msgid "Group"
+msgstr "Grupo"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Preciso contactar o servidor MandrakeSoft para lhe pedir a lista dos\n"
-"servidores espelho. Por favor verifique que a sua rede está a funcionar.\n"
-"\n"
-"Posso continuar?"
+msgid "Protocol"
+msgstr "Protocolo"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Por favor aguarde, a procurar..."
+msgid "Media limit"
+msgstr "Limite de média"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:421
 #, c-format
 msgid "Command"
 msgstr "Commando"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../gurpmi.addmedia:1
+#: ../edit-urpm-sources.pl:431 ../rpmdrake:252 ../rpmdrake:269 ../rpmdrake:380
+#: ../rpmdrake:449
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Posso continuar?"
+msgid "(none)"
+msgstr "(nenhum)"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:444 ../edit-urpm-sources.pl:645
 #, c-format
-msgid "Literature"
-msgstr "Literatura"
+msgid "Edit"
+msgstr "Editar"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:449 ../edit-urpm-sources.pl:647
 #, c-format
-msgid "Initializing..."
-msgstr "A inicializar..."
+msgid "Add..."
+msgstr "Adicionar..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:461
 #, c-format
-msgid "Emulators"
-msgstr "Emuladores"
+msgid "Manage keys for digital signatures of packages"
+msgstr "Gerir as chaves para as assinaturas digitais dos pacotes"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:465 ../edit-urpm-sources.pl:585
 #, c-format
-msgid "Password:"
-msgstr "Senha:"
+msgid "Medium"
+msgstr "Média"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:470
 #, c-format
-msgid "Software Packages Installation"
-msgstr "Instalação de Pacotes de Programas"
+msgid "Keys"
+msgstr "Chaves"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:489
 #, c-format
-msgid "in descriptions"
-msgstr "nas descrições"
+msgid "no name found, key doesn't exist in rpm keyring!"
+msgstr "nenhum nome encontrado, a chave não existe na lista do rpm!"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:503
 #, c-format
-msgid " failed!"
-msgstr " falhou!"
+msgid "Add a key"
+msgstr "Adicionar uma chave"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:513
 #, c-format
-msgid "All packages, by update availability"
-msgstr "Todos os pacotes, por disponibilidade de actualização"
+msgid "Choose a key for adding to the medium %s"
+msgstr "Escolha uma chave a adicionar ao média %s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:534
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Alguns pacotes adicionais necessitam ser apagados"
+msgid "Remove a key"
+msgstr "Apagar uma chave"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:535
 #, c-format
-msgid "Packaging"
-msgstr "Pacotes"
+msgid ""
+"Are you sure you want to remove the key %s from medium %s?\n"
+"(name of the key: %s)"
+msgstr ""
+"Tem a certeza que deseja retirar a chave %s do média %s?\n"
+"(nome da chave : %s)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:548
 #, c-format
-msgid "Configure media"
-msgstr "Configurar os médias"
+msgid "Add a key..."
+msgstr "Adicionar uma chave ..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:550
 #, c-format
-msgid "United States"
-msgstr "Estados Unidos"
+msgid "Remove key"
+msgstr "Apagar chave"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:562
 #, c-format
-msgid "Greece"
-msgstr "Grécia"
+msgid "Configure media"
+msgstr "Configurar os médias"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:584
 #, c-format
-msgid "GNOME"
-msgstr "GNOME"
+msgid "Enabled?"
+msgstr "Activado?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:595
 #, c-format
-msgid "Monitoring"
-msgstr "Monitorização"
+msgid "Update medium"
+msgstr "Actualizar médias"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:595
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Regenerate hdlist"
+msgstr "Regenerar o hdlist"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:607 ../rpmdrake.pm:421
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "Alguns pacotes não podem ser instalados"
+msgid "Please wait, updating media..."
+msgstr "Por favor aguarde, a actualizar o média..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:611
 #, c-format
-msgid "The help window has been started, it should appear shortly on your desktop."
-msgstr "A janela de ajuda foi lançada, vai aparecer em breve no seu ecrã;"
+msgid "Please wait, generating hdlist..."
+msgstr "Por favor aguarde, a criar o hdlist..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:649
 #, c-format
-msgid "No mirror"
-msgstr "Nenhum espelho"
+msgid "Update..."
+msgstr "Actualizar..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:650
 #, c-format
-msgid "Reload the packages list"
-msgstr "Recarregar a lista dos pacotes"
+msgid "Manage keys..."
+msgstr "Gerir as chaves ..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:651
 #, c-format
-msgid "Poland"
-msgstr "Polónia"
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:652
 #, c-format
-msgid "Path or mount point:"
-msgstr "Caminho ou ponto de montagem:"
+msgid "Parallel..."
+msgstr "Paralelo..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:655 ../rpmdrake:901
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Por favor aguarde, estou a descarregar os endereços dos espelhos a partir da "
-"MandrakeSoft."
+msgid "Help"
+msgstr "Ajuda"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:657 ../rpmdrake:904
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Escolha um espelho..."
+msgid "Help launched in background"
+msgstr "Ajuda lançada por trás"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:658 ../rpmdrake:905
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"The help window has been started, it should appear shortly on your desktop."
+msgstr "A janela de ajuda foi lançada, vai aparecer em breve no seu ecrã;"
+
+#: ../edit-urpm-sources.pl:669 ../gurpmi.addmedia:75 ../rpmdrake:1338
+#, c-format
+msgid ""
+"%s\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"atenção : parece que está adicionando tantos pacotes que o\n"
-"seu sistema de ficheiros vai faltar de espaço, durante ou\n"
-"depois da instalação ; isto é muito perigoso e deveria ser\n"
-"considerado com atenção.\n"
+"%s\n"
 "\n"
-"Deseja mesmo assim instalar todos os pacotes seleccionados ?"
+"Posso continuar?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:672
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Tamanho da selecção: %d MB"
+msgid ""
+"Welcome to the Software Media Manager!\n"
+"\n"
+"This tool will help you configure the packages media you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Seja Bem-vindo ao Editor de Médias de Programas!\n"
+"\n"
+"Esta ferramenta vai ajudá-lo a escolher os médias de pacotes que\n"
+"desejautilizar no seu computador. Elas serão então disponíveis para\n"
+"instalar novos programas ou para fazer actualizações."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:684
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Por favor aguarde, a ler a base de dados dos pacotes..."
+msgid ""
+"Packages database is locked. Please close other applications\n"
+"working with packages database (do you have another media\n"
+"manager on another desktop, or are you currently installing\n"
+"packages as well?)."
+msgstr ""
+"A lista dos pacotes está bloqueada. Por favor feche\n"
+"os outros programas que utilizam a lista (pode ter\n"
+"outra janela do gestor de pacotes noutro ecrã, ou\n"
+"senão estará a instalar pacotes?)."
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:70
 #, c-format
-msgid "Add a medium"
-msgstr "Adicionar um média"
+msgid "Unable to add medium, wrong or missing arguments"
+msgstr "Incapaz de adicionar um média, faltam parametros ou são errados"
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:78
 #, c-format
-msgid "Update medium"
-msgstr "Actualizar médias"
+msgid ""
+"You are about to add a new packages medium, `%s'.\n"
+"That means you will be able to add new software packages\n"
+"to your system from that new medium."
+msgstr ""
+"Você está prestes a adicionar um novo média de pacotes, '%s'.\n"
+"Isso significa que vai poder adicionar novos pacotes de programas ao seu "
+"sistema a partir desse média."
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:87
 #, c-format
-msgid "In order to save the changes, you need to insert the medium in the drive."
-msgstr "Para gravar as mudanças, necessita inserir o média no leitor."
+msgid "Successfully added medium `%s'."
+msgstr "O média foi adicionado, '%s'."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:85
 #, c-format
-msgid "All packages, by size"
-msgstr "Todos os pacotes, por tamanho"
+msgid "Running in user mode"
+msgstr "Lançado em modo utilizador"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:86
 #, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+"You are launching this program as a normal user.\n"
+"You will not be able to perform modifications on the system,\n"
+"but you may still browse the existing database."
 msgstr ""
-"Ocorreu um problema ao apagar os pacotes :\n"
-"\n"
-"%s"
+"Você lançou este programa como utilizador normal.\n"
+"Não vai poder operar mudanças no sistema, mas\n"
+"poderá examinar a base de dados actual."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:93
 #, c-format
-msgid "Examining file of medium `%s'..."
-msgstr "A examinar o ficheiro do média `%s'..."
+msgid "Accessibility"
+msgstr "Acessibilidade"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:94 ../rpmdrake:95 ../rpmdrake:96 ../rpmdrake:97 ../rpmdrake:98
+#: ../rpmdrake:99 ../rpmdrake:100 ../rpmdrake:101 ../rpmdrake:102
+#: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
+#: ../rpmdrake:107 ../rpmdrake:108 ../rpmdrake:109
 #, c-format
-msgid "Path:"
-msgstr "Caminho:"
+msgid "System"
+msgstr "Sistema"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:94
 #, c-format
-msgid "IRC"
-msgstr "IRC"
+msgid "Servers"
+msgstr "Servidores"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:95
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "A descarregar o pacote '%s' (%s/%s)..."
+msgid "Kernel and hardware"
+msgstr "Núcleo e material"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:96
 #, c-format
-msgid "Protocol:"
-msgstr "Protocolo :"
+msgid "Libraries"
+msgstr "Livrarias"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:97
 #, c-format
-msgid "C"
-msgstr "C"
+msgid "XFree86"
+msgstr "XFree86"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:98 ../rpmdrake:99 ../rpmdrake:100 ../rpmdrake:101
 #, c-format
-msgid "Other"
-msgstr "Outro"
+msgid "Fonts"
+msgstr "Tipos de Letra"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:98
 #, c-format
-msgid "Sweden"
-msgstr "Suécia"
+msgid "Console"
+msgstr "Consola"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:99
 #, c-format
-msgid "Boards"
-msgstr "Tabuleiros"
+msgid "True type"
+msgstr "True type"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:100
 #, c-format
-msgid "Austria"
-msgstr "Áustria"
+msgid "Type1"
+msgstr "Tipo1"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:101
 #, c-format
-msgid "Faqs"
-msgstr "Faqs"
+msgid "X11 bitmap"
+msgstr "Bitmap X11"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:102
 #, c-format
-msgid "Info..."
-msgstr "Informação..."
+msgid "Base"
+msgstr "Base"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
+#: ../rpmdrake:107 ../rpmdrake:108
 #, c-format
-msgid "Inspect..."
-msgstr "Inspeccionar..."
+msgid "Configuration"
+msgstr "Configuração"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:103
 #, c-format
-msgid "Japan"
-msgstr "Japão"
+msgid "Hardware"
+msgstr "Material"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:104
 #, c-format
-msgid "Summary: "
-msgstr "Resumo: "
+msgid "Packaging"
+msgstr "Pacotes"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:105 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
+#: ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154 ../rpmdrake:155
+#: ../rpmdrake:156 ../rpmdrake:157
 #, c-format
-msgid "Backup"
-msgstr "Arquivar"
+msgid "Networking"
+msgstr "Rede"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:106
+#, c-format
+msgid "Printing"
+msgstr "Imprimir"
+
+#: ../rpmdrake:107
 #, c-format
 msgid "Boot and Init"
 msgstr "Arranque e Inicialização"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:108 ../rpmdrake:119 ../rpmdrake:127 ../rpmdrake:139
+#: ../rpmdrake:144 ../rpmdrake:157 ../rpmdrake:171 ../rpmdrake:176
+#: ../rpmdrake:230
 #, c-format
-msgid "FTP server"
-msgstr "Servidor FTP"
+msgid "Other"
+msgstr "Outro"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:109
 #, c-format
-msgid "Remove .%s"
-msgstr "Remover %s"
+msgid "Internationalization"
+msgstr "Internacionalização"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112 ../rpmdrake:113
+#: ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116 ../rpmdrake:117
+#: ../rpmdrake:118 ../rpmdrake:119
 #, c-format
-msgid "Importance: "
-msgstr "Importância: "
+msgid "Development"
+msgstr "Desenvolvimento"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:110
 #, c-format
-msgid "WWW"
-msgstr "WWW"
+msgid "Kernel"
+msgstr "Núcleo"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:111 ../rpmdrake:129
 #, c-format
-msgid "Unable to create medium."
-msgstr "Impossível criar o média."
+msgid "Databases"
+msgstr "Bases de Dados"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:112
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Os pacotes seguintes têm de ser apagados para que outros sejam "
-"actualizados :\n"
-"\n"
-"%s\n"
-"\n"
-"Posso continuar?"
+msgid "Perl"
+msgstr "Perl"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:113
 #, c-format
-msgid ""
-"Welcome to the Software Media Manager!\n"
-"\n"
-"This tool will help you configure the packages media you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Seja Bem-vindo ao Editor de Médias de Programas!\n"
-"\n"
-"Esta ferramenta vai ajudá-lo a escolher os médias de pacotes que\n"
-"desejautilizar no seu computador. Elas serão então disponíveis para\n"
-"instalar novos programas ou para fazer actualizações."
+msgid "Python"
+msgstr "Python"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:114
 #, c-format
-msgid "Medium"
-msgstr "Média"
+msgid "C"
+msgstr "C"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:115
 #, c-format
-msgid "Size: "
-msgstr "Tamanho: "
+msgid "C++"
+msgstr "C++"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:116
 #, c-format
-msgid "Office"
-msgstr "Escritório"
+msgid "Java"
+msgstr "Java"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:117
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Tudo se instalou com sucesso"
+msgid "GNOME and GTK+"
+msgstr "GNOME e GTK+"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:118
 #, c-format
-msgid "Add a parallel group"
-msgstr "Adicionar um grupo paralelo"
+msgid "KDE and Qt"
+msgstr "KDE e Qt"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:120 ../rpmdrake:121 ../rpmdrake:122 ../rpmdrake:123
+#: ../rpmdrake:124 ../rpmdrake:125 ../rpmdrake:126 ../rpmdrake:127
 #, c-format
-msgid "Update media"
-msgstr "Actualizar média"
+msgid "Sciences"
+msgstr "Ciências"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:120
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "A instalar o pacote '%s' (%s/%s)..."
+msgid "Astronomy"
+msgstr "Astronomia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:121
 #, c-format
-msgid "Parallel..."
-msgstr "Paralelo..."
+msgid "Biology"
+msgstr "Biologia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:122
 #, c-format
-msgid "in names"
-msgstr "nos nomes"
+msgid "Chemistry"
+msgstr "Química"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:123
 #, c-format
-msgid "Not selected"
-msgstr "Não escolhido"
+msgid "Computer science"
+msgstr "Computadores"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:124
 #, c-format
-msgid "Problem during installation"
-msgstr "Problema durante a instalação"
+msgid "Geosciences"
+msgstr "Geo-ciências"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:125
 #, c-format
-msgid "Terminals"
-msgstr "Terminais"
+msgid "Mathematics"
+msgstr "Matemáticas"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:126
 #, c-format
-msgid "Kernel and hardware"
-msgstr "Núcleo e material"
+msgid "Physics"
+msgstr "Física"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:128
 #, c-format
-msgid "Edit"
-msgstr "Editar"
+msgid "Communications"
+msgstr "Comunicações"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:130
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Selecção: %d MB / Espaço disponível no disco: %d MB"
+msgid "Editors"
+msgstr "Editores"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:131
 #, c-format
-msgid "Australia"
-msgstr "Austrália"
+msgid "Emulators"
+msgstr "Emuladores"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
+#: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
 #, c-format
-msgid "Security updates"
-msgstr "Actualizações de segurança"
+msgid "Games"
+msgstr "Jogos"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:132
 #, c-format
-msgid "Korea"
-msgstr "Coreia"
+msgid "Adventure"
+msgstr "Aventura"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:133
 #, c-format
-msgid "Examining remote file of medium `%s'..."
-msgstr "A examinar o ficheiro distante do média `%s'..."
+msgid "Arcade"
+msgstr "Arcada"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:134
 #, c-format
-msgid "All packages, by group"
-msgstr "Todos os pacotes, por grupo"
+msgid "Boards"
+msgstr "Tabuleiros"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:135
 #, c-format
-msgid "Kernel"
-msgstr "Núcleo"
+msgid "Cards"
+msgstr "Cartas"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:136
 #, c-format
-msgid "Console"
-msgstr "Consola"
+msgid "Puzzles"
+msgstr "Puzzles"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:137
 #, c-format
-msgid "C++"
-msgstr "C++"
+msgid "Sports"
+msgstr "Desporto"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:138
 #, c-format
-msgid "Netherlands"
-msgstr "Holanda"
+msgid "Strategy"
+msgstr "Estratégia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:140
 #, c-format
-msgid "Search results (none)"
-msgstr "Resultados da Pesquisa (nenhum)"
+msgid "Toys"
+msgstr "Brinquedos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143 ../rpmdrake:144
 #, c-format
-msgid "Adventure"
-msgstr "Aventura"
+msgid "Archiving"
+msgstr "Arquivar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:141
+#, c-format
+msgid "Compression"
+msgstr "Compressão"
+
+#: ../rpmdrake:142
 #, c-format
 msgid "Cd burning"
 msgstr "Gravar Cd"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:143
 #, c-format
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Seja bem-vindo à ferramenta de instalação de programas!\n"
-"\n"
-"O seu sistema Linux Mandrake vem com várias centenas de pacotes de\n"
-"programas nos CDROM ou DVD. Esta ferramenta vai ajudá-lo a escolher\n"
-"quais os programas que deseja instalar no seu computador."
+msgid "Backup"
+msgstr "Arquivar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:145
 #, c-format
-msgid "Stop"
-msgstr "Parar"
+msgid "Monitoring"
+msgstr "Monitorização"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:146
 #, c-format
-msgid "Biology"
-msgstr "Biologia"
+msgid "Sound"
+msgstr "Som"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:147
 #, c-format
-msgid "Please wait, generating hdlist..."
-msgstr "Por favor aguarde, a criar o hdlist..."
+msgid "Graphics"
+msgstr "Gráficos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:148
 #, c-format
-msgid "Mathematics"
-msgstr "Matemáticas"
+msgid "Video"
+msgstr "Vídeo"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:149
 #, c-format
-msgid "Internationalization"
-msgstr "Internacionalização"
+msgid "File transfer"
+msgstr "Transferência de ficheiros"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:150
 #, c-format
-msgid "Edit a medium"
-msgstr "Editar um média"
+msgid "IRC"
+msgstr "IRC"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:151
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"Já existe um média com este nome, quere\n"
-"substituir-lo mesmo?"
+msgid "Instant messaging"
+msgstr "Mensagens Instantâneas"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:152
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Por forma a satisfazer as dependências,estes pacotes devem ser\n"
-"instalados:\n"
-"\n"
+msgid "Chat"
+msgstr "Discussão (Chat)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:153
 #, c-format
-msgid "HTTP server"
-msgstr "Servidor HTTP"
+msgid "News"
+msgstr "Forums"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:154
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Erro irrecuperável : nenhum pacote encontrado para  instalar, desculpe."
+msgid "Mail"
+msgstr "Correio"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:155
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "Alguns pacotes não podem ser apagados"
+msgid "WWW"
+msgstr "WWW"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:156
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s"
-msgstr ""
-"Lamento, os pacotes seguintes não podem ser seleccionados :\n"
-"\n"
-"%s"
+msgid "Remote access"
+msgstr "Acesso remoto"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:158
 #, c-format
-msgid "Finland"
-msgstr "Finlândia"
+msgid "Office"
+msgstr "Escritório"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:159
 #, c-format
-msgid "X11 bitmap"
-msgstr "Bitmap X11"
+msgid "Publishing"
+msgstr "Publicar"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:160
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Problema ao adicionar o média"
+msgid "Terminals"
+msgstr "Terminais"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:161
 #, c-format
-msgid "Media limit:"
-msgstr "Limite do média :"
+msgid "Shells"
+msgstr "Consolas"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:162
 #, c-format
-msgid "More information on package..."
-msgstr "Mais informação sobre o pacote..."
+msgid "File tools"
+msgstr "Ferramentas de ficheiros"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:163
 #, c-format
-msgid "Save changes"
-msgstr "Gravar alterações"
+msgid "Text tools"
+msgstr "Ferramentas de texto"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166 ../rpmdrake:167
+#: ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170 ../rpmdrake:171
 #, c-format
-msgid "Instant messaging"
-msgstr "Mensagens Instantâneas"
+msgid "Graphical desktop"
+msgstr "Ecrã gráfico"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:164
 #, c-format
-msgid "News"
-msgstr "Forums"
+msgid "GNOME"
+msgstr "GNOME"
 
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../rpmdrake:165
 #, c-format
-msgid "More info"
-msgstr "Mais informações"
+msgid "Icewm"
+msgstr "Icewm"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:166
 #, c-format
-msgid "Search"
-msgstr "Procurar"
+msgid "FVWM based"
+msgstr "Baseado em FVWM"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:167
 #, c-format
-msgid "Computer books"
-msgstr "Livros de computadores"
+msgid "KDE"
+msgstr "KDE"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:168
 #, c-format
-msgid "If left blank, synthesis/hdlist will be automatically probed"
-msgstr "Se for deixado branco, synthesis/hdlist são automáticamente procurados"
+msgid "Sawfish"
+msgstr "Sawfish"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:169
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Não consigo encontrar nenhum servidor espelho que convenha.\n"
-"\n"
-"Há várias razoes para este problema ; a mais habitual é o caso\n"
-"em que a arquitectura do seu processador não é suportada pelas\n"
-"Actualizações Oficiais da Mandrake Linux."
+msgid "WindowMaker"
+msgstr "WindowMaker"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:170
 #, c-format
-msgid "Spain"
-msgstr "Espanha"
+msgid "Enlightenment"
+msgstr "Enlightenment"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175
+#: ../rpmdrake:176
 #, c-format
-msgid "Already existing update media"
-msgstr "Este média de actualização já existe"
+msgid "Books"
+msgstr "Livros"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:172
 #, c-format
-msgid "Files:\n"
-msgstr "Ficheiros:\n"
+msgid "Howtos"
+msgstr "Como fazer"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:173
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Impossível descarregar os pacotes da fonte"
+msgid "Faqs"
+msgstr "Faqs"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:174
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Pode indicar um utilizador/senha para a autenticação no proxy :"
+msgid "Computer books"
+msgstr "Livros de computadores"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:175
 #, c-format
-msgid "Chat"
-msgstr "Discussão (Chat)"
+msgid "Literature"
+msgstr "Literatura"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:275 ../rpmdrake:637 ../rpmdrake:638
 #, c-format
-msgid "Update"
-msgstr "Actualizar"
+msgid "(Not available)"
+msgstr "(Não disponível)"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:303 ../rpmdrake:361
 #, c-format
-msgid "Additional packages needed"
-msgstr "Pacotes adicionais necessários"
+msgid "Search results"
+msgstr "Resultados da Pesquisa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:303
 #, c-format
-msgid "Running in user mode"
-msgstr "Lançado em modo utilizador"
+msgid "Search results (none)"
+msgstr "Resultados da Pesquisa (nenhum)"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:313 ../rpmdrake:324
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Media Manager, and then add a `Security\n"
-"updates' medium.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Também pode escolher o servidor espelho desejado manualmente :\n"
-"para isso, lance o Gestor de Médias de Programas, e adicione um\n"
-"média de 'Actualizações de Segurança'.\n"
-"\n"
-"Depois, relance MandrakeUpdate."
+msgid "Please wait, searching..."
+msgstr "Por favor aguarde, a procurar..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:327
 #, c-format
-msgid "Adding a medium:"
-msgstr "A adicionar um média :"
+msgid "Stop"
+msgstr "Parar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:362 ../rpmdrake:478
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Por forma a satisfazer as dependências,estes pacotes também\n"
-"necessitam ser removidos:\n"
-"\n"
+msgid "Upgradable"
+msgstr "Actualizar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:362 ../rpmdrake:478
 #, c-format
-msgid ""
-"You already have at least one update medium configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Media Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Já há pelo menos um média de actualização configurado, mas\n"
-"estão todos desactivados. Deveria lançar o Editor de Médias\n"
-"de Programas para activar pelo menos um (marque-o na coluna\n"
-"Activo?).\n"
-"\n"
-"Poderá então relançar MandrakeUpdate."
+msgid "Addable"
+msgstr "Instalar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:364
 #, c-format
-msgid "Find:"
-msgstr "Procurar:"
+msgid "Selected"
+msgstr "Selecionado"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:364
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Por favor aguarde, a listar os pacotes..."
+msgid "Not selected"
+msgstr "Não escolhido"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:398
 #, c-format
-msgid "All"
-msgstr "Tudo"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:416 ../rpmdrake:520 ../rpmdrake:522
 #, c-format
-msgid "XFree86"
-msgstr "XFree86"
+msgid "More information on package..."
+msgstr "Mais informação sobre o pacote..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:417
 #, c-format
-msgid "Normal information"
-msgstr "Informações normais"
+msgid "Please choose"
+msgstr "Por favor escolha"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:417
 #, c-format
-msgid "Removable device"
-msgstr "Dispositivo amovível"
+msgid "One of the following packages is needed:"
+msgstr "Um dos pacotes seguintes é preciso:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:437
 #, c-format
-msgid "Preparing packages installation..."
-msgstr "A preparar a instalação dos pacotes..."
+msgid "Please wait, listing packages..."
+msgstr "Por favor aguarde, a listar os pacotes..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:451
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Por favor aguarde, a remover os pacotes..."
+msgid "No update"
+msgstr "Nenhuma actualização"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:452
 #, c-format
-msgid "Login:"
-msgstr "Utilizador:"
+msgid ""
+"The list of updates is empty. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+"A lista das actualizações está vazia. Isto significa que ou\n"
+"não há actualizações para os pacotes instalados no seu\n"
+"computador, ou você já as instalou todas."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:472
 #, c-format
-msgid "Belgium"
-msgstr "Bélgica"
+msgid "All"
+msgstr "Tudo"
 
-#: ../rpmdrake:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:511 ../rpmdrake:514
 #, c-format
-msgid "File tools"
-msgstr "Ferramentas de ficheiros"
+msgid "More info"
+msgstr "Mais informações"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:515
 #, c-format
-msgid "Configure proxies"
-msgstr "Configurar os proxies"
+msgid "Information on packages"
+msgstr "Informação sobre os pacotes..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:537
 #, c-format
-msgid "Printing"
-msgstr "Imprimir"
+msgid "Some additional packages need to be removed"
+msgstr "Alguns pacotes adicionais necessitam ser apagados"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:538
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "A começar o descarregamento de '%s'..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Por forma a satisfazer as dependências,estes pacotes também\n"
+"necessitam ser removidos:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:544 ../rpmdrake:553
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Um erro fatal ocorreu : %s."
+msgid "Some packages can't be removed"
+msgstr "Alguns pacotes não podem ser apagados"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:545
 #, c-format
-msgid "Fatal error"
-msgstr "Erro fatal"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Lamento, mas a remoção estes pacotes arruinará o seu sistema :\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:554 ../rpmdrake:607
 #, c-format
-msgid "Leaves only, sorted by install date"
-msgstr "Só as folhas, por data de instalação"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Por forma a satisfazer as dependências,estes pacotes devem ser\n"
+"de-seleccionados agora:\n"
+"\n"
+
+#: ../rpmdrake:577
+#, c-format
+msgid "Additional packages needed"
+msgstr "Pacotes adicionais necessários"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:578
 #, c-format
 msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
-"Errors:\n"
-"%s"
 msgstr ""
-"Impossível de actualizar o média, vai ser automaticamente desactivado.\n"
+"Por forma a satisfazer as dependências,estes pacotes devem ser\n"
+"instalados:\n"
 "\n"
-"Erros :\n"
-"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:592
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Alguns pacotes não podem ser instalados"
+
+#: ../rpmdrake:593
 #, c-format
 msgid ""
-"The list of updates is empty. This means that either there is\n"
-"no available update for the packages installed on your computer,\n"
-"or you already installed all of them."
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
 msgstr ""
-"A lista das actualizações está vazia. Isto significa que ou\n"
-"não há actualizações para os pacotes instalados no seu\n"
-"computador, ou você já as instalou todas."
+"Lamento, os pacotes seguintes não podem ser seleccionados :\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:606 ../rpmdrake:858
 #, c-format
-msgid "Geosciences"
-msgstr "Geo-ciências"
+msgid "Some packages need to be removed"
+msgstr "Alguns pacotes necessitam ser removidos"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:625
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Por favor escolha o espelho desejado."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Selecção: %d MB / Espaço disponível no disco: %d MB"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:627
 #, c-format
-msgid "Communications"
-msgstr "Comunicações"
+msgid "Selected size: %d MB"
+msgstr "Tamanho da selecção: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:635
 #, c-format
-msgid "Editing parallel group \"%s\":"
-msgstr "Edição do grupo paralelo \"%s\" :"
+msgid "Files:\n"
+msgstr "Ficheiros:\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:638
 #, c-format
-msgid "Configuration"
-msgstr "Configuração"
+msgid "Changelog:\n"
+msgstr "Evolução:\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:640
 #, c-format
-msgid "Reason for update: "
-msgstr "Motivo de actualização: "
+msgid "Medium: "
+msgstr "Média : "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:642
 #, c-format
-msgid "Remove"
-msgstr "Remover"
+msgid "Currently installed version: "
+msgstr "Versão actualmente instalada: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:646
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid "Name: "
+msgstr "Nome: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:647
 #, c-format
-msgid "Czech Republic"
-msgstr "Republica Checa"
+msgid "Version: "
+msgstr "Versão: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:648
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Alguns pacotes necessitam ser removidos"
+msgid "Size: "
+msgstr "Tamanho: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:648
 #, c-format
-msgid "Problem during removal"
-msgstr "Problema durante a remoção"
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:650
 #, c-format
-msgid "WindowMaker"
-msgstr "WindowMaker"
+msgid "Importance: "
+msgstr "Importância: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:652
 #, c-format
-msgid "Help launched in background"
-msgstr "Ajuda lançada por trás"
+msgid "Summary: "
+msgstr "Resumo: "
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake:654
 #, c-format
-msgid "Unable to add medium, wrong or missing arguments"
-msgstr "Incapaz de adicionar um média, faltam parametros ou são errados"
+msgid "Reason for update: "
+msgstr "Motivo de actualização: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:656
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Ocorreu um problema durante a instalação :\n"
-"\n"
-"%s"
+msgid "Description: "
+msgstr "Descrição: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:707
 #, c-format
-msgid "No package found for installation."
-msgstr "Não encontrei nenhum pacote a instalar."
+msgid "Bugfixes updates"
+msgstr "Actualizações de Correcção de Erros"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:707
 #, c-format
-msgid "Type1"
-msgstr "Tipo1"
+msgid "Normal updates"
+msgstr "Actualizações normais"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:724
 #, c-format
-msgid "Medium: "
-msgstr "Média : "
+msgid "Mandrake choices"
+msgstr "Selecção da Mandrake"
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake:725
 #, c-format
-msgid "Successfully added medium `%s'."
-msgstr "O média foi adicionado, '%s'."
+msgid "All packages, alphabetical"
+msgstr "Todos os pacotes, alfabeticamente"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:731
 #, c-format
-msgid "Strategy"
-msgstr "Estratégia"
+msgid "All packages, by group"
+msgstr "Todos os pacotes, por grupo"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:731
 #, c-format
-msgid "Description: "
-msgstr "Descrição: "
+msgid "All packages, by size"
+msgstr "Todos os pacotes, por tamanho"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:732
 #, c-format
-msgid "Archiving"
-msgstr "Arquivar"
+msgid "All packages, by selection state"
+msgstr "Todos os pacotes, por estado de selecção"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:733
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "All packages, by medium repository"
+msgstr "Todos os pacotes, por média de origem"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:733
 #, c-format
-msgid "System"
-msgstr "Sistema"
+msgid "All packages, by update availability"
+msgstr "Todos os pacotes, por disponibilidade de actualização"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:734
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Todos os pacotes pedidos foram instalados com sucesso."
+msgid "Leaves only, sorted by install date"
+msgstr "Só as folhas, por data de instalação"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Servers"
-msgstr "Servidores"
+msgid "in names"
+msgstr "nos nomes"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Puzzles"
-msgstr "Puzzles"
+msgid "in descriptions"
+msgstr "nas descrições"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Local files"
-msgstr "Ficheiros Locais"
+msgid "in file names"
+msgstr "nos nomes dos ficheiros"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:796
 #, c-format
-msgid "Choose a medium for adding in the media limit:"
-msgstr "Escolha um média a adicionar ao limite de média :"
+msgid "Reset the selection"
+msgstr "Inicializar a selecção"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:796
 #, c-format
-msgid "Addable"
-msgstr "Instalar"
+msgid "Reload the packages list"
+msgstr "Recarregar a lista dos pacotes"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:797 ../rpmdrake.pm:443
 #, c-format
-msgid "Keys"
-msgstr "Chaves"
+msgid "Update media"
+msgstr "Actualizar média"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:822
 #, c-format
-msgid "Please choose"
-msgstr "Por favor escolha"
+msgid "Normal information"
+msgstr "Informações normais"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:822
 #, c-format
-msgid "Databases"
-msgstr "Bases de Dados"
+msgid "Maximum information"
+msgstr "Informações completas"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:842
 #, c-format
-msgid ""
-"Are you sure you want to remove the key %s from medium %s?\n"
-"(name of the key: %s)"
-msgstr ""
-"Tem a certeza que deseja retirar a chave %s do média %s?\n"
-"(nome da chave : %s)"
+msgid "You need to select some packages first."
+msgstr "É preciso escolher alguns pacotes primeiro."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:847
 #, c-format
-msgid "Name: "
-msgstr "Nome: "
+msgid "Too many packages are selected"
+msgstr "Demasiados pacotes seleccionados"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:848
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Nome do servidor proxy:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"atenção : parece que está adicionando tantos pacotes que o\n"
+"seu sistema de ficheiros vai faltar de espaço, durante ou\n"
+"depois da instalação ; isto é muito perigoso e deveria ser\n"
+"considerado com atenção.\n"
+"\n"
+"Deseja mesmo assim instalar todos os pacotes seleccionados ?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:859
 #, c-format
 msgid ""
-"The following packages have bad signatures:\n"
+"The following packages have to be removed for others to be upgraded:\n"
 "\n"
 "%s\n"
 "\n"
-"Do you want to continue installation?"
+"Is it ok to continue?"
 msgstr ""
-"Os pacotes seguintes têm assinaturas erradas :\n"
+"Os pacotes seguintes têm de ser apagados para que outros sejam "
+"actualizados :\n"
 "\n"
 "%s\n"
 "\n"
-"Deseja continuar a instalação?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "A inspeccionar %s"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Descarregamento de `%s', velocidade:%s"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Hosts:"
-msgstr "Anfitriões :"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Video"
-msgstr "Vídeo"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Perl"
-msgstr "Perl"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Normal updates"
-msgstr "Actualizações normais"
+"Posso continuar?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:884
 #, c-format
-msgid "Manage keys..."
-msgstr "Gerir as chaves ..."
+msgid "Software Packages Removal"
+msgstr "Remover Pacotes de Programas"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:885
 #, c-format
-msgid "Maximum information"
-msgstr "Informações completas"
+msgid "Mandrake Update"
+msgstr "Actualizações Mandrake"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:886
 #, c-format
-msgid "Selected"
-msgstr "Selecionado"
+msgid "Software Packages Installation"
+msgstr "Instalação de Pacotes de Programas"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:893
 #, c-format
-msgid "Computer science"
-msgstr "Computadores"
+msgid "Find:"
+msgstr "Procurar:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:898
 #, c-format
-msgid "Fonts"
-msgstr "Tipos de Letra"
+msgid "Search"
+msgstr "Procurar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:909
 #, c-format
-msgid "Hardware"
-msgstr "Material"
+msgid "Install"
+msgstr "Instalar"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:911
 #, c-format
 msgid "Quit"
 msgstr "Sair"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:938
 #, c-format
-msgid "Version: "
-msgstr "Versão: "
+msgid "Fatal error"
+msgstr "Erro fatal"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:939
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Utilizar .%s como ficheiro principal"
+msgid "A fatal error occurred: %s."
+msgstr "Um erro fatal ocorreu : %s."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:947
 #, c-format
-msgid "Norway"
-msgstr "Noruega"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Preciso contactar o servidor espelho para obter os últimos pacotes\n"
+"actualizados. Por favor verifique que a sua rede está a funcionar.\n"
+"\n"
+"Posso continuar?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:956
 #, c-format
-msgid "Israel"
-msgstr "Israel"
+msgid "Already existing update media"
+msgstr "Este média de actualização já existe"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:957
 #, c-format
-msgid "China"
-msgstr "China"
+msgid ""
+"You already have at least one update medium configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Media Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Já há pelo menos um média de actualização configurado, mas\n"
+"estão todos desactivados. Deveria lançar o Editor de Médias\n"
+"de Programas para activar pelo menos um (marque-o na coluna\n"
+"Activo?).\n"
+"\n"
+"Poderá então relançar MandrakeUpdate."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:967
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Como escolher manualmente o seu espelho"
+
+#: ../rpmdrake:968
 #, c-format
 msgid ""
-"Welcome to the software removal tool!\n"
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Media Manager, and then add a `Security\n"
+"updates' medium.\n"
 "\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Seja bem-vindo à ferramenta de remoção de programas!\n"
+"Também pode escolher o servidor espelho desejado manualmente :\n"
+"para isso, lance o Gestor de Médias de Programas, e adicione um\n"
+"média de 'Actualizações de Segurança'.\n"
 "\n"
-"Esta ferramenta vai ajudá-lo a escolher quais os programas que deseja\n"
-"remover do seu computador."
+"Depois, relance MandrakeUpdate."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:996
 #, c-format
-msgid "(Not available)"
-msgstr "(Não disponível)"
+msgid "Please wait, finding available packages..."
+msgstr "Por favor aguarde, a procurar os pacotes disponíveis..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1029
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Actualizações de Correcção de Erros"
+msgid "Inspecting %s"
+msgstr "A inspeccionar %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1048
 #, c-format
-msgid "Java"
-msgstr "Java"
+msgid "changes:"
+msgstr "mudanças:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1052
 #, c-format
-msgid "Update..."
-msgstr "Actualizar..."
+msgid "Remove .%s"
+msgstr "Remover %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1054
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Por favor aguarde, a procurar os pacotes disponíveis..."
+msgid "Use .%s as main file"
+msgstr "Utilizar .%s como ficheiro principal"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1056
 #, c-format
-msgid "Cancel"
-msgstr "Cancelar"
+msgid "Do nothing"
+msgstr "Não fazer nada"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1068
 #, c-format
-msgid "Sciences"
-msgstr "Ciências"
+msgid "Installation finished"
+msgstr "A instalação acabou"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1078
 #, c-format
-msgid "Enabled?"
-msgstr "Activado?"
+msgid "Inspect..."
+msgstr "Inspeccionar..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1104 ../rpmdrake:1229
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Todos os pacotes, alfabeticamente"
+msgid "Everything installed successfully"
+msgstr "Tudo se instalou com sucesso"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1105 ../rpmdrake:1230
 #, c-format
-msgid "Mandrake choices"
-msgstr "Selecção da Mandrake"
+msgid "All requested packages were installed successfully."
+msgstr "Todos os pacotes pedidos foram instalados com sucesso."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1107 ../rpmdrake:1214
 #, c-format
-msgid "Toys"
-msgstr "Brinquedos"
+msgid "Problem during installation"
+msgstr "Problema durante a instalação"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1108 ../rpmdrake:1215 ../rpmdrake:1244
 #, c-format
-msgid "Installation finished"
-msgstr "A instalação acabou"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Ocorreu um problema durante a instalação :\n"
+"\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1129
 #, c-format
-msgid " done."
-msgstr " feito."
+msgid "Unable to get source packages."
+msgstr "Impossível descarregar os pacotes da fonte"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1130
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Necessita inserir o média para continuar"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Não consigo descarregar os pacotes, lamento. %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1131 ../rpmdrake:1187
 #, c-format
 msgid ""
-"Unable to add medium, errors reported:\n"
 "\n"
+"\n"
+"Error(s) reported:\n"
 "%s"
 msgstr ""
-"Incapaz de adicionar o média, erros indicados:\n"
 "\n"
+"\n"
+"Erro(s) encontrados:\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1138
 #, c-format
-msgid "no name found, key doesn't exist in rpm keyring!"
-msgstr "nenhum nome encontrado, a chave não existe na lista do rpm!"
+msgid "Package installation..."
+msgstr "A instalar os pacotes..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1138
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Demasiados pacotes seleccionados"
+msgid "Initializing..."
+msgstr "A inicializar..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1143
 #, c-format
-msgid "Physics"
-msgstr "Física"
+msgid "Change medium"
+msgstr "Mudar o média"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1144
 #, c-format
-msgid "Do nothing"
-msgstr "Não fazer nada"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Por favor insira o média chamado \"%s\" no dispositivo [%s]"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1149
 #, c-format
-msgid "Danmark"
-msgstr "Dinamarca"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "A descarregar o pacote '%s' (%s/%s)..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1168
 #, c-format
-msgid "Error during download"
-msgstr "Erro ao descarregar"
+msgid "Verifying packages signatures..."
+msgstr "A verificar a assinaturas dos pacotes..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1177
 #, c-format
-msgid "Mail"
-msgstr "Correio"
+msgid ""
+"The following packages have bad signatures:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
+msgstr ""
+"Os pacotes seguintes têm assinaturas erradas :\n"
+"\n"
+"%s\n"
+"\n"
+"Deseja continuar a instalação?"
+
+#: ../rpmdrake:1184 ../rpmdrake:1243
+#, c-format
+msgid "Installation failed"
+msgstr "A instalação falhou"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1185
 #, c-format
 msgid ""
-"Packages database is locked. Please close other applications\n"
-"working with packages database (do you have another media\n"
-"manager on another desktop, or are you currently installing\n"
-"packages as well?)."
+"Installation failed, some files are missing:\n"
+"%s\n"
+"\n"
+"You may want to update your media database."
 msgstr ""
-"A lista dos pacotes está bloqueada. Por favor feche\n"
-"os outros programas que utilizam a lista (pode ter\n"
-"outra janela do gestor de pacotes noutro ecrã, ou\n"
-"senão estará a instalar pacotes?)."
+"A instalação falhou, faltam alguns ficheiros :\n"
+"%s\n"
+"\n"
+"Talvez queira actualizar a base de dados dos seus médias."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1199
 #, c-format
-msgid "Help"
-msgstr "Ajuda"
+msgid "Preparing packages installation..."
+msgstr "A preparar a instalação dos pacotes..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1202
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Não consigo descarregar os pacotes, lamento. %s"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "A instalar o pacote '%s' (%s/%s)..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1227
 #, c-format
-msgid "Sports"
-msgstr "Desporto"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"A instalação acabou; %s.\n"
+"\n"
+"Alguns ficheiros de configuração foram criados como `.rpmnew' ou\n"
+"`.rpmsave', pode agora verificá-los para agir em conformidade:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1227
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "everything was installed correctly"
+msgstr "foi tudo bem instalado"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1234
 #, c-format
-msgid "Protocol"
-msgstr "Protocolo"
+msgid "No package found for installation."
+msgstr "Não encontrei nenhum pacote a instalar."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1235
 #, c-format
-msgid "(none)"
-msgstr "(nenhum)"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr ""
+"Erro irrecuperável : nenhum pacote encontrado para  instalar, desculpe."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1257
 #, c-format
-msgid "All packages, by medium repository"
-msgstr "Todos os pacotes, por média de origem"
+msgid "Please wait, reading packages database..."
+msgstr "Por favor aguarde, a ler a base de dados dos pacotes..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1304
 #, c-format
-msgid "Germany"
-msgstr "Alemanha"
+msgid "Please wait, removing packages..."
+msgstr "Por favor aguarde, a remover os pacotes..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1309
 #, c-format
-msgid "Compression"
-msgstr "Compressão"
+msgid "Problem during removal"
+msgstr "Problema durante a remoção"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1310
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Descarregamento de `%s', tempo restante: %s, velocidade: %s"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Ocorreu um problema ao apagar os pacotes :\n"
+"\n"
+"%s"
 
-#. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1342
 #, c-format
-msgid "%s from medium %s"
-msgstr "%s do média %s"
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+"Seja bem-vindo à ferramenta de remoção de programas!\n"
+"\n"
+"Esta ferramenta vai ajudá-lo a escolher quais os programas que deseja\n"
+"remover do seu computador."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1347
 #, c-format
-msgid "Add a host"
-msgstr "Adicionar um anfitrião"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Seja bem-vindo ao MandrakeUpdate!\n"
+"\n"
+"Esta ferramenta vai ajudá-lo a escolher quais as actualizações que deseja\n"
+"instalar no seu computador."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1352
 #, c-format
-msgid "Development"
-msgstr "Desenvolvimento"
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Seja bem-vindo à ferramenta de instalação de programas!\n"
+"\n"
+"O seu sistema Linux Mandrake vem com várias centenas de pacotes de\n"
+"programas nos CDROM ou DVD. Esta ferramenta vai ajudá-lo a escolher\n"
+"quais os programas que deseja instalar no seu computador."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:121
 #, c-format
-msgid "No"
-msgstr "Não"
+msgid "Yes"
+msgstr "Sim"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:123
 #, c-format
-msgid "Media limit"
-msgstr "Limite de média"
+msgid "No"
+msgstr "Não"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:159
 #, c-format
-msgid "Install"
-msgstr "Instalar"
+msgid "Info..."
+msgstr "Informação..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:214
 #, c-format
-msgid "Add..."
-msgstr "Adicionar..."
+msgid "Austria"
+msgstr "Áustria"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:215
 #, c-format
-msgid "Change medium"
-msgstr "Mudar o média"
+msgid "Australia"
+msgstr "Austrália"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:216
 #, c-format
-msgid "Reset the selection"
-msgstr "Inicializar a selecção"
+msgid "Belgium"
+msgstr "Bélgica"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:217
 #, c-format
-msgid "Mandrake Update"
-msgstr "Actualizações Mandrake"
+msgid "Brazil"
+msgstr "Brasil"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:218
 #, c-format
-msgid "in file names"
-msgstr "nos nomes dos ficheiros"
+msgid "Canada"
+msgstr "Canada"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:219
 #, c-format
-msgid "Books"
-msgstr "Livros"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:220
 #, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
-msgstr ""
-"Houve um erro ao descarregar a lista dos espelhos:\n"
-"\n"
-"%s\n"
-"A rede, ou o servidor da MandrakeSoft, podem estar desligados.\n"
-"Por favor tente outra vez mais tarde."
+msgid "Czech Republic"
+msgstr "Republica Checa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:221
 #, c-format
-msgid "Howtos"
-msgstr "Como fazer"
+msgid "Germany"
+msgstr "Alemanha"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:222
 #, c-format
-msgid "Icewm"
-msgstr "Icewm"
+msgid "Danmark"
+msgstr "Dinamarca"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:223 ../rpmdrake.pm:227
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"\n"
-"You may want to update your media database."
-msgstr ""
-"A instalação falhou, faltam alguns ficheiros :\n"
-"%s\n"
-"\n"
-"Talvez queira actualizar a base de dados dos seus médias."
+msgid "Greece"
+msgstr "Grécia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:224
 #, c-format
-msgid "Libraries"
-msgstr "Livrarias"
+msgid "Spain"
+msgstr "Espanha"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:225
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Lamento, mas a remoção estes pacotes arruinará o seu sistema :\n"
-"\n"
+msgid "Finland"
+msgstr "Finlândia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:226
 #, c-format
-msgid "Brazil"
-msgstr "Brasil"
+msgid "France"
+msgstr "França"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:228
 #, c-format
-msgid "Installation failed"
-msgstr "A instalação falhou"
+msgid "Israel"
+msgstr "Israel"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:229
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Erro(s) encontrados:\n"
-"%s"
+msgid "Italy"
+msgstr "Itália"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:230
 #, c-format
-msgid "Manage keys for digital signatures of packages"
-msgstr "Gerir as chaves para as assinaturas digitais dos pacotes"
+msgid "Japan"
+msgstr "Japão"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:231
 #, c-format
-msgid "Currently installed version: "
-msgstr "Versão actualmente instalada: "
+msgid "Korea"
+msgstr "Coreia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:232
 #, c-format
-msgid "Games"
-msgstr "Jogos"
+msgid "Netherlands"
+msgstr "Holanda"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:233
 #, c-format
-msgid "Astronomy"
-msgstr "Astronomia"
+msgid "Norway"
+msgstr "Noruega"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:234
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Por favor insira o média chamado \"%s\" no dispositivo [%s]"
+msgid "Poland"
+msgstr "Polónia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:235
 #, c-format
-msgid "You need to select some packages first."
-msgstr "É preciso escolher alguns pacotes primeiro."
+msgid "Portugal"
+msgstr "Portugal"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:236
 #, c-format
-msgid "All packages, by selection state"
-msgstr "Todos os pacotes, por estado de selecção"
+msgid "Russia"
+msgstr "Rússia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:237
 #, c-format
-msgid "Name:"
-msgstr "Nome:"
+msgid "Sweden"
+msgstr "Suécia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:238
 #, c-format
-msgid "KDE"
-msgstr "KDE"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:239
 #, c-format
-msgid "No update"
-msgstr "Nenhuma actualização"
+msgid "United Kingdom"
+msgstr "Reino Unido"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:240
 #, c-format
-msgid "Networking"
-msgstr "Rede"
+msgid "China"
+msgstr "China"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:241 ../rpmdrake.pm:242 ../rpmdrake.pm:243 ../rpmdrake.pm:244
+#: ../rpmdrake.pm:295
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "United States"
+msgstr "Estados Unidos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:305
 #, c-format
-msgid "Text tools"
-msgstr "Ferramentas de texto"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Preciso contactar o servidor MandrakeSoft para lhe pedir a lista dos\n"
+"servidores espelho. Por favor verifique que a sua rede está a funcionar.\n"
+"\n"
+"Posso continuar?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:309
 #, c-format
-msgid "Cards"
-msgstr "Cartas"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Por favor aguarde, estou a descarregar os endereços dos espelhos a partir da "
+"MandrakeSoft."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:315
 #, c-format
-msgid "Sawfish"
-msgstr "Sawfish"
+msgid "Error during download"
+msgstr "Erro ao descarregar"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:316
 #, c-format
-msgid "Group name:"
-msgstr "Nome do grupo :"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
+"Houve um erro ao descarregar a lista dos espelhos:\n"
+"\n"
+"%s\n"
+"A rede, ou o servidor da MandrakeSoft, podem estar desligados.\n"
+"Por favor tente outra vez mais tarde."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:324
 #, c-format
-msgid "Type in the hostname or IP address of the host to add:"
-msgstr "Escreva o nome ou o endereço IP do anfitrião a adicionar :"
+msgid "No mirror"
+msgstr "Nenhum espelho"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:325
 #, c-format
-msgid "Arcade"
-msgstr "Arcada"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Não consigo encontrar nenhum servidor espelho que convenha.\n"
+"\n"
+"Há várias razoes para este problema ; a mais habitual é o caso\n"
+"em que a arquitectura do seu processador não é suportada pelas\n"
+"Actualizações Oficiais da Mandrake Linux."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:342
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Please choose the desired mirror."
+msgstr "Por favor escolha o espelho desejado."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:383
 #, c-format
-msgid "Editing medium \"%s\":"
-msgstr "A editar o média \"%s\" :"
+msgid "Copying file for medium `%s'..."
+msgstr "A copiar o ficheiro para o média `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:386
 #, c-format
-msgid "Add a medium limit"
-msgstr "Adicionar um limite de média"
+msgid "Examining file of medium `%s'..."
+msgstr "A examinar o ficheiro do média `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:389
 #, c-format
-msgid "Group"
-msgstr "Grupo"
+msgid "Examining remote file of medium `%s'..."
+msgstr "A examinar o ficheiro distante do média `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:393
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Por favor aguarde, a remover o média..."
+msgid " done."
+msgstr " feito."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:397
 #, c-format
-msgid "Accessibility"
-msgstr "Acessibilidade"
+msgid " failed!"
+msgstr " falhou!"
 
-#: ../rpmdrake:1
+#. -PO: We're downloading the said file from the said medium
+#: ../rpmdrake.pm:401
 #, c-format
-msgid "changes:"
-msgstr "mudanças:"
+msgid "%s from medium %s"
+msgstr "%s do média %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:405
 #, c-format
-msgid "Add"
-msgstr "Adicionar"
+msgid "Starting download of `%s'..."
+msgstr "A começar o descarregamento de '%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:409
 #, c-format
-msgid "Regenerate hdlist"
-msgstr "Regenerar o hdlist"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Descarregamento de `%s', tempo restante: %s, velocidade: %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:412
 #, c-format
-msgid "Editors"
-msgstr "Editores"
+msgid "Download of `%s', speed:%s"
+msgstr "Descarregamento de `%s', velocidade:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:449
 #, c-format
-msgid "United Kingdom"
-msgstr "Reino Unido"
+msgid "Select the media you wish to update:"
+msgstr "Seleccione os médias que deseja actualizar :"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:453
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Caminho relativo para síntese/hdlist:"
+msgid "Update"
+msgstr "Actualizar"
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake.pm:465
 #, c-format
 msgid ""
-"You are about to add a new packages medium, `%s'.\n"
-"That means you will be able to add new software packages\n"
-"to your system from that new medium."
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
-"Você está prestes a adicionar um novo média de pacotes, '%s'.\n"
-"Isso significa que vai poder adicionar novos pacotes de programas ao seu "
-"sistema a partir desse média."
+"Impossível de actualizar o média, vai ser automaticamente desactivado.\n"
+"\n"
+"Erros :\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:482 ../rpmdrake.pm:487
 #, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Unable to add medium, errors reported:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+"%s"
 msgstr ""
-"Seja bem-vindo ao MandrakeUpdate!\n"
+"Incapaz de adicionar o média, erros indicados:\n"
 "\n"
-"Esta ferramenta vai ajudá-lo a escolher quais as actualizações que deseja\n"
-"instalar no seu computador."
+"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:498
 #, c-format
-msgid "Remove a key"
-msgstr "Apagar uma chave"
+msgid "Unable to create medium."
+msgstr "Impossível criar o média."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:503
 #, c-format
-msgid "User:"
-msgstr "Utilizador:"
+msgid "Failure when adding medium"
+msgstr "Problema ao adicionar o média"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:504
 #, c-format
-msgid "Browse..."
-msgstr "Navegar..."
+msgid ""
+"There was a problem adding medium:\n"
+"\n"
+"%s"
+msgstr ""
+"Ocorreu um problema enquanto adicionava o média :\n"
+"\n"
+"%s"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -2740,4 +2772,3 @@ msgstr "Gestor de Médias de Programas"
 
 #~ msgid "The package %s is not signed"
 #~ msgstr "O pacote %s não está assinado"
-
diff --git a/po/sk.po b/po/sk.po
index 8a057ab7..057d55ed 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2004-02-20 17:29+0100\n"
+"POT-Creation-Date: 2004-02-20 20:53+0100\n"
 "PO-Revision-Date: 2004-02-21 03:09+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandrake.org>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -14,1961 +14,1986 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:61
 #, c-format
-msgid "Enlightenment"
-msgstr "Enlightenment"
+msgid "Add a medium"
+msgstr "Pridať médium"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:62
 #, c-format
-msgid "Remote access"
-msgstr "Vzdialený prístup"
+msgid "Local files"
+msgstr "Lokálne súbory"
 
-#: ../edit-urpm-sources.pl:1
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:62
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Prosím čakajte, aktualizujem média..."
+msgid "Path:"
+msgstr "Cesta:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:63
 #, c-format
-msgid "FVWM based"
-msgstr "založené na FVWM"
+msgid "FTP server"
+msgstr "FTP server"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:63 ../edit-urpm-sources.pl:64
+#: ../edit-urpm-sources.pl:66 ../edit-urpm-sources.pl:196
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:64
 #, c-format
-msgid "Python"
-msgstr "Python"
+msgid "HTTP server"
+msgstr "HTTP server"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:65
 #, c-format
-msgid "Upgradable"
-msgstr "Aktualizovateľné"
+msgid "Removable device"
+msgstr "Vymeniteľné zariadenie"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:65
 #, c-format
-msgid "everything was installed correctly"
-msgstr "všetko bolo úspešne nainštalované"
+msgid "Path or mount point:"
+msgstr "Cesta alebo bod pripojenia:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:66 ../rpmdrake:707
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr "Overovanie podpisov balíkov..."
+msgid "Security updates"
+msgstr "Bezpečnostné aktualizácie"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:78
 #, c-format
-msgid "File transfer"
-msgstr "Prenos súborov"
+msgid "Browse..."
+msgstr "Prechádzať..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:80
 #, c-format
-msgid "KDE and Qt"
-msgstr "KDE a Qt"
+msgid "Choose a mirror..."
+msgstr "Zvoľte si miror..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:107
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Je potrebné vyplniť najmenej prvé dve položky."
+msgid "Login:"
+msgstr "Login:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:107 ../edit-urpm-sources.pl:240
 #, c-format
-msgid "Type of medium:"
-msgstr "Typ média:"
+msgid "Password:"
+msgstr "Heslo:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:112
 #, c-format
-msgid "Copying file for medium `%s'..."
-msgstr "Kopírujem súbor pre médium `%s'..."
+msgid "Name:"
+msgstr "Meno:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:116 ../edit-urpm-sources.pl:197
 #, c-format
-msgid "France"
-msgstr "Francúzsko"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Relatívna cesta k synthesis/hdlist: "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:117
 #, c-format
-msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Je potrebné kontaktovať mirror pre získanie najnovších aktualizácií.\n"
-"Skontrolujte prosím, či je sieť funkčná.\n"
-"\n"
-"Je možné pokračovať?"
+msgid "If left blank, synthesis/hdlist will be automatically probed"
+msgstr "Ak ponecháte nevyplnené, synthesis/hdlist budú automaticky vyskúšané"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:125
 #, c-format
-msgid "Search results"
-msgstr "Výsledky vyhľadávania"
+msgid "You need to fill up at least the two first entries."
+msgstr "Je potrebné vyplniť najmenej prvé dve položky."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:129
 #, c-format
-msgid "Graphical desktop"
-msgstr "Grafická pracovná plocha"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Už existuje zdroj s takýmto menom, chcete ho\n"
+"skutočne prepísať?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:138
 #, c-format
-msgid "Yes"
-msgstr "Ano"
+msgid "Adding a medium:"
+msgstr "Pridanie zdroja:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:139
 #, c-format
-msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
-msgstr ""
-"Inštalácia bola ukončená; %s.\n"
-"\n"
-"Niektoré konfiguračné súbory boli vytvorené ako `.rpmnew' alebo `.rpmsave',\n"
-"mali by ste ich prezrieš:"
+msgid "Type of medium:"
+msgstr "Typ média:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:143 ../edit-urpm-sources.pl:211
+#: ../edit-urpm-sources.pl:244 ../edit-urpm-sources.pl:317
+#: ../edit-urpm-sources.pl:355 ../edit-urpm-sources.pl:396
+#: ../edit-urpm-sources.pl:453 ../edit-urpm-sources.pl:517
+#: ../edit-urpm-sources.pl:554 ../edit-urpm-sources.pl:660 ../rpmdrake:88
+#: ../rpmdrake:511 ../rpmdrake:525 ../rpmdrake:529 ../rpmdrake:1084
+#: ../rpmdrake:1145 ../rpmdrake.pm:125 ../rpmdrake.pm:168 ../rpmdrake.pm:353
 #, c-format
-msgid "Edit a parallel group"
-msgstr "Zmeniť pralélnu skupinu"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:159 ../edit-urpm-sources.pl:205
+#: ../edit-urpm-sources.pl:211 ../edit-urpm-sources.pl:251
+#: ../edit-urpm-sources.pl:322 ../edit-urpm-sources.pl:356
+#: ../edit-urpm-sources.pl:403 ../edit-urpm-sources.pl:522 ../rpmdrake:88
+#: ../rpmdrake:511 ../rpmdrake:1145 ../rpmdrake:1151 ../rpmdrake.pm:353
+#: ../rpmdrake.pm:458
 #, c-format
-msgid ""
-"There was a problem adding medium:\n"
-"\n"
-"%s"
-msgstr ""
-"Vyskytol sa problém pri pridávaní média:\n"
-"\n"
-"%s"
+msgid "Cancel"
+msgstr "Zrušiť"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:177
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "Ako si zvoliť miror manuálne"
+msgid "Please wait, removing medium..."
+msgstr "Prosím čakajte, odstraňujem médium..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:190
 #, c-format
-msgid "Publishing"
-msgstr "Publikovanie"
+msgid "Edit a medium"
+msgstr "Zmeniť médium"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:194
 #, c-format
-msgid "Remove key"
-msgstr "Odstrániť kľúč"
+msgid "Editing medium \"%s\":"
+msgstr "Zmena média \"%s\":"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:200
 #, c-format
-msgid "Package installation..."
-msgstr "Inštalácia balíčkov..."
+msgid "Save changes"
+msgstr "Uložiť zmeny"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:209
 #, c-format
-msgid "GNOME and GTK+"
-msgstr "GNOME a GTK+"
+msgid "You need to insert the medium to continue"
+msgstr "Vložte médium ak chcete pokračovať"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:210
 #, c-format
-msgid "Select the media you wish to update:"
-msgstr "Prosím zvoľte médium ktoré chcete aktualizovať:"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Pre uloženie zmien je potrebné aby ste vložili médium do mechaniky."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:226
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Odstránenie softvérových balíčkov"
+msgid "Configure proxies"
+msgstr "Nastaviť proxy"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:232
 #, c-format
-msgid "Shells"
-msgstr "Shelly"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Ak potrebujete proxy, zadajte meno hostiteľa a voliteľne aj port (syntax: "
+"<proxyhost[:port]>):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:234
 #, c-format
-msgid "Chemistry"
-msgstr "Chémia"
+msgid "Proxy hostname:"
+msgstr "Hostiteľ proxy:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:236
 #, c-format
-msgid "Choose a key for adding to the medium %s"
-msgstr "Vyberte si kľúč na pridanie k zdroju %s"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Môžete zadať užívateľské meno/heslo pre proxy autentifikáciu:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:238
 #, c-format
-msgid "Add a key"
-msgstr "Pridať kľúč"
+msgid "User:"
+msgstr "Užívateľ:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:292
 #, c-format
-msgid "True type"
-msgstr "True type"
+msgid "Add a parallel group"
+msgstr "Pridať paralélnu skupinu"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:292
 #, c-format
-msgid "Base"
-msgstr "Základ"
+msgid "Edit a parallel group"
+msgstr "Zmeniť pralélnu skupinu"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:303
 #, c-format
-msgid "Graphics"
-msgstr "Grafika"
+msgid "Add a medium limit"
+msgstr "Pridať limit média"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:313
 #, c-format
-msgid "Italy"
-msgstr "Taliansko"
+msgid "Choose a medium for adding in the media limit:"
+msgstr "Vyberte si zdroj pre pridanie k obmedzeným zdrojom:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:347
 #, c-format
-msgid ""
-"You are launching this program as a normal user.\n"
-"You will not be able to perform modifications on the system,\n"
-"but you may still browse the existing database."
-msgstr ""
-"Spustili ste tento program ako bežný používateľ.\n"
-"Nebude vám umožnené vykonať systémové modifikácie,\n"
-"ale budete môcť prehliadať existujúcu databázu."
+msgid "Add a host"
+msgstr "Pridať hostiteľa"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:351
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Jeden z nasledujúcich balíčkov je potrebný:"
+msgid "Type in the hostname or IP address of the host to add:"
+msgstr "Zadajte meno alebo IP adresu zdroja ktorý chcete pridať:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:375
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Editing parallel group \"%s\":"
+msgstr "Úprava paralelnej skupiny \"%s\":"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:377
 #, c-format
-msgid "Information on packages"
-msgstr "Informácie o balíčkoch"
+msgid "Group name:"
+msgstr "Meno skupiny:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:378
 #, c-format
-msgid "Proxy..."
-msgstr "Proxy..."
+msgid "Protocol:"
+msgstr "Protokol:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:380
 #, c-format
-msgid "Russia"
-msgstr "Rusko"
+msgid "Media limit:"
+msgstr "Limit média:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:385 ../edit-urpm-sources.pl:392
 #, c-format
-msgid "If you need a proxy, enter the hostname and an optional port (syntax: <proxyhost[:port]>):"
-msgstr "Ak potrebujete proxy, zadajte meno hostiteľa a voliteľne aj port (syntax: <proxyhost[:port]>):"
+msgid "Add"
+msgstr "Pridať"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:386 ../edit-urpm-sources.pl:393
+#: ../edit-urpm-sources.pl:442 ../edit-urpm-sources.pl:643 ../rpmdrake:909
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"Kvôli závislostiam musia byť nasledujúce balíčky teraz odznačené:\n"
-"\n"
+msgid "Remove"
+msgstr "Odstrániť"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:387
 #, c-format
-msgid "Add a key..."
-msgstr "Pridať kľúč..."
+msgid "Hosts:"
+msgstr "Hostitelia:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:417
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Konfigurácia paralelného urpmi (distribuované spúšťanie urpmi)"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Sound"
-msgstr "Zvuk"
-
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid "Changelog:\n"
-msgstr "Záznam zmien:\n"
+msgid "Group"
+msgstr "Skupina"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Je potrebné kontaktovať websajt MandrakeSoft pre získanie\n"
-"zoznamu mirrorov. Skontrolujte či je vaše sieťové pripojenie funkčné.\n"
-"\n"
-"Je možné pokračovať?"
+msgid "Protocol"
+msgstr "Protokol"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Prosím čakajte, vyhľadávam..."
+msgid "Media limit"
+msgstr "Limit média"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:421
 #, c-format
 msgid "Command"
 msgstr "Príkaz"
 
-#: ../rpmdrake:1
-#: ../edit-urpm-sources.pl:1
-#: ../gurpmi.addmedia:1
+#: ../edit-urpm-sources.pl:431 ../rpmdrake:252 ../rpmdrake:269 ../rpmdrake:380
+#: ../rpmdrake:449
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Je možné pokračovať?"
+msgid "(none)"
+msgstr "(žiadna)"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:444 ../edit-urpm-sources.pl:645
 #, c-format
-msgid "Literature"
-msgstr "Literatúra"
+msgid "Edit"
+msgstr "Zmeň"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:449 ../edit-urpm-sources.pl:647
 #, c-format
-msgid "Initializing..."
-msgstr "Inicializácia..."
+msgid "Add..."
+msgstr "Pridať..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:461
 #, c-format
-msgid "Emulators"
-msgstr "Emulátory"
+msgid "Manage keys for digital signatures of packages"
+msgstr "Manažovanie kľúčov pre elektronické podpisy balíkov"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:465 ../edit-urpm-sources.pl:585
 #, c-format
-msgid "Password:"
-msgstr "Heslo:"
+msgid "Medium"
+msgstr "Stredná"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:470
 #, c-format
-msgid "Software Packages Installation"
-msgstr "Príprava balíkov na inštaláciu"
+msgid "Keys"
+msgstr "Kľúče"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:489
 #, c-format
-msgid "in descriptions"
-msgstr "v popisoch"
+msgid "no name found, key doesn't exist in rpm keyring!"
+msgstr "žiadne meno nebol nájdené, kľúč neexistuje na rpm väzku kľúčov!"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:503
 #, c-format
-msgid " failed!"
-msgstr " chyba!"
+msgid "Add a key"
+msgstr "Pridať kľúč"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:513
 #, c-format
-msgid "All packages, by update availability"
-msgstr "Všetky balíčky, podľa dostupnosti aktualizácie"
+msgid "Choose a key for adding to the medium %s"
+msgstr "Vyberte si kľúč na pridanie k zdroju %s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:534
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Je potrebné odstrániť niektoré balíčky"
+msgid "Remove a key"
+msgstr "Odstrániť kľúč"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:535
 #, c-format
-msgid "Packaging"
-msgstr "Balíkovanie"
+msgid ""
+"Are you sure you want to remove the key %s from medium %s?\n"
+"(name of the key: %s)"
+msgstr ""
+"Ste si istí, že chcete odstrániť kľúč %s zo zdroja %s?\n"
+"(meno kľúča: %s)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:548
 #, c-format
-msgid "Configure media"
-msgstr "Nastaviť média"
+msgid "Add a key..."
+msgstr "Pridať kľúč..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:550
 #, c-format
-msgid "United States"
-msgstr "Spojené Štáty"
+msgid "Remove key"
+msgstr "Odstrániť kľúč"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:562
 #, c-format
-msgid "Greece"
-msgstr "Grécko"
+msgid "Configure media"
+msgstr "Nastaviť média"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:584
 #, c-format
-msgid "GNOME"
-msgstr "GNOME"
+msgid "Enabled?"
+msgstr "Povolené?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:595
 #, c-format
-msgid "Monitoring"
-msgstr "Monitorovanie"
+msgid "Update medium"
+msgstr "Aktualizácia média"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:595
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Regenerate hdlist"
+msgstr "Regenerovať hdlist"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:607 ../rpmdrake.pm:421
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "Niektore balíčky nebolo možné nainštalovať"
+msgid "Please wait, updating media..."
+msgstr "Prosím čakajte, aktualizujem média..."
 
-#: ../rpmdrake:1
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:611
 #, c-format
-msgid "The help window has been started, it should appear shortly on your desktop."
-msgstr "Okno s pomocou bolo vyvolané, malo by sa čoskoro zjaviť na vašej pracovnej ploche."
+msgid "Please wait, generating hdlist..."
+msgstr "Prosím čakajte, generujem hdlist..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:649
 #, c-format
-msgid "No mirror"
-msgstr "Žiaden miror"
+msgid "Update..."
+msgstr "Aktualizácia..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:650
 #, c-format
-msgid "Reload the packages list"
-msgstr "Znovu načítač zoznam balíčkov"
+msgid "Manage keys..."
+msgstr "Manažovanie kľúčov..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:651
 #, c-format
-msgid "Poland"
-msgstr "Poľsko"
+msgid "Proxy..."
+msgstr "Proxy..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:652
 #, c-format
-msgid "Path or mount point:"
-msgstr "Cesta alebo bod pripojenia:"
+msgid "Parallel..."
+msgstr "Paralélne..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:655 ../rpmdrake:901
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Prosím čakajte, sťahujem adresy mirorov z web stránky MandrakeSoft."
+msgid "Help"
+msgstr "Pomoc"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:657 ../rpmdrake:904
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Zvoľte si miror..."
+msgid "Help launched in background"
+msgstr "Pomoc spustená na pozadí"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:658 ../rpmdrake:905
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"The help window has been started, it should appear shortly on your desktop."
+msgstr ""
+"Okno s pomocou bolo vyvolané, malo by sa čoskoro zjaviť na vašej pracovnej "
+"ploche."
+
+#: ../edit-urpm-sources.pl:669 ../gurpmi.addmedia:75 ../rpmdrake:1338
+#, c-format
+msgid ""
+"%s\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"Varovanie: zdá sa, že sa pokúšate pridať príliš veľa balíčkov,\n"
-"čo môže spôsobiť, že váš súborový systém bude zaplnený\n"
-"počas alebo po inštalácii balíčkov ; toto je veľmi nebezpečné\n"
-"a mali by ste byť opatrní.\n"
+"%s\n"
 "\n"
-"Skutočne si želáte nainštalovať všetky zvolené balíčky?"
+"Je možné pokračovať?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:672
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Vybraná veľkosť: %d Mb"
+msgid ""
+"Welcome to the Software Media Manager!\n"
+"\n"
+"This tool will help you configure the packages media you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Vitajte v editore zdrojov pre balíky!\n"
+"\n"
+"Tento nástroj vám pomôže pri nastavení zdrojov pre balíky, ktoré môžete\n"
+"použiť pre váš systém. Tieto balíky budú dostupné pri inštalácii nových\n"
+"balíkov alebo pri vykonávaní aktualizácií."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:684
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Prosím čakajte, načítavam databázu balíčkov..."
+msgid ""
+"Packages database is locked. Please close other applications\n"
+"working with packages database (do you have another media\n"
+"manager on another desktop, or are you currently installing\n"
+"packages as well?)."
+msgstr ""
+"Databáza balíkov je uzamknutá. Ukončite iné aplikácie, ktoré\n"
+"pracujú s databázou balíkov (napríklda iný správca balíkov na\n"
+"inej ploche, alebo sa práva inštalujú iné balíky?)."
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:70
 #, c-format
-msgid "Add a medium"
-msgstr "Pridať médium"
+msgid "Unable to add medium, wrong or missing arguments"
+msgstr "Nie je možné pridať médium, chybné alebo chýbajúce argumenty"
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:78
 #, c-format
-msgid "Update medium"
-msgstr "Aktualizácia média"
+msgid ""
+"You are about to add a new packages medium, `%s'.\n"
+"That means you will be able to add new software packages\n"
+"to your system from that new medium."
+msgstr ""
+"Chcete pridať médium obsahujúce nové rpm balíky `%s'.\n"
+"Znamená to, že bude možné pridávať nové softvérové balíky\n"
+"do vášho systému z tohto nového média."
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:87
 #, c-format
-msgid "In order to save the changes, you need to insert the medium in the drive."
-msgstr "Pre uloženie zmien je potrebné aby ste vložili médium do mechaniky."
+msgid "Successfully added medium `%s'."
+msgstr "Úspešne pridané médium `%s'."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:85
 #, c-format
-msgid "All packages, by size"
-msgstr "Všetky balíčky, podľa veľkosti"
+msgid "Running in user mode"
+msgstr "Beh v používateľskom móde"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:86
 #, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+"You are launching this program as a normal user.\n"
+"You will not be able to perform modifications on the system,\n"
+"but you may still browse the existing database."
 msgstr ""
-"Vyskytol sa problém počas inštalácie balíkov:\n"
-"\n"
-"%s"
+"Spustili ste tento program ako bežný používateľ.\n"
+"Nebude vám umožnené vykonať systémové modifikácie,\n"
+"ale budete môcť prehliadať existujúcu databázu."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:93
 #, c-format
-msgid "Examining file of medium `%s'..."
-msgstr "Preverujem súbory zo zdroja '%s'..."
+msgid "Accessibility"
+msgstr "Dostupnosť"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:94 ../rpmdrake:95 ../rpmdrake:96 ../rpmdrake:97 ../rpmdrake:98
+#: ../rpmdrake:99 ../rpmdrake:100 ../rpmdrake:101 ../rpmdrake:102
+#: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
+#: ../rpmdrake:107 ../rpmdrake:108 ../rpmdrake:109
 #, c-format
-msgid "Path:"
-msgstr "Cesta:"
+msgid "System"
+msgstr "Systém"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:94
 #, c-format
-msgid "IRC"
-msgstr "IRC"
+msgid "Servers"
+msgstr "Servre"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:95
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Sťahovanie balíčka `%s' (%s/%s)..."
+msgid "Kernel and hardware"
+msgstr "Kernel a hardware"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:96
 #, c-format
-msgid "Protocol:"
-msgstr "Protokol:"
+msgid "Libraries"
+msgstr "Knižnice"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:97
 #, c-format
-msgid "C"
-msgstr "C"
+msgid "XFree86"
+msgstr "XFree86"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:98 ../rpmdrake:99 ../rpmdrake:100 ../rpmdrake:101
 #, c-format
-msgid "Other"
-msgstr "Iné"
+msgid "Fonts"
+msgstr "Písma"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:98
 #, c-format
-msgid "Sweden"
-msgstr "Švédsko"
+msgid "Console"
+msgstr "Konzola"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:99
 #, c-format
-msgid "Boards"
-msgstr "Nástenky"
+msgid "True type"
+msgstr "True type"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:100
 #, c-format
-msgid "Austria"
-msgstr "Rakúsko"
+msgid "Type1"
+msgstr "Type1"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:101
 #, c-format
-msgid "Faqs"
-msgstr "Často kladené otázky"
+msgid "X11 bitmap"
+msgstr "X11 bitmapa"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:102
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "Base"
+msgstr "Základ"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
+#: ../rpmdrake:107 ../rpmdrake:108
 #, c-format
-msgid "Inspect..."
-msgstr "Preveriť.."
+msgid "Configuration"
+msgstr "Konfigurácia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:103
 #, c-format
-msgid "Japan"
-msgstr "Japonsko"
+msgid "Hardware"
+msgstr "Hardware"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:104
 #, c-format
-msgid "Summary: "
-msgstr "Stručný obsah: "
+msgid "Packaging"
+msgstr "Balíkovanie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:105 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
+#: ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154 ../rpmdrake:155
+#: ../rpmdrake:156 ../rpmdrake:157
 #, c-format
-msgid "Backup"
-msgstr "Záloha"
+msgid "Networking"
+msgstr "Sieť"
+
+#: ../rpmdrake:106
+#, c-format
+msgid "Printing"
+msgstr "Tlač"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:107
 #, c-format
 msgid "Boot and Init"
 msgstr "Štart s inicializácia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:108 ../rpmdrake:119 ../rpmdrake:127 ../rpmdrake:139
+#: ../rpmdrake:144 ../rpmdrake:157 ../rpmdrake:171 ../rpmdrake:176
+#: ../rpmdrake:230
 #, c-format
-msgid "FTP server"
-msgstr "FTP server"
+msgid "Other"
+msgstr "Iné"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:109
 #, c-format
-msgid "Remove .%s"
-msgstr "Odstrániť .%s"
+msgid "Internationalization"
+msgstr "Internacionalizácia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112 ../rpmdrake:113
+#: ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116 ../rpmdrake:117
+#: ../rpmdrake:118 ../rpmdrake:119
 #, c-format
-msgid "Importance: "
-msgstr "Dôležitosť: "
+msgid "Development"
+msgstr "Vývoj"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:110
 #, c-format
-msgid "WWW"
-msgstr "WWW"
+msgid "Kernel"
+msgstr "Kernel"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:111 ../rpmdrake:129
 #, c-format
-msgid "Unable to create medium."
-msgstr "Nemôžem vytvoriť médium."
+msgid "Databases"
+msgstr "Databázy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:112
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Nasledovné balíky budú odstránené aby bolo možné iné aktualizovať:\n"
-"\n"
-"%s\n"
-"\n"
-"Je možné pokračovať?"
+msgid "Perl"
+msgstr "Perl"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:113
 #, c-format
-msgid ""
-"Welcome to the Software Media Manager!\n"
-"\n"
-"This tool will help you configure the packages media you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Vitajte v editore zdrojov pre balíky!\n"
-"\n"
-"Tento nástroj vám pomôže pri nastavení zdrojov pre balíky, ktoré môžete\n"
-"použiť pre váš systém. Tieto balíky budú dostupné pri inštalácii nových\n"
-"balíkov alebo pri vykonávaní aktualizácií."
+msgid "Python"
+msgstr "Python"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:114
 #, c-format
-msgid "Medium"
-msgstr "Stredná"
+msgid "C"
+msgstr "C"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:115
 #, c-format
-msgid "Size: "
-msgstr "Veľkosť: "
+msgid "C++"
+msgstr "C++"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:116
 #, c-format
-msgid "Office"
-msgstr "Kancelária"
+msgid "Java"
+msgstr "Java"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:117
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Všetko bolo úspešne nainštalované"
+msgid "GNOME and GTK+"
+msgstr "GNOME a GTK+"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:118
 #, c-format
-msgid "Add a parallel group"
-msgstr "Pridať paralélnu skupinu"
+msgid "KDE and Qt"
+msgstr "KDE a Qt"
 
-#: ../rpmdrake:1
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:120 ../rpmdrake:121 ../rpmdrake:122 ../rpmdrake:123
+#: ../rpmdrake:124 ../rpmdrake:125 ../rpmdrake:126 ../rpmdrake:127
 #, c-format
-msgid "Update media"
-msgstr "Aktualizácia média"
+msgid "Sciences"
+msgstr "Veda"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:120
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Inštalácia balíčka `%s' (%s/%s)..."
+msgid "Astronomy"
+msgstr "Astronómia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:121
 #, c-format
-msgid "Parallel..."
-msgstr "Paralélne..."
+msgid "Biology"
+msgstr "Biológia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:122
 #, c-format
-msgid "in names"
-msgstr "v menách"
+msgid "Chemistry"
+msgstr "Chémia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:123
 #, c-format
-msgid "Not selected"
-msgstr "Neoznačené"
+msgid "Computer science"
+msgstr "Počítačové vedy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:124
 #, c-format
-msgid "Problem during installation"
-msgstr "Problém počas inštalácie"
+msgid "Geosciences"
+msgstr "Geológia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:125
 #, c-format
-msgid "Terminals"
-msgstr "Terminály"
+msgid "Mathematics"
+msgstr "Matematika"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:126
 #, c-format
-msgid "Kernel and hardware"
-msgstr "Kernel a hardware"
+msgid "Physics"
+msgstr "Fyzika"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:128
 #, c-format
-msgid "Edit"
-msgstr "Zmeň"
+msgid "Communications"
+msgstr "Komunikácia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:130
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Vybrané: %d MB / Dostupné: %d MB"
+msgid "Editors"
+msgstr "Editory"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:131
 #, c-format
-msgid "Australia"
-msgstr "Austrália"
+msgid "Emulators"
+msgstr "Emulátory"
 
-#: ../rpmdrake:1
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
+#: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
 #, c-format
-msgid "Security updates"
-msgstr "Bezpečnostné aktualizácie"
+msgid "Games"
+msgstr "Hry"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:132
 #, c-format
-msgid "Korea"
-msgstr "Korea"
+msgid "Adventure"
+msgstr "Dobrodružné"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:133
 #, c-format
-msgid "Examining remote file of medium `%s'..."
-msgstr "Preverujem vzdialené súbory pre zdroj '%s'..."
+msgid "Arcade"
+msgstr "Arkády"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:134
 #, c-format
-msgid "All packages, by group"
-msgstr "Všetky balíčky, podľa skupiny"
+msgid "Boards"
+msgstr "Nástenky"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:135
 #, c-format
-msgid "Kernel"
-msgstr "Kernel"
+msgid "Cards"
+msgstr "Karty"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:136
 #, c-format
-msgid "Console"
-msgstr "Konzola"
+msgid "Puzzles"
+msgstr "Puzzle"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:137
 #, c-format
-msgid "C++"
-msgstr "C++"
+msgid "Sports"
+msgstr "Šport"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:138
 #, c-format
-msgid "Netherlands"
-msgstr "Holandsko"
+msgid "Strategy"
+msgstr "Stratégie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:140
 #, c-format
-msgid "Search results (none)"
-msgstr "Výsledky vyhľadávania (žiadne)"
+msgid "Toys"
+msgstr "Hračky"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143 ../rpmdrake:144
 #, c-format
-msgid "Adventure"
-msgstr "Dobrodružné"
+msgid "Archiving"
+msgstr "Archivovanie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:141
+#, c-format
+msgid "Compression"
+msgstr "Kompresia"
+
+#: ../rpmdrake:142
 #, c-format
 msgid "Cd burning"
 msgstr "Napaľovanie CD"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:143
 #, c-format
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Vítajte v nástroji pre inštaláciu softvéru!\n"
-"\n"
-"Váš Mandrake Linux systém prichádza s niekoľko tisíc softvérovými\n"
-"balíčkami na CDROM alebo DVD. Tento nástroj vám pomôže pri výbere a inštalácii\n"
-"softvéru na váš počítač."
+msgid "Backup"
+msgstr "Záloha"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:145
 #, c-format
-msgid "Stop"
-msgstr "Stop"
+msgid "Monitoring"
+msgstr "Monitorovanie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:146
 #, c-format
-msgid "Biology"
-msgstr "Biológia"
+msgid "Sound"
+msgstr "Zvuk"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:147
 #, c-format
-msgid "Please wait, generating hdlist..."
-msgstr "Prosím čakajte, generujem hdlist..."
+msgid "Graphics"
+msgstr "Grafika"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:148
 #, c-format
-msgid "Mathematics"
-msgstr "Matematika"
+msgid "Video"
+msgstr "Video"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:149
 #, c-format
-msgid "Internationalization"
-msgstr "Internacionalizácia"
+msgid "File transfer"
+msgstr "Prenos súborov"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:150
 #, c-format
-msgid "Edit a medium"
-msgstr "Zmeniť médium"
+msgid "IRC"
+msgstr "IRC"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:151
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"Už existuje zdroj s takýmto menom, chcete ho\n"
-"skutočne prepísať?"
+msgid "Instant messaging"
+msgstr "Instant messaging"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:152
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"Pre vyriešenie závislosti, sú potrebné nainštalovať tieto balíčky:\n"
-"\n"
+msgid "Chat"
+msgstr "Chat"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:153
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP server"
+msgid "News"
+msgstr "Správy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:154
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Neobnoviteľná chyba: neboli nájdené žiadne balíky pre inštaláciu."
+msgid "Mail"
+msgstr "Pošta"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:155
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "Niektoré balíky nie je možné odstrániť"
+msgid "WWW"
+msgstr "WWW"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:156
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s"
-msgstr ""
-"Prepáčte, tieto balíky nie je možné vybrať:\n"
-"\n"
-"%s"
+msgid "Remote access"
+msgstr "Vzdialený prístup"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:158
 #, c-format
-msgid "Finland"
-msgstr "Fínsko"
+msgid "Office"
+msgstr "Kancelária"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:159
 #, c-format
-msgid "X11 bitmap"
-msgstr "X11 bitmapa"
+msgid "Publishing"
+msgstr "Publikovanie"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:160
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Chyba pri pridávaní média"
+msgid "Terminals"
+msgstr "Terminály"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:161
 #, c-format
-msgid "Media limit:"
-msgstr "Limit média:"
+msgid "Shells"
+msgstr "Shelly"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:162
 #, c-format
-msgid "More information on package..."
-msgstr "Viac informácii o balíčku..."
+msgid "File tools"
+msgstr "Súborove nástroje"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:163
 #, c-format
-msgid "Save changes"
-msgstr "Uložiť zmeny"
+msgid "Text tools"
+msgstr "Textove nástroje"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166 ../rpmdrake:167
+#: ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170 ../rpmdrake:171
 #, c-format
-msgid "Instant messaging"
-msgstr "Instant messaging"
+msgid "Graphical desktop"
+msgstr "Grafická pracovná plocha"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:164
 #, c-format
-msgid "News"
-msgstr "Správy"
+msgid "GNOME"
+msgstr "GNOME"
 
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../rpmdrake:165
 #, c-format
-msgid "More info"
-msgstr "Viac informácií"
+msgid "Icewm"
+msgstr "Icewm"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:166
 #, c-format
-msgid "Search"
-msgstr "Hľadať"
+msgid "FVWM based"
+msgstr "založené na FVWM"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:167
 #, c-format
-msgid "Computer books"
-msgstr "Počítačove knihy"
+msgid "KDE"
+msgstr "KDE"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:168
 #, c-format
-msgid "If left blank, synthesis/hdlist will be automatically probed"
-msgstr "Ak ponecháte nevyplnené, synthesis/hdlist budú automaticky vyskúšané"
+msgid "Sawfish"
+msgstr "Sawfish"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:169
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Nie je možné nájsť žiaden použiteľný mirror.\n"
-"\n"
-"Je veľa možných dôvodov pre tento problém; najčastejší je ten,\n"
-"že architektúra vášho procesora nie je podpororovaná oficiálnymi\n"
-"aktualizáciami Mandrake Linux."
+msgid "WindowMaker"
+msgstr "WindowMaker"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:170
 #, c-format
-msgid "Spain"
-msgstr "Španielsko"
+msgid "Enlightenment"
+msgstr "Enlightenment"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175
+#: ../rpmdrake:176
 #, c-format
-msgid "Already existing update media"
-msgstr "Už existuje zdroj s aktualizáciami"
+msgid "Books"
+msgstr "Knihy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:172
 #, c-format
-msgid "Files:\n"
-msgstr "Súbory:\n"
+msgid "Howtos"
+msgstr "Ako nato"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:173
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Nie je možné prebrať zdrojové balíčky."
+msgid "Faqs"
+msgstr "Často kladené otázky"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:174
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Môžete zadať užívateľské meno/heslo pre proxy autentifikáciu:"
+msgid "Computer books"
+msgstr "Počítačove knihy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:175
 #, c-format
-msgid "Chat"
-msgstr "Chat"
+msgid "Literature"
+msgstr "Literatúra"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:275 ../rpmdrake:637 ../rpmdrake:638
 #, c-format
-msgid "Update"
-msgstr "Aktualizácia"
+msgid "(Not available)"
+msgstr "(Nedostupné)"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:303 ../rpmdrake:361
 #, c-format
-msgid "Additional packages needed"
-msgstr "Sú potrebné ďalšie balíčky"
+msgid "Search results"
+msgstr "Výsledky vyhľadávania"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:303
 #, c-format
-msgid "Running in user mode"
-msgstr "Beh v používateľskom móde"
+msgid "Search results (none)"
+msgstr "Výsledky vyhľadávania (žiadne)"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:313 ../rpmdrake:324
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Media Manager, and then add a `Security\n"
-"updates' medium.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Môžete si vybrať váš obľúbený mirror manuálne: a to tak,\n"
-"že spustíte editor zdrojov a pridáte zdroj pre\n"
-"'Bezpečnostné aktualizácie'.\n"
-"\n"
-"Potom je potrebné reštartovať MandrakeUpdate."
+msgid "Please wait, searching..."
+msgstr "Prosím čakajte, vyhľadávam..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:327
 #, c-format
-msgid "Adding a medium:"
-msgstr "Pridanie zdroja:"
+msgid "Stop"
+msgstr "Stop"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:362 ../rpmdrake:478
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Kvôli závislostiam budú tieto balíčky odstránené:\n"
-"\n"
+msgid "Upgradable"
+msgstr "Aktualizovateľné"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:362 ../rpmdrake:478
 #, c-format
-msgid ""
-"You already have at least one update medium configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Media Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"Máte už nakonfigurovaný aspoň jeden zdroj s aktualizáciami, ale\n"
-"momentálne je zakázaný. Môžete spustiť editor zdrojov pre povolenie\n"
-"aspoň jedného (označiť v stĺpci Povolené?).\n"
-"\n"
-"Potom reštartujte MandrakeUpdate."
+msgid "Addable"
+msgstr "Pridateľné"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:364
 #, c-format
-msgid "Find:"
-msgstr "Hľadaj:"
+msgid "Selected"
+msgstr "Vybrané"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:364
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Prosím čakajte, vypisujem balíčky..."
+msgid "Not selected"
+msgstr "Neoznačené"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:398
 #, c-format
-msgid "All"
-msgstr "Všetko"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:416 ../rpmdrake:520 ../rpmdrake:522
 #, c-format
-msgid "XFree86"
-msgstr "XFree86"
+msgid "More information on package..."
+msgstr "Viac informácii o balíčku..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:417
 #, c-format
-msgid "Normal information"
-msgstr "Normálne informácie"
+msgid "Please choose"
+msgstr "Prosím zvoľte"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:417
 #, c-format
-msgid "Removable device"
-msgstr "Vymeniteľné zariadenie"
+msgid "One of the following packages is needed:"
+msgstr "Jeden z nasledujúcich balíčkov je potrebný:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:437
 #, c-format
-msgid "Preparing packages installation..."
-msgstr "Príprava balíkov na inštaláciu..."
+msgid "Please wait, listing packages..."
+msgstr "Prosím čakajte, vypisujem balíčky..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:451
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Prosím čakajte, odstraňujú balíčky..."
+msgid "No update"
+msgstr "Žiadna aktualizácia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:452
 #, c-format
-msgid "Login:"
-msgstr "Login:"
+msgid ""
+"The list of updates is empty. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+"Zoznam aktualizácií je prázdny. To znamená, že buď nie sú\n"
+"dostupné žiadne aktualizácie pre balíčky nainštalované vo vašom\n"
+"systéme alebo už máte všetky nainštalované."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:472
 #, c-format
-msgid "Belgium"
-msgstr "Belgicko"
+msgid "All"
+msgstr "Všetko"
 
-#: ../rpmdrake:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:511 ../rpmdrake:514
 #, c-format
-msgid "File tools"
-msgstr "Súborove nástroje"
+msgid "More info"
+msgstr "Viac informácií"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:515
 #, c-format
-msgid "Configure proxies"
-msgstr "Nastaviť proxy"
+msgid "Information on packages"
+msgstr "Informácie o balíčkoch"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:537
 #, c-format
-msgid "Printing"
-msgstr "Tlač"
+msgid "Some additional packages need to be removed"
+msgstr "Je potrebné odstrániť niektoré balíčky"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:538
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "Spustenie získavania `%s'..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"Kvôli závislostiam budú tieto balíčky odstránené:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:544 ../rpmdrake:553
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Nastala fatálna chyba: %s"
+msgid "Some packages can't be removed"
+msgstr "Niektoré balíky nie je možné odstrániť"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:545
 #, c-format
-msgid "Fatal error"
-msgstr "Fatálna chyba"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Odstránenie týchto balíčkov naruší váš systém, prepáčte:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:554 ../rpmdrake:607
 #, c-format
-msgid "Leaves only, sorted by install date"
-msgstr "Iba ponechať, zoradiť podľa dátumu inštalácie"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"Kvôli závislostiam musia byť nasledujúce balíčky teraz odznačené:\n"
+"\n"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:577
+#, c-format
+msgid "Additional packages needed"
+msgstr "Sú potrebné ďalšie balíčky"
+
+#: ../rpmdrake:578
 #, c-format
 msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
-"Errors:\n"
-"%s"
 msgstr ""
-"Nie je možné aktualizovať zdroj; bude automaticky zakázaný.\n"
+"Pre vyriešenie závislosti, sú potrebné nainštalovať tieto balíčky:\n"
 "\n"
-"Chyba:\n"
-"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:592
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Niektore balíčky nebolo možné nainštalovať"
+
+#: ../rpmdrake:593
 #, c-format
 msgid ""
-"The list of updates is empty. This means that either there is\n"
-"no available update for the packages installed on your computer,\n"
-"or you already installed all of them."
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
 msgstr ""
-"Zoznam aktualizácií je prázdny. To znamená, že buď nie sú\n"
-"dostupné žiadne aktualizácie pre balíčky nainštalované vo vašom\n"
-"systéme alebo už máte všetky nainštalované."
+"Prepáčte, tieto balíky nie je možné vybrať:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:606 ../rpmdrake:858
 #, c-format
-msgid "Geosciences"
-msgstr "Geológia"
+msgid "Some packages need to be removed"
+msgstr "Je potrebné odstrániť niektoré balíčky"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:625
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Prosím zvoľte si jeden z mirorov."
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Vybrané: %d MB / Dostupné: %d MB"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:627
 #, c-format
-msgid "Communications"
-msgstr "Komunikácia"
+msgid "Selected size: %d MB"
+msgstr "Vybraná veľkosť: %d Mb"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:635
 #, c-format
-msgid "Editing parallel group \"%s\":"
-msgstr "Úprava paralelnej skupiny \"%s\":"
+msgid "Files:\n"
+msgstr "Súbory:\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:638
 #, c-format
-msgid "Configuration"
-msgstr "Konfigurácia"
+msgid "Changelog:\n"
+msgstr "Záznam zmien:\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:640
 #, c-format
-msgid "Reason for update: "
-msgstr "Dôvod pre aktualizáciu:"
+msgid "Medium: "
+msgstr "Médium:"
 
-#: ../rpmdrake:1
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:642
 #, c-format
-msgid "Remove"
-msgstr "Odstrániť"
+msgid "Currently installed version: "
+msgstr "Aktuálne nainštalovaná verzia:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:646
 #, c-format
-msgid "Portugal"
-msgstr "Portugalsko"
+msgid "Name: "
+msgstr "Názov: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:647
 #, c-format
-msgid "Czech Republic"
-msgstr "Česká Republika"
+msgid "Version: "
+msgstr "Verzia: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:648
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Je potrebné odstrániť niektoré balíčky"
+msgid "Size: "
+msgstr "Veľkosť: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:648
 #, c-format
-msgid "Problem during removal"
-msgstr "Problém počas odstraňovania"
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:650
 #, c-format
-msgid "WindowMaker"
-msgstr "WindowMaker"
+msgid "Importance: "
+msgstr "Dôležitosť: "
 
-#: ../rpmdrake:1
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:652
 #, c-format
-msgid "Help launched in background"
-msgstr "Pomoc spustená na pozadí"
+msgid "Summary: "
+msgstr "Stručný obsah: "
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake:654
 #, c-format
-msgid "Unable to add medium, wrong or missing arguments"
-msgstr "Nie je možné pridať médium, chybné alebo chýbajúce argumenty"
+msgid "Reason for update: "
+msgstr "Dôvod pre aktualizáciu:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:656
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Vyskytol sa problém počas inštalácie balíkov:\n"
-"\n"
-"%s"
+msgid "Description: "
+msgstr "Popis:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:707
 #, c-format
-msgid "No package found for installation."
-msgstr "Nebol nájdený žiaden balík pre inštaláciu."
+msgid "Bugfixes updates"
+msgstr "Aktualizácie opravujúce chyby"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:707
 #, c-format
-msgid "Type1"
-msgstr "Type1"
+msgid "Normal updates"
+msgstr "Normálne aktualizácie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:724
 #, c-format
-msgid "Medium: "
-msgstr "Médium:"
+msgid "Mandrake choices"
+msgstr "Voľby Mandrake"
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake:725
 #, c-format
-msgid "Successfully added medium `%s'."
-msgstr "Úspešne pridané médium `%s'."
+msgid "All packages, alphabetical"
+msgstr "Všetky balíčky, abecedne"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:731
 #, c-format
-msgid "Strategy"
-msgstr "Stratégie"
+msgid "All packages, by group"
+msgstr "Všetky balíčky, podľa skupiny"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:731
 #, c-format
-msgid "Description: "
-msgstr "Popis:"
+msgid "All packages, by size"
+msgstr "Všetky balíčky, podľa veľkosti"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:732
 #, c-format
-msgid "Archiving"
-msgstr "Archivovanie"
+msgid "All packages, by selection state"
+msgstr "Všetky balíky podľa stavu výberu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:733
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "All packages, by medium repository"
+msgstr "Všetky balíky podľa zdroja"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:733
 #, c-format
-msgid "System"
-msgstr "Systém"
+msgid "All packages, by update availability"
+msgstr "Všetky balíčky, podľa dostupnosti aktualizácie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:734
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Všetky požadované balíčky boli úspešne nainštalované."
+msgid "Leaves only, sorted by install date"
+msgstr "Iba ponechať, zoradiť podľa dátumu inštalácie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Servers"
-msgstr "Servre"
+msgid "in names"
+msgstr "v menách"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Puzzles"
-msgstr "Puzzle"
+msgid "in descriptions"
+msgstr "v popisoch"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Local files"
-msgstr "Lokálne súbory"
+msgid "in file names"
+msgstr "v menách súborov"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:796
 #, c-format
-msgid "Choose a medium for adding in the media limit:"
-msgstr "Vyberte si zdroj pre pridanie k obmedzeným zdrojom:"
+msgid "Reset the selection"
+msgstr "Zrušiť výber"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:796
 #, c-format
-msgid "Addable"
-msgstr "Pridateľné"
+msgid "Reload the packages list"
+msgstr "Znovu načítač zoznam balíčkov"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:797 ../rpmdrake.pm:443
 #, c-format
-msgid "Keys"
-msgstr "Kľúče"
+msgid "Update media"
+msgstr "Aktualizácia média"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:822
 #, c-format
-msgid "Please choose"
-msgstr "Prosím zvoľte"
+msgid "Normal information"
+msgstr "Normálne informácie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:822
 #, c-format
-msgid "Databases"
-msgstr "Databázy"
+msgid "Maximum information"
+msgstr "Maximálne informácie"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:842
 #, c-format
-msgid ""
-"Are you sure you want to remove the key %s from medium %s?\n"
-"(name of the key: %s)"
-msgstr ""
-"Ste si istí, že chcete odstrániť kľúč %s zo zdroja %s?\n"
-"(meno kľúča: %s)"
+msgid "You need to select some packages first."
+msgstr "Je potrebné najprv vybrať niektoré balíky."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:847
 #, c-format
-msgid "Name: "
-msgstr "Názov: "
+msgid "Too many packages are selected"
+msgstr "Vybrali ste príliš veľa balíčkov"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:848
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Hostiteľ proxy:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Varovanie: zdá sa, že sa pokúšate pridať príliš veľa balíčkov,\n"
+"čo môže spôsobiť, že váš súborový systém bude zaplnený\n"
+"počas alebo po inštalácii balíčkov ; toto je veľmi nebezpečné\n"
+"a mali by ste byť opatrní.\n"
+"\n"
+"Skutočne si želáte nainštalovať všetky zvolené balíčky?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:859
 #, c-format
 msgid ""
-"The following packages have bad signatures:\n"
+"The following packages have to be removed for others to be upgraded:\n"
 "\n"
 "%s\n"
 "\n"
-"Do you want to continue installation?"
+"Is it ok to continue?"
 msgstr ""
-"Nasledovné balíky obsahujú zlé podpisy:\n"
+"Nasledovné balíky budú odstránené aby bolo možné iné aktualizovať:\n"
 "\n"
 "%s\n"
 "\n"
-"Chcete pokračovať v inštalácii?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Preverujem %s"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Získavanie '%s', rýchlosťou: %s"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Hosts:"
-msgstr "Hostitelia:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Video"
-msgstr "Video"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Perl"
-msgstr "Perl"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Normal updates"
-msgstr "Normálne aktualizácie"
+"Je možné pokračovať?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:884
 #, c-format
-msgid "Manage keys..."
-msgstr "Manažovanie kľúčov..."
+msgid "Software Packages Removal"
+msgstr "Odstránenie softvérových balíčkov"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:885
 #, c-format
-msgid "Maximum information"
-msgstr "Maximálne informácie"
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:886
 #, c-format
-msgid "Selected"
-msgstr "Vybrané"
+msgid "Software Packages Installation"
+msgstr "Príprava balíkov na inštaláciu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:893
 #, c-format
-msgid "Computer science"
-msgstr "Počítačové vedy"
+msgid "Find:"
+msgstr "Hľadaj:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:898
 #, c-format
-msgid "Fonts"
-msgstr "Písma"
+msgid "Search"
+msgstr "Hľadať"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:909
 #, c-format
-msgid "Hardware"
-msgstr "Hardware"
+msgid "Install"
+msgstr "Inštaluj"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:911
 #, c-format
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:938
 #, c-format
-msgid "Version: "
-msgstr "Verzia: "
+msgid "Fatal error"
+msgstr "Fatálna chyba"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:939
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Použite .%s ako hlavný súbor"
+msgid "A fatal error occurred: %s."
+msgstr "Nastala fatálna chyba: %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:947
 #, c-format
-msgid "Norway"
-msgstr "Nórsko"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Je potrebné kontaktovať mirror pre získanie najnovších aktualizácií.\n"
+"Skontrolujte prosím, či je sieť funkčná.\n"
+"\n"
+"Je možné pokračovať?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:956
 #, c-format
-msgid "Israel"
-msgstr "Izrael"
+msgid "Already existing update media"
+msgstr "Už existuje zdroj s aktualizáciami"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:957
 #, c-format
-msgid "China"
-msgstr "Čína"
+msgid ""
+"You already have at least one update medium configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Media Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Máte už nakonfigurovaný aspoň jeden zdroj s aktualizáciami, ale\n"
+"momentálne je zakázaný. Môžete spustiť editor zdrojov pre povolenie\n"
+"aspoň jedného (označiť v stĺpci Povolené?).\n"
+"\n"
+"Potom reštartujte MandrakeUpdate."
+
+#: ../rpmdrake:967
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Ako si zvoliť miror manuálne"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:968
 #, c-format
 msgid ""
-"Welcome to the software removal tool!\n"
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Media Manager, and then add a `Security\n"
+"updates' medium.\n"
 "\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Vítajte v nástroji pre odstraňovanie softvéru!\n"
+"Môžete si vybrať váš obľúbený mirror manuálne: a to tak,\n"
+"že spustíte editor zdrojov a pridáte zdroj pre\n"
+"'Bezpečnostné aktualizácie'.\n"
 "\n"
-"Tento nástroj vám pomôže si zvoliť softvér ktorý chcete odstrániť\n"
-"z vášho počítača."
+"Potom je potrebné reštartovať MandrakeUpdate."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:996
 #, c-format
-msgid "(Not available)"
-msgstr "(Nedostupné)"
+msgid "Please wait, finding available packages..."
+msgstr "Prosím čakajte, hľadám dostupné balíčky..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1029
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Aktualizácie opravujúce chyby"
+msgid "Inspecting %s"
+msgstr "Preverujem %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1048
 #, c-format
-msgid "Java"
-msgstr "Java"
+msgid "changes:"
+msgstr "zmeny:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1052
 #, c-format
-msgid "Update..."
-msgstr "Aktualizácia..."
+msgid "Remove .%s"
+msgstr "Odstrániť .%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1054
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Prosím čakajte, hľadám dostupné balíčky..."
+msgid "Use .%s as main file"
+msgstr "Použite .%s ako hlavný súbor"
 
-#: ../rpmdrake:1
-#: ../edit-urpm-sources.pl:1
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1056
 #, c-format
-msgid "Cancel"
-msgstr "Zrušiť"
+msgid "Do nothing"
+msgstr "Neurobiť nič"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1068
 #, c-format
-msgid "Sciences"
-msgstr "Veda"
+msgid "Installation finished"
+msgstr "Inštalácia ukončená"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1078
 #, c-format
-msgid "Enabled?"
-msgstr "Povolené?"
+msgid "Inspect..."
+msgstr "Preveriť.."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1104 ../rpmdrake:1229
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Všetky balíčky, abecedne"
+msgid "Everything installed successfully"
+msgstr "Všetko bolo úspešne nainštalované"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1105 ../rpmdrake:1230
 #, c-format
-msgid "Mandrake choices"
-msgstr "Voľby Mandrake"
+msgid "All requested packages were installed successfully."
+msgstr "Všetky požadované balíčky boli úspešne nainštalované."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1107 ../rpmdrake:1214
 #, c-format
-msgid "Toys"
-msgstr "Hračky"
+msgid "Problem during installation"
+msgstr "Problém počas inštalácie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1108 ../rpmdrake:1215 ../rpmdrake:1244
 #, c-format
-msgid "Installation finished"
-msgstr "Inštalácia ukončená"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Vyskytol sa problém počas inštalácie balíkov:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1129
 #, c-format
-msgid " done."
-msgstr " hotovo."
+msgid "Unable to get source packages."
+msgstr "Nie je možné prebrať zdrojové balíčky."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1130
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Vložte médium ak chcete pokračovať"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Nie je možné získať zdrojové balíky. %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1131 ../rpmdrake:1187
 #, c-format
 msgid ""
-"Unable to add medium, errors reported:\n"
 "\n"
+"\n"
+"Error(s) reported:\n"
 "%s"
 msgstr ""
-"Nie je možné pridať médium, chyba je oznámená:\n"
 "\n"
+"\n"
+"Ohlásená chyba:\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1138
 #, c-format
-msgid "no name found, key doesn't exist in rpm keyring!"
-msgstr "žiadne meno nebol nájdené, kľúč neexistuje na rpm väzku kľúčov!"
+msgid "Package installation..."
+msgstr "Inštalácia balíčkov..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1138
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Vybrali ste príliš veľa balíčkov"
+msgid "Initializing..."
+msgstr "Inicializácia..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1143
 #, c-format
-msgid "Physics"
-msgstr "Fyzika"
+msgid "Change medium"
+msgstr "Vymeniť médium"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1144
 #, c-format
-msgid "Do nothing"
-msgstr "Neurobiť nič"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Prosím vložte médium s názvom \"%s\" do zariadenia [%s]"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1149
 #, c-format
-msgid "Danmark"
-msgstr "Dánsko"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Sťahovanie balíčka `%s' (%s/%s)..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1168
 #, c-format
-msgid "Error during download"
-msgstr "Chyba počas sťahovania"
+msgid "Verifying packages signatures..."
+msgstr "Overovanie podpisov balíkov..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1177
 #, c-format
-msgid "Mail"
-msgstr "Pošta"
+msgid ""
+"The following packages have bad signatures:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
+msgstr ""
+"Nasledovné balíky obsahujú zlé podpisy:\n"
+"\n"
+"%s\n"
+"\n"
+"Chcete pokračovať v inštalácii?"
+
+#: ../rpmdrake:1184 ../rpmdrake:1243
+#, c-format
+msgid "Installation failed"
+msgstr "Inštalácia neúspešná"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1185
 #, c-format
 msgid ""
-"Packages database is locked. Please close other applications\n"
-"working with packages database (do you have another media\n"
-"manager on another desktop, or are you currently installing\n"
-"packages as well?)."
+"Installation failed, some files are missing:\n"
+"%s\n"
+"\n"
+"You may want to update your media database."
 msgstr ""
-"Databáza balíkov je uzamknutá. Ukončite iné aplikácie, ktoré\n"
-"pracujú s databázou balíkov (napríklda iný správca balíkov na\n"
-"inej ploche, alebo sa práva inštalujú iné balíky?)."
+"Inštalácia neúspešná, niektoré súbory chýbajú:\n"
+"%s\n"
+"\n"
+"Možno bude potrebné aktualizovať databázu zdrojov."
 
-#: ../rpmdrake:1
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1199
 #, c-format
-msgid "Help"
-msgstr "Pomoc"
+msgid "Preparing packages installation..."
+msgstr "Príprava balíkov na inštaláciu..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1202
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Nie je možné získať zdrojové balíky. %s"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Inštalácia balíčka `%s' (%s/%s)..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1227
 #, c-format
-msgid "Sports"
-msgstr "Šport"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"Inštalácia bola ukončená; %s.\n"
+"\n"
+"Niektoré konfiguračné súbory boli vytvorené ako `.rpmnew' alebo `.rpmsave',\n"
+"mali by ste ich prezrieš:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1227
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "everything was installed correctly"
+msgstr "všetko bolo úspešne nainštalované"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1234
 #, c-format
-msgid "Protocol"
-msgstr "Protokol"
+msgid "No package found for installation."
+msgstr "Nebol nájdený žiaden balík pre inštaláciu."
 
-#: ../rpmdrake:1
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1235
 #, c-format
-msgid "(none)"
-msgstr "(žiadna)"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Neobnoviteľná chyba: neboli nájdené žiadne balíky pre inštaláciu."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1257
 #, c-format
-msgid "All packages, by medium repository"
-msgstr "Všetky balíky podľa zdroja"
+msgid "Please wait, reading packages database..."
+msgstr "Prosím čakajte, načítavam databázu balíčkov..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1304
 #, c-format
-msgid "Germany"
-msgstr "Nemecko"
+msgid "Please wait, removing packages..."
+msgstr "Prosím čakajte, odstraňujú balíčky..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1309
 #, c-format
-msgid "Compression"
-msgstr "Kompresia"
+msgid "Problem during removal"
+msgstr "Problém počas odstraňovania"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1310
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Získavanie '%s', čas do konca: %s, rýchlosť: %s"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Vyskytol sa problém počas inštalácie balíkov:\n"
+"\n"
+"%s"
 
-#. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1342
 #, c-format
-msgid "%s from medium %s"
-msgstr "%s z média %s"
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+"Vítajte v nástroji pre odstraňovanie softvéru!\n"
+"\n"
+"Tento nástroj vám pomôže si zvoliť softvér ktorý chcete odstrániť\n"
+"z vášho počítača."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1347
 #, c-format
-msgid "Add a host"
-msgstr "Pridať hostiteľa"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Vítajte v MandrakeUpdate!\n"
+"\n"
+"Tento nástroj vám pomôže vybrať aktualizácie ktoré chcete nainštalovať do "
+"vášho\n"
+"počítača."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1352
 #, c-format
-msgid "Development"
-msgstr "Vývoj"
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"Vítajte v nástroji pre inštaláciu softvéru!\n"
+"\n"
+"Váš Mandrake Linux systém prichádza s niekoľko tisíc softvérovými\n"
+"balíčkami na CDROM alebo DVD. Tento nástroj vám pomôže pri výbere a "
+"inštalácii\n"
+"softvéru na váš počítač."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:121
 #, c-format
-msgid "No"
-msgstr "Nie"
+msgid "Yes"
+msgstr "Ano"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:123
 #, c-format
-msgid "Media limit"
-msgstr "Limit média"
+msgid "No"
+msgstr "Nie"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:159
 #, c-format
-msgid "Install"
-msgstr "Inštaluj"
+msgid "Info..."
+msgstr "Info..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:214
 #, c-format
-msgid "Add..."
-msgstr "Pridať..."
+msgid "Austria"
+msgstr "Rakúsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:215
 #, c-format
-msgid "Change medium"
-msgstr "Vymeniť médium"
+msgid "Australia"
+msgstr "Austrália"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:216
 #, c-format
-msgid "Reset the selection"
-msgstr "Zrušiť výber"
+msgid "Belgium"
+msgstr "Belgicko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:217
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+msgid "Brazil"
+msgstr "Brazília"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:218
 #, c-format
-msgid "in file names"
-msgstr "v menách súborov"
+msgid "Canada"
+msgstr "Kanada"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:219
 #, c-format
-msgid "Books"
-msgstr "Knihy"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:220
 #, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
-msgstr ""
-"Nastala chyba pri získavaní zoznamu mirrorov:\n"
-"\n"
-"%s\n"
-"Sieť, alebo websajt MandrakeSoft sú zrejme nedostupné.\n"
-"Prosím, skúste neskôr"
+msgid "Czech Republic"
+msgstr "Česká Republika"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:221
 #, c-format
-msgid "Howtos"
-msgstr "Ako nato"
+msgid "Germany"
+msgstr "Nemecko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:222
 #, c-format
-msgid "Icewm"
-msgstr "Icewm"
+msgid "Danmark"
+msgstr "Dánsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:223 ../rpmdrake.pm:227
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"\n"
-"You may want to update your media database."
-msgstr ""
-"Inštalácia neúspešná, niektoré súbory chýbajú:\n"
-"%s\n"
-"\n"
-"Možno bude potrebné aktualizovať databázu zdrojov."
+msgid "Greece"
+msgstr "Grécko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:224
 #, c-format
-msgid "Libraries"
-msgstr "Knižnice"
+msgid "Spain"
+msgstr "Španielsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:225
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Odstránenie týchto balíčkov naruší váš systém, prepáčte:\n"
-"\n"
+msgid "Finland"
+msgstr "Fínsko"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:226
 #, c-format
-msgid "Brazil"
-msgstr "Brazília"
+msgid "France"
+msgstr "Francúzsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:228
 #, c-format
-msgid "Installation failed"
-msgstr "Inštalácia neúspešná"
+msgid "Israel"
+msgstr "Izrael"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:229
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Ohlásená chyba:\n"
-"%s"
+msgid "Italy"
+msgstr "Taliansko"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:230
 #, c-format
-msgid "Manage keys for digital signatures of packages"
-msgstr "Manažovanie kľúčov pre elektronické podpisy balíkov"
+msgid "Japan"
+msgstr "Japonsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:231
 #, c-format
-msgid "Currently installed version: "
-msgstr "Aktuálne nainštalovaná verzia:"
+msgid "Korea"
+msgstr "Korea"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:232
 #, c-format
-msgid "Games"
-msgstr "Hry"
+msgid "Netherlands"
+msgstr "Holandsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:233
 #, c-format
-msgid "Astronomy"
-msgstr "Astronómia"
+msgid "Norway"
+msgstr "Nórsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:234
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Prosím vložte médium s názvom \"%s\" do zariadenia [%s]"
+msgid "Poland"
+msgstr "Poľsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:235
 #, c-format
-msgid "You need to select some packages first."
-msgstr "Je potrebné najprv vybrať niektoré balíky."
+msgid "Portugal"
+msgstr "Portugalsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:236
 #, c-format
-msgid "All packages, by selection state"
-msgstr "Všetky balíky podľa stavu výberu"
+msgid "Russia"
+msgstr "Rusko"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:237
 #, c-format
-msgid "Name:"
-msgstr "Meno:"
+msgid "Sweden"
+msgstr "Švédsko"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:238
 #, c-format
-msgid "KDE"
-msgstr "KDE"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:239
 #, c-format
-msgid "No update"
-msgstr "Žiadna aktualizácia"
+msgid "United Kingdom"
+msgstr "Veľká Británia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:240
 #, c-format
-msgid "Networking"
-msgstr "Sieť"
+msgid "China"
+msgstr "Čína"
 
-#: ../rpmdrake:1
-#: ../edit-urpm-sources.pl:1
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:241 ../rpmdrake.pm:242 ../rpmdrake.pm:243 ../rpmdrake.pm:244
+#: ../rpmdrake.pm:295
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "United States"
+msgstr "Spojené Štáty"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:305
 #, c-format
-msgid "Text tools"
-msgstr "Textove nástroje"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Je potrebné kontaktovať websajt MandrakeSoft pre získanie\n"
+"zoznamu mirrorov. Skontrolujte či je vaše sieťové pripojenie funkčné.\n"
+"\n"
+"Je možné pokračovať?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:309
 #, c-format
-msgid "Cards"
-msgstr "Karty"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Prosím čakajte, sťahujem adresy mirorov z web stránky MandrakeSoft."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:315
 #, c-format
-msgid "Sawfish"
-msgstr "Sawfish"
+msgid "Error during download"
+msgstr "Chyba počas sťahovania"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:316
 #, c-format
-msgid "Group name:"
-msgstr "Meno skupiny:"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
+"Nastala chyba pri získavaní zoznamu mirrorov:\n"
+"\n"
+"%s\n"
+"Sieť, alebo websajt MandrakeSoft sú zrejme nedostupné.\n"
+"Prosím, skúste neskôr"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:324
 #, c-format
-msgid "Type in the hostname or IP address of the host to add:"
-msgstr "Zadajte meno alebo IP adresu zdroja ktorý chcete pridať:"
+msgid "No mirror"
+msgstr "Žiaden miror"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:325
 #, c-format
-msgid "Arcade"
-msgstr "Arkády"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Nie je možné nájsť žiaden použiteľný mirror.\n"
+"\n"
+"Je veľa možných dôvodov pre tento problém; najčastejší je ten,\n"
+"že architektúra vášho procesora nie je podpororovaná oficiálnymi\n"
+"aktualizáciami Mandrake Linux."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:342
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Please choose the desired mirror."
+msgstr "Prosím zvoľte si jeden z mirorov."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:383
 #, c-format
-msgid "Editing medium \"%s\":"
-msgstr "Zmena média \"%s\":"
+msgid "Copying file for medium `%s'..."
+msgstr "Kopírujem súbor pre médium `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:386
 #, c-format
-msgid "Add a medium limit"
-msgstr "Pridať limit média"
+msgid "Examining file of medium `%s'..."
+msgstr "Preverujem súbory zo zdroja '%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:389
 #, c-format
-msgid "Group"
-msgstr "Skupina"
+msgid "Examining remote file of medium `%s'..."
+msgstr "Preverujem vzdialené súbory pre zdroj '%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:393
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Prosím čakajte, odstraňujem médium..."
+msgid " done."
+msgstr " hotovo."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:397
 #, c-format
-msgid "Accessibility"
-msgstr "Dostupnosť"
+msgid " failed!"
+msgstr " chyba!"
 
-#: ../rpmdrake:1
+#. -PO: We're downloading the said file from the said medium
+#: ../rpmdrake.pm:401
 #, c-format
-msgid "changes:"
-msgstr "zmeny:"
+msgid "%s from medium %s"
+msgstr "%s z média %s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:405
 #, c-format
-msgid "Add"
-msgstr "Pridať"
+msgid "Starting download of `%s'..."
+msgstr "Spustenie získavania `%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:409
 #, c-format
-msgid "Regenerate hdlist"
-msgstr "Regenerovať hdlist"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Získavanie '%s', čas do konca: %s, rýchlosť: %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:412
 #, c-format
-msgid "Editors"
-msgstr "Editory"
+msgid "Download of `%s', speed:%s"
+msgstr "Získavanie '%s', rýchlosťou: %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:449
 #, c-format
-msgid "United Kingdom"
-msgstr "Veľká Británia"
+msgid "Select the media you wish to update:"
+msgstr "Prosím zvoľte médium ktoré chcete aktualizovať:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:453
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Relatívna cesta k synthesis/hdlist: "
+msgid "Update"
+msgstr "Aktualizácia"
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake.pm:465
 #, c-format
 msgid ""
-"You are about to add a new packages medium, `%s'.\n"
-"That means you will be able to add new software packages\n"
-"to your system from that new medium."
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
-"Chcete pridať médium obsahujúce nové rpm balíky `%s'.\n"
-"Znamená to, že bude možné pridávať nové softvérové balíky\n"
-"do vášho systému z tohto nového média."
+"Nie je možné aktualizovať zdroj; bude automaticky zakázaný.\n"
+"\n"
+"Chyba:\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:482 ../rpmdrake.pm:487
 #, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Unable to add medium, errors reported:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+"%s"
 msgstr ""
-"Vítajte v MandrakeUpdate!\n"
+"Nie je možné pridať médium, chyba je oznámená:\n"
 "\n"
-"Tento nástroj vám pomôže vybrať aktualizácie ktoré chcete nainštalovať do vášho\n"
-"počítača."
+"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:498
 #, c-format
-msgid "Remove a key"
-msgstr "Odstrániť kľúč"
+msgid "Unable to create medium."
+msgstr "Nemôžem vytvoriť médium."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:503
 #, c-format
-msgid "User:"
-msgstr "Užívateľ:"
+msgid "Failure when adding medium"
+msgstr "Chyba pri pridávaní média"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:504
 #, c-format
-msgid "Browse..."
-msgstr "Prechádzať..."
+msgid ""
+"There was a problem adding medium:\n"
+"\n"
+"%s"
+msgstr ""
+"Vyskytol sa problém pri pridávaní média:\n"
+"\n"
+"%s"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -2239,4 +2264,3 @@ msgstr "Odstrániť softvér"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Manažér zdrojov softvéru"
-
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5343ce2a..9d64038d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2004-02-20 17:29+0100\n"
+"POT-Creation-Date: 2004-02-20 20:53+0100\n"
 "PO-Revision-Date: 2004-02-21 14:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake i18n Team <cooker-i18n@linux-mandrake.com>\n"
@@ -19,1937 +19,1966 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:61
 #, c-format
-msgid "Enlightenment"
-msgstr "Enlightenment"
+msgid "Add a medium"
+msgstr "添加一个介质"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:62
 #, c-format
-msgid "Remote access"
-msgstr "远程访问"
+msgid "Local files"
+msgstr "本机文件"
 
-#: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:62
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "正在更新介质，请稍候..."
+msgid "Path:"
+msgstr "路径:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:63
 #, c-format
-msgid "FVWM based"
-msgstr "基于 FVWM"
+msgid "FTP server"
+msgstr "FTP 服务器"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:63 ../edit-urpm-sources.pl:64
+#: ../edit-urpm-sources.pl:66 ../edit-urpm-sources.pl:196
 #, c-format
-msgid "Canada"
-msgstr "加拿大"
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:64
 #, c-format
-msgid "Python"
-msgstr "Python"
+msgid "HTTP server"
+msgstr "HTTP 服务器"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:65
 #, c-format
-msgid "Upgradable"
-msgstr "可升级"
+msgid "Removable device"
+msgstr "可移动设备"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:65
 #, c-format
-msgid "everything was installed correctly"
-msgstr "所有软件包都已正确安装"
+msgid "Path or mount point:"
+msgstr "路径或挂载点:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:66 ../rpmdrake:707
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr "正在校验软件包的签名..."
+msgid "Security updates"
+msgstr "安全更新"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:78
 #, c-format
-msgid "File transfer"
-msgstr "文件传送"
+msgid "Browse..."
+msgstr "浏览..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:80
 #, c-format
-msgid "KDE and Qt"
-msgstr "KDE 和 Qt"
+msgid "Choose a mirror..."
+msgstr "选择镜像..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:107
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "您至少要填写头两项。"
+msgid "Login:"
+msgstr "登录名:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:107 ../edit-urpm-sources.pl:240
 #, c-format
-msgid "Type of medium:"
-msgstr "介质类型:"
+msgid "Password:"
+msgstr "密码:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:112
 #, c-format
-msgid "Copying file for medium `%s'..."
-msgstr "正在复制介质“%s”的文件..."
+msgid "Name:"
+msgstr "名称:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:116 ../edit-urpm-sources.pl:197
 #, c-format
-msgid "France"
-msgstr "法国"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "相对 synthesis/hdlist 的路径:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:117
 #, c-format
-msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"我需要连接镜像才能获得最新的更新软件包。\n"
-"请检查您的网络是否运转正常。\n"
-"\n"
-"确定继续吗?"
+msgid "If left blank, synthesis/hdlist will be automatically probed"
+msgstr "如果留空, 将会自动探测综合文件/hdlist"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:125
 #, c-format
-msgid "Search results"
-msgstr "搜索结果"
+msgid "You need to fill up at least the two first entries."
+msgstr "您至少要填写头两项。"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:129
 #, c-format
-msgid "Graphical desktop"
-msgstr "图形桌面"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr "已经有该名称的介质，您真的想要替换吗?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:138
 #, c-format
-msgid "Yes"
-msgstr "是"
+msgid "Adding a medium:"
+msgstr "添加一个介质:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:139
 #, c-format
-msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
-msgstr ""
-"安装完成；%s。\n"
-"\n"
-"某些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
-"在执行操作以前，您需要检查一下:"
+msgid "Type of medium:"
+msgstr "介质类型:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:143 ../edit-urpm-sources.pl:211
+#: ../edit-urpm-sources.pl:244 ../edit-urpm-sources.pl:317
+#: ../edit-urpm-sources.pl:355 ../edit-urpm-sources.pl:396
+#: ../edit-urpm-sources.pl:453 ../edit-urpm-sources.pl:517
+#: ../edit-urpm-sources.pl:554 ../edit-urpm-sources.pl:660 ../rpmdrake:88
+#: ../rpmdrake:511 ../rpmdrake:525 ../rpmdrake:529 ../rpmdrake:1084
+#: ../rpmdrake:1145 ../rpmdrake.pm:125 ../rpmdrake.pm:168 ../rpmdrake.pm:353
 #, c-format
-msgid "Edit a parallel group"
-msgstr "编辑并行组"
+msgid "Ok"
+msgstr "确定"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:159 ../edit-urpm-sources.pl:205
+#: ../edit-urpm-sources.pl:211 ../edit-urpm-sources.pl:251
+#: ../edit-urpm-sources.pl:322 ../edit-urpm-sources.pl:356
+#: ../edit-urpm-sources.pl:403 ../edit-urpm-sources.pl:522 ../rpmdrake:88
+#: ../rpmdrake:511 ../rpmdrake:1145 ../rpmdrake:1151 ../rpmdrake.pm:353
+#: ../rpmdrake.pm:458
 #, c-format
-msgid ""
-"There was a problem adding medium:\n"
-"\n"
-"%s"
-msgstr ""
-"添加介质的过程中发生了问题:\n"
-"\n"
-"%s"
+msgid "Cancel"
+msgstr "取消"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:177
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "如何手工选择您的镜像"
+msgid "Please wait, removing medium..."
+msgstr "正在删除临时文件，请稍候..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:190
 #, c-format
-msgid "Publishing"
-msgstr "出版"
+msgid "Edit a medium"
+msgstr "编辑介质"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:194
 #, c-format
-msgid "Remove key"
-msgstr "删除密钥"
+msgid "Editing medium \"%s\":"
+msgstr "编辑介质“%s”:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:200
 #, c-format
-msgid "Package installation..."
-msgstr "软件包安装..."
+msgid "Save changes"
+msgstr "保存修改"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:209
 #, c-format
-msgid "GNOME and GTK+"
-msgstr "GNOME 和 GTK+"
+msgid "You need to insert the medium to continue"
+msgstr "您必须插入介质才能继续"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:210
 #, c-format
-msgid "Select the media you wish to update:"
-msgstr "选择您想要更新的介质:"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "要保存改变，您必须在驱动器中插入介质。"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:226
 #, c-format
-msgid "Software Packages Removal"
-msgstr "软件包删除"
+msgid "Configure proxies"
+msgstr "配置代理服务器"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:232
 #, c-format
-msgid "Shells"
-msgstr "Shell"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr "如果您需要用代理服务器，请输入主机名和端口(语法: <proxyhost[:port]>):"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:234
 #, c-format
-msgid "Chemistry"
-msgstr "化学"
+msgid "Proxy hostname:"
+msgstr "代理服务器主机名:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:236
 #, c-format
-msgid "Choose a key for adding to the medium %s"
-msgstr "选择要添加到介质 %s 中的密钥"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "在登录代理服务器时，您可能要指定用户名和密码:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:238
 #, c-format
-msgid "Add a key"
-msgstr "添加密钥"
+msgid "User:"
+msgstr "用户名:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:292
 #, c-format
-msgid "True type"
-msgstr "TrueType"
+msgid "Add a parallel group"
+msgstr "添加并行组"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:292
 #, c-format
-msgid "Base"
-msgstr "基本"
+msgid "Edit a parallel group"
+msgstr "编辑并行组"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:303
 #, c-format
-msgid "Graphics"
-msgstr "图形"
+msgid "Add a medium limit"
+msgstr "添加一个介质限制"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:313
 #, c-format
-msgid "Italy"
-msgstr "意大利"
+msgid "Choose a medium for adding in the media limit:"
+msgstr "在介质限制中选择介质进行添加:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:347
 #, c-format
-msgid ""
-"You are launching this program as a normal user.\n"
-"You will not be able to perform modifications on the system,\n"
-"but you may still browse the existing database."
-msgstr ""
-"您正在以普通用户调用此程序。\n"
-"您将无法执行对系统的修改，\n"
-"但您仍然可以浏览已有数据库。"
+msgid "Add a host"
+msgstr "添加主机"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:351
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "需要下列软件包之一:"
+msgid "Type in the hostname or IP address of the host to add:"
+msgstr "输入要添加的主机名或 IP 地址:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:375
 #, c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "Editing parallel group \"%s\":"
+msgstr "编辑并行组“%s”:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:377
 #, c-format
-msgid "Information on packages"
-msgstr "该软件包的信息"
+msgid "Group name:"
+msgstr "组名称:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:378
 #, c-format
-msgid "Proxy..."
-msgstr "代理服务器..."
+msgid "Protocol:"
+msgstr "协议:"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:380
 #, c-format
-msgid "Russia"
-msgstr "俄罗斯"
+msgid "Media limit:"
+msgstr "介质限制:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:385 ../edit-urpm-sources.pl:392
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr "如果您需要用代理服务器，请输入主机名和端口(语法: <proxyhost[:port]>):"
+msgid "Add"
+msgstr "添加"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:386 ../edit-urpm-sources.pl:393
+#: ../edit-urpm-sources.pl:442 ../edit-urpm-sources.pl:643 ../rpmdrake:909
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
-msgstr ""
-"由于软件包之间的依赖关系，您不可以选择下列软件包:\n"
-"\n"
+msgid "Remove"
+msgstr "卸载"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:387
 #, c-format
-msgid "Add a key..."
-msgstr "添加密钥..."
+msgid "Hosts:"
+msgstr "主机:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:417
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "配置并行 urpmi(urpmi 的分布式执行)"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Sound"
-msgstr "声音"
-
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid "Changelog:\n"
-msgstr "更新日志:\n"
+msgid "Group"
+msgstr "组"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"需要连接 MandrakeSoft 网站才能获得镜像列表。\n"
-"请检查您的网络是否运转正常。\n"
-"\n"
-"确定继续吗?"
+msgid "Protocol"
+msgstr "协议"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:420
 #, c-format
-msgid "Please wait, searching..."
-msgstr "正在搜索，请稍候..."
+msgid "Media limit"
+msgstr "介质限制"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:421
 #, c-format
 msgid "Command"
 msgstr "命令"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../gurpmi.addmedia:1
+#: ../edit-urpm-sources.pl:431 ../rpmdrake:252 ../rpmdrake:269 ../rpmdrake:380
+#: ../rpmdrake:449
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"确定继续吗?"
+msgid "(none)"
+msgstr "(无)"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:444 ../edit-urpm-sources.pl:645
 #, c-format
-msgid "Literature"
-msgstr "文献"
+msgid "Edit"
+msgstr "编辑"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:449 ../edit-urpm-sources.pl:647
 #, c-format
-msgid "Initializing..."
-msgstr "正在初始化..."
+msgid "Add..."
+msgstr "添加..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:461
 #, c-format
-msgid "Emulators"
-msgstr "模拟器"
+msgid "Manage keys for digital signatures of packages"
+msgstr "管理软件包的数字签名"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:465 ../edit-urpm-sources.pl:585
 #, c-format
-msgid "Password:"
-msgstr "密码:"
+msgid "Medium"
+msgstr "介质"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:470
 #, c-format
-msgid "Software Packages Installation"
-msgstr "软件包安装"
+msgid "Keys"
+msgstr "密钥"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:489
 #, c-format
-msgid "in descriptions"
-msgstr "在描述中"
+msgid "no name found, key doesn't exist in rpm keyring!"
+msgstr "没有找到名称，密钥在 rpm 密钥环中不存在!"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:503
 #, c-format
-msgid " failed!"
-msgstr " 失败!"
+msgid "Add a key"
+msgstr "添加密钥"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:513
 #, c-format
-msgid "All packages, by update availability"
-msgstr "全部软件包，按照是否可更新排列"
+msgid "Choose a key for adding to the medium %s"
+msgstr "选择要添加到介质 %s 中的密钥"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:534
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "另外一些软件包需要删除"
+msgid "Remove a key"
+msgstr "删除密钥"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:535
 #, c-format
-msgid "Packaging"
-msgstr "打包"
+msgid ""
+"Are you sure you want to remove the key %s from medium %s?\n"
+"(name of the key: %s)"
+msgstr ""
+"您真的想要从介质 %2$s 中删除密钥 %1$s 吗?\n"
+"(密钥名称: %3$s)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:548
 #, c-format
-msgid "Configure media"
-msgstr "配置介质"
+msgid "Add a key..."
+msgstr "添加密钥..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:550
 #, c-format
-msgid "United States"
-msgstr "美国"
+msgid "Remove key"
+msgstr "删除密钥"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:562
 #, c-format
-msgid "Greece"
-msgstr "希腊"
+msgid "Configure media"
+msgstr "配置介质"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:584
 #, c-format
-msgid "GNOME"
-msgstr "GNOME"
+msgid "Enabled?"
+msgstr "启用?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:595
 #, c-format
-msgid "Monitoring"
-msgstr "监视"
+msgid "Update medium"
+msgstr "更新介质"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:595
 #, c-format
-msgid "Costa Rica"
-msgstr "哥斯达黎加"
+msgid "Regenerate hdlist"
+msgstr "重新生成 hdlist"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:607 ../rpmdrake.pm:421
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "有些软件包无法安装"
+msgid "Please wait, updating media..."
+msgstr "正在更新介质，请稍候..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:611
 #, c-format
-msgid ""
-"The help window has been started, it should appear shortly on your desktop."
-msgstr "已经启动帮助窗口，稍后桌面上将会出现。"
+msgid "Please wait, generating hdlist..."
+msgstr "正在重新生成 hdlist，请稍候..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:649
 #, c-format
-msgid "No mirror"
-msgstr "无镜像"
+msgid "Update..."
+msgstr "更新..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:650
 #, c-format
-msgid "Reload the packages list"
-msgstr "重新装入软件包清单"
+msgid "Manage keys..."
+msgstr "管理密钥..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:651
 #, c-format
-msgid "Poland"
-msgstr "波兰"
+msgid "Proxy..."
+msgstr "代理服务器..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:652
 #, c-format
-msgid "Path or mount point:"
-msgstr "路径或挂载点:"
+msgid "Parallel..."
+msgstr "并行..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:655 ../rpmdrake:901
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "正在从 MandrakeSoft 网站下载镜像站点的地址，请稍候。"
+msgid "Help"
+msgstr "帮助"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:657 ../rpmdrake:904
 #, c-format
-msgid "Choose a mirror..."
-msgstr "选择镜像..."
+msgid "Help launched in background"
+msgstr "正在后台调用帮助"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:658 ../rpmdrake:905
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"The help window has been started, it should appear shortly on your desktop."
+msgstr "已经启动帮助窗口，稍后桌面上将会出现。"
+
+#: ../edit-urpm-sources.pl:669 ../gurpmi.addmedia:75 ../rpmdrake:1338
+#, c-format
+msgid ""
+"%s\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Is it ok to continue?"
 msgstr ""
-"警告: 您试图添加的软件包太多，有可能在安装的过程中导致剩余磁\n"
-"盘空间告罄；这是很危险的，您应当小心操作。\n"
+"%s\n"
 "\n"
-"您真的想要安装所有选中的软件包吗?"
+"确定继续吗?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:672
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "选中大小: %d MB"
+msgid ""
+"Welcome to the Software Media Manager!\n"
+"\n"
+"This tool will help you configure the packages media you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"欢迎使用软件介质管理器!\n"
+"\n"
+"本工具将帮助您配置要在您的电脑上使用的软件包介质。这些介质将在安装新\n"
+"软件包或执行更新时使用。"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:684
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "正在读取软件包数据库，请稍候..."
+msgid ""
+"Packages database is locked. Please close other applications\n"
+"working with packages database (do you have another media\n"
+"manager on another desktop, or are you currently installing\n"
+"packages as well?)."
+msgstr ""
+"软件包数据库已锁定。请关闭其它使用软件包数据库的应用程序(您是否有其它介质管理"
+"器或其它桌面，或者您正在安装软件包？)。"
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:70
 #, c-format
-msgid "Add a medium"
-msgstr "添加一个介质"
+msgid "Unable to add medium, wrong or missing arguments"
+msgstr "无法添加介质，给出的参数有错或者不够"
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:78
 #, c-format
-msgid "Update medium"
-msgstr "更新介质"
+msgid ""
+"You are about to add a new packages medium, `%s'.\n"
+"That means you will be able to add new software packages\n"
+"to your system from that new medium."
+msgstr ""
+"您即将添加新的软件包介质“%s”。\n"
+"这意味着您可以从新介质中向系统添加新的软件包。"
 
-#: ../edit-urpm-sources.pl:1
+#: ../gurpmi.addmedia:87
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "要保存改变，您必须在驱动器中插入介质。"
+msgid "Successfully added medium `%s'."
+msgstr "成功添加了介质“%s”。"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:85
 #, c-format
-msgid "All packages, by size"
-msgstr "全部软件包，按大小排列"
+msgid "Running in user mode"
+msgstr "以用户模式运行"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:86
 #, c-format
 msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+"You are launching this program as a normal user.\n"
+"You will not be able to perform modifications on the system,\n"
+"but you may still browse the existing database."
 msgstr ""
-"删除包过程中发生一个问题:\n"
-"\n"
-"%s"
+"您正在以普通用户调用此程序。\n"
+"您将无法执行对系统的修改，\n"
+"但您仍然可以浏览已有数据库。"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:93
 #, c-format
-msgid "Examining file of medium `%s'..."
-msgstr "正在检查介质“%s”的文件..."
+msgid "Accessibility"
+msgstr "辅助功能"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:94 ../rpmdrake:95 ../rpmdrake:96 ../rpmdrake:97 ../rpmdrake:98
+#: ../rpmdrake:99 ../rpmdrake:100 ../rpmdrake:101 ../rpmdrake:102
+#: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
+#: ../rpmdrake:107 ../rpmdrake:108 ../rpmdrake:109
 #, c-format
-msgid "Path:"
-msgstr "路径:"
+msgid "System"
+msgstr "系统"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:94
 #, c-format
-msgid "IRC"
-msgstr "IRC"
+msgid "Servers"
+msgstr "服务器"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:95
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "正在下载软件包“%s”(%s/%s)..."
+msgid "Kernel and hardware"
+msgstr "内核和硬件"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:96
 #, c-format
-msgid "Protocol:"
-msgstr "协议:"
+msgid "Libraries"
+msgstr "库"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:97
 #, c-format
-msgid "C"
-msgstr "C"
+msgid "XFree86"
+msgstr "XFree86"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:98 ../rpmdrake:99 ../rpmdrake:100 ../rpmdrake:101
 #, c-format
-msgid "Other"
-msgstr "其它"
+msgid "Fonts"
+msgstr "字体"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:98
 #, c-format
-msgid "Sweden"
-msgstr "瑞典"
+msgid "Console"
+msgstr "控制台"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:99
 #, c-format
-msgid "Boards"
-msgstr "棋盘"
+msgid "True type"
+msgstr "TrueType"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:100
 #, c-format
-msgid "Austria"
-msgstr "奥地利"
+msgid "Type1"
+msgstr "Type1"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:101
 #, c-format
-msgid "Faqs"
-msgstr "常见问题解答"
+msgid "X11 bitmap"
+msgstr "X11 位图"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:102
 #, c-format
-msgid "Info..."
-msgstr "信息..."
+msgid "Base"
+msgstr "基本"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
+#: ../rpmdrake:107 ../rpmdrake:108
 #, c-format
-msgid "Inspect..."
-msgstr "检查..."
+msgid "Configuration"
+msgstr "配置"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:103
 #, c-format
-msgid "Japan"
-msgstr "日本"
+msgid "Hardware"
+msgstr "硬件"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:104
 #, c-format
-msgid "Summary: "
-msgstr "摘要:"
+msgid "Packaging"
+msgstr "打包"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:105 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
+#: ../rpmdrake:152 ../rpmdrake:153 ../rpmdrake:154 ../rpmdrake:155
+#: ../rpmdrake:156 ../rpmdrake:157
 #, c-format
-msgid "Backup"
-msgstr "备份"
+msgid "Networking"
+msgstr "网络"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:106
+#, c-format
+msgid "Printing"
+msgstr "打印"
+
+#: ../rpmdrake:107
 #, c-format
 msgid "Boot and Init"
 msgstr "启动和初始化"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:108 ../rpmdrake:119 ../rpmdrake:127 ../rpmdrake:139
+#: ../rpmdrake:144 ../rpmdrake:157 ../rpmdrake:171 ../rpmdrake:176
+#: ../rpmdrake:230
 #, c-format
-msgid "FTP server"
-msgstr "FTP 服务器"
+msgid "Other"
+msgstr "其它"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:109
 #, c-format
-msgid "Remove .%s"
-msgstr "删除 .%s"
+msgid "Internationalization"
+msgstr "国际化"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:110 ../rpmdrake:111 ../rpmdrake:112 ../rpmdrake:113
+#: ../rpmdrake:114 ../rpmdrake:115 ../rpmdrake:116 ../rpmdrake:117
+#: ../rpmdrake:118 ../rpmdrake:119
 #, c-format
-msgid "Importance: "
-msgstr "重要性:"
+msgid "Development"
+msgstr "开发"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:110
 #, c-format
-msgid "WWW"
-msgstr "WWW"
+msgid "Kernel"
+msgstr "内核"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:111 ../rpmdrake:129
 #, c-format
-msgid "Unable to create medium."
-msgstr "无法创建介质。"
+msgid "Databases"
+msgstr "数据库"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:112
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"要升级其它软件包，必须删除下列软件包:\n"
-"\n"
-"%s\n"
-"\n"
-"确定继续吗?"
+msgid "Perl"
+msgstr "Perl"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:113
 #, c-format
-msgid ""
-"Welcome to the Software Media Manager!\n"
-"\n"
-"This tool will help you configure the packages media you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"欢迎使用软件介质管理器!\n"
-"\n"
-"本工具将帮助您配置要在您的电脑上使用的软件包介质。这些介质将在安装新\n"
-"软件包或执行更新时使用。"
+msgid "Python"
+msgstr "Python"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:114
 #, c-format
-msgid "Medium"
-msgstr "介质"
+msgid "C"
+msgstr "C"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:115
 #, c-format
-msgid "Size: "
-msgstr "大小:"
+msgid "C++"
+msgstr "C++"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:116
 #, c-format
-msgid "Office"
-msgstr "办公"
+msgid "Java"
+msgstr "Java"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:117
 #, c-format
-msgid "Everything installed successfully"
-msgstr "所有软件包都已成功安装"
+msgid "GNOME and GTK+"
+msgstr "GNOME 和 GTK+"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:118
 #, c-format
-msgid "Add a parallel group"
-msgstr "添加并行组"
+msgid "KDE and Qt"
+msgstr "KDE 和 Qt"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:120 ../rpmdrake:121 ../rpmdrake:122 ../rpmdrake:123
+#: ../rpmdrake:124 ../rpmdrake:125 ../rpmdrake:126 ../rpmdrake:127
 #, c-format
-msgid "Update media"
-msgstr "更新介质"
+msgid "Sciences"
+msgstr "科学"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:120
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "正在安装软件包“%s”(%s/%s)..."
+msgid "Astronomy"
+msgstr "天文"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:121
 #, c-format
-msgid "Parallel..."
-msgstr "并行..."
+msgid "Biology"
+msgstr "生物"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:122
 #, c-format
-msgid "in names"
-msgstr "在名称中"
+msgid "Chemistry"
+msgstr "化学"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:123
 #, c-format
-msgid "Not selected"
-msgstr "未选中"
+msgid "Computer science"
+msgstr "计算机科学"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:124
 #, c-format
-msgid "Problem during installation"
-msgstr "在安装过程中发生问题"
+msgid "Geosciences"
+msgstr "地球科学"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:125
 #, c-format
-msgid "Terminals"
-msgstr "终端"
+msgid "Mathematics"
+msgstr "数学"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:126
 #, c-format
-msgid "Kernel and hardware"
-msgstr "内核和硬件"
+msgid "Physics"
+msgstr "物理"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:128
 #, c-format
-msgid "Edit"
-msgstr "编辑"
+msgid "Communications"
+msgstr "通讯"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:130
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "选中软件: %d MB / 剩余磁盘空间: %d MB"
+msgid "Editors"
+msgstr "编辑器"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:131
 #, c-format
-msgid "Australia"
-msgstr "澳大利亚"
+msgid "Emulators"
+msgstr "模拟器"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
+#: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
 #, c-format
-msgid "Security updates"
-msgstr "安全更新"
+msgid "Games"
+msgstr "游戏"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:132
 #, c-format
-msgid "Korea"
-msgstr "韩国"
+msgid "Adventure"
+msgstr "探险"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:133
 #, c-format
-msgid "Examining remote file of medium `%s'..."
-msgstr "正在检查介质“%s”的远程文件..."
+msgid "Arcade"
+msgstr "街机"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:134
 #, c-format
-msgid "All packages, by group"
-msgstr "全部软件包，按照组别排列"
+msgid "Boards"
+msgstr "棋盘"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:135
 #, c-format
-msgid "Kernel"
-msgstr "内核"
+msgid "Cards"
+msgstr "卡"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:136
 #, c-format
-msgid "Console"
-msgstr "控制台"
+msgid "Puzzles"
+msgstr "拼图"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:137
 #, c-format
-msgid "C++"
-msgstr "C++"
+msgid "Sports"
+msgstr "运动"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:138
 #, c-format
-msgid "Netherlands"
-msgstr "荷兰"
+msgid "Strategy"
+msgstr "策略"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:140
 #, c-format
-msgid "Search results (none)"
-msgstr "搜索结果(无)"
+msgid "Toys"
+msgstr "玩具"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143 ../rpmdrake:144
 #, c-format
-msgid "Adventure"
-msgstr "探险"
+msgid "Archiving"
+msgstr "归档"
+
+#: ../rpmdrake:141
+#, c-format
+msgid "Compression"
+msgstr "压缩"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:142
 #, c-format
 msgid "Cd burning"
 msgstr "光盘刻录"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:143
 #, c-format
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"欢迎使用软件包安装工具!\n"
-"\n"
-"您的 Mandrake Linux 的安装光盘包含有数千个软件包。\n"
-"本工具将帮助您选择要为您的电脑安装的软件包。"
+msgid "Backup"
+msgstr "备份"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:145
 #, c-format
-msgid "Stop"
-msgstr "停止"
+msgid "Monitoring"
+msgstr "监视"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:146
 #, c-format
-msgid "Biology"
-msgstr "生物"
+msgid "Sound"
+msgstr "声音"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:147
 #, c-format
-msgid "Please wait, generating hdlist..."
-msgstr "正在重新生成 hdlist，请稍候..."
+msgid "Graphics"
+msgstr "图形"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:148
 #, c-format
-msgid "Mathematics"
-msgstr "数学"
+msgid "Video"
+msgstr "视频"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:149
 #, c-format
-msgid "Internationalization"
-msgstr "国际化"
+msgid "File transfer"
+msgstr "文件传送"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:150
 #, c-format
-msgid "Edit a medium"
-msgstr "编辑介质"
+msgid "IRC"
+msgstr "IRC"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:151
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr "已经有该名称的介质，您真的想要替换吗?"
+msgid "Instant messaging"
+msgstr "即时通讯"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:152
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
-"\n"
-msgstr ""
-"为满足依赖关系，还需要安装下列软件包:\n"
-"\n"
+msgid "Chat"
+msgstr "聊天"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:153
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP 服务器"
+msgid "News"
+msgstr "新闻"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:154
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "不可恢复的错误: 对不起，没有发现可安装的软件包。"
+msgid "Mail"
+msgstr "邮件"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:155
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "有些软件包无法删除"
+msgid "WWW"
+msgstr "WWW"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:156
 #, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s"
-msgstr ""
-"对不起，不能选择下列软件包:\n"
-"\n"
-"%s"
+msgid "Remote access"
+msgstr "远程访问"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:158
 #, c-format
-msgid "Finland"
-msgstr "芬兰"
+msgid "Office"
+msgstr "办公"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:159
 #, c-format
-msgid "X11 bitmap"
-msgstr "X11 位图"
+msgid "Publishing"
+msgstr "出版"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:160
 #, c-format
-msgid "Failure when adding medium"
-msgstr "添加介质失败"
+msgid "Terminals"
+msgstr "终端"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:161
 #, c-format
-msgid "Media limit:"
-msgstr "介质限制:"
+msgid "Shells"
+msgstr "Shell"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:162
 #, c-format
-msgid "More information on package..."
-msgstr "该软件包的更多信息..."
+msgid "File tools"
+msgstr "文件工具"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:163
 #, c-format
-msgid "Save changes"
-msgstr "保存修改"
+msgid "Text tools"
+msgstr "文本工具"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:164 ../rpmdrake:165 ../rpmdrake:166 ../rpmdrake:167
+#: ../rpmdrake:168 ../rpmdrake:169 ../rpmdrake:170 ../rpmdrake:171
 #, c-format
-msgid "Instant messaging"
-msgstr "即时通讯"
+msgid "Graphical desktop"
+msgstr "图形桌面"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:164
 #, c-format
-msgid "News"
-msgstr "新闻"
+msgid "GNOME"
+msgstr "GNOME"
 
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../rpmdrake:165
 #, c-format
-msgid "More info"
-msgstr "更多信息"
+msgid "Icewm"
+msgstr "Icewm"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:166
 #, c-format
-msgid "Search"
-msgstr "搜索"
+msgid "FVWM based"
+msgstr "基于 FVWM"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:167
 #, c-format
-msgid "Computer books"
-msgstr "计算机图书"
+msgid "KDE"
+msgstr "KDE"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:168
 #, c-format
-msgid "If left blank, synthesis/hdlist will be automatically probed"
-msgstr "如果留空, 将会自动探测综合文件/hdlist"
+msgid "Sawfish"
+msgstr "Sawfish"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:169
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"找不到任何适合的镜像。\n"
-"此问题可能有很多原因；最常见的就是您的处理器架构不为 Mandrake\n"
-"Linux 官方更新所支持。"
+msgid "WindowMaker"
+msgstr "WindowMaker"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:170
 #, c-format
-msgid "Spain"
-msgstr "西班牙"
+msgid "Enlightenment"
+msgstr "Enlightenment"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175
+#: ../rpmdrake:176
 #, c-format
-msgid "Already existing update media"
-msgstr "更新介质已经存在"
+msgid "Books"
+msgstr "书籍"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:172
 #, c-format
-msgid "Files:\n"
-msgstr "文件:\n"
+msgid "Howtos"
+msgstr "Howtos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:173
 #, c-format
-msgid "Unable to get source packages."
-msgstr "源软件包未找到。"
+msgid "Faqs"
+msgstr "常见问题解答"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:174
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "在登录代理服务器时，您可能要指定用户名和密码:"
+msgid "Computer books"
+msgstr "计算机图书"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:175
 #, c-format
-msgid "Chat"
-msgstr "聊天"
+msgid "Literature"
+msgstr "文献"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:275 ../rpmdrake:637 ../rpmdrake:638
 #, c-format
-msgid "Update"
-msgstr "更新"
+msgid "(Not available)"
+msgstr "(不可用)"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:303 ../rpmdrake:361
 #, c-format
-msgid "Additional packages needed"
-msgstr "需要另外的软件包"
+msgid "Search results"
+msgstr "搜索结果"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:303
 #, c-format
-msgid "Running in user mode"
-msgstr "以用户模式运行"
+msgid "Search results (none)"
+msgstr "搜索结果(无)"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:313 ../rpmdrake:324
 #, c-format
-msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Media Manager, and then add a `Security\n"
-"updates' medium.\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"您还可以手动选择您希望使用的镜像: 方法是，使用软件介质管理器，\n"
-"然后添加“安全更新”介质。\n"
-"\n"
-"然后，重新启动 MandrakeUpdate。"
+msgid "Please wait, searching..."
+msgstr "正在搜索，请稍候..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:327
 #, c-format
-msgid "Adding a medium:"
-msgstr "添加一个介质:"
+msgid "Stop"
+msgstr "停止"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:362 ../rpmdrake:478
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"为了满足所有的依赖关系，需要删除下列软件包:\n"
-"\n"
+msgid "Upgradable"
+msgstr "可升级"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:362 ../rpmdrake:478
 #, c-format
-msgid ""
-"You already have at least one update medium configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Media Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
-msgstr ""
-"你已经至少配置了一个升级介质，但是它们现在全部都不\n"
-"可用。你需要运行“软件介质管理器”来启用其中的至少\n"
-"一项(在“启用?”栏中选中)。\n"
-"\n"
-"然后，重新启动 MandrakeUpdate。"
+msgid "Addable"
+msgstr "可添加"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:364
 #, c-format
-msgid "Find:"
-msgstr "查找:"
+msgid "Selected"
+msgstr "选中"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:364
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "正在列出软件包，请稍候..."
+msgid "Not selected"
+msgstr "未选中"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:398
 #, c-format
-msgid "All"
-msgstr "全部"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:416 ../rpmdrake:520 ../rpmdrake:522
 #, c-format
-msgid "XFree86"
-msgstr "XFree86"
+msgid "More information on package..."
+msgstr "该软件包的更多信息..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:417
 #, c-format
-msgid "Normal information"
-msgstr "正常信息"
+msgid "Please choose"
+msgstr "请选择"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:417
 #, c-format
-msgid "Removable device"
-msgstr "可移动设备"
+msgid "One of the following packages is needed:"
+msgstr "需要下列软件包之一:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:437
 #, c-format
-msgid "Preparing packages installation..."
-msgstr "准备安装软件包..."
+msgid "Please wait, listing packages..."
+msgstr "正在列出软件包，请稍候..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:451
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "正在删除软件包，请稍候..."
+msgid "No update"
+msgstr "没有更新"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:452
 #, c-format
-msgid "Login:"
-msgstr "登录名:"
+msgid ""
+"The list of updates is empty. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+"更新列表为空。这意味着可能您所安装的软件包没有相应的更新，\n"
+"或者您已经安装了全部更新。"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:472
 #, c-format
-msgid "Belgium"
-msgstr "比利时"
+msgid "All"
+msgstr "全部"
 
-#: ../rpmdrake:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:511 ../rpmdrake:514
 #, c-format
-msgid "File tools"
-msgstr "文件工具"
+msgid "More info"
+msgstr "更多信息"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:515
 #, c-format
-msgid "Configure proxies"
-msgstr "配置代理服务器"
+msgid "Information on packages"
+msgstr "该软件包的信息"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:537
 #, c-format
-msgid "Printing"
-msgstr "打印"
+msgid "Some additional packages need to be removed"
+msgstr "另外一些软件包需要删除"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:538
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "正在开始下载“%s”..."
+msgid ""
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
+"\n"
+msgstr ""
+"为了满足所有的依赖关系，需要删除下列软件包:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:544 ../rpmdrake:553
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "发生了一个致命错误: %s。"
+msgid "Some packages can't be removed"
+msgstr "有些软件包无法删除"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:545
 #, c-format
-msgid "Fatal error"
-msgstr "致命错误"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"对不起，删除这些软件包将可能毁坏您的系统:\n"
+"\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:554 ../rpmdrake:607
 #, c-format
-msgid "Leaves only, sorted by install date"
-msgstr "只剩下，按安装日期排序"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
+msgstr ""
+"由于软件包之间的依赖关系，您不可以选择下列软件包:\n"
+"\n"
+
+#: ../rpmdrake:577
+#, c-format
+msgid "Additional packages needed"
+msgstr "需要另外的软件包"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:578
 #, c-format
 msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
-"Errors:\n"
-"%s"
 msgstr ""
-"无法更新介质；该介质将被自动禁用。\n"
+"为满足依赖关系，还需要安装下列软件包:\n"
 "\n"
-"错误如下:\n"
-"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:592
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "有些软件包无法安装"
+
+#: ../rpmdrake:593
 #, c-format
 msgid ""
-"The list of updates is empty. This means that either there is\n"
-"no available update for the packages installed on your computer,\n"
-"or you already installed all of them."
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
 msgstr ""
-"更新列表为空。这意味着可能您所安装的软件包没有相应的更新，\n"
-"或者您已经安装了全部更新。"
+"对不起，不能选择下列软件包:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:606 ../rpmdrake:858
 #, c-format
-msgid "Geosciences"
-msgstr "地球科学"
+msgid "Some packages need to be removed"
+msgstr "需要删除一些软件包"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:625
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "请选择喜欢的镜像站点。"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "选中软件: %d MB / 剩余磁盘空间: %d MB"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:627
 #, c-format
-msgid "Communications"
-msgstr "通讯"
+msgid "Selected size: %d MB"
+msgstr "选中大小: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:635
 #, c-format
-msgid "Editing parallel group \"%s\":"
-msgstr "编辑并行组“%s”:"
+msgid "Files:\n"
+msgstr "文件:\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:638
 #, c-format
-msgid "Configuration"
-msgstr "配置"
+msgid "Changelog:\n"
+msgstr "更新日志:\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:640
 #, c-format
-msgid "Reason for update: "
-msgstr "更新原因:"
+msgid "Medium: "
+msgstr "介质:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:642
 #, c-format
-msgid "Remove"
-msgstr "卸载"
+msgid "Currently installed version: "
+msgstr "当前安装的版本:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:646
 #, c-format
-msgid "Portugal"
-msgstr "葡萄牙"
+msgid "Name: "
+msgstr "名称:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:647
 #, c-format
-msgid "Czech Republic"
-msgstr "捷克共和国"
+msgid "Version: "
+msgstr "版本: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:648
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "需要删除一些软件包"
+msgid "Size: "
+msgstr "大小:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:648
 #, c-format
-msgid "Problem during removal"
-msgstr "在删除过程中发生问题"
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:650
 #, c-format
-msgid "WindowMaker"
-msgstr "WindowMaker"
+msgid "Importance: "
+msgstr "重要性:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:652
 #, c-format
-msgid "Help launched in background"
-msgstr "正在后台调用帮助"
+msgid "Summary: "
+msgstr "摘要:"
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake:654
 #, c-format
-msgid "Unable to add medium, wrong or missing arguments"
-msgstr "无法添加介质，给出的参数有错或者不够"
+msgid "Reason for update: "
+msgstr "更新原因:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:656
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"安装过程中发生了问题:\n"
-"\n"
-"%s"
+msgid "Description: "
+msgstr "描述:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:707
 #, c-format
-msgid "No package found for installation."
-msgstr "没有可供安装的软件包。"
+msgid "Bugfixes updates"
+msgstr "缺陷修正更新"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:707
 #, c-format
-msgid "Type1"
-msgstr "Type1"
+msgid "Normal updates"
+msgstr "正常更新"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:724
 #, c-format
-msgid "Medium: "
-msgstr "介质:"
+msgid "Mandrake choices"
+msgstr "Mandrake 精选"
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake:725
 #, c-format
-msgid "Successfully added medium `%s'."
-msgstr "成功添加了介质“%s”。"
+msgid "All packages, alphabetical"
+msgstr "全部软件包，按照字母次序排列"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:731
 #, c-format
-msgid "Strategy"
-msgstr "策略"
+msgid "All packages, by group"
+msgstr "全部软件包，按照组别排列"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:731
 #, c-format
-msgid "Description: "
-msgstr "描述:"
+msgid "All packages, by size"
+msgstr "全部软件包，按大小排列"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:732
 #, c-format
-msgid "Archiving"
-msgstr "归档"
+msgid "All packages, by selection state"
+msgstr "全部软件包，按选中状态排列"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:733
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "All packages, by medium repository"
+msgstr "全部软件包，按照介质库排列"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:733
 #, c-format
-msgid "System"
-msgstr "系统"
+msgid "All packages, by update availability"
+msgstr "全部软件包，按照是否可更新排列"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:734
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "所有要求的软件包都已成功安装。"
+msgid "Leaves only, sorted by install date"
+msgstr "只剩下，按安装日期排序"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Servers"
-msgstr "服务器"
+msgid "in names"
+msgstr "在名称中"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Puzzles"
-msgstr "拼图"
+msgid "in descriptions"
+msgstr "在描述中"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:785
 #, c-format
-msgid "Local files"
-msgstr "本机文件"
+msgid "in file names"
+msgstr "在文件名中"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:796
 #, c-format
-msgid "Choose a medium for adding in the media limit:"
-msgstr "在介质限制中选择介质进行添加:"
+msgid "Reset the selection"
+msgstr "重置选中内容"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:796
 #, c-format
-msgid "Addable"
-msgstr "可添加"
+msgid "Reload the packages list"
+msgstr "重新装入软件包清单"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:797 ../rpmdrake.pm:443
 #, c-format
-msgid "Keys"
-msgstr "密钥"
+msgid "Update media"
+msgstr "更新介质"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:822
 #, c-format
-msgid "Please choose"
-msgstr "请选择"
+msgid "Normal information"
+msgstr "正常信息"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:822
 #, c-format
-msgid "Databases"
-msgstr "数据库"
+msgid "Maximum information"
+msgstr "最多信息"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:842
 #, c-format
-msgid ""
-"Are you sure you want to remove the key %s from medium %s?\n"
-"(name of the key: %s)"
-msgstr ""
-"您真的想要从介质 %2$s 中删除密钥 %1$s 吗?\n"
-"(密钥名称: %3$s)"
+msgid "You need to select some packages first."
+msgstr "您需要先选中一些软件包。"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:847
 #, c-format
-msgid "Name: "
-msgstr "名称:"
+msgid "Too many packages are selected"
+msgstr "选中的包太多"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:848
 #, c-format
-msgid "Proxy hostname:"
-msgstr "代理服务器主机名:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"警告: 您试图添加的软件包太多，有可能在安装的过程中导致剩余磁\n"
+"盘空间告罄；这是很危险的，您应当小心操作。\n"
+"\n"
+"您真的想要安装所有选中的软件包吗?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:859
 #, c-format
 msgid ""
-"The following packages have bad signatures:\n"
+"The following packages have to be removed for others to be upgraded:\n"
 "\n"
 "%s\n"
 "\n"
-"Do you want to continue installation?"
+"Is it ok to continue?"
 msgstr ""
-"下列软件包的签名出现以下问题:\n"
+"要升级其它软件包，必须删除下列软件包:\n"
 "\n"
 "%s\n"
 "\n"
-"您想要继续安装吗?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "正在检查 %s"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "下载“%s”，速度: %s"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Hosts:"
-msgstr "主机:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Video"
-msgstr "视频"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Perl"
-msgstr "Perl"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Normal updates"
-msgstr "正常更新"
+"确定继续吗?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:884
 #, c-format
-msgid "Manage keys..."
-msgstr "管理密钥..."
+msgid "Software Packages Removal"
+msgstr "软件包删除"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:885
 #, c-format
-msgid "Maximum information"
-msgstr "最多信息"
+msgid "Mandrake Update"
+msgstr "Mandrake Update"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:886
 #, c-format
-msgid "Selected"
-msgstr "选中"
+msgid "Software Packages Installation"
+msgstr "软件包安装"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:893
 #, c-format
-msgid "Computer science"
-msgstr "计算机科学"
+msgid "Find:"
+msgstr "查找:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:898
 #, c-format
-msgid "Fonts"
-msgstr "字体"
+msgid "Search"
+msgstr "搜索"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:909
 #, c-format
-msgid "Hardware"
-msgstr "硬件"
+msgid "Install"
+msgstr "安装"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:911
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:938
 #, c-format
-msgid "Version: "
-msgstr "版本: "
+msgid "Fatal error"
+msgstr "致命错误"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:939
 #, c-format
-msgid "Use .%s as main file"
-msgstr "使用 .%s 作为主文件"
+msgid "A fatal error occurred: %s."
+msgstr "发生了一个致命错误: %s。"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:947
 #, c-format
-msgid "Norway"
-msgstr "挪威"
+msgid ""
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"我需要连接镜像才能获得最新的更新软件包。\n"
+"请检查您的网络是否运转正常。\n"
+"\n"
+"确定继续吗?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:956
 #, c-format
-msgid "Israel"
-msgstr "以色列"
+msgid "Already existing update media"
+msgstr "更新介质已经存在"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:957
 #, c-format
-msgid "China"
-msgstr "中国"
+msgid ""
+"You already have at least one update medium configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Media Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"你已经至少配置了一个升级介质，但是它们现在全部都不\n"
+"可用。你需要运行“软件介质管理器”来启用其中的至少\n"
+"一项(在“启用?”栏中选中)。\n"
+"\n"
+"然后，重新启动 MandrakeUpdate。"
+
+#: ../rpmdrake:967
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "如何手工选择您的镜像"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:968
 #, c-format
 msgid ""
-"Welcome to the software removal tool!\n"
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Media Manager, and then add a `Security\n"
+"updates' medium.\n"
 "\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+"Then, restart MandrakeUpdate."
 msgstr ""
-"欢迎使用软件包删除工具!\n"
+"您还可以手动选择您希望使用的镜像: 方法是，使用软件介质管理器，\n"
+"然后添加“安全更新”介质。\n"
 "\n"
-"本工具将帮助您删除掉您想要从您的电脑中删除的软件包。"
+"然后，重新启动 MandrakeUpdate。"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:996
 #, c-format
-msgid "(Not available)"
-msgstr "(不可用)"
+msgid "Please wait, finding available packages..."
+msgstr "正在寻找可用的软件包，请稍候..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1029
 #, c-format
-msgid "Bugfixes updates"
-msgstr "缺陷修正更新"
+msgid "Inspecting %s"
+msgstr "正在检查 %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1048
 #, c-format
-msgid "Java"
-msgstr "Java"
+msgid "changes:"
+msgstr "更改:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1052
 #, c-format
-msgid "Update..."
-msgstr "更新..."
+msgid "Remove .%s"
+msgstr "删除 .%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1054
 #, c-format
-msgid "Please wait, finding available packages..."
-msgstr "正在寻找可用的软件包，请稍候..."
+msgid "Use .%s as main file"
+msgstr "使用 .%s 作为主文件"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1056
 #, c-format
-msgid "Cancel"
-msgstr "取消"
+msgid "Do nothing"
+msgstr "不做任何事"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1068
 #, c-format
-msgid "Sciences"
-msgstr "科学"
+msgid "Installation finished"
+msgstr "安装完成"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1078
 #, c-format
-msgid "Enabled?"
-msgstr "启用?"
+msgid "Inspect..."
+msgstr "检查..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1104 ../rpmdrake:1229
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "全部软件包，按照字母次序排列"
+msgid "Everything installed successfully"
+msgstr "所有软件包都已成功安装"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1105 ../rpmdrake:1230
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake 精选"
+msgid "All requested packages were installed successfully."
+msgstr "所有要求的软件包都已成功安装。"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1107 ../rpmdrake:1214
 #, c-format
-msgid "Toys"
-msgstr "玩具"
+msgid "Problem during installation"
+msgstr "在安装过程中发生问题"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1108 ../rpmdrake:1215 ../rpmdrake:1244
 #, c-format
-msgid "Installation finished"
-msgstr "安装完成"
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"安装过程中发生了问题:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1129
 #, c-format
-msgid " done."
-msgstr " 完成。"
+msgid "Unable to get source packages."
+msgstr "源软件包未找到。"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1130
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "您必须插入介质才能继续"
+msgid "Unable to get source packages, sorry. %s"
+msgstr "对不起，无法得到源软件包。%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1131 ../rpmdrake:1187
 #, c-format
 msgid ""
-"Unable to add medium, errors reported:\n"
 "\n"
+"\n"
+"Error(s) reported:\n"
 "%s"
 msgstr ""
-"无法添加介质，报告了错误：\n"
 "\n"
+"\n"
+"报告的错误:\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1138
 #, c-format
-msgid "no name found, key doesn't exist in rpm keyring!"
-msgstr "没有找到名称，密钥在 rpm 密钥环中不存在!"
+msgid "Package installation..."
+msgstr "软件包安装..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1138
 #, c-format
-msgid "Too many packages are selected"
-msgstr "选中的包太多"
+msgid "Initializing..."
+msgstr "正在初始化..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1143
 #, c-format
-msgid "Physics"
-msgstr "物理"
+msgid "Change medium"
+msgstr "更改介质"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1144
 #, c-format
-msgid "Do nothing"
-msgstr "不做任何事"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "请把名为“%s”的介质放进设备 [%s]"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1149
 #, c-format
-msgid "Danmark"
-msgstr "丹麦"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "正在下载软件包“%s”(%s/%s)..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1168
 #, c-format
-msgid "Error during download"
-msgstr "下载出错"
+msgid "Verifying packages signatures..."
+msgstr "正在校验软件包的签名..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1177
 #, c-format
-msgid "Mail"
-msgstr "邮件"
+msgid ""
+"The following packages have bad signatures:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
+msgstr ""
+"下列软件包的签名出现以下问题:\n"
+"\n"
+"%s\n"
+"\n"
+"您想要继续安装吗?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1184 ../rpmdrake:1243
+#, c-format
+msgid "Installation failed"
+msgstr "安装失败"
+
+#: ../rpmdrake:1185
 #, c-format
 msgid ""
-"Packages database is locked. Please close other applications\n"
-"working with packages database (do you have another media\n"
-"manager on another desktop, or are you currently installing\n"
-"packages as well?)."
+"Installation failed, some files are missing:\n"
+"%s\n"
+"\n"
+"You may want to update your media database."
 msgstr ""
-"软件包数据库已锁定。请关闭其它使用软件包数据库的应用程序"
-"(您是否有其它介质管理器或其它桌面，或者您正在安装软件包？)。"
+"安装失败，缺少某些文件:\n"
+"%s\n"
+"\n"
+"您可能需要更新您的介质数据库。"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1199
 #, c-format
-msgid "Help"
-msgstr "帮助"
+msgid "Preparing packages installation..."
+msgstr "准备安装软件包..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1202
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "对不起，无法得到源软件包。%s"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1227
 #, c-format
-msgid "Sports"
-msgstr "运动"
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"安装完成；%s。\n"
+"\n"
+"某些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
+"在执行操作以前，您需要检查一下:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1227
 #, c-format
-msgid "Taiwan"
-msgstr "中国台湾"
+msgid "everything was installed correctly"
+msgstr "所有软件包都已正确安装"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1234
 #, c-format
-msgid "Protocol"
-msgstr "协议"
+msgid "No package found for installation."
+msgstr "没有可供安装的软件包。"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1235
 #, c-format
-msgid "(none)"
-msgstr "(无)"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "不可恢复的错误: 对不起，没有发现可安装的软件包。"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1257
 #, c-format
-msgid "All packages, by medium repository"
-msgstr "全部软件包，按照介质库排列"
+msgid "Please wait, reading packages database..."
+msgstr "正在读取软件包数据库，请稍候..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1304
 #, c-format
-msgid "Germany"
-msgstr "德国"
+msgid "Please wait, removing packages..."
+msgstr "正在删除软件包，请稍候..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1309
 #, c-format
-msgid "Compression"
-msgstr "压缩"
+msgid "Problem during removal"
+msgstr "在删除过程中发生问题"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1310
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "下载“%s”，剩余时间: %s，速度: %s"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"删除包过程中发生一个问题:\n"
+"\n"
+"%s"
 
-#. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1342
 #, c-format
-msgid "%s from medium %s"
-msgstr "介质 %2$s 中的 %1$s"
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+"欢迎使用软件包删除工具!\n"
+"\n"
+"本工具将帮助您删除掉您想要从您的电脑中删除的软件包。"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1347
 #, c-format
-msgid "Add a host"
-msgstr "添加主机"
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"欢迎使用 MandrakeUpdate!\n"
+"\n"
+"本工具将帮助您为您的电脑中安装更新的软件包。"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1352
 #, c-format
-msgid "Development"
-msgstr "开发"
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"欢迎使用软件包安装工具!\n"
+"\n"
+"您的 Mandrake Linux 的安装光盘包含有数千个软件包。\n"
+"本工具将帮助您选择要为您的电脑安装的软件包。"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:121
 #, c-format
-msgid "No"
-msgstr "否"
+msgid "Yes"
+msgstr "是"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:123
 #, c-format
-msgid "Media limit"
-msgstr "介质限制"
+msgid "No"
+msgstr "否"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:159
 #, c-format
-msgid "Install"
-msgstr "安装"
+msgid "Info..."
+msgstr "信息..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:214
 #, c-format
-msgid "Add..."
-msgstr "添加..."
+msgid "Austria"
+msgstr "奥地利"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:215
 #, c-format
-msgid "Change medium"
-msgstr "更改介质"
+msgid "Australia"
+msgstr "澳大利亚"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:216
 #, c-format
-msgid "Reset the selection"
-msgstr "重置选中内容"
+msgid "Belgium"
+msgstr "比利时"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:217
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake Update"
+msgid "Brazil"
+msgstr "巴西"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:218
 #, c-format
-msgid "in file names"
-msgstr "在文件名中"
+msgid "Canada"
+msgstr "加拿大"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:219
 #, c-format
-msgid "Books"
-msgstr "书籍"
+msgid "Costa Rica"
+msgstr "哥斯达黎加"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:220
 #, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
-msgstr ""
-"下载镜像列表时发生错误:\n"
-"\n"
-"%s\n"
-"您的网络或 MandrakeSoft 网站可能不可用。\n"
-"请稍后再试。"
+msgid "Czech Republic"
+msgstr "捷克共和国"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:221
 #, c-format
-msgid "Howtos"
-msgstr "Howtos"
+msgid "Germany"
+msgstr "德国"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:222
 #, c-format
-msgid "Icewm"
-msgstr "Icewm"
+msgid "Danmark"
+msgstr "丹麦"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:223 ../rpmdrake.pm:227
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"\n"
-"You may want to update your media database."
-msgstr ""
-"安装失败，缺少某些文件:\n"
-"%s\n"
-"\n"
-"您可能需要更新您的介质数据库。"
+msgid "Greece"
+msgstr "希腊"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:224
 #, c-format
-msgid "Libraries"
-msgstr "库"
+msgid "Spain"
+msgstr "西班牙"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:225
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"对不起，删除这些软件包将可能毁坏您的系统:\n"
-"\n"
+msgid "Finland"
+msgstr "芬兰"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:226
 #, c-format
-msgid "Brazil"
-msgstr "巴西"
+msgid "France"
+msgstr "法国"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:228
 #, c-format
-msgid "Installation failed"
-msgstr "安装失败"
+msgid "Israel"
+msgstr "以色列"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:229
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"报告的错误:\n"
-"%s"
+msgid "Italy"
+msgstr "意大利"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:230
 #, c-format
-msgid "Manage keys for digital signatures of packages"
-msgstr "管理软件包的数字签名"
+msgid "Japan"
+msgstr "日本"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:231
 #, c-format
-msgid "Currently installed version: "
-msgstr "当前安装的版本:"
+msgid "Korea"
+msgstr "韩国"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:232
 #, c-format
-msgid "Games"
-msgstr "游戏"
+msgid "Netherlands"
+msgstr "荷兰"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:233
 #, c-format
-msgid "Astronomy"
-msgstr "天文"
+msgid "Norway"
+msgstr "挪威"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:234
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "请把名为“%s”的介质放进设备 [%s]"
+msgid "Poland"
+msgstr "波兰"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:235
 #, c-format
-msgid "You need to select some packages first."
-msgstr "您需要先选中一些软件包。"
+msgid "Portugal"
+msgstr "葡萄牙"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:236
 #, c-format
-msgid "All packages, by selection state"
-msgstr "全部软件包，按选中状态排列"
+msgid "Russia"
+msgstr "俄罗斯"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:237
 #, c-format
-msgid "Name:"
-msgstr "名称:"
+msgid "Sweden"
+msgstr "瑞典"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:238
 #, c-format
-msgid "KDE"
-msgstr "KDE"
+msgid "Taiwan"
+msgstr "中国台湾"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:239
 #, c-format
-msgid "No update"
-msgstr "没有更新"
+msgid "United Kingdom"
+msgstr "英国"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:240
 #, c-format
-msgid "Networking"
-msgstr "网络"
+msgid "China"
+msgstr "中国"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:241 ../rpmdrake.pm:242 ../rpmdrake.pm:243 ../rpmdrake.pm:244
+#: ../rpmdrake.pm:295
 #, c-format
-msgid "Ok"
-msgstr "确定"
+msgid "United States"
+msgstr "美国"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:305
 #, c-format
-msgid "Text tools"
-msgstr "文本工具"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"需要连接 MandrakeSoft 网站才能获得镜像列表。\n"
+"请检查您的网络是否运转正常。\n"
+"\n"
+"确定继续吗?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:309
 #, c-format
-msgid "Cards"
-msgstr "卡"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "正在从 MandrakeSoft 网站下载镜像站点的地址，请稍候。"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:315
 #, c-format
-msgid "Sawfish"
-msgstr "Sawfish"
+msgid "Error during download"
+msgstr "下载出错"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:316
 #, c-format
-msgid "Group name:"
-msgstr "组名称:"
+msgid ""
+"There was an error downloading the mirrors list:\n"
+"\n"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
+msgstr ""
+"下载镜像列表时发生错误:\n"
+"\n"
+"%s\n"
+"您的网络或 MandrakeSoft 网站可能不可用。\n"
+"请稍后再试。"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:324
 #, c-format
-msgid "Type in the hostname or IP address of the host to add:"
-msgstr "输入要添加的主机名或 IP 地址:"
+msgid "No mirror"
+msgstr "无镜像"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:325
 #, c-format
-msgid "Arcade"
-msgstr "街机"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"找不到任何适合的镜像。\n"
+"此问题可能有很多原因；最常见的就是您的处理器架构不为 Mandrake\n"
+"Linux 官方更新所支持。"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:342
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Please choose the desired mirror."
+msgstr "请选择喜欢的镜像站点。"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:383
 #, c-format
-msgid "Editing medium \"%s\":"
-msgstr "编辑介质“%s”:"
+msgid "Copying file for medium `%s'..."
+msgstr "正在复制介质“%s”的文件..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:386
 #, c-format
-msgid "Add a medium limit"
-msgstr "添加一个介质限制"
+msgid "Examining file of medium `%s'..."
+msgstr "正在检查介质“%s”的文件..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:389
 #, c-format
-msgid "Group"
-msgstr "组"
+msgid "Examining remote file of medium `%s'..."
+msgstr "正在检查介质“%s”的远程文件..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:393
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "正在删除临时文件，请稍候..."
+msgid " done."
+msgstr " 完成。"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:397
 #, c-format
-msgid "Accessibility"
-msgstr "辅助功能"
+msgid " failed!"
+msgstr " 失败!"
 
-#: ../rpmdrake:1
+#. -PO: We're downloading the said file from the said medium
+#: ../rpmdrake.pm:401
 #, c-format
-msgid "changes:"
-msgstr "更改:"
+msgid "%s from medium %s"
+msgstr "介质 %2$s 中的 %1$s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:405
 #, c-format
-msgid "Add"
-msgstr "添加"
+msgid "Starting download of `%s'..."
+msgstr "正在开始下载“%s”..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:409
 #, c-format
-msgid "Regenerate hdlist"
-msgstr "重新生成 hdlist"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "下载“%s”，剩余时间: %s，速度: %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:412
 #, c-format
-msgid "Editors"
-msgstr "编辑器"
+msgid "Download of `%s', speed:%s"
+msgstr "下载“%s”，速度: %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:449
 #, c-format
-msgid "United Kingdom"
-msgstr "英国"
+msgid "Select the media you wish to update:"
+msgstr "选择您想要更新的介质:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:453
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "相对 synthesis/hdlist 的路径:"
+msgid "Update"
+msgstr "更新"
 
-#: ../gurpmi.addmedia:1
+#: ../rpmdrake.pm:465
 #, c-format
 msgid ""
-"You are about to add a new packages medium, `%s'.\n"
-"That means you will be able to add new software packages\n"
-"to your system from that new medium."
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
 msgstr ""
-"您即将添加新的软件包介质“%s”。\n"
-"这意味着您可以从新介质中向系统添加新的软件包。"
+"无法更新介质；该介质将被自动禁用。\n"
+"\n"
+"错误如下:\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:482 ../rpmdrake.pm:487
 #, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Unable to add medium, errors reported:\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+"%s"
 msgstr ""
-"欢迎使用 MandrakeUpdate!\n"
+"无法添加介质，报告了错误：\n"
 "\n"
-"本工具将帮助您为您的电脑中安装更新的软件包。"
+"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:498
 #, c-format
-msgid "Remove a key"
-msgstr "删除密钥"
+msgid "Unable to create medium."
+msgstr "无法创建介质。"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:503
 #, c-format
-msgid "User:"
-msgstr "用户名:"
+msgid "Failure when adding medium"
+msgstr "添加介质失败"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:504
 #, c-format
-msgid "Browse..."
-msgstr "浏览..."
+msgid ""
+"There was a problem adding medium:\n"
+"\n"
+"%s"
+msgstr ""
+"添加介质的过程中发生了问题:\n"
+"\n"
+"%s"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
author	Pablo Saratxaga <pablo@mandriva.com>	2004-02-22 11:33:24 +0000
committer	Pablo Saratxaga <pablo@mandriva.com>	2004-02-22 11:33:24 +0000
commit	7264d0f26440b845e9813235f61db8ee7e3b3563 (patch)
tree	992e9a13ff78729eefc4c733b99c12a36f3b8bc4
parent	f8e03b891b600c61b007ae8147e98a9900dd4ca6 (diff)
download	rpmdrake-7264d0f26440b845e9813235f61db8ee7e3b3563.tar rpmdrake-7264d0f26440b845e9813235f61db8ee7e3b3563.tar.gz rpmdrake-7264d0f26440b845e9813235f61db8ee7e3b3563.tar.bz2 rpmdrake-7264d0f26440b845e9813235f61db8ee7e3b3563.tar.xz rpmdrake-7264d0f26440b845e9813235f61db8ee7e3b3563.zip