substitute references to "sources" by now talking about "medias",

should be more understandable and more consistent with urpmi

1 files changed, 744 insertions, 741 deletions

diff --git a/po/cy.po b/po/cy.po
index f035bf68..2b3baf0a 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-13 13:06+0200\n"
+"POT-Creation-Date: 2003-05-16 18:58+0200\n"
 "PO-Revision-Date: 2003-02-17 22:21-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <cy@li.org>\n"
@@ -14,16 +14,20 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Ydi hi'n iawn parhau?"
+msgid "Enabled?"
+msgstr "Galluogwyd?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Llwybr neu bwynt gosod:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portiwgal"
 
 #: ../rpmdrake:1
 #, c-format
@@ -42,103 +46,53 @@ msgstr ""
 
 #: ../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."
+msgid "by group"
+msgstr "yn ôl grwp"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl: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."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"Digwyddodd gwall wrth osod pecyn:\n"
-"\n"
-"%s"
+msgid "Name:"
+msgstr "Enw:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Problem wrth dynnu"
+msgid "Italy"
+msgstr "Yr Eidal"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Arhoswch tynnu'r pecynnau..."
+msgid "How to choose manually your mirror"
+msgstr "Sut i ddewis drych gyda llaw."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Arhoswch, darlen cronfa ddata'r pecynnau..."
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"Digwyddodd gwall wrth osod pecyn:\n"
-"\n"
-"%s"
+msgid "URL:"
+msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Methodd y gosodiad"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Paratoi pecynnau i'w gosod"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "Paratoi pecynnau i'w gosod"
+msgid "Some packages need to be removed"
+msgstr "Rhaid tynnu rhai pecynnau"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
+msgid "More information on package..."
+msgstr "Rhagor o wybodaethar becyn..."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Gosodwyd popeth yn llwyddiannus"
+msgid "Yes"
+msgstr "Iawn"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\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:"
+"Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
+"eu dad-ddewis nawr:\n"
 
 #: ../rpmdrake:1
 #, c-format
@@ -146,451 +100,453 @@ msgid "everything was installed correctly"
 msgstr "gosodwyd popeth yn llwyddiannus"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "Digwyddodd anhawster wrth osod"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Gosod pecyn `%s' (%s/%s)..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "Paratoi pecynnau i'w gosod"
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Cewch ddewis eich drych eich hun, i wneud hynny\n"
+"cychwynnwch y Rheolwr Ffynonellau Meddalwedd, ac ychwanegu\n"
+"ffynhonnell 'Diweddariadau Diogelwch'.\n"
+"\n"
+"Yna ailgychwynnwch MandrakeUpdate."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
+"Welcome to the software removal tool!\n"
 "\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+"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"
-"\n"
-"Gwall(au) wedi eu hadrodd:\n"
-"%s"
+"Bydd yr offeryn hwn yn eich cynorthwyo o ddewis pa feddalwedd rydych\n"
+"am ei dynnu oddi ar eich cyfrifiadur."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl: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."
+"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."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "Cadw a gadael"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Do you want to continue installation?"
+"%s"
 msgstr ""
-"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
-"\n"
-"%s\n"
+"Digwyddodd gwall wrth osod pecyn:\n"
 "\n"
-"Ydi hi'n iawn parhau?"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Dileu"
+msgid "Size: "
+msgstr "Maint: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Ok"
-msgstr "Iawn"
+msgid "Security updates"
+msgstr "Diweddariadau diogelwch"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
+msgid "Already existing update medias"
+msgstr "Gwall wrth ychwanegu cyfrwng diweddaru"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Newid cyfrwng"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Initializing..."
-msgstr "Ymgychwyn..."
+msgid "Maximum information"
+msgstr "Gwybodath lawn"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Paratoi pecynnau i'w gosod"
+msgid "Proxy..."
+msgstr "Gwall..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "Rhaid eich bod yn wraidd i osod pecyn."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
-msgstr "Methu estyn pecynnau ffynhonnell."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspect..."
-msgstr "Archwilio..."
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Methodd y gosodiad, mae rhai ffeiliau ar goll.\n"
+"Efallai'r hoffech ddiweddaru eich cronfa ddata o ffynonellau."
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Installation finished"
-msgstr "Gorffennodd y gosodiad"
+msgid "United Kingdom"
+msgstr "Y Deyrnas Unideg"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Gwneud dim"
+msgid "in names"
+msgstr "enwau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "Defnyddio .%s fel y brif ffeil"
+msgid ""
+"I can't find any suitable mirror.\n"
+"\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
+msgstr ""
+"Methu canfod drych addas.\n"
+"\n"
+"Gall fod amryw o resymau; y mwyaf tebygol yw'r achos pan nad\n"
+"yw pensaernïaeth eich prosesydd yn cael ei gynnal gan Diweddariadau\n"
+"Swyddogol Mandrake Linux."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
 msgstr "Tynnu .%s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "changes:"
-msgstr "newidiadau:"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Inspecting %s"
-msgstr "Archwilio %s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Please wait, finding available packages..."
-msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
-
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Arhoswch, ychwanegu cyfrwng..."
+msgid "Finland"
+msgstr "Ffindir"
 
 #: ../rpmdrake:1
-#, c-format
+#, fuzzy, 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"
+"The following packages have bad signatures:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s\n"
+"\n"
+"Do you want to continue installation?"
 msgstr ""
-"Cewch ddewis eich drych eich hun, i wneud hynny\n"
-"cychwynnwch y Rheolwr Ffynonellau Meddalwedd, ac ychwanegu\n"
-"ffynhonnell 'Diweddariadau Diogelwch'.\n"
+"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "\n"
-"Yna ailgychwynnwch MandrakeUpdate."
+"%s\n"
+"\n"
+"Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "How to choose manually your mirror"
-msgstr "Sut i ddewis drych gyda llaw."
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Examining distant file of media `%s'..."
+msgstr "Archwilio ffeil pell y ffynhonell '%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"You already have at least one update source configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Sources Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
-"\n"
-"Then, restart MandrakeUpdate."
+msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update sources"
-msgstr ""
+msgid "France"
+msgstr "Ffrainc"
 
+#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "More info"
+msgstr "Mwy o wybodaeth"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl: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"
+"%s\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"
+"%s\n"
 "\n"
 "Ydi hi'n iawn parhau?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+msgid "Reload the packages list"
+msgstr "Ail lwytho'r rhestr pecynnau"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Dewis drych..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "Gwall ffeil"
+msgid "Some packages can't be installed"
+msgstr "Nid oes modd gosod pecyn '%s'\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
+msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Paratoi pecynnau i'w gosod"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Diweddaru Mandrake"
+msgid "All packages,"
+msgstr "Pob pecyn,"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Software Packages Removal"
-msgstr "Tynnu Pecynnau Meddalwedd"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Type of media:"
+msgstr "Math o ffynonellau:"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Gadael"
+msgid "in files"
+msgstr "mewn ffeiliau"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Gosod"
+msgid "All requested packages were installed successfully."
+msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "Tynnu"
+msgid "Proxy hostname:"
+msgstr "Enw gwesteiwr y dirprwy:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Help"
-msgstr "Cymorth"
+msgid "Local files"
+msgstr "Ffeiliau lleol"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Chwilio"
+msgid "Inspecting %s"
+msgstr "Archwilio %s"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Find:"
-msgstr "Canfod:"
+msgid "Israel"
+msgstr "Israel"
 
 #: ../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 ""
-"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
-"\n"
-"%s\n"
-"\n"
-"Ydi hi'n iawn parhau?"
+msgid "Help"
+msgstr "Cymorth"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Rhaid tynnu rhai pecynnau"
+msgid "HTTP server"
+msgstr "Gwasanaethwr HTTP"
 
 #: ../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 "Rhybudd:"
+msgid "Installation failed"
+msgstr "Methodd y gosodiad"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Mae gormod o becynnau wedi eu dewis"
+msgid "Use .%s as main file"
+msgstr "Defnyddio .%s fel y brif ffeil"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Maximum information"
-msgstr "Gwybodath lawn"
+msgid "Search results"
+msgstr "Canlyniadau'r chwilio"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Normal information"
-msgstr "Gwybodaeth arferol"
+msgid " failed!"
+msgstr " methwyd!"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Update source(s)"
-msgstr "Diweddaru ffynonellau"
+msgid "Brazil"
+msgstr "Brasil"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Ail lwytho'r rhestr pecynnau"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Mae yna gyfrwng o'r enw yna eisoes, hoffech chi\n"
+"ei amnewid?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Ailosod y dewis"
+msgid "Find:"
+msgstr "Canfod:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "mewn ffeiliau"
+msgid "All packages, alphabetical"
+msgstr "Pob pecyn, trefn yr wyddor"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "disgrifiadau"
+msgid "Please wait, searching..."
+msgstr "Arhoswch, chwilio..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in names"
-msgstr "enwau"
+msgid "Please wait, reading packages database..."
+msgstr "Arhoswch, darlen cronfa ddata'r pecynnau..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by update availability"
-msgstr "yn ôl diweddariad"
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "Methu agor pecyn `%s'\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "by source repository"
-msgstr "yn ôl ffynhonnell eu tarddiad"
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "by selection state"
-msgstr "yn ôl cyflwr dewis"
+msgid "Reset the selection"
+msgstr "Ailosod y dewis"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "by size"
-msgstr "yn ôl maint"
+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 "by group"
-msgstr "yn ôl grwp"
+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.pm:1
 #, c-format
-msgid "All packages,"
-msgstr "Pob pecyn,"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Pob pecyn, trefn yr wyddor"
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"Digwyddodd gwall wrth osod pecyn:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Dewisiadau Mandrake"
+msgid "Please wait, removing medium..."
+msgstr "Arhoswch, tynnu cyfrwng..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Normal updates"
-msgstr "Diweddariadau arferol"
+msgid "Password:"
+msgstr "Cyfrinair:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Diweddariad cywiro gwallau"
+msgid "Taiwan"
+msgstr "Taiwan"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Security updates"
-msgstr "Diweddariadau diogelwch"
+msgid "User:"
+msgstr "Defnyddiwr:"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Description: "
-msgstr "Disgrifiadau: "
+msgid "Please wait, updating medium..."
+msgstr "Arhoswch, diweddaru'r cyfrwng..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Rheswm am y diweddariad:"
+msgid "Please wait, listing packages..."
+msgstr "Arhoswch, rhestri pecynnau..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Crynodeb: "
+msgid "Information on packages"
+msgstr "Gwybodaeth am becynnau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Importance: "
-msgstr "Pwysigrwydd: "
+msgid "Cancel"
+msgstr "Dileu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Everything installed successfully"
+msgstr "Gosodwyd popeth yn llwyddiannus"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Size: "
-msgstr "Maint: "
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Dewiswch y ffynhonellau i'w diweddaru:"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Version: "
-msgstr "Fersiwn: "
+msgid "Please wait, updating media..."
+msgstr "Arhoswch, diweddaru cyfrwng..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Enw: "
+msgid "A fatal error occurred: %s."
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
+"\n"
+"%s\n"
+"\n"
+"Ydi hi'n iawn parhau?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Source: "
-msgstr "Ffynhonell: "
+msgid "in descriptions"
+msgstr "disgrifiadau"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "(Not available)"
-msgstr "(Dim ar gael)"
+msgid "Configure proxies"
+msgstr "Ffurfweddu'r dirprwyon"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Cofnod Newid:\n"
+msgid ""
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Mae angen i mi gysylltu â safle gwe MandrakeSoft i gael y rhestr\n"
+"drychau. Gwiriwch fod eich rhwydwaith yn rhedeg.\n"
+"\n"
+"Ydi hi'n iawn parhau?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Ffeiliau:\n"
+msgid "Please choose"
+msgstr "Dewiswch"
 
 #: ../rpmdrake:1
 #, c-format
@@ -599,42 +555,28 @@ msgstr "Maint dewisiwyd: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
+msgid "Initializing..."
+msgstr "Ymgychwyn..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl: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"
+msgid "Save changes"
+msgstr "Cadw newidiadau"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
-"\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Gwall wrth lwytho i lawr"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " gwrthdaro gyda"
+msgid "Package installation..."
+msgstr "Paratoi pecynnau i'w gosod"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "Nid oes modd gosod pecyn '%s'\n"
+#, c-format
+msgid "Importance: "
+msgstr "Pwysigrwydd: "
 
 #: ../rpmdrake:1
 #, c-format
@@ -647,311 +589,301 @@ msgstr ""
 "hefyd:\n"
 "\n"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Pecynnau ychwanegol angenrheidiol"
+msgid "Add..."
+msgstr "Ychwanegu..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be removed"
-msgstr "Nid oes modd gosod pecyn '%s'\n"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "Methu creu cyfrwng."
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"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 ""
-"Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
+"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:1
+#: ../edit-urpm-sources.pl:1
 #, 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 "Browse..."
+msgstr "Pori..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Some packages can't be removed"
+msgstr "Nid oes modd gosod pecyn '%s'\n"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
+msgid "Info..."
+msgstr "Gwybodaeth..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More information on package..."
-msgstr "Rhagor o wybodaethar becyn..."
+msgid "You need to insert the medium to continue"
+msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Copying file for media `%s'..."
+msgstr "Copïo ffeil fel ffynhonell '%s'..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Information on packages"
-msgstr "Gwybodaeth am becynnau"
+msgid "Remove"
+msgstr "Tynnu"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "More info"
-msgstr "Mwy o wybodaeth"
+msgid "Preparing packages installation..."
+msgstr "Paratoi pecynnau i'w gosod"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "by media repository"
+msgstr "yn ôl ffynhonnell eu tarddiad"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Addable"
-msgstr "Ychwanegadwy"
+msgid "No mirror"
+msgstr "Dim drych"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Upgradable"
-msgstr "Diweddariadwy"
+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 ""
-"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 ""
-"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 "Install"
+msgstr "Gosod"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "No update"
-msgstr "Dim diweddariad"
+msgid "Japan"
+msgstr "Siapan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(dim)"
+msgid "Do nothing"
+msgstr "Gwneud dim"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Arhoswch, rhestri pecynnau..."
+msgid "No update"
+msgstr "Dim diweddariad"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Methu agor pecyn `%s'\n"
+#, c-format
+msgid "Description: "
+msgstr "Disgrifiadau: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Mae angen un o'r pecynnau canlynol:"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr "Rhybudd:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Dewiswch"
+msgid "Name: "
+msgstr "Enw: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Inspect..."
+msgstr "Archwilio..."
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "Canfyddwyd gwrthdaro"
+msgid "Editing media \"%s\":"
+msgstr "Golygu ffynhonnell \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Selected"
-msgstr "Dewiswyd"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "Paratoi pecynnau i'w gosod"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results"
-msgstr "Canlyniadau'r chwilio"
+msgid "Australia"
+msgstr "Awstralia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Atal"
+msgid "Installation finished"
+msgstr "Gorffennodd y gosodiad"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Arhoswch, chwilio..."
+msgid "by update availability"
+msgstr "yn ôl diweddariad"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Canlyniadau'r chwilio (dim)"
+msgid "Poland"
+msgstr "Gwlad Pwyl"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Arall"
+msgid "Version: "
+msgstr "Fersiwn: "
 
 #: ../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 ""
-"Croeso i'r golygydd ffynhonnell pecynnau!\n"
-"\n"
-"Bydd yr offeryn yn eich cynorthwyo i ffurfweddu'r ffynhonnell pecynnau\n"
-"rydych am eu defnyddio ar eich cyfrifiadur. Byddant ar gael i'w gosod fel\n"
-"pecynnau newydd neu er mwyn diweddaru."
+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
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "Cadw a gadael"
+msgid "Upgradable"
+msgstr "Diweddariadwy"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " gorffen.."
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Proxy..."
-msgstr "Gwall..."
+msgid "Software Packages Installation"
+msgstr "Paratoi pecynnau i'w gosod"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "Diweddau..."
+msgid "Additional packages needed"
+msgstr "Pecynnau ychwanegol angenrheidiol"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "Ychwanegu..."
+msgid "Bugfixes updates"
+msgstr "Diweddariad cywiro gwallau"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "Golygu"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "Llwytho '%s' i lawr, amser yn weddill:%s, cyflymdra:%s"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Source"
-msgstr "Ffynhonell"
+msgid "Germany"
+msgstr "Yr Almaen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Enabled?"
-msgstr "Galluogwyd?"
+msgid "Russia"
+msgstr "Rwsia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Configure sources"
-msgstr "Ffurfweddu'r ffynonellau"
+msgid "Norway"
+msgstr "Norwy"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Password:"
-msgstr "Cyfrinair:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during installation"
+msgstr "Digwyddodd anhawster wrth osod"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "User:"
-msgstr "Defnyddiwr:"
+msgid "Search"
+msgstr "Chwilio"
 
 #: ../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:"
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "Golygu ffynhonnell"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Proxy hostname:"
-msgstr "Enw gwesteiwr y dirprwy:"
+msgid "Czech Republic"
+msgstr "Gweriniaeth Tsiec"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
 msgstr ""
-"Os oes angen dirprwy arnoch, rhowch enw gwesteiwr a phorth dewisol "
-"(cystrawen: <proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Ffurfweddu'r dirprwyon"
+msgid "Stop"
+msgstr "Atal"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Arhoswch, diweddaru'r cyfrwng..."
+msgid "Update"
+msgstr "Diweddaru"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake: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."
+msgid "Please wait, removing packages..."
+msgstr "Arhoswch tynnu'r pecynnau..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
+msgid "Normal information"
+msgstr "Gwybodaeth arferol"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save changes"
-msgstr "Cadw newidiadau"
+msgid "Media: "
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Llwybr perthynol i synthesis/hdlist:"
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "URL:"
-msgstr "URL:"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Editing source \"%s\":"
-msgstr "Golygu ffynhonnell \"%s\":"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit a source"
-msgstr "Golygu ffynhonnell"
+msgid "Media"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Arhoswch, tynnu cyfrwng..."
+msgid "Spain"
+msgstr "Sbaen"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Type of source:"
-msgstr "Math o ffynonellau:"
+msgid "Normal updates"
+msgstr "Diweddariadau arferol"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Adding a source:"
-msgstr "Ychwanegu ffynhonnell"
+msgid "by selection state"
+msgstr "yn ôl cyflwr dewis"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
-"Mae yna gyfrwng o'r enw yna eisoes, hoffech chi\n"
-"ei amnewid?"
-
-#: ../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"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Name:"
-msgstr "Enw:"
+"Arhoswch, llwytho i lawr cyfeiriaidau drychau o safle gwe MandrakeSoft."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -959,143 +891,148 @@ msgid "Login:"
 msgstr "Mewngofnod:"
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Dewis drych..."
+#, fuzzy, c-format
+msgid "Adding a media:"
+msgstr "Ychwanegu ffynhonnell"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Browse..."
-msgstr "Pori..."
+msgid "Austria"
+msgstr "Awstria"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Path or mount point:"
-msgstr "Llwybr neu bwynt gosod:"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Fatal error"
+msgstr "Gwall ffeil"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
-msgstr "Dyfais symudol"
+msgid "Update..."
+msgstr "Diweddau..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Starting download of `%s'..."
+msgstr "Gwirio llofnod `%s'..."
+
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "Gwasanaethwr HTTP"
+msgid "(none)"
+msgstr "(dim)"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "FTP server"
-msgstr "Gwasanaethwr FTP"
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
+"\n"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Path:"
-msgstr "Llwybr:"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Ffeiliau lleol"
+msgid "Currently installed version: "
+msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a source"
-msgstr "Ychwanegu ffynhonnell"
+msgid "Other"
+msgstr "Arall"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "Methu diweddaru'r cyfrwng; bydd yn cael ei anablu'n awtomatig."
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "Rheswm am y diweddariad:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Methu creu cyfrwng."
+msgid "Please choose the desired mirror."
+msgstr "Dewiswch ddrych"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Update"
-msgstr "Diweddaru"
+msgid "Edit"
+msgstr "Golygu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the source(s) you wish to update:"
-msgstr "Dewiswch y ffynhonellau i'w diweddaru:"
+msgid "Please wait, finding available packages..."
+msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Arhoswch, diweddaru cyfrwng..."
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Llwybr perthynol i synthesis/hdlist:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid " failed!"
-msgstr " methwyd!"
+msgid "Search results (none)"
+msgstr "Canlyniadau'r chwilio (dim)"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " gorffen.."
+msgid "Danmark"
+msgstr "Denmarc"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
+msgid "China"
+msgstr "Tseina"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "Llwytho '%s' i lawr, amser yn weddill:%s, cyflymdra:%s"
+msgid "United States"
+msgstr "Yr Unod Daleithiau"
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "Gwirio llofnod `%s'..."
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "newidiadau:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of source `%s'..."
-msgstr "Archwilio ffeil pell y ffynhonell '%s'..."
+msgid "Some additional packages need to be removed"
+msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of source `%s'..."
-msgstr "Archwilio ffeil y ffynhonell '%s'..."
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for source `%s'..."
-msgstr "Copïo ffeil fel ffynhonell '%s'..."
+msgid "No"
+msgstr "Na"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "Ffurfweddu'r ffynonellau"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "Ychwanegu ffynhonnell"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please choose the desired mirror."
-msgstr "Dewiswch ddrych"
+msgid "Summary: "
+msgstr "Crynodeb: "
 
 #: ../rpmdrake.pm:1
 #, 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 "Canada"
+msgstr "Canada"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "No mirror"
-msgstr "Dim drych"
+msgid "Greece"
+msgstr "Groeg"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1112,179 +1049,242 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu safle MandrakeSoft, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "Rhaid eich bod yn wraidd i osod pecyn."
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Error during download"
-msgstr "Gwall wrth lwytho i lawr"
+msgid "Path:"
+msgstr "Llwybr:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr ""
-"Arhoswch, llwytho i lawr cyfeiriaidau drychau o safle gwe MandrakeSoft."
+msgid "Problem during removal"
+msgstr "Problem wrth dynnu"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, 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 "Selected"
+msgstr "Dewiswyd"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "Yr Unod Daleithiau"
+msgid "Netherlands"
+msgstr "Yr Iseldiroedd"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "Tseina"
+msgid "Addable"
+msgstr "Ychwanegadwy"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Y Deyrnas Unideg"
+msgid "(Not available)"
+msgstr "(Dim ar gael)"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
+"\n"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Canfyddwyd gwrthdaro"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Software Packages Removal"
+msgstr "Tynnu Pecynnau Meddalwedd"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
 msgstr "Sweden"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "Rwsia"
+msgid ""
+"\n"
+"\n"
+"Error(s) reported:\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"Gwall(au) wedi eu hadrodd:\n"
+"%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Portugal"
-msgstr "Portiwgal"
+msgid ""
+"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 ""
+"Mae'r rhestr diweddariadau'n wag. Mae hyn yn golygu un ai\n"
+"nad oes diweddariad ar gyfer y pecynnau ar eich cyfrifiadur,\n"
+"neu rydych wedi eu gosod i gyd yn barod."
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Poland"
-msgstr "Gwlad Pwyl"
+#, fuzzy, c-format
+msgid "Examining file of media `%s'..."
+msgstr "Archwilio ffeil y ffynhonell '%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Norwy"
+msgid "Download of `%s', speed:%s"
+msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Netherlands"
-msgstr "Yr Iseldiroedd"
+msgid "One of the following packages is needed:"
+msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Korea"
-msgstr "Corea"
+msgid "Quit"
+msgstr "Gadael"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Japan"
-msgstr "Siapan"
+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
-#, c-format
-msgid "Italy"
-msgstr "Yr Eidal"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Update media(s)"
+msgstr "Diweddaru ffynonellau"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "Israel"
-msgstr "Israel"
+msgid "Ok"
+msgstr "Iawn"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Greece"
-msgstr "Groeg"
+msgid "Please wait, adding medium..."
+msgstr "Arhoswch, ychwanegu cyfrwng..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "France"
-msgstr "Ffrainc"
+msgid "Unable to get source packages."
+msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Finland"
-msgstr "Ffindir"
+msgid "Too many packages are selected"
+msgstr "Mae gormod o becynnau wedi eu dewis"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Spain"
-msgstr "Sbaen"
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias 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 golygydd ffynhonnell pecynnau!\n"
+"\n"
+"Bydd yr offeryn yn eich cynorthwyo i ffurfweddu'r ffynhonnell pecynnau\n"
+"rydych am eu defnyddio ar eich cyfrifiadur. Byddant ar gael i'w gosod fel\n"
+"pecynnau newydd neu er mwyn diweddaru."
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Danmark"
-msgstr "Denmarc"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr " gwrthdaro gyda"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "Yr Almaen"
+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
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Gweriniaeth Tsiec"
+msgid "Mandrake choices"
+msgstr "Dewisiadau Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Changelog:\n"
+msgstr "Cofnod Newid:\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Canada"
+msgid "Korea"
+msgstr "Corea"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasil"
+msgid "Removable device"
+msgstr "Dyfais symudol"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
 msgstr "Gwlad Belg"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Awstralia"
+msgid "Change medium"
+msgstr "Newid cyfrwng"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Awstria"
+msgid "Mandrake Update"
+msgstr "Diweddaru Mandrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Gwybodaeth..."
+msgid "by size"
+msgstr "yn ôl maint"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "No"
-msgstr "Na"
+msgid "FTP server"
+msgstr "Gwasanaethwr FTP"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Yes"
-msgstr "Iawn"
+msgid "Files:\n"
+msgstr "Ffeiliau:\n"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "Methu diweddaru'r cyfrwng; bydd yn cael ei anablu'n awtomatig."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1557,6 +1557,12 @@ msgstr "Tynnu Meddalwedd"
 msgid "Software Sources Manager"
 msgstr "Rheolwr Ffynhonnell Meddalwedd"
 
+#~ msgid "Source: "
+#~ msgstr "Ffynhonell: "
+
+#~ msgid "Source"
+#~ msgstr "Ffynhonell"
+
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
@@ -1593,9 +1599,6 @@ msgstr "Rheolwr Ffynhonnell Meddalwedd"
 #~ "\n"
 #~ "Hoffech chi fynd at ddrych arall?"
 
-#~ msgid "Error adding update medium"
-#~ msgstr "Gwall wrth ychwanegu cyfrwng diweddaru"
-
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
 #~ msgstr "Arhoswch, yn cysylltu â'r drych i gychwyn pecynnau diweddaru."