update (Rhoslyn Prys)

1 files changed, 870 insertions, 439 deletions

diff --git a/po/cy.po b/po/cy.po
index fe9edd95..ed490491 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-04 09:56+0100\n"
-"PO-Revision-Date: 2006-12-11 22:15-0000\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\n"
+"PO-Revision-Date: 2007-01-09 18:13+0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +19,12 @@ msgstr ""
 "X-Poedit-Country: UK\n"
 
 #: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "Dewis y math o gyfrwng"
 
 #: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -48,15 +50,17 @@ msgstr ""
 "hyn mewn dau gam)"
 
 #: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "Ffynonellau dosbarthu"
 
 #: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "Diweddariadau swyddogol"
 
 #: ../edit-urpm-sources.pl:97
-#, perl-format
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -74,85 +78,104 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#. because updates media do not provide media.cfg yet
 #: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "Arhoswch, ychwanegu cyfrwng..."
 
 #: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Ychwanegu cyfrwng"
 
 #: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Ffeiliau lleol"
 
 #: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Llwybr:"
 
 #: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "Gweinydd FTP"
 
 #: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
-#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:416
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
 #: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr "Gweinydd RSYNC"
 
 #: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "Gweinydd HTTP"
 
 #: ../edit-urpm-sources.pl:150
-msgid "Path or mount point:"
-msgstr "Llwybr neu bwynt gosod:"
-
-#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Dyfais symudol"
 
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Llwybr neu bwynt gosod:"
+
 #: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Pori..."
 
-#: ../edit-urpm-sources.pl:197
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Mewngofnod:"
 
-#: ../edit-urpm-sources.pl:197 ../edit-urpm-sources.pl:501 ../rpmdrake.pm:131
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../edit-urpm-sources.pl:202 ../edit-urpm-sources.pl:417
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Llwybr perthynol i synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:204
+#: ../edit-urpm-sources.pl:203
+#, c-format
 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:209
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Enw:"
 
-#: ../edit-urpm-sources.pl:217
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Creu cyfrwng ar gyfer dosbarthiad cyfan"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "Chwilio'rcyfrwng am ddiweddariadau"
 
-#: ../edit-urpm-sources.pl:238
+#: ../edit-urpm-sources.pl:237
+#, c-format
 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:242
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -160,113 +183,132 @@ msgstr ""
 "Mae yna gyfrwng o'r enw yna eisoes, hoffech chi\n"
 "ei amnewid?"
 
-#: ../edit-urpm-sources.pl:253
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Ychwanegu cyfrwng:"
 
-#: ../edit-urpm-sources.pl:255
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Math o gyfrwng:"
 
-#: ../edit-urpm-sources.pl:263 ../edit-urpm-sources.pl:338
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:453
-#: ../edit-urpm-sources.pl:518 ../edit-urpm-sources.pl:600
-#: ../edit-urpm-sources.pl:640 ../edit-urpm-sources.pl:698
-#: ../edit-urpm-sources.pl:837 ../rpmdrake:208 ../rpmdrake:960
-#: ../rpmdrake:1921 ../rpmdrake:1929 ../rpmdrake.pm:287 ../rpmdrake.pm:596
-#: ../rpmdrake.pm:681 ../rpmdrake.pm:754
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: ../edit-urpm-sources.pl:265 ../edit-urpm-sources.pl:340
-#: ../edit-urpm-sources.pl:453 ../edit-urpm-sources.pl:508
-#: ../edit-urpm-sources.pl:597 ../edit-urpm-sources.pl:639
-#: ../edit-urpm-sources.pl:691 ../edit-urpm-sources.pl:763
-#: ../edit-urpm-sources.pl:830 ../edit-urpm-sources.pl:883
-#: ../edit-urpm-sources.pl:1032 ../rpmdrake:208 ../rpmdrake:960
-#: ../rpmdrake:977 ../rpmdrake:982 ../rpmdrake:1827 ../rpmdrake:1921
-#: ../rpmdrake:2068 ../rpmdrake.pm:122 ../rpmdrake.pm:227 ../rpmdrake.pm:289
-#: ../rpmdrake.pm:596
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../edit-urpm-sources.pl:322
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "Dewisiadau eang ar gyfer gosod pecynnau"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "bob tro"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "byth"
 
-#: ../edit-urpm-sources.pl:334
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Gwirio RPMau i'w gosod:"
 
-#: ../edit-urpm-sources.pl:335
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "Llwytho rhaglen i lawr i'w defnyddio:"
 
-#: ../edit-urpm-sources.pl:365
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Tynnu Ffynhonnell"
 
-#: ../edit-urpm-sources.pl:366
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-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:371
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Arhoswch, tynnu cyfrwng..."
 
-#: ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Golygu'r cyfrwng"
 
-#: ../edit-urpm-sources.pl:413
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Golygu ffynhonnell \"%s\":"
 
 #: ../edit-urpm-sources.pl:416
+#, c-format
 msgid "Downloader:"
 msgstr "Llwythwr i Lawr:"
 
 #: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Cadw newidiadau"
 
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:1019
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Dirprwy..."
 
-#: ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
 
-#: ../edit-urpm-sources.pl:452
+#: ../edit-urpm-sources.pl:450
+#, 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:473
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Ffurfweddu'r dirprwyon"
 
-#: ../edit-urpm-sources.pl:484
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Gosodiadau dirprwy ar gyfer cyfrwng \"%s\""
 
-#: ../edit-urpm-sources.pl:485
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Gosodiadau dirprwy eang"
 
-#: ../edit-urpm-sources.pl:487
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -274,114 +316,140 @@ msgstr ""
 "Os oes angen dirprwy arnoch, rhowch enw gwesteiwr a phorth dewisol "
 "(cystrawen: <proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:490
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Enw gwesteiwr y dirprwy:"
 
-#: ../edit-urpm-sources.pl:493
+#: ../edit-urpm-sources.pl:491
+#, 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:496
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Defnyddiwr:"
 
-#: ../edit-urpm-sources.pl:568
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Ychwanegu grŵp paralel"
 
-#: ../edit-urpm-sources.pl:568
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Golygu grŵp paralel"
 
-#: ../edit-urpm-sources.pl:579
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Ychwanegu terfyn cyfrwng"
 
-#: ../edit-urpm-sources.pl:591
+#: ../edit-urpm-sources.pl:589
+#, 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:628
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Ychwanegu gwesteiwr:"
 
-#: ../edit-urpm-sources.pl:634
+#: ../edit-urpm-sources.pl:632
+#, 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:665
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Golygu grŵp paralel\"%s\":"
 
-#: ../edit-urpm-sources.pl:669
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Enw grŵp:"
 
-#: ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../edit-urpm-sources.pl:672
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Terfyn cyfrwng:"
 
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:684
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: ../edit-urpm-sources.pl:678 ../edit-urpm-sources.pl:685
-#: ../edit-urpm-sources.pl:743 ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Tynnu"
 
-#: ../edit-urpm-sources.pl:679
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Gwesteion:"
 
-#: ../edit-urpm-sources.pl:713
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Ffurfweddu urpmi paralel (dosbarthiad gweithredol o urpmi)"
 
-#: ../edit-urpm-sources.pl:716
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Grŵp"
 
-#: ../edit-urpm-sources.pl:716
-msgid "Media limit"
-msgstr "Terfyn cyfrwng"
-
-#: ../edit-urpm-sources.pl:716
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../edit-urpm-sources.pl:717
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Terfyn cyfrwng"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Gorchymyn"
 
-#: ../edit-urpm-sources.pl:727 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
-#: ../rpmdrake:886 ../rpmdrake:1748
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(dim)"
 
-#: ../edit-urpm-sources.pl:747 ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Golygu..."
 
-#: ../edit-urpm-sources.pl:755 ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Ychwanegu..."
 
-#: ../edit-urpm-sources.pl:771
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Rheoli allweddi pecynnau digidol "
 
-#: ../edit-urpm-sources.pl:775 ../edit-urpm-sources.pl:932
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Cyfrwng"
 
 #: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
@@ -389,29 +457,33 @@ msgstr ""
 "_:cryptographic keys\n"
 "Allweddi"
 
-#: ../edit-urpm-sources.pl:799
+#: ../edit-urpm-sources.pl:803
+#, 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:812
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Ychwanegu allwedd"
 
-#: ../edit-urpm-sources.pl:824
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Dewis bysell ti ychwanegu at gyfrwng %s"
 
-#: ../edit-urpm-sources.pl:833
+#: ../edit-urpm-sources.pl:834
+#, c-format
 msgid "Close"
 msgstr "Cau"
 
-#: ../edit-urpm-sources.pl:855
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Tynnu allwedd"
 
-#: ../edit-urpm-sources.pl:853
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -419,32 +491,38 @@ msgstr ""
 "Ydych chi'n siŵr eich bod eisiau tynnu allwedd %s o gyfrwng %s?\n"
 "(enw'r allwedd: %s)"
 
-#: ../edit-urpm-sources.pl:871
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Ychwanegu allwedd..."
 
-#: ../edit-urpm-sources.pl:875
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Tynnu allwedd"
 
-#: ../edit-urpm-sources.pl:891
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Ffurfweddu'r cyfrwng"
 
-#: ../edit-urpm-sources.pl:930
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Galluogwyd?"
 
-#: ../edit-urpm-sources.pl:931
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "Diweddariadau?"
 
-#: ../edit-urpm-sources.pl:947
+#: ../edit-urpm-sources.pl:951
+#, c-format
 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:977
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -454,32 +532,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:1011
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "Ychwanegu addasiad..."
 
-#: ../edit-urpm-sources.pl:1015
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Diweddau..."
 
-#: ../edit-urpm-sources.pl:1018
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Rheoli allweddi"
 
-#: ../edit-urpm-sources.pl:1020
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Paralel..."
 
-#: ../edit-urpm-sources.pl:1021
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Dewisiadau eang..."
 
-#: ../edit-urpm-sources.pl:1031 ../rpmdrake:1428
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Cymorth"
 
-#: ../edit-urpm-sources.pl:1047 ../gurpmi.addmedia:98 ../rpmdrake:2144
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -489,7 +573,8 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../edit-urpm-sources.pl:1050
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -503,7 +588,8 @@ 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:1063
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -516,11 +602,12 @@ msgstr ""
 " eraill hefyd?"
 
 #: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Methu ychwanegu cyfrwng, ymresymiadau anghywir neu goll."
 
 #: ../gurpmi.addmedia:102
-#, perl-format
+#, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -531,7 +618,7 @@ msgstr ""
 "newydd i'ch system o'r cyfrwng hwnnw."
 
 #: ../gurpmi.addmedia:105
-#, perl-format
+#, c-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -542,21 +629,22 @@ msgstr ""
 "newydd i'ch system o'r cyfrwng hwnnw."
 
 #: ../gurpmi.addmedia:130
-#, perl-format
+#, c-format
 msgid "Successfully added media %s."
 msgstr "Llwyddiant wrth ychwanegu cyfrwng %s."
 
 #: ../gurpmi.addmedia:131
-#, perl-format
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "Llwyddiant wrth ychwanegu cyfrwng '%s'"
 
 #: ../rpmdrake:39
-#, perl-format
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Defnyddi: %s [DEWIS]..."
 
 #: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -565,34 +653,41 @@ msgstr ""
 "disgrifio"
 
 #: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     terfyn i'r cyfrwng hwn"
 
 #: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr "  --merge-all-rpmnew     cynnig uno pob ffeil  .rpmnew/.rpmsave"
 
 #: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            gosod modd (gosod (rhagosodedig), tynnu, diweddaru)"
 
 #: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      peidio gofyn cwestiwn cadarnhau ym modd diweddaru"
 
 #: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update    peidio diweddaru cyfrwng wrth gychwyn"
 
 #: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        peidio gwirio llofnod pecynnau"
 
 #: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -601,26 +696,32 @@ msgstr ""
 "defnyddio peiriant  \"host\" i ddangos deps angenrheidiol"
 
 #: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    dangos y pecynnau yma'n unig"
 
 #: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      rhag ddewis y pecynnau yma"
 
 #: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 gorfodi ei redeg fel root"
 
 #: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           chwilio am \"pkg\""
 
 #: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Rhedeg ym modd defnyddiwr"
 
 #: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -631,70 +732,86 @@ msgstr ""
 "ond bydd modd i chi bori'r gronfa ddata presennol."
 
 #: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Hygyrchedd"
 
 #: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
 #: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Archifo"
 
 #: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Wrth Gefn"
 
 #: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Llosgi CD"
 
 #: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Cywasgiad"
 
 #: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
 #: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
 #: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Arall"
 
 #: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
 #: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Llyfrau"
 
 #: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Llyfrau cyfrifiadurol"
 
 #: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Cwestiynau poblogaidd"
 
 #: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
 #: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Llenyddiaeth"
 
 #: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Clwstwr"
 
 #: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "Pasio Negeseuon"
 
 #: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Gwasanaethau Ciwio"
 
 #: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Cyfathrebu"
 
 #: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Cronfeydd Data"
 
@@ -702,245 +819,302 @@ msgstr "Cronfeydd Data"
 #: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
 #: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
 #: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Datblygiad"
 
 #: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
 #: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
 #: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME a GTK+"
 
 #: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
 #: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE a Qt"
 
 #: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Cnewyllyn"
 
 #: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
 #: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr "PHP"
 
 #: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
 #: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Golygyddion"
 
 #: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Addysg"
 
 #: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Efelychwyr"
 
 #: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Offer ffeiliau"
 
 #: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
 #: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
 #: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Gemau"
 
 #: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Antur"
 
 #: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Arcêd"
 
 #: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Byrddau"
 
 #: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Cardiau"
 
 #: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Posau"
 
 #: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Chwaraeon"
 
 #: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Strategaeth"
 
 #: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
 #: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
 #: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Bwrdd gwaith graffigol"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "FVWM seiliedig"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
 #: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Graffigau"
 
 #: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Monitro"
 
 #: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Amlgyfrwng"
 
 #: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Fideo"
 
 #: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
 #: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
 #: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Rhwydweithio"
 
 #: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Sgwrs"
 
 #: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Trosglwyddo ffeiliau"
 
 #: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
 #: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Negesu Chwim"
 
 #: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "E-bost"
 
 #: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Newyddion"
 
 #: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Mynediad pell"
 
 #: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
 #: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Swyddfa"
 
 #: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Allweddi Cyhoeddus"
 
 #: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Cyhoeddi"
 
 #: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
 #: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
 #: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Gwyddorau"
 
 #: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astroleg"
 
 #: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Bywydeg"
 
 #: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Cemeg"
 
 #: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Gwyddor Cyfrifiadureg"
 
 #: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Gwyddorau Daear"
 
 #: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Mathemateg"
 
 #: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Ffiseg"
 
 #: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Cregyn"
 
 #: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Sain"
 
@@ -950,315 +1124,392 @@ msgstr "Sain"
 #: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
 #: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
 #: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "System"
 
 #: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Sail"
 
 #: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
 #: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Ffurfweddu"
 
 #: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Cychwyn ac Ymgychwyn"
 
 #: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Caledwedd"
 
 #: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Pecynnu"
 
 #: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Argraffu"
 
 #: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Defnyddio"
 
 #: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Defnyddio"
 
 #: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
 #: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Ffontiau"
 
 #: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Consol"
 
 #: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
 #: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Math 1"
 
 #: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "Didfap X11"
 
 #: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Rhyngwladoli"
 
 #: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Cnewyllyn a chaledwedd."
 
 #: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Llyfrgelloedd"
 
 #: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Gweinyddion"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr "X11"
 
 #: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terfynellau"
 
 #: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Offer testun"
 
 #: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Teganau"
 
-#. for Mandriva Choice:
 #: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
 #: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
 #: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
 msgid "Workstation"
 msgstr "Man Gwaith"
 
 #: ../rpmdrake:339
+#, c-format
 msgid "Console Tools"
 msgstr "Offer y Consol"
 
 #: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
 msgid "Documentation"
 msgstr "Dogfennaeth"
 
 #: ../rpmdrake:341
+#, c-format
 msgid "Game station"
 msgstr "Man chwarae"
 
 #: ../rpmdrake:342
+#, c-format
 msgid "Internet station"
 msgstr "Man Rhyngrwyd"
 
 #: ../rpmdrake:343
+#, c-format
 msgid "Multimedia station"
 msgstr "Man aml-gyfrwng"
 
 #: ../rpmdrake:344
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Cyfrifiadur Rhwydwaith (cleient)"
 
 #: ../rpmdrake:345
+#, c-format
 msgid "Office Workstation"
 msgstr "Gweithfan Swyddfa"
 
 #: ../rpmdrake:346
+#, c-format
 msgid "Scientific Workstation"
 msgstr "Man Gwaith Gwyddonol"
 
 #: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
 #: ../rpmdrake:352
+#, c-format
 msgid "Graphical Environment"
 msgstr "Amgylchedd Graffig"
 
 #: ../rpmdrake:349
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Man Gwaith Gnome"
 
 #: ../rpmdrake:350
+#, c-format
 msgid "IceWm Desktop"
 msgstr "Bwrdd Gwaith IceWm"
 
 #: ../rpmdrake:351
+#, c-format
 msgid "KDE Workstation"
 msgstr "Man Gwaith KDE"
 
 #: ../rpmdrake:352
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Byrddau Gwaith Graffigol Eraill"
 
 #: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
 #: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
 msgid "Server"
 msgstr "Gweinydd"
 
 #: ../rpmdrake:357
+#, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
 #: ../rpmdrake:358
+#, c-format
 msgid "Database"
 msgstr "Cronfa Ddata"
 
 #: ../rpmdrake:359
+#, c-format
 msgid "Firewall/Router"
 msgstr "Mur Gwarchod/Llwybrydd"
 
 #: ../rpmdrake:361
+#, c-format
 msgid "Mail/Groupware/News"
 msgstr "E-bost/Grwpwar/Newyddion"
 
 #: ../rpmdrake:362
+#, c-format
 msgid "Network Computer server"
 msgstr "Gweinydd Cyfrifiadur Rhwydwaith"
 
 #: ../rpmdrake:363
+#, c-format
 msgid "Web/FTP"
 msgstr "Gwe/FTP"
 
-#. - to highlight information
-#: ../rpmdrake:502 ../rpmdrake:707 ../rpmdrake:712 ../rpmdrake:726
-#: ../rpmdrake:728
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Dim ar gael)"
 
-#: ../rpmdrake:534
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Canlyniadau'r chwilio"
 
 #: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Canlyniadau'r chwilio (dim)"
 
-#: ../rpmdrake:545 ../rpmdrake:2125
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Arhoswch, chwilio..."
 
-#: ../rpmdrake:617 ../rpmdrake:921
-msgid "Addable"
-msgstr "Ychwanegadwy"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "Rheoli Meddalwedd"
 
-#: ../rpmdrake:617 ../rpmdrake:921
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr ""
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Diweddariadwy"
 
-#: ../rpmdrake:619
-msgid "Not selected"
-msgstr "Heb ei ddewis"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Ychwanegadwy"
 
 #: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Dewiswyd"
 
-#. is it an update?
-#: ../rpmdrake:687 ../rpmdrake:744
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Heb ei ddewis"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Pwysigrwydd: "
 
-#: ../rpmdrake:688 ../rpmdrake:752
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Rheswm am y diweddariad:"
 
-#: ../rpmdrake:692
+#: ../rpmdrake:688
+#, c-format
 msgid "Security advisory"
 msgstr "Diweddariadau diogelwch"
 
-#: ../rpmdrake:700 ../rpmdrake:754
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Dim disgrifiad"
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Ffeiliau:"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Cofnod Newid:"
 
-#: ../rpmdrake:723
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Ffeiliau:\n"
 
-#: ../rpmdrake:728
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Cofnod Newid:\n"
 
-#: ../rpmdrake:733 ../rpmdrake.pm:807
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Cyfrwng:"
 
-#: ../rpmdrake:734
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
 
-#: ../rpmdrake:738
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Enw: "
 
-#: ../rpmdrake:739
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Fersiwn: "
 
-#: ../rpmdrake:740
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "Pensaernïaeth:"
 
-#: ../rpmdrake:741
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:741
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Maint: "
 
-#. extra empty line
-#: ../rpmdrake:748
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Crynodeb: "
 
-#: ../rpmdrake:754
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Disgrifiadau: "
 
-#: ../rpmdrake:810 ../rpmdrake.pm:179
-msgid "Software Management"
-msgstr "Rheoli Meddalwedd"
-
-#: ../rpmdrake:827 ../rpmdrake:973 ../rpmdrake:975
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Rhagor o wybodaeth ar becyn..."
 
-#: ../rpmdrake:829
-msgid "One of the following packages is needed:"
-msgstr "Mae angen un o'r pecynnau canlynol:"
-
-#: ../rpmdrake:829
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Dewiswch"
 
-#: ../rpmdrake:870
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Mae angen un o'r pecynnau canlynol:"
+msgstr[1] "Mae angen un o'r pecynnau canlynol:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Arhoswch, rhestri pecynnau..."
 
-#: ../rpmdrake:888
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Dim diweddariad"
 
-#: ../rpmdrake:889
+#: ../rpmdrake:885
+#, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1268,34 +1519,41 @@ msgstr ""
 "nad oes diweddariad ar gyfer y pecynnau ar eich cyfrifiadur,\n"
 "neu rydych wedi eu gosod i gyd yn barod."
 
-#: ../rpmdrake:912 ../rpmdrake:1174
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Popeth"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:960 ../rpmdrake:965
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Rhagor"
 
-#: ../rpmdrake:968
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Gwybodaeth am becynnau"
 
-#: ../rpmdrake:991
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 
-#: ../rpmdrake:992
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "Oherwydd eu dibyniaethau, rhaid tynnu'r pecynnau canlynol  hefyd:"
 
-#: ../rpmdrake:998 ../rpmdrake:1007
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Nid oes modd tynnu rhai pecynnau"
 
-#: ../rpmdrake:999
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1303,7 +1561,8 @@ msgstr ""
 "Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
 "\n"
 
-#: ../rpmdrake:1008 ../rpmdrake:1073
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1312,11 +1571,13 @@ msgstr ""
 "Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
 "eu dad-ddewis nawr:\n"
 
-#: ../rpmdrake:1037
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Pecynnau ychwanegol angenrheidiol"
 
-#: ../rpmdrake:1038
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1326,134 +1587,164 @@ msgstr ""
 "hefyd:\n"
 "\n"
 
-#: ../rpmdrake:1053
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (perthyn i'r rhestr hepgor)"
 
-#: ../rpmdrake:1056
-msgid "Some packages can't be installed"
-msgstr "Nid oes modd gosod rhai pecynnau"
-
-#: ../rpmdrake:1057
-#, perl-format
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Nid oes modd gosod rhai pecynnau"
+msgstr[1] "Nid oes modd gosod rhai pecynnau"
+
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
+"\n"
+"%s"
+msgstr[1] ""
 "Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:1072 ../rpmdrake:1896
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Rhaid tynnu rhai pecynnau"
 
-#: ../rpmdrake:1101
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Dewiswyd: %s / Lle gwag ar ddisg: %s"
 
-#: ../rpmdrake:1102
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Maint dewiswyd: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:1107
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "Dim disgrifiad ar gael i'r pecyn hwn\n"
 
-#: ../rpmdrake:1113 ../rpmdrake:1506
-#, perl-format
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Digwyddodd gwall terfynol:%s."
 
-#: ../rpmdrake:1174
+#: ../rpmdrake:1171
+#, c-format
 msgid "Installed"
 msgstr "Gosodwyd"
 
-#: ../rpmdrake:1174
+#: ../rpmdrake:1171
+#, c-format
 msgid "Non installed"
 msgstr "Heb eu gosod"
 
-#: ../rpmdrake:1175
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s dewis"
 
-#: ../rpmdrake:1175
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Dewisiadau Mandriva Linux"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1177
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Pob pecyn, trefn yr wyddor"
 
-#: ../rpmdrake:1178
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Pob pecyn, yn ôl diweddariad"
 
-#: ../rpmdrake:1179
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Pob pecyn, yn ôl maint"
 
-#: ../rpmdrake:1180
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Pob pecyn, yn ôl dyddiad dewis"
 
-#: ../rpmdrake:1181
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Gadael, yn ôl dyddiad gosod"
 
-#: ../rpmdrake:1182
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Pob pecyn, yn ôl grŵp"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1181
+#, c-format
 msgid "All updates"
 msgstr "Pob diweddariad"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Diweddariadau diogelwch"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Diweddariad cywiro gwallau"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Diweddariadau arferol"
 
-#: ../rpmdrake:1184
-msgid "Security updates"
-msgstr "Diweddariadau diogelwch"
-
-#: ../rpmdrake:1247
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "mewn enwau"
 
-#: ../rpmdrake:1249
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "mewn disgrifiadau"
 
-#: ../rpmdrake:1251
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "mewn enwau ffeil"
 
-#: ../rpmdrake:1278
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "Gwall: %s i weld wedi ei osod fel darllen yn unig."
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Rhaid dewis rhai pecynnau'n gyntaf."
 
-#: ../rpmdrake:1287
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Mae gormod o becynnau wedi eu dewis"
 
-#: ../rpmdrake:1288
+#: ../rpmdrake:1285
+#, 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"
@@ -1463,141 +1754,172 @@ msgid ""
 "Do you really want to install all the selected packages?"
 msgstr "Rhybudd:"
 
-#: ../rpmdrake:1320 ../rpmdrake:1323 ../rpmdrake:1334 ../rpmdrake:1347
-#: ../rpmdrake:1356
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Ffeil"
 
-#: ../rpmdrake:1323
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Diweddaru'r cyfrwng"
 
-#: ../rpmdrake:1334
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Ailosod y dewis"
 
-#: ../rpmdrake:1347
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/_Ail-lwytho'r rhestr pecynnau"
 
-#: ../rpmdrake:1356
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Gadael"
 
-#: ../rpmdrake:1356
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1359 ../rpmdrake:1360 ../rpmdrake:1363 ../rpmdrake:1393
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Dewisiadau"
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1357
+#, c-format
 msgid "/_Media Manager"
 msgstr "/_Rheolwr Cyfrwng"
 
-#: ../rpmdrake:1363 ../rpmdrake:1393
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Dangoswch y pecynnau dewis awtomatig"
 
-#: ../rpmdrake:1367 ../rpmdrake:1368 ../rpmdrake:1369 ../rpmdrake:1370
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Cymorth"
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Adrodd ar Wall"
 
-#: ../rpmdrake:1370
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_Ynghylch..."
 
-#. nicer formatting
-#: ../rpmdrake:1373
+#: ../rpmdrake:1370
+#, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:1375
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Hawlfraint (C) %s Mandriva"
 
-#: ../rpmdrake:1377
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake yw offeryn rheoli pecynnau Mandriva Linux."
 
-#: ../rpmdrake:1379
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1384
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "_: Rhoslyn Prys post@meddal.com\n"
 
-#: ../rpmdrake:1408
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Canfod:"
 
-#: ../rpmdrake:1417
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Chwilio"
 
-#: ../rpmdrake:1419
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Clirio"
 
-#: ../rpmdrake:1433 ../rpmdrake.pm:758
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
 msgid "Select all"
 msgstr "Dewis popeth"
 
-#: ../rpmdrake:1440
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Gosod"
 
-#: ../rpmdrake:1444
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Gadael"
 
-#: ../rpmdrake:1460
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr "Cyflwyniad Cyflym"
 
-#: ../rpmdrake:1461
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr "Gallwch edrych ar y pecynnau drwy'r rhestr categorïau ar y chwith."
 
-#: ../rpmdrake:1462
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 "Gallwch ddarllen gwybodaeth am y pecynnau drwy glicio ar y rhestr ar y dde."
 
-#: ../rpmdrake:1463
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr "I osod, diweddaru neu dynnu rhaglen, cliciwch ar ei \"flwch ticio\"."
 
 #: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Gwall terfynol"
 
-#: ../rpmdrake:1507 ../rpmdrake:1932
-msgid "Initializing..."
-msgstr "Ymgychwyn..."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Arhoswch"
 
-#: ../rpmdrake:1507 ../rpmdrake:1932
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
 msgid "Package installation..."
 msgstr "Gosod pecynnau..."
 
-#: ../rpmdrake:1507 ../rpmdrake:1932 ../rpmdrake.pm:311
-msgid "Please wait"
-msgstr "Arhoswch"
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Ymgychwyn..."
 
-#: ../rpmdrake:1530 ../rpmdrake:1918
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, c-format
 msgid "Confirmation"
 msgstr "Gwiriad"
 
-#: ../rpmdrake:1532
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1609,12 +1931,13 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../rpmdrake:1541
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Cyfrwng diweddaru sy'n bod eisoes"
 
-#: ../rpmdrake:1542
-#, perl-format
+#: ../rpmdrake:1544
+#, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1630,12 +1953,13 @@ msgstr ""
 "\n"
 "Yna ailgychwyn %s."
 
-#: ../rpmdrake:1553
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Sut i ddewis drych gyda llaw."
 
-#: ../rpmdrake:1554
-#, perl-format
+#: ../rpmdrake:1556
+#, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1649,64 +1973,73 @@ msgstr ""
 "\n"
 "Yna ailgychwynnwch %s."
 
-#: ../rpmdrake:1567
+#: ../rpmdrake:1570
+#, c-format
 msgid "Reading updates description"
 msgstr "Darllen disgrifiad diweddariadau"
 
-#: ../rpmdrake:1593 ../rpmdrake:1670
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../rpmdrake:1601
+#: ../rpmdrake:1604
+#, c-format
 msgid "Please wait, listing base packages..."
 msgstr "Arhoswch, rhestri pecynnau sail..."
 
-#: ../rpmdrake:1637
+#: ../rpmdrake:1640
+#, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "Arhoswch, canfod pecynnau sydd wedi eu gosod..."
 
-#: ../rpmdrake:1771
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Archwilio %s"
 
-#: ../rpmdrake:1772
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "newidiadau:"
 
-#: ../rpmdrake:1780
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Tynnu .%s"
 
-#: ../rpmdrake:1784
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Defnyddio .%s fel y brif ffeil"
 
-#: ../rpmdrake:1788
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Gwneud dim"
 
-#: ../rpmdrake:1804
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Gorffennodd y gosodiad"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Archwilio..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1852 ../rpmdrake:2045
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
-#: ../rpmdrake:1856 ../rpmdrake:2025
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Anhawster wrth osod"
 
-#: ../rpmdrake:1857 ../rpmdrake:2026 ../rpmdrake:2084
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1716,17 +2049,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1876
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../rpmdrake:1877
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Methu estyn pecynnau ffynhonnell, %s"
 
-#: ../rpmdrake:1878 ../rpmdrake:1976
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1738,60 +2072,80 @@ msgstr ""
 "Gwall(au) wedi eu hadrodd:\n"
 "%s"
 
-#: ../rpmdrake:1894
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod:\n"
+"%s\n"
+msgstr[1] ""
 "I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod:\n"
 "%s\n"
 
-#: ../rpmdrake:1920
-#, perl-format
-msgid "Remove %d packages?"
-msgstr "Tynnu %d pecyn?"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Tynnu %d pecyn?"
+msgstr[1] "Tynnu %d pecyn?"
 
-#: ../rpmdrake:1921
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Cafodd y pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"Parhau?"
+msgstr[1] ""
 "Cafodd y pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "\n"
 "%s\n"
 "\n"
 "Parhau?"
 
-#: ../rpmdrake:1941
+#: ../rpmdrake:1927
+#, c-format
+msgid "Is it ok to continue?"
+msgstr "Ydi hi'n iawn parhau?"
+
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Newid cyfrwng"
 
-#: ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" i mewn i ddyfais [%s]"
 
-#: ../rpmdrake:1927
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
 
-#: ../rpmdrake:1947
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Gwirio llofnodion pecynnau ..."
 
-#: ../rpmdrake:1960 ../rpmdrake.pm:737 ../rpmdrake.pm:846
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../rpmdrake:1961
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1805,12 +2159,13 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau gyda'r gosod?"
 
-#: ../rpmdrake:1973 ../rpmdrake:2083
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosodiad"
 
-#: ../rpmdrake:1974
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1822,25 +2177,28 @@ msgstr ""
 "\n"
 "Efallai'r hoffech ddiweddaru eich cronfa ddata o gyfryngau."
 
-#: ../rpmdrake:1988
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Paratoi pecynnau i'w gosod..."
 
-#: ../rpmdrake:1988
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
 
-#: ../rpmdrake:1991
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../rpmdrake:2006
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad at ffeil rpm (%s)"
 
-#: ../rpmdrake:2040
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1852,41 +2210,48 @@ msgstr ""
 "Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
 "mae modd eu harchwilio i weithredu arnynt:"
 
-#: ../rpmdrake:2070
+#: ../rpmdrake:2073
+#, c-format
 msgid "Upgrade information"
 msgstr "Gwybodaeth uwchraddio"
 
-#: ../rpmdrake:2072
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Mae gan y pecynnau wybodaeth uwchraddio"
 
-#: ../rpmdrake:2080
+#: ../rpmdrake:2083
+#, c-format
 msgid "Upgrade information about this package"
 msgstr "Gwybodaeth uwchraddio am y pecyn hwn"
 
-#: ../rpmdrake:2083
-#, perl-format
+#: ../rpmdrake:2086
+#, c-format
 msgid "Upgrade information about package %s"
 msgstr "Gwybodaeth uwchraddio am becyn %s"
 
-#: ../rpmdrake:2095 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Gwall"
 
-#: ../rpmdrake:2074
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Gwall anadferadwy: dim pecyn wedi ei ganfod ar gyfer y gosod."
 
-#: ../rpmdrake:2099
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Arhoswch, tynnu'r pecynnau..."
 
-#: ../rpmdrake:2110
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Problem wrth dynnu"
 
-#: ../rpmdrake:2111
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1896,11 +2261,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:2143
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Croeso"
 
-#: ../rpmdrake:2148
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1912,8 +2279,8 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis pa feddalwedd rydych\n"
 "am ei dynnu oddi ar eich cyfrifiadur."
 
-#: ../rpmdrake:2153
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1924,11 +2291,13 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
 "ar eich cyfrifiadur."
 
-#: ../rpmdrake:2158
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Croeso i'r offeryn gosod meddalwedd!"
 
-#: ../rpmdrake:2159
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1942,171 +2311,213 @@ msgstr ""
 "meddalwedd ar CDROM neu DVD.  Bydd yr offeryn hwn yn eich cynorthwyo\n"
 "i ddewis pa feddalwedd i osod ar eich cyfrifiadur."
 
-#: ../rpmdrake.pm:103
-msgid "Mandriva Linux Update"
-msgstr "Diweddaru Mandriva Linux"
-
-#: ../rpmdrake.pm:103
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "Diweddaru Meddalwedd"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Diweddaru Mandriva Linux"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Rhowch eich hawl i gael mynediad dirprwy\n"
 
-#: ../rpmdrake.pm:131
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Enw Defnyddiwr:"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Tynnu Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Diweddaru Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:176
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Gosod Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:218
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Na"
 
-#: ../rpmdrake.pm:222
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Iawn"
 
-#: ../rpmdrake.pm:272
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Gwybodaeth..."
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Awstria"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Awstralia"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Gwlad Belg"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Y Swistir"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:396
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Gweriniaeth Tsiec"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Yr Almaen"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Denmarc"
 
-#: ../rpmdrake.pm:399 ../rpmdrake.pm:403
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Groeg"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Sbaen"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Ffindir"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Ffrainc"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Hwngari"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Yr Eidal"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Siapan"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Yr Iseldiroedd"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norwy"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Gwlad Pwyl"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portiwgal"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Rwsia"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Sweden"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Slofacia"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:418
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Y Deyrnas Unedig"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Tsiena"
 
-#: ../rpmdrake.pm:420 ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Yr Unol Daleithiau"
 
-#: ../rpmdrake.pm:520
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2118,7 +2529,8 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2130,25 +2542,28 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../rpmdrake.pm:530 ../rpmdrake.pm:568
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr "Dewis drychau"
 
-#: ../rpmdrake.pm:533
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau."
 
-#: ../rpmdrake.pm:534
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau o safle gwe Mandriva."
 
-#. - seems that value is bitten before being printed by next func..
-#: ../rpmdrake.pm:541
+#: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Gwall wrth lwytho i lawr"
 
-#: ../rpmdrake.pm:543
-#, perl-format
+#: ../rpmdrake.pm:544
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2162,8 +2577,8 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu'r safle, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:548
-#, perl-format
+#: ../rpmdrake.pm:549
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2177,15 +2592,18 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu safle Mandriva, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:558
+#: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Dim drych"
 
-#: ../rpmdrake.pm:560
+#: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Methu canfod drych addas."
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2199,64 +2617,69 @@ msgstr ""
 "yw pensaernïaeth eich prosesydd yn cael ei gynnal gan Diweddariadau\n"
 "Swyddogol Mandriva Linux."
 
-#: ../rpmdrake.pm:580
+#: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Dewiswch ddrych"
 
-#: ../rpmdrake.pm:633
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copïo ffeil fel ar gyfer cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:636
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Archwilio ffeil cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Archwilio ffeil bell y cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:643
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " gorffen.."
 
-#: ../rpmdrake.pm:647
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " methwyd!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:651
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s o gyfrwng %s"
 
-#: ../rpmdrake.pm:655
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Cychwyn llwytho %s i lawr..."
 
-#: ../rpmdrake.pm:659
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Llwytho '%s' i lawr, amser yn weddill:%s, cyflymdra:%s"
 
-#: ../rpmdrake.pm:662
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
 
-#: ../rpmdrake.pm:673
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Arhoswch, diweddaru cyfrwng..."
 
-#: ../rpmdrake.pm:700
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Gwall estyn pecynnau"
 
-#: ../rpmdrake.pm:701
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2272,25 +2695,29 @@ msgstr ""
 "neu nid oes modd ei gyrraedd ar hyn o bryd a dylech geisio eto \n"
 "rhywbryd."
 
-#: ../rpmdrake.pm:732
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Diweddaru'r cyfrwng"
 
-#: ../rpmdrake.pm:737
+#: ../rpmdrake.pm:739
+#, c-format
 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:744
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Dewiswch y cyfrwng i'w diweddaru:"
 
-#: ../rpmdrake.pm:762
+#: ../rpmdrake.pm:764
+#, c-format
 msgid "Update"
 msgstr "Diweddaru"
 
-#: ../rpmdrake.pm:783
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2302,8 +2729,8 @@ msgstr ""
 "Gwallau:\n"
 "%s"
 
-#: ../rpmdrake.pm:806 ../rpmdrake.pm:817
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2313,16 +2740,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:829
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Methu creu cyfrwng."
 
-#: ../rpmdrake.pm:834
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Methu ychwanegu cyfrwng"
 
-#: ../rpmdrake.pm:835
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2332,8 +2761,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:848
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2343,8 +2772,8 @@ msgstr ""
 "s rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
-#: ../rpmdrake.pm:851
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2354,11 +2783,13 @@ msgstr ""
 "Mandriva Linux rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
-#: ../rpmdrake.pm:868
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Cymorth wedi ei gychwyn yn y cefndir"
 
-#: ../rpmdrake.pm:869
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""