converted to UTF-8 (as it must be in sync with DrakX)

1 files changed, 1234 insertions, 1205 deletions

diff --git a/po/cy.po b/po/cy.po
index 32af0716..a16bc691 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2004-01-12 18:45+0100\n"
+"POT-Creation-Date: 2004-01-17 17:49+0100\n"
 "PO-Revision-Date: 2003-12-14 22:52-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <cy@li.org>\n"
@@ -17,1892 +17,1921 @@ 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 "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 "Gwasanaethwr 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 "Gwasanaethwr 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:705
 #, 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:"
+
+#: ../edit-urpm-sources.pl:117
+#, c-format
+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 "You need to fill up at least the two first entries."
+msgstr "Mae angen llanw o leiaf y ddau gofnod cyntaf"
+
+#: ../edit-urpm-sources.pl:129
 #, 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?"
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 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?"
+"Mae yna gyfrwng o'r enw yna eisoes, hoffech chi\n"
+"ei amnewid?"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:138
 #, c-format
-msgid "Search results"
-msgstr "Canlyniadau'r chwilio"
+msgid "Adding a medium:"
+msgstr "Ychwanegu cyfrwng:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:139
 #, c-format
-msgid "Graphical desktop"
-msgstr "Bwrdd gwaith graffigol"
+msgid "Type of medium:"
+msgstr "Math o gyfrwng:"
 
-#: ../rpmdrake.pm: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:509 ../rpmdrake:523 ../rpmdrake:527 ../rpmdrake:1092
+#: ../rpmdrake:1150 ../rpmdrake.pm:123 ../rpmdrake.pm:164 ../rpmdrake.pm:347
 #, c-format
-msgid "Yes"
+msgid "Ok"
 msgstr "Iawn"
 
-#: ../rpmdrake: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:509 ../rpmdrake:1150 ../rpmdrake:1156 ../rpmdrake.pm:347
+#: ../rpmdrake.pm:450
 #, 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:"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit a parallel group"
-msgstr "Golygu grwp paralel"
+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:904
 #, 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
+#: ../edit-urpm-sources.pl:431 ../rpmdrake:252 ../rpmdrake:269 ../rpmdrake:379
+#: ../rpmdrake:447
 #, 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 ""
-"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."
+msgid "Manage keys for digital signatures of packages"
+msgstr "Rheoli allweddi pecynnau digidol "
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:465 ../edit-urpm-sources.pl:585
 #, c-format
-msgid "Emulators"
-msgstr "Efelychwyr"
+msgid "Medium"
+msgstr "Cyfrwng"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:470
 #, c-format
-msgid "Password:"
-msgstr "Cyfrinair:"
+msgid "Keys"
+msgstr "Allweddi"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:489
 #, c-format
-msgid "Software Packages Installation"
-msgstr "Gosod Pecynnau Meddalwedd"
+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:1
+#: ../edit-urpm-sources.pl:503
 #, c-format
-msgid "in descriptions"
-msgstr "disgrifiadau"
+msgid "Add a key"
+msgstr "Ychwanegu allwedd"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:513
 #, c-format
-msgid " failed!"
-msgstr " methwyd!"
+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 "All packages, by update availability"
-msgstr "Pob pecyn, yn ôl diweddariad"
+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)"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:548
 #, c-format
-msgid "Packaging"
-msgstr "Pecynnu"
+msgid "Add a key..."
+msgstr "Ychwanegu allwedd..."
+
+#: ../edit-urpm-sources.pl:550
+#, c-format
+msgid "Remove key"
+msgstr "Tynnu allwedd"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:562
 #, c-format
 msgid "Configure media"
 msgstr "Ffurfweddu'r cyfrwng"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:584
 #, c-format
-msgid "United States"
-msgstr "Yr Unol Daleithiau"
+msgid "Enabled?"
+msgstr "Galluogwyd?"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:595
 #, c-format
-msgid "Greece"
-msgstr "Groeg"
+msgid "Update medium"
+msgstr "Diweddaru'r cyfrwng"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:595
 #, c-format
-msgid "GNOME"
-msgstr "GNOME"
+msgid "Regenerate hdlist"
+msgstr "Atgynhyrchu rhestr"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:607 ../rpmdrake.pm:415
 #, c-format
-msgid "Monitoring"
-msgstr "Monitro"
+msgid "Please wait, updating media..."
+msgstr "Arhoswch, diweddaru cyfrwng..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:611
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Please wait, generating hdlist..."
+msgstr "Arhoswch, cynhyrchu hdlist..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:649
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "Nid oes modd gosod rhai pecynnau"
+msgid "Update..."
+msgstr "Diweddau..."
 
-#: ../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 ""
-"Mae'r ffenestr cymorth wedi ei hagor, dylai ymddangos ar eich bwrdd gwaith "
-"cyn hir."
+msgid "Manage keys..."
+msgstr "Rheoli allweddi"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:651
 #, c-format
-msgid "No mirror"
-msgstr "Dim drych"
+msgid "Proxy..."
+msgstr "Dirprwy..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:652
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ail lwytho'r rhestr pecynnau"
+msgid "Parallel..."
+msgstr "Paralel..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:655 ../rpmdrake:896
 #, c-format
-msgid "Poland"
-msgstr "Gwlad Pwyl"
+msgid "Help"
+msgstr "Cymorth"
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:657 ../rpmdrake:899
 #, c-format
-msgid "Path or mount point:"
-msgstr "Llwybr neu bwynt gosod:"
+msgid "Help launched in background"
+msgstr "Cymorth wedi ei gychwyn yn y cefndir"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:658 ../rpmdrake:900
 #, 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 ""
-"Arhoswch, llwytho i lawr cyfeiriaidau drychau o safle gwe MandrakeSoft."
+"Mae'r ffenestr cymorth wedi ei hagor, dylai ymddangos ar eich bwrdd gwaith "
+"cyn hir."
 
-#: ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:669 ../rpmdrake:1342
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Dewis drych..."
+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 ""
-"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"
+"Welcome to the Software Media Manager!\n"
 "\n"
-"Do you really want to install all the selected packages?"
-msgstr "Rhybudd:"
+"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."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:85
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Maint dewiswyd: %d MB"
+msgid "Running in user mode"
+msgstr "Rhedeg ym modd defnyddiwr"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:86
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Arhoswch, darllen cronfa ddata'r pecynnau..."
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:93
 #, c-format
-msgid "Add a medium"
-msgstr "Ychwanegu cyfrwng"
+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 "Update medium"
-msgstr "Diweddaru'r cyfrwng"
+msgid "System"
+msgstr "System"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:94
 #, 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."
+msgid "Servers"
+msgstr "Gwasanaethwyr"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:95
 #, c-format
-msgid "All packages, by size"
-msgstr "Pob pecyn, yn ôl maint"
+msgid "Kernel and hardware"
+msgstr "Cnewyllyn a chaledwedd."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:96
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Digwyddodd gwall wrth dynnu pecyn:\n"
-"\n"
-"%s"
+msgid "Libraries"
+msgstr "Llyfrgelloedd"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:97
 #, c-format
-msgid "Examining file of medium `%s'..."
-msgstr "Archwilio ffeil cyfrwng '%s'..."
+msgid "XFree86"
+msgstr "XFree86"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:98 ../rpmdrake:99 ../rpmdrake:100 ../rpmdrake:101
 #, c-format
-msgid "Path:"
-msgstr "Llwybr:"
+msgid "Fonts"
+msgstr "Ffontiau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:98
 #, c-format
-msgid "IRC"
-msgstr "IRC"
+msgid "Console"
+msgstr "Consol"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:99
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
+msgid "True type"
+msgstr "True type"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:100
 #, c-format
-msgid "Protocol:"
-msgstr "Protocol:"
+msgid "Type1"
+msgstr "Math 1"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:101
 #, c-format
-msgid "C"
-msgstr "C"
+msgid "X11 bitmap"
+msgstr "Didfap X11"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:102
 #, c-format
-msgid "Other"
-msgstr "Arall"
+msgid "Base"
+msgstr "Sail"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
+#: ../rpmdrake:107 ../rpmdrake:108
 #, c-format
-msgid "Sweden"
-msgstr "Sweden"
+msgid "Configuration"
+msgstr "Ffurfweddu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:103
 #, c-format
-msgid "Boards"
-msgstr "Byrddau"
+msgid "Hardware"
+msgstr "Caledwedd"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:104
 #, c-format
-msgid "Austria"
-msgstr "Awstria"
+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 "Faqs"
-msgstr "Cwestiynau poblogaidd"
+msgid "Networking"
+msgstr "Rhwydweithio"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:106
 #, c-format
-msgid "Info..."
-msgstr "Gwybodaeth..."
+msgid "Printing"
+msgstr "Argraffu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:107
 #, c-format
-msgid "Inspect..."
-msgstr "Archwilio..."
+msgid "Boot and Init"
+msgstr "Cychwyn ac Ymgychwyn"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:108 ../rpmdrake:119 ../rpmdrake:127 ../rpmdrake:139
+#: ../rpmdrake:144 ../rpmdrake:157 ../rpmdrake:171 ../rpmdrake:176
+#: ../rpmdrake:230
 #, c-format
-msgid "Japan"
-msgstr "Siapan"
+msgid "Other"
+msgstr "Arall"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:109
 #, c-format
-msgid "Summary: "
-msgstr "Crynodeb: "
+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 "Backup"
-msgstr "Wrth Gefn"
+msgid "Development"
+msgstr "Datblygiad"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:110
 #, c-format
-msgid "Boot and Init"
-msgstr "Cychwyn ac Ymgychwyn"
+msgid "Kernel"
+msgstr "Cnewyllyn"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:111 ../rpmdrake:129
 #, c-format
-msgid "FTP server"
-msgstr "Gwasanaethwr FTP"
+msgid "Databases"
+msgstr "Cronfeydd Data"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:112
 #, c-format
-msgid "Remove .%s"
-msgstr "Tynnu .%s"
+msgid "Perl"
+msgstr "Perl"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:113
 #, c-format
-msgid "Importance: "
-msgstr "Pwysigrwydd: "
+msgid "Python"
+msgstr "Python"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:114
 #, c-format
-msgid "WWW"
-msgstr "WWW"
+msgid "C"
+msgstr "C"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:115
 #, c-format
-msgid "Unable to create medium."
-msgstr "Methu creu cyfrwng."
+msgid "C++"
+msgstr "C++"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:116
 #, 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 "Java"
+msgstr "Java"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:117
 #, 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 "GNOME and GTK+"
+msgstr "GNOME a GTK+"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:118
 #, c-format
-msgid "Medium"
-msgstr "Cyfrwng"
+msgid "KDE and Qt"
+msgstr "KDE a Qt"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:120 ../rpmdrake:121 ../rpmdrake:122 ../rpmdrake:123
+#: ../rpmdrake:124 ../rpmdrake:125 ../rpmdrake:126 ../rpmdrake:127
 #, c-format
-msgid "Size: "
-msgstr "Maint: "
+msgid "Sciences"
+msgstr "Gwyddorau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:120
 #, c-format
-msgid "Office"
-msgstr "Swyddfa"
+msgid "Astronomy"
+msgstr "Astroleg"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:121
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Gosodwyd popeth yn llwyddiannus"
+msgid "Biology"
+msgstr "Bywydeg"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:122
 #, c-format
-msgid "Add a parallel group"
-msgstr "Ychwanegu grwp paralel"
+msgid "Chemistry"
+msgstr "Cemeg"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:123
 #, c-format
-msgid "Update media"
-msgstr "Diweddaru'r cyfrwng"
+msgid "Computer science"
+msgstr "Gwyddor Cyfrifiadureg"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:124
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Gosod pecyn `%s' (%s/%s)..."
+msgid "Geosciences"
+msgstr "Gwyddorau Daear"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:125
 #, c-format
-msgid "Parallel..."
-msgstr "Paralel..."
+msgid "Mathematics"
+msgstr "Mathemateg"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:126
 #, c-format
-msgid "Not selected"
-msgstr "Heb ei ddewis"
+msgid "Physics"
+msgstr "Ffiseg"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:128
 #, c-format
-msgid "in names"
-msgstr "enwau"
+msgid "Communications"
+msgstr "Cyfathrebu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:130
 #, c-format
-msgid "Problem during installation"
-msgstr "Anhawster wrth osod"
+msgid "Editors"
+msgstr "Golygyddion"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:131
 #, c-format
-msgid "Terminals"
-msgstr "Terfynellau"
+msgid "Emulators"
+msgstr "Efelychwyr"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:132 ../rpmdrake:133 ../rpmdrake:134 ../rpmdrake:135
+#: ../rpmdrake:136 ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139
 #, c-format
-msgid "Kernel and hardware"
-msgstr "Cnewyllyn a chaledwedd."
+msgid "Games"
+msgstr "Gemau"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:132
 #, c-format
-msgid "Edit"
-msgstr "Golygu"
+msgid "Adventure"
+msgstr "Antur"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:133
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
+msgid "Arcade"
+msgstr "Arcêd"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:134
 #, c-format
-msgid "Australia"
-msgstr "Awstralia"
+msgid "Boards"
+msgstr "Byrddau"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:135
 #, c-format
-msgid "Security updates"
-msgstr "Diweddariadau diogelwch"
+msgid "Cards"
+msgstr "Cardiau"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:136
 #, c-format
-msgid "Korea"
-msgstr "Corea"
+msgid "Puzzles"
+msgstr "Posau"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:137
 #, c-format
-msgid "Examining remote file of medium `%s'..."
-msgstr "Archwilio ffeil pell y cyfrwng '%s'..."
+msgid "Sports"
+msgstr "Chwaraeon"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:138
 #, c-format
-msgid "All packages, by group"
-msgstr "Pob pecyn, yn ôl grwp"
+msgid "Strategy"
+msgstr "Strategaeth"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:140
 #, c-format
-msgid "Kernel"
-msgstr "Cnewyllyn"
+msgid "Toys"
+msgstr "Teganau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143 ../rpmdrake:144
 #, c-format
-msgid "Console"
-msgstr "Consol"
+msgid "Archiving"
+msgstr "Archifo"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:141
 #, c-format
-msgid "C++"
-msgstr "C++"
+msgid "Compression"
+msgstr "Cywasgiad"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:142
 #, c-format
-msgid "Netherlands"
-msgstr "Yr Iseldiroedd"
+msgid "Cd burning"
+msgstr "Llosgi CD"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:143
 #, c-format
-msgid "Search results (none)"
-msgstr "Canlyniadau'r chwilio (dim)"
+msgid "Backup"
+msgstr "Wrth Gefn"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:145
 #, c-format
-msgid "Adventure"
-msgstr "Antur"
+msgid "Monitoring"
+msgstr "Monitro"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:146
 #, c-format
-msgid "Cd burning"
-msgstr "Llosgi CD"
+msgid "Sound"
+msgstr "Sain"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:147
 #, 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 "Graphics"
+msgstr "Graffigau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:148
 #, c-format
-msgid "Stop"
-msgstr "Atal"
+msgid "Video"
+msgstr "Fideo"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:149
 #, c-format
-msgid "Biology"
-msgstr "Bywydeg"
+msgid "File transfer"
+msgstr "Trosglwyddo ffeiliau"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:150
 #, c-format
-msgid "Please wait, generating hdlist..."
-msgstr "Arhoswch, cynhyrchu hdlist..."
+msgid "IRC"
+msgstr "IRC"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:151
 #, c-format
-msgid "Mathematics"
-msgstr "Mathemateg"
+msgid "Instant messaging"
+msgstr "Negesu Chwim"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:152
 #, c-format
-msgid "Internationalization"
-msgstr "Rhyngwladoli"
+msgid "Chat"
+msgstr "Sgwrs"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:153
 #, c-format
-msgid "Edit a medium"
-msgstr "Golygu'r cyfrwng"
+msgid "News"
+msgstr "Newyddion"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:154
 #, 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 "Mail"
+msgstr "E-bost"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:155
 #, 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 "WWW"
+msgstr "WWW"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:156
 #, c-format
-msgid "HTTP server"
-msgstr "Gwasanaethwr HTTP"
+msgid "Remote access"
+msgstr "Mynediad pell"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:158
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Gwall anadferadwy: dim pecyn wedi ei ganfod ar gyfer y gosod."
+msgid "Office"
+msgstr "Swyddfa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:159
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "Nid oes modd tynnu rhai pecynnau"
+msgid "Publishing"
+msgstr "Cyhoeddi"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:160
 #, 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 "Terminals"
+msgstr "Terfynellau"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:161
 #, c-format
-msgid "Finland"
-msgstr "Ffindir"
+msgid "Shells"
+msgstr "Cregyn"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:162
 #, c-format
-msgid "X11 bitmap"
-msgstr "Didfap X11"
+msgid "File tools"
+msgstr "Offer ffeilio"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:163
 #, c-format
-msgid "Media limit:"
-msgstr "Terfyn cyfrwng:"
+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 "More information on package..."
-msgstr "Rhagor o wybodaeth ar becyn..."
+msgid "Graphical desktop"
+msgstr "Bwrdd gwaith graffigol"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:164
 #, c-format
-msgid "Save changes"
-msgstr "Cadw newidiadau"
+msgid "GNOME"
+msgstr "GNOME"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:165
 #, c-format
-msgid "Instant messaging"
-msgstr "Negesu Chwim"
+msgid "Icewm"
+msgstr "Icewm"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:166
 #, c-format
-msgid "News"
-msgstr "Newyddion"
+msgid "FVWM based"
+msgstr "FVWM seiliedig"
 
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../rpmdrake:167
 #, c-format
-msgid "More info"
-msgstr "Rhagor o wybodaeth"
+msgid "KDE"
+msgstr "KDE"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:168
 #, c-format
-msgid "Search"
-msgstr "Chwilio"
+msgid "Sawfish"
+msgstr "Sawfish"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:169
 #, c-format
-msgid "Computer books"
-msgstr "Llyfrau cyfrifiadurol"
+msgid "WindowMaker"
+msgstr "WindowMaker"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:170
 #, c-format
-msgid "If left blank, synthesis/hdlist will be automatically probed"
-msgstr "Os fydd yn cael ei adael yn wag"
+msgid "Enlightenment"
+msgstr "Enlightenment"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175
+#: ../rpmdrake:176
 #, 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 "Books"
+msgstr "Llyfrau"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:172
 #, c-format
-msgid "Spain"
-msgstr "Sbaen"
+msgid "Howtos"
+msgstr "Howtos"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:173
 #, c-format
-msgid "Already existing update media"
-msgstr "Cyfrwng diweddaru sy'n bod eisoes"
+msgid "Faqs"
+msgstr "Cwestiynau poblogaidd"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:174
 #, c-format
-msgid "Files:\n"
-msgstr "Ffeiliau:\n"
+msgid "Computer books"
+msgstr "Llyfrau cyfrifiadurol"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:175
 #, c-format
-msgid "Unable to get source packages."
-msgstr "Methu estyn pecynnau ffynhonnell."
+msgid "Literature"
+msgstr "Llenyddiaeth"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:275 ../rpmdrake:635 ../rpmdrake:636
 #, 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 "(Not available)"
+msgstr "(Dim ar gael)"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:302 ../rpmdrake:360
 #, c-format
-msgid "Chat"
-msgstr "Sgwrs"
+msgid "Search results"
+msgstr "Canlyniadau'r chwilio"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:302
 #, c-format
-msgid "Update"
-msgstr "Diweddaru"
+msgid "Search results (none)"
+msgstr "Canlyniadau'r chwilio (dim)"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:312 ../rpmdrake:323
 #, c-format
-msgid "Additional packages needed"
-msgstr "Pecynnau ychwanegol angenrheidiol"
+msgid "Please wait, searching..."
+msgstr "Arhoswch, chwilio..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:326
 #, c-format
-msgid "Running in user mode"
-msgstr "Rhedeg ym modd defnyddiwr"
+msgid "Stop"
+msgstr "Atal"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:361 ../rpmdrake:476
 #, 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 "Upgradable"
+msgstr "Diweddariadwy"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:361 ../rpmdrake:476
 #, c-format
-msgid "Adding a medium:"
-msgstr "Ychwanegu cyfrwng:"
+msgid "Addable"
+msgstr "Ychwanegadwy"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:363
 #, 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 "Selected"
+msgstr "Dewiswyd"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:363
 #, 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 "Not selected"
+msgstr "Heb ei ddewis"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:397
 #, c-format
-msgid "Find:"
-msgstr "Canfod:"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:415 ../rpmdrake:518 ../rpmdrake:520
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Arhoswch, rhestri pecynnau..."
+msgid "More information on package..."
+msgstr "Rhagor o wybodaeth ar becyn..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:416
 #, c-format
-msgid "All"
-msgstr ""
+msgid "Please choose"
+msgstr "Dewiswch"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:416
 #, c-format
-msgid "XFree86"
-msgstr "XFree86"
+msgid "One of the following packages is needed:"
+msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:435
 #, c-format
-msgid "Normal information"
-msgstr "Gwybodaeth arferol"
+msgid "Please wait, listing packages..."
+msgstr "Arhoswch, rhestri pecynnau..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:449
 #, c-format
-msgid "Removable device"
-msgstr "Dyfais symudol"
+msgid "No update"
+msgstr "Dim diweddariad"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:450
 #, c-format
-msgid "Preparing packages installation..."
-msgstr "Paratoi pecynnau i'w gosod..."
+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:1
+#: ../rpmdrake:470
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Arhoswch, tynnu'r pecynnau..."
+msgid "All"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:509 ../rpmdrake:512
 #, c-format
-msgid "Login:"
-msgstr "Mewngofnod:"
+msgid "More info"
+msgstr "Rhagor o wybodaeth"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:513
 #, c-format
-msgid "Belgium"
-msgstr "Gwlad Belg"
+msgid "Information on packages"
+msgstr "Gwybodaeth am becynnau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:536
 #, c-format
-msgid "File tools"
-msgstr "Offer ffeilio"
+msgid "Some additional packages need to be removed"
+msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:537
 #, c-format
-msgid "Configure proxies"
-msgstr "Ffurfweddu'r dirprwyon"
+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:543 ../rpmdrake:551
 #, c-format
-msgid "Printing"
-msgstr "Argraffu"
+msgid "Some packages can't be removed"
+msgstr "Nid oes modd tynnu rhai pecynnau"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:544
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "Cychwyn llwytho %s i lawr..."
+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:552 ../rpmdrake:605
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Digwyddodd gwall terfynol:%s."
+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:1
+#: ../rpmdrake:575
 #, c-format
-msgid "Fatal error"
-msgstr "Gwall terfynol"
+msgid "Additional packages needed"
+msgstr "Pecynnau ychwanegol angenrheidiol"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:576
 #, c-format
-msgid "Leaves only, sorted by install date"
-msgstr "Gadael, yn ôl dyddiad gosod"
+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"
+
+#: ../rpmdrake:590
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Nid oes modd gosod rhai pecynnau"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:591
 #, c-format
 msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
-"Errors:\n"
 "%s"
 msgstr ""
-"Methu diweddaru'r cyfrwng; bydd yn cael ei anablu'n awtomatig.\n"
+"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
 "\n"
-"Gwallau:\n"
 "%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:604 ../rpmdrake:856
 #, c-format
-msgid "Geosciences"
-msgstr "Gwyddorau Daear"
+msgid "Some packages need to be removed"
+msgstr "Rhaid tynnu rhai pecynnau"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:623
 #, 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:625
 #, c-format
-msgid "Communications"
-msgstr "Cyfathrebu"
+msgid "Selected size: %d MB"
+msgstr "Maint dewiswyd: %d MB"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:633
 #, c-format
-msgid "Editing parallel group \"%s\":"
-msgstr "Golygu grwp paralel\"%s\":"
+msgid "Files:\n"
+msgstr "Ffeiliau:\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:636
 #, c-format
-msgid "Configuration"
-msgstr "Ffurfweddu"
+msgid "Changelog:\n"
+msgstr "Cofnod Newid:\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:638
 #, c-format
-msgid "Reason for update: "
-msgstr "Rheswm am y diweddariad:"
+msgid "Medium: "
+msgstr "Cyfrwng:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:640
 #, c-format
-msgid "Remove"
-msgstr "Tynnu"
+msgid "Currently installed version: "
+msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:644
 #, c-format
-msgid "Portugal"
-msgstr "Portiwgal"
+msgid "Name: "
+msgstr "Enw: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:645
 #, c-format
-msgid "Czech Republic"
-msgstr "Gweriniaeth Tsiec"
+msgid "Version: "
+msgstr "Fersiwn: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:646
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Rhaid tynnu rhai pecynnau"
+msgid "Size: "
+msgstr "Maint: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:646
 #, c-format
-msgid "Problem during removal"
-msgstr "Problem wrth dynnu"
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:648
 #, c-format
-msgid "WindowMaker"
-msgstr "WindowMaker"
+msgid "Importance: "
+msgstr "Pwysigrwydd: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:650
 #, c-format
-msgid "Help launched in background"
-msgstr "Cymorth wedi ei gychwyn yn y cefndir"
+msgid "Summary: "
+msgstr "Crynodeb: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:652
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Digwyddodd anhawster wrth osod pecyn:\n"
-"\n"
-"%s"
+msgid "Reason for update: "
+msgstr "Rheswm am y diweddariad:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:654
 #, c-format
-msgid "No package found for installation."
-msgstr "Heb ganfod pecyn i'w osod"
+msgid "Description: "
+msgstr "Disgrifiadau: "
 
-#: ../rpmdrake:1
+#: ../rpmdrake:705
 #, c-format
-msgid "Type1"
-msgstr "Math 1"
+msgid "Bugfixes updates"
+msgstr "Diweddariad cywiro gwallau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:705
 #, c-format
-msgid "Medium: "
-msgstr "Cyfrwng:"
+msgid "Normal updates"
+msgstr "Diweddariadau arferol"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:722
 #, c-format
-msgid "Strategy"
-msgstr "Strategaeth"
+msgid "Mandrake choices"
+msgstr "Dewisiadau Mandrake"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:723
 #, c-format
-msgid "Description: "
-msgstr "Disgrifiadau: "
+msgid "All packages, alphabetical"
+msgstr "Pob pecyn, trefn yr wyddor"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:729
 #, c-format
-msgid "Archiving"
-msgstr "Archifo"
+msgid "All packages, by group"
+msgstr "Pob pecyn, yn ôl grwp"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:729
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "All packages, by size"
+msgstr "Pob pecyn, yn ôl maint"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:730
 #, c-format
-msgid "System"
-msgstr "System"
+msgid "All packages, by selection state"
+msgstr "Pob pecyn, yn ôl dyddiad dewis"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:731
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
+msgid "All packages, by medium repository"
+msgstr "Pob pecyn, yn ôl yn ôl ffynhonnell eu storfa"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:731
 #, c-format
-msgid "Servers"
-msgstr "Gwasanaethwyr"
+msgid "All packages, by update availability"
+msgstr "Pob pecyn, yn ôl diweddariad"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:732
 #, c-format
-msgid "Puzzles"
-msgstr "Posau"
+msgid "Leaves only, sorted by install date"
+msgstr "Gadael, yn ôl dyddiad gosod"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:783
 #, c-format
-msgid "Local files"
-msgstr "Ffeiliau lleol"
+msgid "in names"
+msgstr "enwau"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:783
 #, c-format
-msgid "Choose a medium for adding in the media limit:"
-msgstr "Dewiswch gyfrwng i ychwanegu at derfyn y cyfrwng:"
+msgid "in descriptions"
+msgstr "disgrifiadau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:783
 #, c-format
-msgid "Addable"
-msgstr "Ychwanegadwy"
+msgid "in file names"
+msgstr "mewn enwau ffeil"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:794
 #, c-format
-msgid "Keys"
-msgstr "Allweddi"
+msgid "Reset the selection"
+msgstr "Ailosod y dewis"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:794
 #, c-format
-msgid "Please choose"
-msgstr "Dewiswch"
+msgid "Reload the packages list"
+msgstr "Ail lwytho'r rhestr pecynnau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:795 ../rpmdrake.pm:436
 #, c-format
-msgid "Databases"
-msgstr "Cronfeydd Data"
+msgid "Update media"
+msgstr "Diweddaru'r cyfrwng"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:820
 #, 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 "Normal information"
+msgstr "Gwybodaeth arferol"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:820
 #, c-format
-msgid "Name: "
-msgstr "Enw: "
+msgid "Maximum information"
+msgstr "Gwybodaeth lawn"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:840
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Enw gwesteiwr y dirprwy:"
+msgid "You need to select some packages first."
+msgstr "Rhaid dewis rhai pecynnau'n gyntaf."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:845
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Mae gormod o becynnau wedi eu dewis"
+
+#: ../rpmdrake:846
 #, c-format
 msgid ""
-"The following packages have bad signatures:\n"
+"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:857
+#, c-format
+msgid ""
+"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"
+"Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:888
 #, c-format
-msgid "Normal updates"
-msgstr "Diweddariadau arferol"
+msgid "Find:"
+msgstr "Canfod:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:893
 #, c-format
-msgid "Manage keys..."
-msgstr "Rheoli allweddi"
+msgid "Search"
+msgstr "Chwilio"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:904
 #, c-format
-msgid "Maximum information"
-msgstr "Gwybodaeth lawn"
+msgid "Install"
+msgstr "Gosod"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:906
 #, c-format
-msgid "Selected"
-msgstr "Dewiswyd"
+msgid "Quit"
+msgstr "Gadael"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:913
 #, c-format
-msgid "Computer science"
-msgstr "Gwyddor Cyfrifiadureg"
+msgid "Software Packages Removal"
+msgstr "Tynnu Pecynnau Meddalwedd"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:913
 #, c-format
-msgid "Fonts"
-msgstr "Ffontiau"
+msgid "Mandrake Update"
+msgstr "Diweddaru Mandrake"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:913
 #, c-format
-msgid "Hardware"
-msgstr "Caledwedd"
+msgid "Software Packages Installation"
+msgstr "Gosod Pecynnau Meddalwedd"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:946
 #, c-format
-msgid "Quit"
-msgstr "Gadael"
+msgid "Fatal error"
+msgstr "Gwall terfynol"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:947
 #, c-format
-msgid "Version: "
-msgstr "Fersiwn: "
+msgid "A fatal error occurred: %s."
+msgstr "Digwyddodd gwall terfynol:%s."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:955
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Defnyddio .%s fel y brif ffeil"
+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:964
 #, c-format
-msgid "Norway"
-msgstr "Norwy"
+msgid "Already existing update media"
+msgstr "Cyfrwng diweddaru sy'n bod eisoes"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:965
 #, c-format
-msgid "Israel"
-msgstr "Israel"
+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.pm:1
+#: ../rpmdrake:975
 #, c-format
-msgid "China"
-msgstr "Tsiena"
+msgid "How to choose manually your mirror"
+msgstr "Sut i ddewis drych gyda llaw."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:976
 #, 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:1004
 #, 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:1037
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Diweddariad cywiro gwallau"
+msgid "Inspecting %s"
+msgstr "Archwilio %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1056
 #, c-format
-msgid "Java"
-msgstr "Java"
+msgid "changes:"
+msgstr "newidiadau:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1060
 #, c-format
-msgid "Update..."
-msgstr "Diweddau..."
+msgid "Remove .%s"
+msgstr "Tynnu .%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1062
 #, 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:1064
 #, c-format
-msgid "Cancel"
-msgstr "Dileu"
+msgid "Do nothing"
+msgstr "Gwneud dim"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1076
 #, c-format
-msgid "Sciences"
-msgstr "Gwyddorau"
+msgid "Installation finished"
+msgstr "Gorffennodd y gosodiad"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1086
 #, c-format
-msgid "Enabled?"
-msgstr "Galluogwyd?"
+msgid "Inspect..."
+msgstr "Archwilio..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1111 ../rpmdrake:1234
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Pob pecyn, trefn yr wyddor"
+msgid "Everything installed successfully"
+msgstr "Gosodwyd popeth yn llwyddiannus"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1112 ../rpmdrake:1235
 #, 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:1114 ../rpmdrake:1219
 #, c-format
-msgid "Toys"
-msgstr "Teganau"
+msgid "Problem during installation"
+msgstr "Anhawster wrth osod"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1115 ../rpmdrake:1220 ../rpmdrake:1249
 #, 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:1134
 #, c-format
-msgid " done."
-msgstr " gorffen.."
+msgid "Unable to get source packages."
+msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1135
 #, 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"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1136 ../rpmdrake:1192
 #, 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 ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Gwall(au) wedi eu hadrodd:\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1143
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Mae gormod o becynnau wedi eu dewis"
+msgid "Package installation..."
+msgstr "Gosod pecynnau..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1143
 #, c-format
-msgid "Physics"
-msgstr "Ffiseg"
+msgid "Initializing..."
+msgstr "Ymgychwyn..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1148
 #, c-format
-msgid "Do nothing"
-msgstr "Gwneud dim"
+msgid "Change medium"
+msgstr "Newid cyfrwng"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1149
 #, c-format
-msgid "Danmark"
-msgstr "Denmarc"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Rhowch gyfrwng \"%s\" i fewn i ddyfais [%s]"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1154
 #, c-format
-msgid "Error during download"
-msgstr "Gwall wrth lwytho i lawr"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1173
 #, c-format
-msgid "Mail"
-msgstr "E-bost"
+msgid "Verifying packages signatures..."
+msgstr "Gwirio llofnodion pecynnau ..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1182
 #, c-format
-msgid "Help"
-msgstr "Cymorth"
+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:1
+#: ../rpmdrake:1189 ../rpmdrake:1248
 #, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Methu estyn pecynnau ffynhonnell, %s"
+msgid "Installation failed"
+msgstr "Methodd y gosodiad"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1190
 #, c-format
-msgid "Sports"
-msgstr "Chwaraeon"
+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."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1204
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Preparing packages installation..."
+msgstr "Paratoi pecynnau i'w gosod..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1207
 #, c-format
-msgid "Protocol"
-msgstr "Protocol"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1232
 #, c-format
-msgid "(none)"
-msgstr "(dim)"
+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:1232
 #, c-format
-msgid "Germany"
-msgstr "Yr Almaen"
+msgid "everything was installed correctly"
+msgstr "gosodwyd popeth yn llwyddiannus"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1239
 #, c-format
-msgid "All packages, by medium repository"
-msgstr "Pob pecyn, yn ôl yn ôl ffynhonnell eu storfa"
+msgid "No package found for installation."
+msgstr "Heb ganfod pecyn i'w osod"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1240
 #, c-format
-msgid "Compression"
-msgstr "Cywasgiad"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Gwall anadferadwy: dim pecyn wedi ei ganfod ar gyfer y gosod."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1262
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Llwytho '%s' i lawr, amser yn weddill:%s, cyflymdra:%s"
+msgid "Please wait, reading packages database..."
+msgstr "Arhoswch, darllen cronfa ddata'r pecynnau..."
 
-#. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1308
 #, c-format
-msgid "%s from medium %s"
-msgstr "%s o gyfrwng %s"
+msgid "Please wait, removing packages..."
+msgstr "Arhoswch, tynnu'r pecynnau..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1313
 #, c-format
-msgid "Add a host"
-msgstr "Y&chwanegu gwestai:"
+msgid "Problem during removal"
+msgstr "Problem wrth dynnu"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1314
 #, c-format
-msgid "Development"
-msgstr "Datblygiad"
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Digwyddodd gwall wrth dynnu pecyn:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1346
 #, c-format
-msgid "No"
-msgstr "Na"
+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:1351
 #, c-format
-msgid "Media limit"
-msgstr "Terfyn cyfrwng"
+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:1356
 #, c-format
-msgid "Install"
-msgstr "Gosod"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:119
 #, c-format
-msgid "Add..."
-msgstr "Ychwanegu..."
+msgid "Yes"
+msgstr "Iawn"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:121
 #, c-format
-msgid "Change medium"
-msgstr "Newid cyfrwng"
+msgid "No"
+msgstr "Na"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:155
 #, c-format
-msgid "Reset the selection"
-msgstr "Ailosod y dewis"
+msgid "Info..."
+msgstr "Gwybodaeth..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:210
 #, c-format
-msgid "Mandrake Update"
-msgstr "Diweddaru Mandrake"
+msgid "Austria"
+msgstr "Awstria"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:211
 #, c-format
-msgid "in file names"
-msgstr "mewn enwau ffeil"
+msgid "Australia"
+msgstr "Awstralia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:212
 #, c-format
-msgid "Books"
-msgstr "Llyfrau"
+msgid "Belgium"
+msgstr "Gwlad Belg"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:213
 #, 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 "Brazil"
+msgstr "Brasil"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:214
 #, c-format
-msgid "Howtos"
-msgstr "Howtos"
+msgid "Canada"
+msgstr "Canada"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:215
 #, c-format
-msgid "Icewm"
-msgstr "Icewm"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:216
 #, 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 "Czech Republic"
+msgstr "Gweriniaeth Tsiec"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:217
 #, c-format
-msgid "Libraries"
-msgstr "Llyfrgelloedd"
+msgid "Germany"
+msgstr "Yr Almaen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:218
 #, 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 "Danmark"
+msgstr "Denmarc"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:219 ../rpmdrake.pm:223
 #, c-format
-msgid "Brazil"
-msgstr "Brasil"
+msgid "Greece"
+msgstr "Groeg"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:220
 #, c-format
-msgid "Installation failed"
-msgstr "Methodd y gosodiad"
+msgid "Spain"
+msgstr "Sbaen"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:221
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"Gwall(au) wedi eu hadrodd:\n"
-"%s"
+msgid "Finland"
+msgstr "Ffindir"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:222
 #, c-format
-msgid "Manage keys for digital signatures of packages"
-msgstr "Rheoli allweddi pecynnau digidol "
+msgid "France"
+msgstr "Ffrainc"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:224
 #, c-format
-msgid "Currently installed version: "
-msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
+msgid "Israel"
+msgstr "Israel"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:225
 #, c-format
-msgid "Games"
-msgstr "Gemau"
+msgid "Italy"
+msgstr "Yr Eidal"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:226
 #, c-format
-msgid "Astronomy"
-msgstr "Astroleg"
+msgid "Japan"
+msgstr "Siapan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:227
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Rhowch gyfrwng \"%s\" i fewn i ddyfais [%s]"
+msgid "Korea"
+msgstr "Corea"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:228
 #, c-format
-msgid "You need to select some packages first."
-msgstr "Rhaid dewis rhai pecynnau'n gyntaf."
+msgid "Netherlands"
+msgstr "Yr Iseldiroedd"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:229
 #, c-format
-msgid "All packages, by selection state"
-msgstr "Pob pecyn, yn ôl dyddiad dewis"
+msgid "Norway"
+msgstr "Norwy"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:230
 #, c-format
-msgid "Name:"
-msgstr "Enw:"
+msgid "Poland"
+msgstr "Gwlad Pwyl"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:231
 #, c-format
-msgid "KDE"
-msgstr "KDE"
+msgid "Portugal"
+msgstr "Portiwgal"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:232
 #, c-format
-msgid "No update"
-msgstr "Dim diweddariad"
+msgid "Russia"
+msgstr "Rwsia"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:233
 #, c-format
-msgid "Networking"
-msgstr "Rhwydweithio"
+msgid "Sweden"
+msgstr "Sweden"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:234
 #, c-format
-msgid "Ok"
-msgstr "Iawn"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:235
 #, c-format
-msgid "Text tools"
-msgstr "Offer testun"
+msgid "United Kingdom"
+msgstr "Y Deyrnas Unedig"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:236
 #, c-format
-msgid "Cards"
-msgstr "Cardiau"
+msgid "China"
+msgstr "Tsiena"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:237 ../rpmdrake.pm:238 ../rpmdrake.pm:239 ../rpmdrake.pm:240
+#: ../rpmdrake.pm:291
 #, c-format
-msgid "Sawfish"
-msgstr "Sawfish"
+msgid "United States"
+msgstr "Yr Unol Daleithiau"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:300
 #, c-format
-msgid "Group name:"
-msgstr "Enw grwp:"
+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?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:304
 #, 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 "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Arhoswch, llwytho i lawr cyfeiriaidau drychau o safle gwe MandrakeSoft."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:310
 #, c-format
-msgid "Arcade"
-msgstr "Arcêd"
+msgid "Error during download"
+msgstr "Gwall wrth lwytho i lawr"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:311
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+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:319
 #, c-format
-msgid "Editing medium \"%s\":"
-msgstr "Golygu ffynhonnell \"%s\":"
+msgid "No mirror"
+msgstr "Dim drych"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:320
 #, c-format
-msgid "Add a medium limit"
-msgstr "Ychwanegu terfyn cyfrwng"
+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."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:336
 #, c-format
-msgid "Group"
-msgstr "Grwp"
+msgid "Please choose the desired mirror."
+msgstr "Dewiswch ddrych"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:377
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Arhoswch, tynnu cyfrwng..."
+msgid "Copying file for medium `%s'..."
+msgstr "Copïo ffeil fel ar gyfer cyfrwng '%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:380
 #, c-format
-msgid "Accessibility"
-msgstr "Hygyrchedd"
+msgid "Examining file of medium `%s'..."
+msgstr "Archwilio ffeil cyfrwng '%s'..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:383
 #, c-format
-msgid "changes:"
-msgstr "newidiadau:"
+msgid "Examining remote file of medium `%s'..."
+msgstr "Archwilio ffeil pell y cyfrwng '%s'..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:387
 #, c-format
-msgid "Add"
-msgstr "Ychwanegu"
+msgid " done."
+msgstr " gorffen.."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:391
 #, c-format
-msgid "Regenerate hdlist"
-msgstr "Atgynhyrchu rhestr"
+msgid " failed!"
+msgstr " methwyd!"
 
-#: ../rpmdrake:1
+#. -PO: We're downloading the said file from the said medium
+#: ../rpmdrake.pm:395
 #, c-format
-msgid "Editors"
-msgstr "Golygyddion"
+msgid "%s from medium %s"
+msgstr "%s o gyfrwng %s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake.pm:399
 #, c-format
-msgid "United Kingdom"
-msgstr "Y Deyrnas Unedig"
+msgid "Starting download of `%s'..."
+msgstr "Cychwyn llwytho %s i lawr..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:403
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Llwybr perthynol i synthesis/hdlist:"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Llwytho '%s' i lawr, amser yn weddill:%s, cyflymdra:%s"
+
+#: ../rpmdrake.pm:406
+#, c-format
+msgid "Download of `%s', speed:%s"
+msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:429
 #, c-format
 msgid ""
-"Welcome to MandrakeUpdate!\n"
+"Unable to update medium; it will be automatically disabled.\n"
 "\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+"Errors:\n"
+"%s"
 msgstr ""
-"Croeso i MandrakeUpdate!\n"
-"Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
-"ar eich cyfrifiadur."
+"Methu diweddaru'r cyfrwng; bydd yn cael ei anablu'n awtomatig.\n"
+"\n"
+"Gwallau:\n"
+"%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:441
 #, c-format
-msgid "Remove a key"
-msgstr "Tynnu allwedd"
+msgid "Select the media you wish to update:"
+msgstr "Dewiswch y cyfrwng i'w diweddaru:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:445
 #, c-format
-msgid "User:"
-msgstr "Defnyddiwr:"
+msgid "Update"
+msgstr "Diweddaru"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:469
 #, c-format
-msgid "Browse..."
-msgstr "Pori..."
+msgid "Unable to create medium."
+msgstr "Methu creu cyfrwng."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"