From 115995e7873351becb9a879bd00a37fae9159f91 Mon Sep 17 00:00:00 2001
From: Funda Wang <fwang@mandriva.org>
Date: Sat, 22 Jul 2006 08:43:00 +0000
Subject: Updated POT file.

---
 po/cy.po | 1477 +++++++++++++++++++++++++-------------------------------------
 1 file changed, 596 insertions(+), 881 deletions(-)

(limited to 'po/cy.po')

diff --git a/po/cy.po b/po/cy.po
index ff908ba8..947f2e3c 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2006-03-08 19:36-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -17,13 +18,11 @@ msgstr ""
 "X-Poedit-Language: Welsh\n"
 "X-Poedit-Country: UK\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Dewis y math o gyfrwng"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -48,18 +47,16 @@ msgstr ""
 "gwneud\n"
 "hyn mewn dau gam)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Ffynonellau dosbarthu"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Diweddariadau swyddogol"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -77,104 +74,84 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Arhoswch, ychwanegu cyfrwng..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Ychwanegu cyfrwng"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Ffeiliau lleol"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Llwybr:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "Gweinydd FTP"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, c-format
+#: ../edit-urpm-sources.pl:134
 msgid "RSYNC server"
 msgstr "Gweinydd RSYNC"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "Gweinydd HTTP"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Dyfais symudol"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Llwybr neu bwynt gosod:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Dyfais symudol"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Pori..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Mewngofnod:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Llwybr perthynol i synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Os yn wag bydd synthesis/hdlistyn cael ei holi'n awtomatic"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Enw:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Creu cyfrwng ar gyfer dosbarthiad cyfan"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Chwilio'rcyfrwng am ddiweddariadau"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Mae angen llanw y ddau gofnod cyntaf, o leiaf."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -182,13 +159,11 @@ msgstr ""
 "Mae yna gyfrwng o'r enw yna eisoes, hoffech chi\n"
 "ei amnewid?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Ychwanegu cyfrwng:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Math o gyfrwng:"
 
@@ -196,10 +171,9 @@ msgstr "Math o gyfrwng:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Diddymu"
 
@@ -208,101 +182,86 @@ msgstr "Diddymu"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "Iawn"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Dewisiadau eang ar gyfer gosod pecynnau"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "bob tro"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "byth"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Gwirio RPMau i'w gosod:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Llwytho rhaglen i lawr i'w defnyddio:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Tynnu Ffynhonnell"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Ydych chi'n siŵr eich bod eisiau tynnu ffynhonnell \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Arhoswch, tynnu cyfrwng..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Golygu'r cyfrwng"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Golygu ffynhonnell \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Cadw newidiadau"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Dirprwy..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
 
 #: ../edit-urpm-sources.pl:434
-#, 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."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Ffurfweddu'r dirprwyon"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Gosodiadau dirprwy ar gyfer cyfrwng \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Gosodiadau dirprwy eang"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -311,139 +270,113 @@ msgstr ""
 "(cystrawen: <proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Enw gwesteiwr y dirprwy:"
 
 #: ../edit-urpm-sources.pl:474
-#, 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:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Defnyddiwr:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Ychwanegu grŵp paralel"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Golygu grŵp paralel"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Ychwanegu terfyn cyfrwng"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Dewiswch gyfrwng i ychwanegu at derfyn y cyfrwng:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Ychwanegu gwesteiwr:"
 
 #: ../edit-urpm-sources.pl:611
-#, 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:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Golygu grŵp paralel\"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Enw grŵp:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protocol:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Terfyn cyfrwng:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Ychwanegu"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Tynnu"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Gwesteion:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Ffurfweddu urpmi paralel (dosbarthiad gweithredol o urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Grŵp"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protocol"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Terfyn cyfrwng"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protocol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Gorchymyn"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(dim)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Golygu..."
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Ychwanegu..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Rheoli allweddi pecynnau digidol "
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Cyfrwng"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
@@ -452,27 +385,24 @@ msgstr ""
 "Allweddi"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "heb ganfod enw, nid yw'r allwedd yn bodoli yng nghylch allwedd rpm"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Ychwanegu allwedd"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Dewis bysell ti ychwanegu at gyfrwng %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Tynnu allwedd"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -481,37 +411,31 @@ msgstr ""
 "(enw'r allwedd: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Ychwanegu allwedd..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Tynnu allwedd"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Ffurfweddu'r cyfrwng"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Galluogwyd?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Diweddariadau?"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "Mae angen diweddaru'r cyfrwng i fod yn ddefnyddiol. Diweddaru?"
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -521,38 +445,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Ychwanegu addasiad..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Diweddau..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Rheoli allweddi"
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Paralel..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Dewisiadau eang..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Cymorth"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -562,8 +480,7 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -577,8 +494,7 @@ msgstr ""
 "rydych am eu defnyddio ar eich cyfrifiadur. Byddant ar gael i'w gosod fel\n"
 "pecynnau newydd neu er mwyn diweddaru."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -590,13 +506,23 @@ msgstr ""
 "arall ar fwrdd gwaith arall, neu a ydych yn gosod pecynnau\n"
 " eraill hefyd?"
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Methu ychwanegu cyfrwng, ymresymiadau anghywir neu goll."
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"Rydych ar fin gosod cyfrwng pecynnau newydd, %s'.\n"
+"Mae hyn yn golygu y bydd modd gosod pecynnau meddalwedd\n"
+"newydd i'ch system o'r cyfrwng hwnnw."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -606,18 +532,22 @@ msgstr ""
 "Mae hyn yn golygu y bydd modd gosod pecynnau meddalwedd\n"
 "newydd i'ch system o'r cyfrwng hwnnw."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Llwyddiant wrth ychwanegu cyfrwng '%s'"
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Llwyddiant wrth ychwanegu cyfrwng '%s'"
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Defnyddi: %s [DEWIS]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -625,42 +555,35 @@ msgstr ""
 "  --changelog-first      dangos cofnod newid cyn filelist yn y ffenestr "
 "disgrifio"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     terfyn i'r cyfrwng hwn"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr "  --merge-all-rpmnew     cynnig uno pob ffeil  .rpmnew/.rpmsave"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            gosod modd (gosod (rhagosodedig), tynnu, diweddaru)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      peidio gofyn cwestiwn cadarnhau ym modd diweddaru"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update    peidio diweddaru cyfrwng wrth gychwyn"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        peidio gwirio llofnod pecynnau"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -668,33 +591,27 @@ msgstr ""
 "  --parallel=alias,host  ym modd paralel, defnyddio grŵp \"alias\" , "
 "defnyddio peiriant  \"host\" i ddangos deps angenrheidiol"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    dangos y pecynnau yma'n unig"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      rhag ddewis y pecynnau yma"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 gorfodi ei redeg fel root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           chwilio am \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Rhedeg ym modd defnyddiwr"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -704,634 +621,517 @@ msgstr ""
 "Ni fydd modd i chi greu newidiadau i'r system.\n"
 "ond bydd modd i chi bori'r gronfa ddata presennol."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Hygyrchedd"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Archifo"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Wrth Gefn"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Llosgi CD"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Cywasgiad"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Arall"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Llyfrau"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Llyfrau cyfrifiadurol"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Cwestiynau poblogaidd"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Llenyddiaeth"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Clwstwr"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Pasio Negeseuon"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Gwasanaethau Ciwio"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Cyfathrebu"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Cronfeydd Data"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Datblygiad"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Datblygiad"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME a GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE a Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Cnewyllyn"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Golygyddion"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Addysg"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Efelychwyr"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Offer ffeilio"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Gemau"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Antur"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Gemau"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arcêd"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Byrddau"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Cardiau"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Posau"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Chwaraeon"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Strategaeth"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Bwrdd gwaith graffigol"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Bwrdd gwaith graffigol"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM seiliedig"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Graffigau"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Monitro"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Amlgyfrwng"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Rhwydweithio"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Sgwrs"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Rhwydweithio"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Trosglwyddo ffeiliau"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Negesu Chwim"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "E-bost"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Newyddion"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Mynediad pell"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Swyddfa"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Allweddi Cyhoeddus"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Cyhoeddi"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Gwyddorau"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astroleg"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Gwyddorau"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Bywydeg"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Cemeg"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Gwyddor Cyfrifiadureg"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Gwyddorau Daear"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Mathemateg"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Ffiseg"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Cregyn"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Sain"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "System"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Sail"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Ffurfweddu"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "System"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Cychwyn ac Ymgychwyn"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Ffurfweddu"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Caledwedd"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pecynnu"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Argraffu"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Defnyddio"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Defnyddio"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Ffontiau"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Consol"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Ffontiau"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Math 1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "Didfap X11"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Rhyngwladoli"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Cnewyllyn a chaledwedd."
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Llyfrgelloedd"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Gweinyddion"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terfynellau"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Offer testun"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Teganau"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Fideo"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Dim ar gael)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Canlyniadau'r chwilio"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Canlyniadau'r chwilio (dim)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Arhoswch, chwilio..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Atal"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Ychwanegadwy"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Diweddariadwy"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Ychwanegadwy"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Heb ei ddewis"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Dewiswyd"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Heb ei ddewis"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Pwysigrwydd: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Rheswm am y diweddariad:"
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Dim disgrifiad"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Ffeiliau:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Cofnod Newid:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Cyfrwng:"
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Enw: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Fersiwn: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Pensaernïaeth:"
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Maint: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Pwysigrwydd: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Maint: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Crynodeb: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Rheswm am y diweddariad:"
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Disgrifiadau: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Dim disgrifiad"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Rhagor o wybodaeth ar becyn..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Dewiswch"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Dewiswch"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Arhoswch, rhestri pecynnau..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Dim diweddariad"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 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"
@@ -1341,29 +1141,24 @@ msgstr ""
 "nad oes diweddariad ar gyfer y pecynnau ar eich cyfrifiadur,\n"
 "neu rydych wedi eu gosod i gyd yn barod."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Popeth"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Rhagor"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Gwybodaeth am becynnau"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1373,13 +1168,11 @@ msgstr ""
 "hefyd: \n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Nid oes modd tynnu rhai pecynnau"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1387,8 +1180,7 @@ msgstr ""
 "Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1397,13 +1189,11 @@ msgstr ""
 "Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
 "eu dad-ddewis nawr:\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Pecynnau ychwanegol angenrheidiol"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1413,18 +1203,17 @@ msgstr ""
 "hefyd:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (perthyn i'r rhestr hepgor)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Nid oes modd gosod rhai pecynnau"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1434,123 +1223,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Rhaid tynnu rhai pecynnau"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Maint dewiswyd: %d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "Dim disgrifiad ar gael i'r pecyn hwn\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Diweddariadau diogelwch"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Diweddariad cywiro gwallau"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Gosod"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Diweddariadau arferol"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Gosod"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s dewis"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Dewisiadau Mandriva Linux"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Pob pecyn, trefn yr wyddor"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Pob pecyn, yn ôl grŵp"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Pob pecyn, yn ôl diweddariad"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Pob pecyn, yn ôl maint"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Pob pecyn, yn ôl dyddiad dewis"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Pob pecyn, yn ôl yn ôl ffynhonnell eu storfa"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Pob pecyn, yn ôl diweddariad"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Gadael, yn ôl dyddiad gosod"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Pob pecyn, yn ôl grŵp"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Diweddariadau arferol"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Diweddariad cywiro gwallau"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Diweddariadau arferol"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Diweddariadau diogelwch"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "enwau"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "disgrifiadau"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "mewn enwau ffeil"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Gwybodaeth arferol"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Gwybodaeth lawn"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Rhaid dewis rhai pecynnau'n gyntaf."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Mae gormod o becynnau wedi eu dewis"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1561,7 +1335,7 @@ msgid ""
 msgstr "Rhybudd:"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1575,89 +1349,100 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Ffeil"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Diweddaru'r cyfrwng"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Ailosod y dewis"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/_Ail-lwytho'r rhestr pecynnau"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Gadael"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Dewisiadau"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Dangoswch y pecynnau dewis awtomatig"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Cymorth"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Diweddaru Mandriva Linux"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Canfod:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Chwilio"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Clirio"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Gosod"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Gadael"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Gwall terfynol"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Digwyddodd gwall terfynol:%s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1669,13 +1454,12 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Cyfrwng diweddaru sy'n bod eisoes"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-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"
@@ -1691,13 +1475,12 @@ msgstr ""
 "\n"
 "Yna ailgychwyn %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Sut i ddewis drych gyda llaw."
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-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"
@@ -1711,58 +1494,56 @@ msgstr ""
 "\n"
 "Yna ailgychwynnwch %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Arhoswch, darllen cronfa ddata'r pecynnau..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Archwilio %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "newidiadau:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Tynnu .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Defnyddio .%s fel y brif ffeil"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Gwneud dim"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Gorffennodd y gosodiad"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Archwilio..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Anhawster wrth osod"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1772,18 +1553,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Methu estyn pecynnau ffynhonnell, %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1795,38 +1575,34 @@ msgstr ""
 "Gwall(au) wedi eu hadrodd:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Gosod pecynnau..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Ymgychwyn..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Gosod pecynnau..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Newid cyfrwng"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" i mewn i ddyfais [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Gwirio llofnodion pecynnau ..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1840,13 +1616,12 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau gyda'r gosod?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Methodd y gosodiad"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1858,23 +1633,21 @@ msgstr ""
 "\n"
 "Efallai'r hoffech ddiweddaru eich cronfa ddata o gyfryngau."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Paratoi pecynnau i'w gosod..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad at ffeil rpm (%s)"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1886,43 +1659,33 @@ msgstr ""
 "Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
 "mae modd eu harchwilio i weithredu arnynt:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Mae gan y pecynnau wybodaeth uwchraddio"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Rhagor o wybodaeth ar becyn... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Heb ganfod pecyn i'w osod"
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Gwall anadferadwy: dim pecyn wedi ei ganfod ar gyfer y gosod."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Arhoswch, darllen cronfa ddata'r pecynnau..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Arhoswch, tynnu'r pecynnau..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Problem wrth dynnu"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1932,8 +1695,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1945,8 +1707,8 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis pa feddalwedd rydych\n"
 "am ei dynnu oddi ar eich cyfrifiadur."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1957,13 +1719,11 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
 "ar eich cyfrifiadur."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Croeso i'r offeryn gosod meddalwedd!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1977,214 +1737,172 @@ msgstr ""
 "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:101
-#, c-format
-msgid "Software Update"
-msgstr "Diweddaru Meddalwedd"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Diweddaru Mandriva Linux"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Diweddaru Meddalwedd"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Rhowch eich hawl i gael mynediad dirprwy\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Enw Defnyddiwr:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Tynnu Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Diweddaru Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Gosod Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Na"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Iawn"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Gwybodaeth..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Awstria"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Awstralia"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Gwlad Belg"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Y Swistir"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Gweriniaeth Tsiec"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Yr Almaen"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Denmarc"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Groeg"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Sbaen"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Ffindir"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Ffrainc"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Hwngari"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Yr Eidal"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Siapan"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Yr Iseldiroedd"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norwy"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Gwlad Pwyl"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portiwgal"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rwsia"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Sweden"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slofacia"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Y Deyrnas Unedig"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Tsiena"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "Yr Unol Daleithiau"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2196,8 +1914,7 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2209,23 +1926,26 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s dewis"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau o safle gwe Mandriva."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Gwall wrth lwytho i lawr"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2239,8 +1959,8 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu'r safle, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2254,18 +1974,15 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu safle Mandriva, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Dim drych"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Methu canfod drych addas."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2279,69 +1996,64 @@ msgstr ""
 "yw pensaernïaeth eich prosesydd yn cael ei gynnal gan Diweddariadau\n"
 "Swyddogol Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Dewiswch ddrych"
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copïo ffeil fel ar gyfer cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Archwilio ffeil cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Archwilio ffeil bell y cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " gorffen.."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " methwyd!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s o gyfrwng %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Cychwyn llwytho %s i lawr..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Llwytho '%s' i lawr, amser yn weddill:%s, cyflymdra:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Arhoswch, diweddaru cyfrwng..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Gwall estyn pecynnau"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2357,34 +2069,29 @@ msgstr ""
 "neu nid oes modd ei gyrraedd ar hyn o bryd a dylech geisio eto \n"
 "rhywbryd."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Diweddaru'r cyfrwng"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr "Heb ganfod cyfrwng byw. Rhaid galluogi cyfrwng i'w diweddaru."
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Dewiswch y cyfrwng i'w diweddaru:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Dewis popeth"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Diweddaru"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2396,8 +2103,8 @@ msgstr ""
 "Gwallau:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2407,18 +2114,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Methu creu cyfrwng."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Methu ychwanegu cyfrwng"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2428,8 +2133,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2439,8 +2144,8 @@ msgstr ""
 "s rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2450,13 +2155,11 @@ msgstr ""
 "Mandriva Linux rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Cymorth wedi ei gychwyn yn y cefndir"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2733,6 +2436,18 @@ msgstr "Tynnu Meddalwedd"
 msgid "Software Media Manager"
 msgstr "Rheolwr Cyfrwng Meddalwedd"
 
+#~ msgid "Stop"
+#~ msgstr "Atal"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Pob pecyn, yn ôl yn ôl ffynhonnell eu storfa"
+
+#~ msgid "Normal information"
+#~ msgstr "Gwybodaeth arferol"
+
+#~ msgid "Maximum information"
+#~ msgstr "Gwybodaeth lawn"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "gosodwyd popeth yn llwyddiannus"
 
-- 
cgit v1.2.1