use perl_checker rather than fake_c to generate pot,

seems like fake_c is missing some strings since some
time :(
i don't msgmerge from the pot file of rpmdrake for 9.0
because it seems to make some rightful translations
fuzzy, and for some translations such as de.po who kept
the missing strings as "other", it's worse, so translators
should open the new po, try msgmerge by hand with the po
from the SRPM of the 9.0 and see if it's better for
them.. much sorry for all this additional work :(

1 files changed, 936 insertions, 650 deletions

diff --git a/po/cy.po b/po/cy.po
index 9681c899..61dfa9ef 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2003-01-30 11:22+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-01-28 22:14-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <cy@li.org>\n"
@@ -13,452 +13,593 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:43
-msgid "Unable to create medium."
-msgstr "Methu creu cyfrwng."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:44
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "Methu diweddaru'r cyfrwng; bydd yn cael ei anablu'n awtomatig."
+#: ../rpmdrake:1
+#, 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."
 
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Add a source"
-msgstr "Ychwanegu ffynhonnell"
+#: ../rpmdrake:1
+#, c-format
+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."
 
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Local files"
-msgstr "Ffeiliau lleol"
+#: ../rpmdrake:1
+#, c-format
+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_.c:55
-msgid "Path:"
-msgstr "Llwybr:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"Problem wrth dynnu pecynnau:\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:56
-msgid "FTP server"
-msgstr "Gwasanaethwr FTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "Problem wrth dynnu"
 
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:57
-#: ../edit-urpm-sources.pl_.c:59 ../edit-urpm-sources.pl_.c:187
-msgid "URL:"
-msgstr "URL:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "Arhoswch tynnu'r pecynnau..."
 
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
-msgstr "Gwasanaethwr HTTP"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "Arhoswch, darlen cronfa ddata'r pecynnau..."
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Path or mount point:"
-msgstr "Llwybr neu bwynt gosod:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Problem wrth osod y rhaglen\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Removable device"
-msgstr "Dyfais symudol"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "Problem wrth osod y rhaglen"
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
-msgstr "Diweddariadau diogelwch"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "Mae popeth wedi ei osod (ydy hyn i fod i ddigwydd o gwbl?)"
 
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
-msgstr "Pori..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "Popeth wedi ei osod eisoes"
 
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-msgstr "Dewis drych..."
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
-#: ../edit-urpm-sources.pl_.c:92
-msgid "Login:"
-msgstr "Mewngofnod:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "Gosodwyd popeth yn llwyddiannus"
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-msgid "Password:"
-msgstr "Cyfrinair:"
+#: ../rpmdrake:1
+#, 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_.c:97
-msgid "Name:"
-msgstr "Enw:"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "gosodwyd popeth yn llwyddiannus"
 
-#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:188
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Llwybr perthynol i synthesis/hdlist:"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"methodd rhai pecynnau a chael eu gosod\n"
+"yn gywir"
 
-#: ../edit-urpm-sources.pl_.c:107
-msgid "You need to fill up at least the two first entries."
-msgstr "Mae angen llanw o leiaf y ddau gofnod cyntaf"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "Arhoswch, tynnu pecynnau i eraill gael eu diweddaru"
 
-#: ../edit-urpm-sources.pl_.c:120
-msgid "Adding a source:"
-msgstr "Ychwanegu ffynhonnell"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
+msgstr ""
+"Methodd y gosodiad, mae rhai ffeiliau ar goll.\n"
+"Efallai'r hoffech ddiweddaru eich cronfa ddata o ffynonellau."
 
-#: ../edit-urpm-sources.pl_.c:121
-msgid "Type of source:"
-msgstr "Math o ffynonellau:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Methodd y gosodiad"
 
-#: ../edit-urpm-sources.pl_.c:125 ../edit-urpm-sources.pl_.c:202
-#: ../edit-urpm-sources.pl_.c:235 ../rpmdrake.pm_.c:100 ../rpmdrake.pm_.c:139
-#: ../rpmdrake.pm_.c:322 ../rpmdrake_.c:355 ../rpmdrake_.c:367
-#: ../rpmdrake_.c:371 ../rpmdrake_.c:918 ../rpmdrake_.c:952
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Dileu"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../edit-urpm-sources.pl_.c:140 ../edit-urpm-sources.pl_.c:196
-#: ../edit-urpm-sources.pl_.c:202 ../edit-urpm-sources.pl_.c:242
-#: ../rpmdrake.pm_.c:322 ../rpmdrake.pm_.c:355 ../rpmdrake_.c:355
-#: ../rpmdrake_.c:952
-msgid "Cancel"
-msgstr "Dileu"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
-#: ../edit-urpm-sources.pl_.c:147
-msgid "Please wait, adding medium..."
-msgstr "Arhoswch, ychwanegu cyfrwng..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "Newid cyfrwng"
 
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
-msgstr "Arhoswch, tynnu cyfrwng..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "Golygu ffynhonnell"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "Golygu ffynhonnell \"%s\":"
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "Mae rhaglen angenrheidiol ar goll (grpmi). Gwiriwch eich gosodiad."
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
-msgstr "Cadw newidiadau"
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "Rhaglen ar goll"
 
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
-msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "Archwilio..."
 
-#: ../edit-urpm-sources.pl_.c:201
-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
+#, c-format
+msgid "Installation finished"
+msgstr "Gorffennodd y gosodiad"
 
-#: ../edit-urpm-sources.pl_.c:206
-msgid "Please wait, updating medium..."
-msgstr "Arhoswch, diweddaru'r cyfrwng..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "Gwneud dim"
 
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
-msgstr "Ffurfweddu'r dirprwyon"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Defnyddio .%s fel y brif ffeil"
 
-#: ../edit-urpm-sources.pl_.c:223
-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
+#, c-format
+msgid "Remove .%s"
+msgstr "Tynnu .%s"
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
-msgstr "Enw gwesteiwr y dirprwy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "newidiadau:"
 
-#: ../edit-urpm-sources.pl_.c:227
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Mae modd i chi enwi defnyddiwr /cyfrinair ar gyfer dilysiad dirprwy:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "Archwilio %s"
 
-#: ../edit-urpm-sources.pl_.c:229
-msgid "User:"
-msgstr "Defnyddiwr:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Configure sources"
-msgstr "Ffurfweddu'r ffynonellau"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was an error while adding the update medium via urpmi.\n"
+"\n"
+"This may be due to a broken or temporary unavailable mirror, or when your\n"
+"Mandrake Linux version (%s) is not yet / no more supported by Mandrake "
+"Linux\n"
+"Official Updates.\n"
+"\n"
+"Do you want to try another mirror?"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:262
-msgid "Enabled?"
-msgstr "Galluogwyd?"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "Gwall wrth ychwanegu cyfrwng diweddaru"
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
-msgstr "Ffynhonell"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr "Arhoswch, yn cysylltu â'r drych i gychwyn pecynnau diweddaru."
 
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:732
-msgid "Remove"
-msgstr "Tynnu"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Sources Manager, and then add a `Security\n"
+"updates' source.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Edit"
-msgstr "Golygu"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "Sut i ddewis drych gyda llaw."
 
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
-msgstr "Ychwanegu..."
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr ""
+"Digwyddodd gwall anadferadwy wrth ddiweddaru'r wybodaeth am y pecynnau."
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
-msgstr "Diweddau..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "Gwall wrth ddiweddaru'r cyfrwng"
 
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
-msgstr "Dirprwy..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "Arhoswch, yn cysylltu â'r drych i ddiweddaru gwybodaeth am y pecynnau."
 
-#: ../edit-urpm-sources.pl_.c:296
-msgid "Save and quit"
-msgstr "Cadw a gadael"
+#: ../rpmdrake:1
+#, 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 ""
 
-#: ../edit-urpm-sources.pl_.c:297 ../rpmdrake_.c:735
-msgid "Quit"
-msgstr "Gadael"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "Gosodiad Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "Iawn"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Diweddaru Mandrake"
 
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "Na"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Tynnu Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "Gwybodaeth..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "Gadael"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "Awstria"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "Gosod"
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "Awstralia"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "Tynnu"
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "Gwlad Belg"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "Chwilio"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "Brasil"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "Canfod:"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Canada"
-msgstr "Canada"
+#: ../rpmdrake:1
+#, 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 ""
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "Rhaid tynnu rhai pecynnau"
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "Gweriniaeth Tsiec"
+#: ../rpmdrake:1
+#, 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 ""
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "Yr Almaen"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "Mae gormod o becynnau wedi eu dewis"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "Denmarc"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "Gwybodath lawn"
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "Groeg"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Gwybodaeth arferol"
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
-msgstr "Sbaen"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "Diweddaru ffynonellau"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "Ffindir"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "Ail lwytho'r rhestr pecynnau"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "Ffrainc"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Ailosod y dewis"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "Israel"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "mewn ffeiliau"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "Yr Eidal"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "disgrifiadau"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "Siapan"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "enwau"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "Corea"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "yn ôl diweddariad"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "Yr Iseldiroedd"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "yn ôl ffynhonnell eu tarddiad"
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "Norwy"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "yn ôl cyflwr dewis"
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "Gwlad Pwyl"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "yn ôl maint"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "Portiwgal"
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "yn ôl grwp"
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "Rwsia"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "Pob pecyn,"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "Sweden"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Pob pecyn, trefn yr wyddor"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "Taiwan"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Dewisiadau Mandrake"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "Y Deyrnas Unideg"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "Diweddariadau arferol"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "Tseina"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Diweddariad cywiro gwallau"
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "Yr Unod Daleithiau"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "Diweddariadau diogelwch"
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Arhoswch, llwytho i lawr cyfeiriaidau drychau o safle gwe MandrakeSoft."
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "Disgrifiadau: "
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "Gwall wrth lwytho i lawr"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "Crynodeb: "
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "Dim drych"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Pwysigrwydd: "
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "Dewiswch ddrych"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
-msgstr "Diweddaru ffynonellau"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "Maint: "
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "Dewiswch y ffynhonellau i'w diweddaru:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "Fersiwn: "
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "Diweddaru"
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Enw: "
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "Arhoswch, diweddaru cyfrwng..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Rheswm am y diweddariad:"
 
-#: ../rpmdrake_.c:101
-msgid "Other"
-msgstr "Arall"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
 
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
-msgstr "(dim)"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "Ffynhonell: "
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
+#: ../rpmdrake:1
+#, c-format
 msgid "(Not available)"
 msgstr "(Dim ar gael)"
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
-msgstr "Canlyniadau'r chwilio"
-
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
-msgstr "Canlyniadau'r chwilio (dim)"
-
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
-msgstr "Arhoswch, chwilio..."
-
-#: ../rpmdrake_.c:177
-msgid "Stop"
-msgstr "Atal"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Addable"
-msgstr "Ychwanegadwy"
-
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Upgradable"
-msgstr "Diweddariadwy"
-
-#: ../rpmdrake_.c:213
-msgid "Not selected"
-msgstr "Heb ddewis"
-
-#: ../rpmdrake_.c:213
-msgid "Selected"
-msgstr "Dewiswyd"
-
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
-msgstr "Rhagor o wybodaethar becyn..."
-
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
-msgstr "Mae angen un o'r pecynnau canlynol:"
-
-#: ../rpmdrake_.c:261
-msgid "Please choose"
-msgstr "Dewiswch"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "Cofnod Newid:\n"
 
-#: ../rpmdrake_.c:277
-msgid "unknown package "
-msgstr "pecyn anhysbys"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Ffeiliau:\n"
 
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
-msgstr "Arhoswch, rhestri pecynnau..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Maint dewisiwyd: %d MB"
 
-#: ../rpmdrake_.c:302
-msgid "No update"
-msgstr "Dim diweddariad"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-msgid "More infos"
-msgstr "Mwy o wybodaeth"
+#: ../rpmdrake:1
+#, 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"
 
-#: ../rpmdrake_.c:357
-msgid "Information on packages"
-msgstr "Rhagor o wybodaeth ar becyn..."
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+msgstr ""
+"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
+"\n"
 
-#: ../rpmdrake_.c:378
-msgid "Some additional packages need to be removed"
-msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Nid oes modd gosod rhai pecynnau"
 
-#: ../rpmdrake_.c:379
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"Oherwydd eu dibyniaethau, rhaid tynnu'r pecynnau canlynol \n"
-"hefyd: \n"
+"I fodloni dibyniaethau, mae angen gosod y pecyn(nau) canlynol\n"
+"hefyd:\n"
 "\n"
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Pecynnau ychwanegol angenrheidiol"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Nid oes modd tynnu rhai pecynnau"
 
-#: ../rpmdrake_.c:386
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -466,416 +607,565 @@ msgstr ""
 "Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
 "\n"
 
-#: ../rpmdrake_.c:394 ../rpmdrake_.c:453
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
-"eu dad-ddewis nawr:\n"
+"Oherwydd eu dibyniaethau, rhaid tynnu'r pecynnau canlynol \n"
+"hefyd: \n"
+"\n"
 
-#: ../rpmdrake_.c:423
-msgid "Additional packages needed"
-msgstr "Pecynnau ychwanegol angenrheidiol"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 
-#: ../rpmdrake_.c:424
-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:1
+#, c-format
+msgid "More information on package..."
+msgstr "Rhagor o wybodaethar becyn..."
 
-#: ../rpmdrake_.c:437
-msgid "Some packages can't be installed"
-msgstr "Nid oes modd gosod rhai pecynnau"
+#: ../rpmdrake:1
+#, c-format
+msgid "Information on packages"
+msgstr "Rhagor o wybodaeth ar becyn..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "Mwy o wybodaeth"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "Ychwanegadwy"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Diweddariadwy"
 
-#: ../rpmdrake_.c:438
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
+"The list of updates is void. 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 ""
-"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
-"\n"
 
-#: ../rpmdrake_.c:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
-msgstr "Rhaid tynnu rhai pecynnau"
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "Dim diweddariad"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
+msgid "(none)"
+msgstr "(dim)"
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Maint dewisiwyd: %d MB"
+msgid "Please wait, listing packages..."
+msgstr "Arhoswch, rhestri pecynnau..."
 
-#: ../rpmdrake_.c:484
-msgid "Files:\n"
-msgstr "Ffeiliau:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "unknown package "
+msgstr "pecyn anhysbys"
 
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
-msgstr "Cofnod Newid:\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "Ffynhonell: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Dewiswch"
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
-msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "Rheswm am y diweddariad:"
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "Heb ddewis"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "Enw: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "Dewiswyd"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "Fersiwn: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "Canlyniadau'r chwilio"
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Stop"
+msgstr "Atal"
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "Maint: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Arhoswch, chwilio..."
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "Pwysigrwydd: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "Canlyniadau'r chwilio (dim)"
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "Crynodeb: "
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "Arall"
 
-#: ../rpmdrake_.c:501
-msgid "Description: "
-msgstr "Disgrifiadau: "
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"Welcome to the packages source editor!\n"
+"\n"
+"This tool will help you configure the packages sources you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
 
-#: ../rpmdrake_.c:550
-msgid "Bugfixes updates"
-msgstr "Diweddariad cywiro gwallau"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Cadw a gadael"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "Diweddariadau arferol"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Dirprwy..."
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "Dewisiadau Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "Diweddau..."
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "Pob pecyn, trefn yr wyddor"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Ychwanegu..."
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "Pob pecyn,"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "Golygu"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "yn ôl grwp"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "Ffynhonell"
 
-#: ../rpmdrake_.c:594
-msgid "by size"
-msgstr "yn ôl maint"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "Galluogwyd?"
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr "yn ôl cyflwr dewis"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "Ffurfweddu'r ffynonellau"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
-msgstr "yn ôl ffynhonnell eu tarddiad"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "Cyfrinair:"
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
-msgstr "yn ôl diweddariad"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Defnyddiwr:"
 
-#: ../rpmdrake_.c:617
-msgid "in descriptions"
-msgstr "disgrifiadau"
+#: ../edit-urpm-sources.pl:1
+#, 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:"
 
-#: ../rpmdrake_.c:617
-msgid "in files"
-msgstr "mewn ffeiliau"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Enw gwesteiwr y dirprwy:"
 
-#: ../rpmdrake_.c:617
-msgid "in names"
-msgstr "enwau"
+#: ../edit-urpm-sources.pl:1
+#, 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]>):"
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "Ail lwytho'r rhestr pecynnau"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "Ffurfweddu'r dirprwyon"
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "Ailosod y dewis"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Arhoswch, diweddaru'r cyfrwng..."
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
-msgstr "Gwybodath lawn"
+#: ../edit-urpm-sources.pl:1
+#, 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."
 
-#: ../rpmdrake_.c:654
-msgid "Normal information"
-msgstr "Gwybodaeth arferol"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
-msgstr "Mae gormod o becynnau wedi eu dewis"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "Cadw newidiadau"
 
-#: ../rpmdrake_.c:722
-msgid "Find:"
-msgstr "Canfod:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Llwybr perthynol i synthesis/hdlist:"
 
-#: ../rpmdrake_.c:727
-msgid "Search"
-msgstr "Chwilio"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL:"
 
-#: ../rpmdrake_.c:733
-msgid "Install"
-msgstr "Gosod"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "Golygu ffynhonnell \"%s\":"
 
-#: ../rpmdrake_.c:740 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Diweddaru Mandrake"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "Golygu ffynhonnell"
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Installation"
-msgstr "Gosodiad Pecynnau Meddalwedd"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "Arhoswch, tynnu cyfrwng..."
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Removal"
-msgstr "Tynnu Pecynnau Meddalwedd"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Arhoswch, ychwanegu cyfrwng..."
 
-#: ../rpmdrake_.c:781
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "Arhoswch, yn cysylltu â'r drych i ddiweddaru gwybodaeth am y pecynnau."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Type of source:"
+msgstr "Math o ffynonellau:"
 
-#: ../rpmdrake_.c:783
-msgid "Error updating medium"
-msgstr "Gwall wrth ddiweddaru'r cyfrwng"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "Ychwanegu ffynhonnell"
 
-#: ../rpmdrake_.c:784
-msgid "There was an unrecoverable error while updating packages information."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
 msgstr ""
-"Digwyddodd gwall anadferadwy wrth ddiweddaru'r wybodaeth am y pecynnau."
 
-#: ../rpmdrake_.c:789
-msgid "How to choose manually your mirror"
-msgstr "Sut i ddewis drych gyda llaw."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr "Mae angen llanw o leiaf y ddau gofnod cyntaf"
 
-#: ../rpmdrake_.c:797
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "Arhoswch, yn cysylltu â'r drych i gychwyn pecynnau diweddaru."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "Enw:"
 
-#: ../rpmdrake_.c:800
-msgid "Error adding update medium"
-msgstr "Gwall wrth ychwanegu cyfrwng diweddaru"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "Mewngofnod:"
 
-#: ../rpmdrake_.c:831
-msgid "Please wait, finding available packages..."
-msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Dewis drych..."
 
-#: ../rpmdrake_.c:863
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "Archwilio %s"
+msgid "Browse..."
+msgstr "Pori..."
 
-#: ../rpmdrake_.c:882
-msgid "changes:"
-msgstr "newidiadau:"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Llwybr neu bwynt gosod:"
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Tynnu .%s"
+msgid "Removable device"
+msgstr "Dyfais symudol"
 
-#: ../rpmdrake_.c:888
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Defnyddio .%s fel y brif ffeil"
+msgid "HTTP server"
+msgstr "Gwasanaethwr HTTP"
 
-#: ../rpmdrake_.c:890
-msgid "Do nothing"
-msgstr "Gwneud dim"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "Gwasanaethwr FTP"
 
-#: ../rpmdrake_.c:902
-msgid "Installation finished"
-msgstr "Gorffennodd y gosodiad"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path:"
+msgstr "Llwybr:"
 
-#: ../rpmdrake_.c:912
-msgid "Inspect..."
-msgstr "Archwilio..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Ffeiliau lleol"
 
-#: ../rpmdrake_.c:927
-msgid "Program missing"
-msgstr "Rhaglen ar goll"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "Ychwanegu ffynhonnell"
 
-#: ../rpmdrake_.c:928
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "Mae rhaglen angenrheidiol ar goll (grpmi). Gwiriwch eich gosodiad."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "Methu diweddaru'r cyfrwng; bydd yn cael ei anablu'n awtomatig."
 
-#: ../rpmdrake_.c:942
-msgid "Unable to get source packages."
-msgstr "Methu estyn pecynnau ffynhonnell."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Methu creu cyfrwng."
 
-#: ../rpmdrake_.c:943
-msgid "Unable to get source packages, sorry."
-msgstr "Methu estyn pecynnau ffynhonnell."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Arhoswch, diweddaru cyfrwng..."
 
-#: ../rpmdrake_.c:950
-msgid "Change medium"
-msgstr "Newid cyfrwng"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "Diweddaru"
 
-#: ../rpmdrake_.c:951
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
+msgid "Select the source(s) you wish to update:"
+msgstr "Dewiswch y ffynhonellau i'w diweddaru:"
 
-#: ../rpmdrake_.c:959
-msgid "Installation failed"
-msgstr "Methodd y gosodiad"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "Dewiswch ddrych"
 
-#: ../rpmdrake_.c:960
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"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 ""
-"Methodd y gosodiad, mae rhai ffeiliau ar goll.\n"
-"Efallai'r hoffech ddiweddaru eich cronfa ddata o ffynonellau."
 
-#: ../rpmdrake_.c:963
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "Arhoswch, tynnu pecynnau i eraill gael eu diweddaru"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "Dim drych"
 
-#: ../rpmdrake_.c:984
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 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_.c:984
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Gwall wrth lwytho i lawr"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr ""
+"Arhoswch, llwytho i lawr cyfeiriaidau drychau o safle gwe MandrakeSoft."
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"methodd rhai pecynnau a chael eu gosod\n"
-"yn gywir"
 
-#: ../rpmdrake_.c:985
-msgid "everything was installed correctly"
-msgstr "gosodwyd popeth yn llwyddiannus"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "Yr Unod Daleithiau"
 
-#: ../rpmdrake_.c:987
-msgid "Everything installed successfully"
-msgstr "Gosodwyd popeth yn llwyddiannus"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Tseina"
 
-#: ../rpmdrake_.c:988
-msgid "All requested packages were installed successfully."
-msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Y Deyrnas Unideg"
 
-#: ../rpmdrake_.c:991
-msgid "Everything already installed."
-msgstr "Popeth wedi ei osod eisoes"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake_.c:992
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "Mae popeth wedi ei osod (ydy hyn i fod i ddigwydd o gwbl?)"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Sweden"
 
-#: ../rpmdrake_.c:999
-msgid "Problem during installation"
-msgstr "Problem wrth osod y rhaglen"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Rwsia"
 
-#: ../rpmdrake_.c:1000
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Problem wrth osod y rhaglen\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "Portiwgal"
 
-#: ../rpmdrake_.c:1014
-msgid "Please wait, reading packages database..."
-msgstr "Arhoswch, darlen cronfa ddata'r pecynnau..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "Gwlad Pwyl"
 
-#: ../rpmdrake_.c:1055
-msgid "Please wait, removing packages..."
-msgstr "Arhoswch tynnu'r pecynnau..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norwy"
 
-#: ../rpmdrake_.c:1058
-msgid "Problem during removal"
-msgstr "Problem wrth dynnu"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "Yr Iseldiroedd"
 
-#: ../rpmdrake_.c:1059
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Problem wrth dynnu pecynnau:\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "Corea"
 
-#: ../rpmdrake_.c:1091
-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."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Siapan"
 
-#: ../rpmdrake_.c:1096
-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.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Yr Eidal"
 
-#: ../rpmdrake_.c:1101
-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
+#, c-format
+msgid "Israel"
+msgstr "Israel"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Groeg"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "Ffrainc"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Ffindir"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Sbaen"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "Denmarc"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Yr Almaen"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Gweriniaeth Tsiec"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Canada"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasil"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Gwlad Belg"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "Awstralia"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Awstria"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Gwybodaeth..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Na"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "Iawn"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "Gosod Meddalwedd"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -884,7 +1174,3 @@ msgstr "Tynnu Meddalwedd"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
 msgstr "Rheolwr Ffynhonnell Meddalwedd"
-
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "Gosod Meddalwedd"