reuse an urpmi string

1 files changed, 411 insertions, 353 deletions

diff --git a/po/cy.po b/po/cy.po
index f3803362..ea6f91a2 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-23 19:01+0100\n"
+"POT-Creation-Date: 2007-03-06 16:07+0100\n"
 "PO-Revision-Date: 2007-03-02 20:31-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -19,12 +19,12 @@ msgstr ""
 "X-Poedit-Country: UK\n"
 "Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:67
+#: ../Rpmdrake/edit_urpm_sources.pm:75
 #, c-format
 msgid "Choose media type"
 msgstr "Dewis y math o gyfrwng"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:68
+#: ../Rpmdrake/edit_urpm_sources.pm:76
 #, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
@@ -50,17 +50,17 @@ msgstr ""
 "gwneud\n"
 "hyn mewn dau gam)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:76
+#: ../Rpmdrake/edit_urpm_sources.pm:84
 #, c-format
 msgid "Distribution sources"
 msgstr "Ffynonellau dosbarthu"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:76
+#: ../Rpmdrake/edit_urpm_sources.pm:84
 #, c-format
 msgid "Official updates"
 msgstr "Diweddariadau swyddogol"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:79
+#: ../Rpmdrake/edit_urpm_sources.pm:87
 #, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
@@ -79,104 +79,104 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:93
+#: ../Rpmdrake/edit_urpm_sources.pm:101
 #, c-format
 msgid "Please wait, adding media..."
 msgstr "Arhoswch, ychwanegu cyfrwng..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:126
+#: ../Rpmdrake/edit_urpm_sources.pm:134
 #, c-format
 msgid "Add a medium"
 msgstr "Ychwanegu cyfrwng"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:130
+#: ../Rpmdrake/edit_urpm_sources.pm:138
 #, c-format
 msgid "Local files"
 msgstr "Ffeiliau lleol"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:130
+#: ../Rpmdrake/edit_urpm_sources.pm:138
 #, c-format
 msgid "Path:"
 msgstr "Llwybr:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:131
+#: ../Rpmdrake/edit_urpm_sources.pm:139
 #, c-format
 msgid "FTP server"
 msgstr "Gweinydd FTP"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:131 ../Rpmdrake/edit_urpm_sources.pm:132
-#: ../Rpmdrake/edit_urpm_sources.pm:133 ../Rpmdrake/edit_urpm_sources.pm:402
+#: ../Rpmdrake/edit_urpm_sources.pm:139 ../Rpmdrake/edit_urpm_sources.pm:140
+#: ../Rpmdrake/edit_urpm_sources.pm:141 ../Rpmdrake/edit_urpm_sources.pm:418
 #, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:132
+#: ../Rpmdrake/edit_urpm_sources.pm:140
 #, c-format
 msgid "RSYNC server"
 msgstr "Gweinydd RSYNC"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:133
+#: ../Rpmdrake/edit_urpm_sources.pm:141
 #, c-format
 msgid "HTTP server"
 msgstr "Gweinydd HTTP"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:134
+#: ../Rpmdrake/edit_urpm_sources.pm:142
 #, c-format
 msgid "Removable device"
 msgstr "Dyfais symudol"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:134
+#: ../Rpmdrake/edit_urpm_sources.pm:142
 #, c-format
 msgid "Path or mount point:"
 msgstr "Llwybr neu bwynt gosod:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:152
+#: ../Rpmdrake/edit_urpm_sources.pm:160
 #, c-format
 msgid "Browse..."
 msgstr "Pori..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:179
+#: ../Rpmdrake/edit_urpm_sources.pm:187
 #, c-format
 msgid "Login:"
 msgstr "Mewngofnod:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:179 ../Rpmdrake/edit_urpm_sources.pm:488
-#: ../rpmdrake.pm:131
+#: ../Rpmdrake/edit_urpm_sources.pm:187 ../Rpmdrake/edit_urpm_sources.pm:504
+#: ../rpmdrake.pm:135
 #, c-format
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:184 ../Rpmdrake/edit_urpm_sources.pm:403
+#: ../Rpmdrake/edit_urpm_sources.pm:192 ../Rpmdrake/edit_urpm_sources.pm:419
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Llwybr perthynol i synthesis/hdlist:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:186
+#: ../Rpmdrake/edit_urpm_sources.pm:194
 #, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Os yn wag bydd synthesis/hdlistyn cael ei holi'n awtomatic"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:191
+#: ../Rpmdrake/edit_urpm_sources.pm:199
 #, c-format
 msgid "Name:"
 msgstr "Enw:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:199
+#: ../Rpmdrake/edit_urpm_sources.pm:207
 #, c-format
 msgid "Create media for a whole distribution"
 msgstr "Creu cyfrwng ar gyfer dosbarthiad cyfan"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:210
+#: ../Rpmdrake/edit_urpm_sources.pm:218
 #, c-format
 msgid "Search this media for updates"
 msgstr "Chwilio'rcyfrwng am ddiweddariadau"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:220
+#: ../Rpmdrake/edit_urpm_sources.pm:228
 #, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Mae angen llanw y ddau gofnod cyntaf, o leiaf."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:224
+#: ../Rpmdrake/edit_urpm_sources.pm:232
 #, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
@@ -185,132 +185,137 @@ msgstr ""
 "Mae yna gyfrwng o'r enw yna eisoes, hoffech chi\n"
 "ei amnewid?"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:236
+#: ../Rpmdrake/edit_urpm_sources.pm:244
 #, c-format
 msgid "Adding a medium:"
 msgstr "Ychwanegu cyfrwng:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:238
+#: ../Rpmdrake/edit_urpm_sources.pm:246
 #, c-format
 msgid "Type of medium:"
 msgstr "Math o gyfrwng:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:248 ../Rpmdrake/edit_urpm_sources.pm:324
-#: ../Rpmdrake/edit_urpm_sources.pm:412 ../Rpmdrake/edit_urpm_sources.pm:439
-#: ../Rpmdrake/edit_urpm_sources.pm:505 ../Rpmdrake/edit_urpm_sources.pm:589
-#: ../Rpmdrake/edit_urpm_sources.pm:630 ../Rpmdrake/edit_urpm_sources.pm:688
-#: ../Rpmdrake/edit_urpm_sources.pm:836 ../Rpmdrake/gui.pm:478
-#: ../Rpmdrake/init.pm:119 ../Rpmdrake/pkg.pm:511 ../Rpmdrake/pkg.pm:519
-#: ../rpmdrake.pm:289 ../rpmdrake.pm:602 ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../Rpmdrake/edit_urpm_sources.pm:256 ../Rpmdrake/edit_urpm_sources.pm:332
+#: ../Rpmdrake/edit_urpm_sources.pm:428 ../Rpmdrake/edit_urpm_sources.pm:455
+#: ../Rpmdrake/edit_urpm_sources.pm:521 ../Rpmdrake/edit_urpm_sources.pm:608
+#: ../Rpmdrake/edit_urpm_sources.pm:649 ../Rpmdrake/edit_urpm_sources.pm:707
+#: ../Rpmdrake/edit_urpm_sources.pm:856 ../Rpmdrake/gui.pm:473
+#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:527 ../Rpmdrake/pkg.pm:573
+#: ../rpmdrake.pm:296 ../rpmdrake.pm:609 ../rpmdrake.pm:694 ../rpmdrake.pm:767
 #, c-format
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:250 ../Rpmdrake/edit_urpm_sources.pm:326
-#: ../Rpmdrake/edit_urpm_sources.pm:439 ../Rpmdrake/edit_urpm_sources.pm:495
-#: ../Rpmdrake/edit_urpm_sources.pm:586 ../Rpmdrake/edit_urpm_sources.pm:629
-#: ../Rpmdrake/edit_urpm_sources.pm:681 ../Rpmdrake/edit_urpm_sources.pm:754
-#: ../Rpmdrake/edit_urpm_sources.pm:882 ../Rpmdrake/edit_urpm_sources.pm:1032
-#: ../Rpmdrake/gui.pm:478 ../Rpmdrake/gui.pm:494 ../Rpmdrake/gui.pm:499
-#: ../Rpmdrake/init.pm:119 ../Rpmdrake/pkg.pm:511 ../Rpmdrake/pkg.pm:658
-#: ../Rpmdrake/rpmnew.pm:159 ../rpmdrake.pm:122 ../rpmdrake.pm:229
-#: ../rpmdrake.pm:291 ../rpmdrake.pm:602
+#: ../Rpmdrake/edit_urpm_sources.pm:258 ../Rpmdrake/edit_urpm_sources.pm:334
+#: ../Rpmdrake/edit_urpm_sources.pm:455 ../Rpmdrake/edit_urpm_sources.pm:511
+#: ../Rpmdrake/edit_urpm_sources.pm:605 ../Rpmdrake/edit_urpm_sources.pm:648
+#: ../Rpmdrake/edit_urpm_sources.pm:700 ../Rpmdrake/edit_urpm_sources.pm:773
+#: ../Rpmdrake/edit_urpm_sources.pm:902 ../Rpmdrake/edit_urpm_sources.pm:1062
+#: ../Rpmdrake/gui.pm:473 ../Rpmdrake/gui.pm:489 ../Rpmdrake/gui.pm:494
+#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:527 ../Rpmdrake/pkg.pm:756
+#: ../Rpmdrake/rpmnew.pm:172 ../rpmdrake.pm:126 ../rpmdrake.pm:236
+#: ../rpmdrake.pm:298 ../rpmdrake.pm:609
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:307
+#: ../Rpmdrake/edit_urpm_sources.pm:315
 #, c-format
 msgid "Global options for package installation"
 msgstr "Dewisiadau eang ar gyfer gosod pecynnau"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:310
+#: ../Rpmdrake/edit_urpm_sources.pm:318
 #, c-format
 msgid "always"
 msgstr "bob tro"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:311
+#: ../Rpmdrake/edit_urpm_sources.pm:319
 #, c-format
 msgid "never"
 msgstr "byth"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:320
+#: ../Rpmdrake/edit_urpm_sources.pm:328
 #, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Gwirio RPMau i'w gosod:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:321
+#: ../Rpmdrake/edit_urpm_sources.pm:329
 #, c-format
 msgid "Download program to use:"
 msgstr "Llwytho rhaglen i lawr i'w defnyddio:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:351
+#: ../Rpmdrake/edit_urpm_sources.pm:360
 #, c-format
 msgid "Source Removal"
 msgstr "Tynnu Ffynhonnell"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:352
+#: ../Rpmdrake/edit_urpm_sources.pm:362
 #, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Ydych chi'n siŵr eich bod eisiau tynnu ffynhonnell \"%s\"?"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:357
+#: ../Rpmdrake/edit_urpm_sources.pm:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the following sources ?"
+msgstr "Ydych chi'n siŵr eich bod eisiau tynnu ffynhonnell \"%s\"?"
+
+#: ../Rpmdrake/edit_urpm_sources.pm:369
 #, c-format
 msgid "Please wait, removing medium..."
 msgstr "Arhoswch, tynnu cyfrwng..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:392
+#: ../Rpmdrake/edit_urpm_sources.pm:408
 #, c-format
 msgid "Edit a medium"
 msgstr "Golygu'r cyfrwng"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:399
+#: ../Rpmdrake/edit_urpm_sources.pm:415
 #, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Golygu ffynhonnell \"%s\":"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:404
+#: ../Rpmdrake/edit_urpm_sources.pm:420
 #, c-format
 msgid "Downloader:"
 msgstr "Llwythwr i Lawr:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:416
+#: ../Rpmdrake/edit_urpm_sources.pm:432
 #, c-format
 msgid "Save changes"
 msgstr "Cadw newidiadau"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:425 ../Rpmdrake/edit_urpm_sources.pm:1019
+#: ../Rpmdrake/edit_urpm_sources.pm:441 ../Rpmdrake/edit_urpm_sources.pm:1049
 #, c-format
 msgid "Proxy..."
 msgstr "Dirprwy..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:437
+#: ../Rpmdrake/edit_urpm_sources.pm:453
 #, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:438
+#: ../Rpmdrake/edit_urpm_sources.pm:454
 #, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Er mwyn cadw'r newidiadau, rhaid gosod y cyfrwng yn y gyrrwr."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:459
+#: ../Rpmdrake/edit_urpm_sources.pm:475
 #, c-format
 msgid "Configure proxies"
 msgstr "Ffurfweddu'r dirprwyon"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:471
+#: ../Rpmdrake/edit_urpm_sources.pm:487
 #, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Gosodiadau dirprwy ar gyfer cyfrwng \"%s\""
 
-#: ../Rpmdrake/edit_urpm_sources.pm:472
+#: ../Rpmdrake/edit_urpm_sources.pm:488
 #, c-format
 msgid "Global proxy settings"
 msgstr "Gosodiadau dirprwy eang"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:474
+#: ../Rpmdrake/edit_urpm_sources.pm:490
 #, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
@@ -319,140 +324,140 @@ msgstr ""
 "Os oes angen dirprwy arnoch, rhowch enw gwesteiwr a phorth dewisol "
 "(cystrawen: <proxyhost[:port]>):"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:477
+#: ../Rpmdrake/edit_urpm_sources.pm:493
 #, c-format
 msgid "Proxy hostname:"
 msgstr "Enw gwesteiwr y dirprwy:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:480
+#: ../Rpmdrake/edit_urpm_sources.pm:496
 #, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Mae modd i chi enwi defnyddiwr/cyfrinair ar gyfer dilysiad dirprwy:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:483
+#: ../Rpmdrake/edit_urpm_sources.pm:499
 #, c-format
 msgid "User:"
 msgstr "Defnyddiwr:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:555
+#: ../Rpmdrake/edit_urpm_sources.pm:574
 #, c-format
 msgid "Add a parallel group"
 msgstr "Ychwanegu grŵp paralel"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:555
+#: ../Rpmdrake/edit_urpm_sources.pm:574
 #, c-format
 msgid "Edit a parallel group"
 msgstr "Golygu grŵp paralel"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:567
+#: ../Rpmdrake/edit_urpm_sources.pm:586
 #, c-format
 msgid "Add a medium limit"
 msgstr "Ychwanegu terfyn cyfrwng"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:580
+#: ../Rpmdrake/edit_urpm_sources.pm:599
 #, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Dewiswch gyfrwng i ychwanegu at derfyn y cyfrwng:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:617
+#: ../Rpmdrake/edit_urpm_sources.pm:636
 #, c-format
 msgid "Add a host"
 msgstr "Ychwanegu gwesteiwr:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:624
+#: ../Rpmdrake/edit_urpm_sources.pm:643
 #, 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:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:655
+#: ../Rpmdrake/edit_urpm_sources.pm:674
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Golygu grŵp paralel\"%s\":"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:659
+#: ../Rpmdrake/edit_urpm_sources.pm:678
 #, c-format
 msgid "Group name:"
 msgstr "Enw grŵp:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:660
+#: ../Rpmdrake/edit_urpm_sources.pm:679
 #, c-format
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:662
+#: ../Rpmdrake/edit_urpm_sources.pm:681
 #, c-format
 msgid "Media limit:"
 msgstr "Terfyn cyfrwng:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:667 ../Rpmdrake/edit_urpm_sources.pm:674
+#: ../Rpmdrake/edit_urpm_sources.pm:686 ../Rpmdrake/edit_urpm_sources.pm:693
 #, c-format
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:668 ../Rpmdrake/edit_urpm_sources.pm:675
-#: ../Rpmdrake/edit_urpm_sources.pm:734 ../Rpmdrake/edit_urpm_sources.pm:997
+#: ../Rpmdrake/edit_urpm_sources.pm:687 ../Rpmdrake/edit_urpm_sources.pm:694
+#: ../Rpmdrake/edit_urpm_sources.pm:753 ../Rpmdrake/edit_urpm_sources.pm:1027
 #, c-format
 msgid "Remove"
 msgstr "Tynnu"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:669
+#: ../Rpmdrake/edit_urpm_sources.pm:688
 #, c-format
 msgid "Hosts:"
 msgstr "Gwesteion:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:703
+#: ../Rpmdrake/edit_urpm_sources.pm:722
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Ffurfweddu urpmi paralel (dosbarthiad gweithredol o urpmi)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:707
+#: ../Rpmdrake/edit_urpm_sources.pm:726
 #, c-format
 msgid "Group"
 msgstr "Grŵp"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:707
+#: ../Rpmdrake/edit_urpm_sources.pm:726
 #, c-format
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:707
+#: ../Rpmdrake/edit_urpm_sources.pm:726
 #, c-format
 msgid "Media limit"
 msgstr "Terfyn cyfrwng"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:708
+#: ../Rpmdrake/edit_urpm_sources.pm:727
 #, c-format
 msgid "Command"
 msgstr "Gorchymyn"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:718 ../Rpmdrake/gui.pm:680
-#: ../Rpmdrake/pkg.pm:98 ../Rpmdrake/pkg.pm:129 ../Rpmdrake/pkg.pm:168
-#: ../Rpmdrake/rpmnew.pm:80
+#: ../Rpmdrake/edit_urpm_sources.pm:737 ../Rpmdrake/gui.pm:675
+#: ../Rpmdrake/pkg.pm:98 ../Rpmdrake/pkg.pm:128 ../Rpmdrake/pkg.pm:167
+#: ../Rpmdrake/rpmnew.pm:77
 #, c-format
 msgid "(none)"
 msgstr "(dim)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:738 ../Rpmdrake/edit_urpm_sources.pm:1001
+#: ../Rpmdrake/edit_urpm_sources.pm:757 ../Rpmdrake/edit_urpm_sources.pm:1031
 #, c-format
 msgid "Edit..."
 msgstr "Golygu..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:746 ../Rpmdrake/edit_urpm_sources.pm:1007
+#: ../Rpmdrake/edit_urpm_sources.pm:765 ../Rpmdrake/edit_urpm_sources.pm:1037
 #, c-format
 msgid "Add..."
 msgstr "Ychwanegu..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:762
+#: ../Rpmdrake/edit_urpm_sources.pm:781
 #, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Rheoli allweddi pecynnau digidol "
 
-#: ../Rpmdrake/edit_urpm_sources.pm:768 ../Rpmdrake/edit_urpm_sources.pm:932
+#: ../Rpmdrake/edit_urpm_sources.pm:787 ../Rpmdrake/edit_urpm_sources.pm:959
 #, c-format
 msgid "Medium"
 msgstr "Cyfrwng"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:774
+#: ../Rpmdrake/edit_urpm_sources.pm:793
 #, c-format
 msgid ""
 "_:cryptographic keys\n"
@@ -461,32 +466,32 @@ msgstr ""
 "_:cryptographic keys\n"
 "Allweddi"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:797
+#: ../Rpmdrake/edit_urpm_sources.pm:817
 #, 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"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:810
+#: ../Rpmdrake/edit_urpm_sources.pm:830
 #, c-format
 msgid "Add a key"
 msgstr "Ychwanegu allwedd"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:823
+#: ../Rpmdrake/edit_urpm_sources.pm:843
 #, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Dewis bysell ti ychwanegu at gyfrwng %s"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:829
+#: ../Rpmdrake/edit_urpm_sources.pm:849
 #, c-format
 msgid "Close"
 msgstr "Cau"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:851
+#: ../Rpmdrake/edit_urpm_sources.pm:871
 #, c-format
 msgid "Remove a key"
 msgstr "Tynnu allwedd"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:852
+#: ../Rpmdrake/edit_urpm_sources.pm:872
 #, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
@@ -495,37 +500,37 @@ msgstr ""
 "Ydych chi'n siŵr eich bod eisiau tynnu allwedd %s o gyfrwng %s?\n"
 "(enw'r allwedd: %s)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:870
+#: ../Rpmdrake/edit_urpm_sources.pm:890
 #, c-format
 msgid "Add a key..."
 msgstr "Ychwanegu allwedd..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:874
+#: ../Rpmdrake/edit_urpm_sources.pm:894
 #, c-format
 msgid "Remove key"
 msgstr "Tynnu allwedd"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:890
+#: ../Rpmdrake/edit_urpm_sources.pm:911
 #, c-format
 msgid "Configure media"
 msgstr "Ffurfweddu'r cyfrwng"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:930
+#: ../Rpmdrake/edit_urpm_sources.pm:957
 #, c-format
 msgid "Enabled"
 msgstr "Galluogwyd"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:931
+#: ../Rpmdrake/edit_urpm_sources.pm:958
 #, c-format
 msgid "Updates"
 msgstr "Diweddariadau"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:947
+#: ../Rpmdrake/edit_urpm_sources.pm:974
 #, 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?"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:977
+#: ../Rpmdrake/edit_urpm_sources.pm:1006
 #, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
@@ -536,37 +541,37 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1011
+#: ../Rpmdrake/edit_urpm_sources.pm:1041
 #, c-format
 msgid "Add custom..."
 msgstr "Ychwanegu addasiad..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1015
+#: ../Rpmdrake/edit_urpm_sources.pm:1045
 #, c-format
 msgid "Update..."
 msgstr "Diweddau..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1018
+#: ../Rpmdrake/edit_urpm_sources.pm:1048
 #, c-format
 msgid "Manage keys..."
 msgstr "Rheoli allweddi"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1020
+#: ../Rpmdrake/edit_urpm_sources.pm:1050
 #, c-format
 msgid "Parallel..."
 msgstr "Paralel..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1021
+#: ../Rpmdrake/edit_urpm_sources.pm:1051
 #, c-format
 msgid "Global options..."
 msgstr "Dewisiadau eang..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1031 ../rpmdrake:472
+#: ../Rpmdrake/edit_urpm_sources.pm:1061 ../rpmdrake:470
 #, c-format
 msgid "Help"
 msgstr "Cymorth"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1044 ../Rpmdrake/init.pm:125
+#: ../Rpmdrake/edit_urpm_sources.pm:1077 ../Rpmdrake/init.pm:132
 #: ../gurpmi.addmedia:93
 #, c-format
 msgid ""
@@ -578,7 +583,7 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1047
+#: ../Rpmdrake/edit_urpm_sources.pm:1080
 #, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
@@ -593,7 +598,7 @@ msgstr ""
 "rydych am eu defnyddio ar eich cyfrifiadur. Byddant ar gael i'w gosod fel\n"
 "pecynnau newydd neu er mwyn diweddaru."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1063
+#: ../Rpmdrake/edit_urpm_sources.pm:1096
 #, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
@@ -632,7 +637,7 @@ msgid "Files:"
 msgstr "Ffeiliau:"
 
 #: ../Rpmdrake/gui.pm:79 ../Rpmdrake/gui.pm:84 ../Rpmdrake/gui.pm:98
-#: ../Rpmdrake/gui.pm:100 ../Rpmdrake/pkg.pm:135
+#: ../Rpmdrake/gui.pm:100 ../Rpmdrake/pkg.pm:134
 #, c-format
 msgid "(Not available)"
 msgstr "(Dim ar gael)"
@@ -652,7 +657,7 @@ msgstr "Ffeiliau:\n"
 msgid "Changelog:\n"
 msgstr "Cofnod Newid:\n"
 
-#: ../Rpmdrake/gui.pm:105 ../rpmdrake.pm:813
+#: ../Rpmdrake/gui.pm:105 ../rpmdrake.pm:820
 #, c-format
 msgid "Medium: "
 msgstr "Cyfrwng:"
@@ -697,55 +702,55 @@ msgstr "Crynodeb: "
 msgid "Description: "
 msgstr "Disgrifiadau: "
 
-#: ../Rpmdrake/gui.pm:453 ../Rpmdrake/gui.pm:490 ../Rpmdrake/gui.pm:492
+#: ../Rpmdrake/gui.pm:448 ../Rpmdrake/gui.pm:485 ../Rpmdrake/gui.pm:487
 #, c-format
 msgid "More information on package..."
 msgstr "Rhagor o wybodaeth ar becyn..."
 
-#: ../Rpmdrake/gui.pm:455
+#: ../Rpmdrake/gui.pm:450
 #, c-format
 msgid "Please choose"
 msgstr "Dewiswch"
 
-#: ../Rpmdrake/gui.pm:456
+#: ../Rpmdrake/gui.pm:451
 #, c-format
 msgid "The following package is needed:"
 msgstr "Mae angen y pecyn canlynol:"
 
-#: ../Rpmdrake/gui.pm:456
+#: ../Rpmdrake/gui.pm:451
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../Rpmdrake/gui.pm:478 ../Rpmdrake/gui.pm:483
+#: ../Rpmdrake/gui.pm:473 ../Rpmdrake/gui.pm:478
 #, c-format
 msgid "More info"
 msgstr "Rhagor"
 
-#: ../Rpmdrake/gui.pm:485
+#: ../Rpmdrake/gui.pm:480
 #, c-format
 msgid "Information on packages"
 msgstr "Gwybodaeth am becynnau"
 
-#: ../Rpmdrake/gui.pm:508
+#: ../Rpmdrake/gui.pm:503
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 
-#: ../Rpmdrake/gui.pm:509
+#: ../Rpmdrake/gui.pm:504
 #, 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/gui.pm:515 ../Rpmdrake/gui.pm:524
+#: ../Rpmdrake/gui.pm:510 ../Rpmdrake/gui.pm:519
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Nid oes modd tynnu rhai pecynnau"
 
-#: ../Rpmdrake/gui.pm:516
+#: ../Rpmdrake/gui.pm:511
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -754,7 +759,7 @@ msgstr ""
 "Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:525 ../Rpmdrake/gui.pm:592
+#: ../Rpmdrake/gui.pm:520 ../Rpmdrake/gui.pm:587
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -764,12 +769,12 @@ msgstr ""
 "Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
 "eu dad-ddewis nawr:\n"
 
-#: ../Rpmdrake/gui.pm:554
+#: ../Rpmdrake/gui.pm:549
 #, c-format
 msgid "Additional packages needed"
 msgstr "Pecynnau ychwanegol angenrheidiol"
 
-#: ../Rpmdrake/gui.pm:555
+#: ../Rpmdrake/gui.pm:550
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -780,22 +785,22 @@ msgstr ""
 "hefyd:\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:569
+#: ../Rpmdrake/gui.pm:564
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (perthyn i'r rhestr hepgor)"
 
-#: ../Rpmdrake/gui.pm:573
+#: ../Rpmdrake/gui.pm:568
 #, c-format
 msgid "One package cannot be installed"
 msgstr "Nid oes modd gosod un pecyn"
 
-#: ../Rpmdrake/gui.pm:573
+#: ../Rpmdrake/gui.pm:568
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Nid oes modd gosod rhai pecynnau"
 
-#: ../Rpmdrake/gui.pm:575
+#: ../Rpmdrake/gui.pm:570
 #, c-format
 msgid ""
 "Sorry, the following package cannot be selected:\n"
@@ -806,7 +811,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:576
+#: ../Rpmdrake/gui.pm:571
 #, c-format
 msgid ""
 "Sorry, the following packages can't be selected:\n"
@@ -817,27 +822,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:591 ../Rpmdrake/pkg.pm:486
+#: ../Rpmdrake/gui.pm:586 ../Rpmdrake/pkg.pm:497
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Rhaid tynnu rhai pecynnau"
 
-#: ../Rpmdrake/gui.pm:622
+#: ../Rpmdrake/gui.pm:617
 #, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "Gwall: %s i weld wedi ei osod fel darllen yn unig."
 
-#: ../Rpmdrake/gui.pm:626
+#: ../Rpmdrake/gui.pm:621
 #, c-format
 msgid "You need to select some packages first."
 msgstr "Rhaid dewis rhai pecynnau'n gyntaf."
 
-#: ../Rpmdrake/gui.pm:631
+#: ../Rpmdrake/gui.pm:626
 #, c-format
 msgid "Too many packages are selected"
 msgstr "Mae gormod o becynnau wedi eu dewis"
 
-#: ../Rpmdrake/gui.pm:632
+#: ../Rpmdrake/gui.pm:627
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -848,17 +853,17 @@ msgid ""
 "Do you really want to install all the selected packages?"
 msgstr "Rhybudd:"
 
-#: ../Rpmdrake/gui.pm:664
+#: ../Rpmdrake/gui.pm:659
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Arhoswch, rhestri pecynnau..."
 
-#: ../Rpmdrake/gui.pm:682
+#: ../Rpmdrake/gui.pm:677
 #, c-format
 msgid "No update"
 msgstr "Dim diweddariad"
 
-#: ../Rpmdrake/gui.pm:683
+#: ../Rpmdrake/gui.pm:678
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -869,27 +874,27 @@ msgstr ""
 "nad oes diweddariad ar gyfer y pecynnau ar eich cyfrifiadur,\n"
 "neu rydych wedi eu gosod i gyd yn barod."
 
-#: ../Rpmdrake/gui.pm:706 ../rpmdrake:256
+#: ../Rpmdrake/gui.pm:701 ../rpmdrake:255
 #, c-format
 msgid "All"
 msgstr "Popeth"
 
-#: ../Rpmdrake/gui.pm:715 ../rpmdrake:142
+#: ../Rpmdrake/gui.pm:710 ../rpmdrake:141
 #, c-format
 msgid "Upgradable"
 msgstr "Diweddariadwy"
 
-#: ../Rpmdrake/gui.pm:715 ../rpmdrake:142
+#: ../Rpmdrake/gui.pm:710 ../rpmdrake:141
 #, c-format
 msgid "Addable"
 msgstr "Ychwanegadwy"
 
-#: ../Rpmdrake/gui.pm:735
+#: ../Rpmdrake/gui.pm:730
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Dim disgrifiad ar gael i'r pecyn hwn\n"
 
-#: ../Rpmdrake/gui.pm:741 ../Rpmdrake/pkg.pm:189
+#: ../Rpmdrake/gui.pm:736 ../Rpmdrake/pkg.pm:188
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Digwyddodd gwall terfynol:%s."
@@ -1592,12 +1597,17 @@ msgstr "  --root                 gorfodi ei redeg fel root"
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           chwilio am \"pkg\""
 
-#: ../Rpmdrake/init.pm:116
+#: ../Rpmdrake/init.pm:53
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - argraffu rhif fersiwn yr offeryn.\n"
+
+#: ../Rpmdrake/init.pm:123
 #, c-format
 msgid "Running in user mode"
 msgstr "Rhedeg ym modd defnyddiwr"
 
-#: ../Rpmdrake/init.pm:117
+#: ../Rpmdrake/init.pm:124
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -1608,12 +1618,12 @@ msgstr ""
 "Ni fydd modd i chi greu newidiadau i'r system.\n"
 "ond bydd modd i chi bori'r gronfa ddata presennol."
 
-#: ../Rpmdrake/init.pm:124
+#: ../Rpmdrake/init.pm:131 ../Rpmdrake/init.pm:156
 #, c-format
 msgid "Welcome"
 msgstr "Croeso"
 
-#: ../Rpmdrake/init.pm:129
+#: ../Rpmdrake/init.pm:136
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1626,7 +1636,7 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis pa feddalwedd rydych\n"
 "am ei dynnu oddi ar eich cyfrifiadur."
 
-#: ../Rpmdrake/init.pm:134
+#: ../Rpmdrake/init.pm:141
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1638,12 +1648,12 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
 "ar eich cyfrifiadur."
 
-#: ../Rpmdrake/init.pm:139
+#: ../Rpmdrake/init.pm:146
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Croeso i'r offeryn gosod meddalwedd!"
 
-#: ../Rpmdrake/init.pm:140
+#: ../Rpmdrake/init.pm:147
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -1658,27 +1668,38 @@ msgstr ""
 "meddalwedd ar CDROM neu DVD.  Bydd yr offeryn hwn yn eich cynorthwyo\n"
 "i ddewis pa feddalwedd i osod ar eich cyfrifiadur."
 
-#: ../Rpmdrake/pkg.pm:188
+#: ../Rpmdrake/init.pm:158
+#, c-format
+msgid "The software installation tool can set up media sources."
+msgstr ""
+
+#: ../Rpmdrake/init.pm:159
+#, fuzzy, c-format
+msgid "Do you want to add media sources now?"
+msgstr "Ydych chi'n siŵr eich bod eisiau tynnu ffynhonnell \"%s\"?"
+
+#: ../Rpmdrake/pkg.pm:187
 #, c-format
 msgid "Fatal error"
 msgstr "Gwall terfynol"
 
-#: ../Rpmdrake/pkg.pm:193 ../Rpmdrake/pkg.pm:499 ../rpmdrake.pm:316
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:512 ../Rpmdrake/pkg.pm:786
+#: ../rpmdrake.pm:323
 #, c-format
 msgid "Please wait"
 msgstr "Arhoswch"
 
-#: ../Rpmdrake/pkg.pm:193 ../Rpmdrake/pkg.pm:499
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:512
 #, c-format
 msgid "Package installation..."
 msgstr "Gosod pecynnau..."
 
-#: ../Rpmdrake/pkg.pm:193 ../Rpmdrake/pkg.pm:499
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:512 ../Rpmdrake/pkg.pm:786
 #, c-format
 msgid "Initializing..."
 msgstr "Ymgychwyn..."
 
-#: ../Rpmdrake/pkg.pm:215 ../Rpmdrake/pkg.pm:486
+#: ../Rpmdrake/pkg.pm:215 ../Rpmdrake/pkg.pm:497
 #, c-format
 msgid "Confirmation"
 msgstr "Gwiriad"
@@ -1758,17 +1779,17 @@ msgstr "Arhoswch, rhestri pecynnau sail..."
 msgid "Please wait, finding installed packages..."
 msgstr "Arhoswch, canfod pecynnau sydd wedi eu gosod..."
 
-#: ../Rpmdrake/pkg.pm:440 ../Rpmdrake/pkg.pm:635
+#: ../Rpmdrake/pkg.pm:445 ../Rpmdrake/pkg.pm:733
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
-#: ../Rpmdrake/pkg.pm:444 ../Rpmdrake/pkg.pm:615
+#: ../Rpmdrake/pkg.pm:449 ../Rpmdrake/pkg.pm:712
 #, c-format
 msgid "Problem during installation"
 msgstr "Anhawster wrth osod"
 
-#: ../Rpmdrake/pkg.pm:445 ../Rpmdrake/pkg.pm:616 ../Rpmdrake/pkg.pm:674
+#: ../Rpmdrake/pkg.pm:450 ../Rpmdrake/pkg.pm:714 ../Rpmdrake/pkg.pm:772
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1779,17 +1800,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:464
+#: ../Rpmdrake/pkg.pm:475
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../Rpmdrake/pkg.pm:465
+#: ../Rpmdrake/pkg.pm:476
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Methu estyn pecynnau ffynhonnell, %s"
 
-#: ../Rpmdrake/pkg.pm:466 ../Rpmdrake/pkg.pm:566
+#: ../Rpmdrake/pkg.pm:477 ../Rpmdrake/pkg.pm:702
 #, c-format
 msgid ""
 "\n"
@@ -1802,7 +1823,7 @@ msgstr ""
 "Gwall(au) wedi eu hadrodd:\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:483
+#: ../Rpmdrake/pkg.pm:494
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
@@ -1811,54 +1832,69 @@ msgid_plural ""
 msgstr[0] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael ei osod:"
 msgstr[1] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu gosod:"
 
-#: ../Rpmdrake/pkg.pm:488
+#: ../Rpmdrake/pkg.pm:499
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Tynnu %d pecyn?"
 msgstr[1] "Tynnu %d pecyn?"
 
-#: ../Rpmdrake/pkg.pm:490
+#: ../Rpmdrake/pkg.pm:501
 #, c-format
 msgid "The following package has to be removed for others to be upgraded:"
 msgstr "Cafodd y pecyn canlynol ei dynnu i eraill gael eu diweddaru:"
 
-#: ../Rpmdrake/pkg.pm:491
+#: ../Rpmdrake/pkg.pm:502
 #, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
 msgstr "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru:"
 
-#: ../Rpmdrake/pkg.pm:491
+#: ../Rpmdrake/pkg.pm:502
 #, c-format
 msgid "Is it ok to continue?"
 msgstr "Ydi hi'n iawn parhau?"
 
-#: ../Rpmdrake/pkg.pm:509
+#: ../Rpmdrake/pkg.pm:525
 #, c-format
 msgid "Change medium"
 msgstr "Newid cyfrwng"
 
-#: ../Rpmdrake/pkg.pm:510
+#: ../Rpmdrake/pkg.pm:526
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" i mewn i ddyfais [%s]"
 
-#: ../Rpmdrake/pkg.pm:517
+#: ../Rpmdrake/pkg.pm:547
+#, c-format
+msgid "Preparing packages installation..."
+msgstr "Paratoi pecynnau i'w gosod..."
+
+#: ../Rpmdrake/pkg.pm:547
+#, c-format
+msgid "Preparing..."
+msgstr "Paratoi..."
+
+#: ../Rpmdrake/pkg.pm:550
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Gosod pecyn `%s' (%s/%s)..."
+
+#: ../Rpmdrake/pkg.pm:571
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
 
-#: ../Rpmdrake/pkg.pm:537
+#: ../Rpmdrake/pkg.pm:591
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "Gwirio llofnodion pecynnau ..."
 
-#: ../Rpmdrake/pkg.pm:550 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../Rpmdrake/pkg.pm:604 ../rpmdrake.pm:750 ../rpmdrake.pm:859
 #, c-format
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../Rpmdrake/pkg.pm:551
+#: ../Rpmdrake/pkg.pm:605
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1873,12 +1909,48 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau gyda'r gosod?"
 
-#: ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:673
+#: ../Rpmdrake/pkg.pm:618
+#, c-format
+msgid "installing %s from %s"
+msgstr "gosod %s o %s"
+
+#: ../Rpmdrake/pkg.pm:620
+#, c-format
+msgid "installing %s"
+msgstr "gosod %s"
+
+#: ../Rpmdrake/pkg.pm:624
+#, c-format
+msgid "removing %s"
+msgstr "tynnu %s"
+
+#: ../Rpmdrake/pkg.pm:650 ../Rpmdrake/pkg.pm:668 ../Rpmdrake/pkg.pm:761
+#: ../rpmdrake.pm:737 ../rpmdrake.pm:818 ../rpmdrake.pm:842
+#, c-format
+msgid "Error"
+msgstr "Gwall"
+
+#: ../Rpmdrake/pkg.pm:651 ../Rpmdrake/pkg.pm:669
+#, c-format
+msgid "Installation failed:"
+msgstr "Methodd y gosod:"
+
+#: ../Rpmdrake/pkg.pm:652
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
+
+#: ../Rpmdrake/pkg.pm:670
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Mwy o orfodaeth gyda'r gosod?  (--force)? (y/N)"
+
+#: ../Rpmdrake/pkg.pm:682 ../Rpmdrake/pkg.pm:699 ../Rpmdrake/pkg.pm:771
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosodiad"
 
-#: ../Rpmdrake/pkg.pm:564
+#: ../Rpmdrake/pkg.pm:700
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1891,27 +1963,12 @@ msgstr ""
 "\n"
 "Efallai'r hoffech ddiweddaru eich cronfa ddata o gyfryngau."
 
-#: ../Rpmdrake/pkg.pm:578
-#, c-format
-msgid "Preparing packages installation..."
-msgstr "Paratoi pecynnau i'w gosod..."
-
-#: ../Rpmdrake/pkg.pm:578
-#, c-format
-msgid "Preparing..."
-msgstr "Paratoi..."
-
-#: ../Rpmdrake/pkg.pm:581
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Gosod pecyn `%s' (%s/%s)..."
-
-#: ../Rpmdrake/pkg.pm:596
-#, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "methu cael mynediad at ffeil rpm (%s)"
+#: ../Rpmdrake/pkg.pm:713
+#, fuzzy, c-format
+msgid "%d installation transactions failed"
+msgstr "Methodd y gosodiad"
 
-#: ../Rpmdrake/pkg.pm:630
+#: ../Rpmdrake/pkg.pm:728
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -1924,48 +1981,42 @@ msgstr ""
 "Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
 "mae modd eu harchwilio i weithredu arnynt:"
 
-#: ../Rpmdrake/pkg.pm:638
+#: ../Rpmdrake/pkg.pm:736
 #, c-format
 msgid "Upgrade information"
 msgstr "Gwybodaeth uwchraddio"
 
-#: ../Rpmdrake/pkg.pm:640
+#: ../Rpmdrake/pkg.pm:738
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "Mae gan y pecynnau wybodaeth uwchraddio"
 
-#: ../Rpmdrake/pkg.pm:648
+#: ../Rpmdrake/pkg.pm:746
 #, c-format
 msgid "Upgrade information about this package"
 msgstr "Gwybodaeth uwchraddio am y pecyn hwn"
 
-#: ../Rpmdrake/pkg.pm:651
+#: ../Rpmdrake/pkg.pm:749
 #, c-format
 msgid "Upgrade information about package %s"
 msgstr "Gwybodaeth uwchraddio am becyn %s"
 
-#: ../Rpmdrake/pkg.pm:663 ../rpmdrake.pm:730 ../rpmdrake.pm:811
-#: ../rpmdrake.pm:835
-#, c-format
-msgid "Error"
-msgstr "Gwall"
-
-#: ../Rpmdrake/pkg.pm:664
+#: ../Rpmdrake/pkg.pm:762
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Gwall anadferadwy: dim pecyn wedi ei ganfod ar gyfer y gosod."
 
-#: ../Rpmdrake/pkg.pm:689
+#: ../Rpmdrake/pkg.pm:786 ../Rpmdrake/pkg.pm:791
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Arhoswch, tynnu'r pecynnau..."
 
-#: ../Rpmdrake/pkg.pm:700
+#: ../Rpmdrake/pkg.pm:802
 #, c-format
 msgid "Problem during removal"
 msgstr "Problem wrth dynnu"
 
-#: ../Rpmdrake/pkg.pm:701
+#: ../Rpmdrake/pkg.pm:803
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -1976,42 +2027,42 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/rpmnew.pm:81
+#: ../Rpmdrake/rpmnew.pm:78
 #, c-format
 msgid "Inspecting %s"
 msgstr "Archwilio %s"
 
-#: ../Rpmdrake/rpmnew.pm:104
+#: ../Rpmdrake/rpmnew.pm:102
 #, c-format
 msgid "Changes:"
 msgstr "Newidiadau:"
 
-#: ../Rpmdrake/rpmnew.pm:112
+#: ../Rpmdrake/rpmnew.pm:110
 #, c-format
 msgid "Remove .%s"
 msgstr "Tynnu .%s"
 
-#: ../Rpmdrake/rpmnew.pm:116
+#: ../Rpmdrake/rpmnew.pm:114
 #, c-format
 msgid "Use .%s as main file"
 msgstr "Defnyddio .%s fel y brif ffeil"
 
-#: ../Rpmdrake/rpmnew.pm:120
+#: ../Rpmdrake/rpmnew.pm:118
 #, c-format
 msgid "Do nothing"
 msgstr "Gwneud dim"
 
-#: ../Rpmdrake/rpmnew.pm:136
+#: ../Rpmdrake/rpmnew.pm:149
 #, c-format
 msgid "Installation finished"
 msgstr "Gorffennodd y gosodiad"
 
-#: ../Rpmdrake/rpmnew.pm:151
+#: ../Rpmdrake/rpmnew.pm:164
 #, c-format
 msgid "Inspect..."
 msgstr "Archwilio..."
 
-#: ../Rpmdrake/rpmnew.pm:169 ../rpmdrake:70 ../rpmdrake:98
+#: ../Rpmdrake/rpmnew.pm:182 ../rpmdrake:70 ../rpmdrake:97
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Arhoswch, chwilio..."
@@ -2053,7 +2104,7 @@ msgstr "Llwyddiant wrth ychwanegu cyfrwng %s."
 msgid "Successfully added medium `%s'."
 msgstr "Llwyddiant wrth ychwanegu cyfrwng '%s'"
 
-#: ../rpmdrake:59 ../rpmdrake:141
+#: ../rpmdrake:59 ../rpmdrake:140
 #, c-format
 msgid "Search results"
 msgstr "Canlyniadau'r chwilio"
@@ -2063,466 +2114,466 @@ msgstr "Canlyniadau'r chwilio"
 msgid "Search results (none)"
 msgstr "Canlyniadau'r chwilio (dim)"
 
-#: ../rpmdrake:93 ../rpmdrake:187 ../rpmdrake.pm:180
+#: ../rpmdrake:92 ../rpmdrake:186 ../rpmdrake.pm:187
 #, c-format
 msgid "Software Management"
 msgstr "Rheoli Meddalwedd"
 
-#: ../rpmdrake:103
+#: ../rpmdrake:102
 #, c-format
 msgid "Stop"
 msgstr "Atal"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:143
 #, c-format
 msgid "Selected"
 msgstr "Dewiswyd"
 
-#: ../rpmdrake:144
+#: ../rpmdrake:143
 #, c-format
 msgid "Not selected"
 msgstr "Heb ei ddewis"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:199
 #, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Dewiswyd: %s / Lle gwag ar ddisg: %s"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:200
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Maint dewiswyd: %d MB"
 
-#: ../rpmdrake:256
+#: ../rpmdrake:255
 #, c-format
 msgid "Installed"
 msgstr "Gosodwyd"
 
-#: ../rpmdrake:256
+#: ../rpmdrake:255
 #, c-format
 msgid "Non installed"
 msgstr "Heb eu gosod"
 
-#: ../rpmdrake:257
+#: ../rpmdrake:256
 #, c-format
 msgid "%s choices"
 msgstr "%s dewis"
 
-#: ../rpmdrake:257
+#: ../rpmdrake:256
 #, c-format
 msgid "Mandriva Linux choices"
 msgstr "Dewisiadau Mandriva Linux"
 
-#: ../rpmdrake:259
+#: ../rpmdrake:258
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Pob pecyn, trefn yr wyddor"
 
-#: ../rpmdrake:260
+#: ../rpmdrake:259
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Pob pecyn, yn ôl diweddariad"
 
-#: ../rpmdrake:261
+#: ../rpmdrake:260
 #, c-format
 msgid "All packages, by size"
 msgstr "Pob pecyn, yn ôl maint"
 
-#: ../rpmdrake:262
+#: ../rpmdrake:261
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Pob pecyn, yn ôl dyddiad dewis"
 
-#: ../rpmdrake:263
+#: ../rpmdrake:262
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Gadael, yn ôl dyddiad gosod"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:263
 #, c-format
 msgid "All packages, by group"
 msgstr "Pob pecyn, yn ôl grŵp"
 
-#: ../rpmdrake:266
+#: ../rpmdrake:265
 #, c-format
 msgid "All updates"
 msgstr "Pob diweddariad"
 
-#: ../rpmdrake:266
+#: ../rpmdrake:265
 #, c-format
 msgid "Security updates"
 msgstr "Diweddariadau diogelwch"
 
-#: ../rpmdrake:266
+#: ../rpmdrake:265
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Diweddariad cywiro gwallau"
 
-#: ../rpmdrake:266
+#: ../rpmdrake:265
 #, c-format
 msgid "Normal updates"
 msgstr "Diweddariadau arferol"
 
-#: ../rpmdrake:327
+#: ../rpmdrake:326
 #, c-format
 msgid "in names"
 msgstr "mewn enwau"
 
-#: ../rpmdrake:329
+#: ../rpmdrake:328
 #, c-format
 msgid "in descriptions"
 msgstr "mewn disgrifiadau"
 
-#: ../rpmdrake:331
+#: ../rpmdrake:330
 #, c-format
 msgid "in file names"
 msgstr "mewn enwau ffeil"
 
-#: ../rpmdrake:362 ../rpmdrake:365 ../rpmdrake:376 ../rpmdrake:389
-#: ../rpmdrake:398
+#: ../rpmdrake:361 ../rpmdrake:364 ../rpmdrake:375 ../rpmdrake:388
+#: ../rpmdrake:397
 #, c-format
 msgid "/_File"
 msgstr "/_Ffeil"
 
-#: ../rpmdrake:365
+#: ../rpmdrake:364
 #, c-format
 msgid "/_Update media"
 msgstr "/_Diweddaru'r cyfrwng"
 
-#: ../rpmdrake:376
+#: ../rpmdrake:375
 #, c-format
 msgid "/_Reset the selection"
 msgstr "/_Ailosod y dewis"
 
-#: ../rpmdrake:389
+#: ../rpmdrake:388
 #, c-format
 msgid "/Reload the _packages list"
 msgstr "/_Ail-lwytho'r rhestr pecynnau"
 
-#: ../rpmdrake:398
+#: ../rpmdrake:397
 #, c-format
 msgid "/_Quit"
 msgstr "/_Gadael"
 
-#: ../rpmdrake:398
+#: ../rpmdrake:397
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:401 ../rpmdrake:402 ../rpmdrake:407 ../rpmdrake:437
+#: ../rpmdrake:400 ../rpmdrake:401 ../rpmdrake:405 ../rpmdrake:435
 #, c-format
 msgid "/_Options"
 msgstr "/_Dewisiadau"
 
-#: ../rpmdrake:402
+#: ../rpmdrake:401
 #, c-format
 msgid "/_Media Manager"
 msgstr "/_Rheolwr Cyfrwng"
 
-#: ../rpmdrake:407 ../rpmdrake:437
+#: ../rpmdrake:405 ../rpmdrake:435
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Dangoswch y pecynnau dewis awtomatig"
 
-#: ../rpmdrake:411 ../rpmdrake:412 ../rpmdrake:413 ../rpmdrake:414
+#: ../rpmdrake:409 ../rpmdrake:410 ../rpmdrake:411 ../rpmdrake:412
 #, c-format
 msgid "/_Help"
 msgstr "/_Cymorth"
 
-#: ../rpmdrake:412
+#: ../rpmdrake:410
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Adrodd ar Wall"
 
-#: ../rpmdrake:414
+#: ../rpmdrake:412
 #, c-format
 msgid "/_About..."
 msgstr "/_Ynghylch..."
 
-#: ../rpmdrake:417
+#: ../rpmdrake:415
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:419
+#: ../rpmdrake:417
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Hawlfraint (C) %s Mandriva"
 
-#: ../rpmdrake:421
+#: ../rpmdrake:419
 #, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake yw offeryn rheoli pecynnau Mandriva Linux."
 
-#: ../rpmdrake:423
+#: ../rpmdrake:421
 #, 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:428
+#: ../rpmdrake:426
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "_: Rhoslyn Prys post@meddal.com\n"
 
-#: ../rpmdrake:452
+#: ../rpmdrake:450
 #, c-format
 msgid "Find:"
 msgstr "Canfod:"
 
-#: ../rpmdrake:461
+#: ../rpmdrake:459
 #, c-format
 msgid "Search"
 msgstr "Chwilio"
 
-#: ../rpmdrake:463
+#: ../rpmdrake:461
 #, c-format
 msgid "Clear"
 msgstr "Clirio"
 
-#: ../rpmdrake:477 ../rpmdrake.pm:764
+#: ../rpmdrake:475 ../rpmdrake.pm:771
 #, c-format
 msgid "Select all"
 msgstr "Dewis popeth"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:482
 #, c-format
 msgid "Apply"
 msgstr "Gosod"
 
-#: ../rpmdrake:488
+#: ../rpmdrake:486
 #, c-format
 msgid "Quit"
 msgstr "Gadael"
 
-#: ../rpmdrake:504
+#: ../rpmdrake:502
 #, c-format
 msgid "Quick Introduction"
 msgstr "Cyflwyniad Cyflym"
 
-#: ../rpmdrake:505
+#: ../rpmdrake:503
 #, 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:506
+#: ../rpmdrake:504
 #, 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:507
+#: ../rpmdrake:505
 #, 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.pm:103
+#: ../rpmdrake.pm:107
 #, c-format
 msgid "Software Update"
 msgstr "Diweddaru Meddalwedd"
 
-#: ../rpmdrake.pm:103
+#: ../rpmdrake.pm:107
 #, c-format
 msgid "Mandriva Linux Update"
 msgstr "Diweddaru Mandriva Linux"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:134
 #, 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:135
 #, c-format
 msgid "User name:"
 msgstr "Enw Defnyddiwr:"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:182
 #, c-format
 msgid "Software Packages Removal"
 msgstr "Tynnu Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:176 ../rpmdrake.pm:180
+#: ../rpmdrake.pm:183 ../rpmdrake.pm:187
 #, c-format
 msgid "Software Packages Update"
 msgstr "Diweddaru Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:177
+#: ../rpmdrake.pm:184
 #, c-format
 msgid "Software Packages Installation"
 msgstr "Gosod Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:220
+#: ../rpmdrake.pm:227
 #, c-format
 msgid "No"
 msgstr "Na"
 
-#: ../rpmdrake.pm:224
+#: ../rpmdrake.pm:231
 #, c-format
 msgid "Yes"
 msgstr "Iawn"
 
-#: ../rpmdrake.pm:274
+#: ../rpmdrake.pm:281
 #, c-format
 msgid "Info..."
 msgstr "Gwybodaeth..."
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:402
 #, c-format
 msgid "Austria"
 msgstr "Awstria"
 
-#: ../rpmdrake.pm:396
+#: ../rpmdrake.pm:403
 #, c-format
 msgid "Australia"
 msgstr "Awstralia"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:404
 #, c-format
 msgid "Belgium"
 msgstr "Gwlad Belg"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:405
 #, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:406
 #, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:407
 #, c-format
 msgid "Switzerland"
 msgstr "Y Swistir"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:408
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:409
 #, c-format
 msgid "Czech Republic"
 msgstr "Gweriniaeth Tsiec"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:410
 #, c-format
 msgid "Germany"
 msgstr "Yr Almaen"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:411
 #, c-format
 msgid "Danmark"
 msgstr "Denmarc"
 
-#: ../rpmdrake.pm:405 ../rpmdrake.pm:409
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:416
 #, c-format
 msgid "Greece"
 msgstr "Groeg"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:413
 #, c-format
 msgid "Spain"
 msgstr "Sbaen"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:414
 #, c-format
 msgid "Finland"
 msgstr "Ffindir"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:415
 #, c-format
 msgid "France"
 msgstr "Ffrainc"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:417
 #, c-format
 msgid "Hungary"
 msgstr "Hwngari"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:418
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:419
 #, c-format
 msgid "Italy"
 msgstr "Yr Eidal"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:420
 #, c-format
 msgid "Japan"
 msgstr "Siapan"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:421
 #, c-format
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Netherlands"
 msgstr "Yr Iseldiroedd"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:423
 #, c-format
 msgid "Norway"
 msgstr "Norwy"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:424
 #, c-format
 msgid "Poland"
 msgstr "Gwlad Pwyl"
 
-#: ../rpmdrake.pm:418
+#: ../rpmdrake.pm:425
 #, c-format
 msgid "Portugal"
 msgstr "Portiwgal"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:426
 #, c-format
 msgid "Russia"
 msgstr "Rwsia"
 
-#: ../rpmdrake.pm:420
+#: ../rpmdrake.pm:427
 #, c-format
 msgid "Sweden"
 msgstr "Sweden"
 
-#: ../rpmdrake.pm:421
+#: ../rpmdrake.pm:428
 #, c-format
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:422
+#: ../rpmdrake.pm:429
 #, c-format
 msgid "Slovakia"
 msgstr "Slofacia"
 
-#: ../rpmdrake.pm:423
+#: ../rpmdrake.pm:430
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:424
+#: ../rpmdrake.pm:431
 #, c-format
 msgid "United Kingdom"
 msgstr "Y Deyrnas Unedig"
 
-#: ../rpmdrake.pm:425
+#: ../rpmdrake.pm:432
 #, c-format
 msgid "China"
 msgstr "Tsiena"
 
-#: ../rpmdrake.pm:426 ../rpmdrake.pm:427 ../rpmdrake.pm:428 ../rpmdrake.pm:429
+#: ../rpmdrake.pm:433 ../rpmdrake.pm:434 ../rpmdrake.pm:435 ../rpmdrake.pm:436
 #, c-format
 msgid "United States"
 msgstr "Yr Unol Daleithiau"
 
-#: ../rpmdrake.pm:526
+#: ../rpmdrake.pm:533
 #, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2535,7 +2586,7 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../rpmdrake.pm:530
+#: ../rpmdrake.pm:537
 #, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
@@ -2548,27 +2599,27 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../rpmdrake.pm:536 ../rpmdrake.pm:574
+#: ../rpmdrake.pm:543 ../rpmdrake.pm:581
 #, c-format
 msgid "Mirror choice"
 msgstr "Dewis drychau"
 
-#: ../rpmdrake.pm:539
+#: ../rpmdrake.pm:546
 #, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau."
 
-#: ../rpmdrake.pm:540
+#: ../rpmdrake.pm:547
 #, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau o safle gwe Mandriva."
 
-#: ../rpmdrake.pm:547
+#: ../rpmdrake.pm:554
 #, c-format
 msgid "Error during download"
 msgstr "Gwall wrth lwytho i lawr"
 
-#: ../rpmdrake.pm:549
+#: ../rpmdrake.pm:556
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2583,7 +2634,7 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu'r safle, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:554
+#: ../rpmdrake.pm:561
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2598,17 +2649,17 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu safle Mandriva, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:564
+#: ../rpmdrake.pm:571
 #, c-format
 msgid "No mirror"
 msgstr "Dim drych"
 
-#: ../rpmdrake.pm:566
+#: ../rpmdrake.pm:573
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Methu canfod drych addas."
 
-#: ../rpmdrake.pm:567
+#: ../rpmdrake.pm:574
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2623,68 +2674,68 @@ msgstr ""
 "yw pensaernïaeth eich prosesydd yn cael ei gynnal gan Diweddariadau\n"
 "Swyddogol Mandriva Linux."
 
-#: ../rpmdrake.pm:586
+#: ../rpmdrake.pm:593
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Dewiswch ddrych"
 
-#: ../rpmdrake.pm:639
+#: ../rpmdrake.pm:646
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copïo ffeil fel ar gyfer cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:642
+#: ../rpmdrake.pm:649
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Archwilio ffeil cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:645
+#: ../rpmdrake.pm:652
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Archwilio ffeil bell y cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:656
 #, c-format
 msgid " done."
 msgstr " gorffen.."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:660
 #, c-format
 msgid " failed!"
 msgstr " methwyd!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
+#: ../rpmdrake.pm:664
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s o gyfrwng %s"
 
-#: ../rpmdrake.pm:661
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Cychwyn llwytho %s i lawr..."
 
-#: ../rpmdrake.pm:665
+#: ../rpmdrake.pm:672
 #, 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:668
+#: ../rpmdrake.pm:675
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:686
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Arhoswch, diweddaru cyfrwng..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:713
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Gwall estyn pecynnau"
 
-#: ../rpmdrake.pm:707
+#: ../rpmdrake.pm:714
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2701,28 +2752,28 @@ msgstr ""
 "neu nid oes modd ei gyrraedd ar hyn o bryd a dylech geisio eto \n"
 "rhywbryd."
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:745
 #, c-format
 msgid "Update media"
 msgstr "Diweddaru'r cyfrwng"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:750
 #, 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:750
+#: ../rpmdrake.pm:757
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Dewiswch y cyfrwng i'w diweddaru:"
 
-#: ../rpmdrake.pm:768
+#: ../rpmdrake.pm:775
 #, c-format
 msgid "Update"
 msgstr "Diweddaru"
 
-#: ../rpmdrake.pm:789
+#: ../rpmdrake.pm:796
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2735,7 +2786,7 @@ msgstr ""
 "Gwallau:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
+#: ../rpmdrake.pm:819 ../rpmdrake.pm:830
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2746,17 +2797,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:842
 #, c-format
 msgid "Unable to create medium."
 msgstr "Methu creu cyfrwng."
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:847
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Methu ychwanegu cyfrwng"
 
-#: ../rpmdrake.pm:841
+#: ../rpmdrake.pm:848
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2767,7 +2818,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
+#: ../rpmdrake.pm:861
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2778,7 +2829,7 @@ msgstr ""
 "s rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
-#: ../rpmdrake.pm:857
+#: ../rpmdrake.pm:864
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
@@ -2789,12 +2840,12 @@ msgstr ""
 "Mandriva Linux rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:881
 #, c-format
 msgid "Help launched in background"
 msgstr "Cymorth wedi ei gychwyn yn y cefndir"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:882
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
@@ -3071,3 +3122,10 @@ msgstr "Tynnu Meddalwedd"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Rheolwr Cyfrwng Meddalwedd"
+
+#, fuzzy
+#~ msgid "  --version              output version information and exit"
+#~ msgstr "  --root                 gorfodi ei redeg fel root"
+
+#~ msgid "unable to access rpm file [%s]"
+#~ msgstr "methu cael mynediad at ffeil rpm (%s)"