Make merge

1 files changed, 357 insertions, 329 deletions

diff --git a/po/cy.po b/po/cy.po
index 48ba1953..0ec08cd2 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2005-01-14 19:45+0100\n"
+"POT-Creation-Date: 2005-01-18 13:29+0100\n"
 "PO-Revision-Date: 2005-01-14 18:13-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -18,7 +18,37 @@ msgstr ""
 "X-Poedit-Language: Welsh\n"
 "X-Poedit-Country: UK\n"
 
-#: ../edit-urpm-sources.pl:65
+#: ../edit-urpm-sources.pl:66
+#, c-format
+msgid "Choose media type"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:67
+#, c-format
+msgid ""
+"This step enables you to add sources from a Mandrakelinux web or FTP "
+"mirror.\n"
+"\n"
+"There are two kinds of official mirrors. You can choose to add sources that\n"
+"contain the complete set of packages of your distribution (usually a "
+"superset\n"
+"of what comes on the standard installation CDs), or sources that provide "
+"the\n"
+"official updates for your distribution. (You can add both, but you'll have\n"
+"to do this in two steps.)"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:75
+#, c-format
+msgid "Distribution sources"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:75
+#, fuzzy, c-format
+msgid "Official updates"
+msgstr "Diweddariadau arferol"
+
+#: ../edit-urpm-sources.pl:78
 #, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
@@ -37,103 +67,93 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../edit-urpm-sources.pl:73
+#: ../edit-urpm-sources.pl:87
 #, c-format
 msgid "Please wait, adding media..."
 msgstr "Arhoswch, diweddaru cyfrwng..."
 
-#: ../edit-urpm-sources.pl:93
+#: ../edit-urpm-sources.pl:120
 #, c-format
 msgid "Add a medium"
 msgstr "Ychwanegu cyfrwng"
 
-#: ../edit-urpm-sources.pl:94
+#: ../edit-urpm-sources.pl:122
 #, c-format
 msgid "Local files"
 msgstr "Ffeiliau lleol"
 
-#: ../edit-urpm-sources.pl:94
+#: ../edit-urpm-sources.pl:122
 #, c-format
 msgid "Path:"
 msgstr "Llwybr:"
 
-#: ../edit-urpm-sources.pl:95
+#: ../edit-urpm-sources.pl:123
 #, c-format
 msgid "FTP server"
 msgstr "Gweinydd FTP"
 
-#: ../edit-urpm-sources.pl:95 ../edit-urpm-sources.pl:96
-#: ../edit-urpm-sources.pl:98 ../edit-urpm-sources.pl:373
+#: ../edit-urpm-sources.pl:123 ../edit-urpm-sources.pl:124
+#: ../edit-urpm-sources.pl:382
 #, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:96
+#: ../edit-urpm-sources.pl:124
 #, c-format
 msgid "HTTP server"
 msgstr "Gweinydd HTTP"
 
-#: ../edit-urpm-sources.pl:97
+#: ../edit-urpm-sources.pl:125
 #, c-format
 msgid "Removable device"
 msgstr "Dyfais symudol"
 
-#: ../edit-urpm-sources.pl:97
+#: ../edit-urpm-sources.pl:125
 #, c-format
 msgid "Path or mount point:"
 msgstr "Llwybr neu bwynt gosod:"
 
-#: ../edit-urpm-sources.pl:98 ../rpmdrake:859
-#, c-format
-msgid "Security updates"
-msgstr "Diweddariadau diogelwch"
-
-#: ../edit-urpm-sources.pl:114
+#: ../edit-urpm-sources.pl:141
 #, c-format
 msgid "Browse..."
 msgstr "Pori..."
 
-#: ../edit-urpm-sources.pl:121
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Dewis drych..."
-
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:171
 #, c-format
 msgid "Login:"
 msgstr "Mewngofnod:"
 
-#: ../edit-urpm-sources.pl:159 ../edit-urpm-sources.pl:450
+#: ../edit-urpm-sources.pl:171 ../edit-urpm-sources.pl:459
 #, c-format
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../edit-urpm-sources.pl:164 ../edit-urpm-sources.pl:374
+#: ../edit-urpm-sources.pl:176 ../edit-urpm-sources.pl:383
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Llwybr perthynol i synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:166
+#: ../edit-urpm-sources.pl:178
 #, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Os fydd yn cael ei adael yn wag"
 
-#: ../edit-urpm-sources.pl:171
+#: ../edit-urpm-sources.pl:183
 #, c-format
 msgid "Name:"
 msgstr "Enw:"
 
-#: ../edit-urpm-sources.pl:184
+#: ../edit-urpm-sources.pl:194
 #, c-format
 msgid "Create media for a whole distribution"
 msgstr "Creu cyfrwng ar gyfer dosbarthiad cyfan"
 
-#: ../edit-urpm-sources.pl:203
+#: ../edit-urpm-sources.pl:212
 #, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Mae angen llanw o leiaf y ddau gofnod cyntaf"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
 #, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
@@ -142,126 +162,126 @@ msgstr ""
 "Mae yna gyfrwng o'r enw yna eisoes, hoffech chi\n"
 "ei amnewid?"
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
 #, c-format
 msgid "Adding a medium:"
 msgstr "Ychwanegu cyfrwng:"
 
-#: ../edit-urpm-sources.pl:219
+#: ../edit-urpm-sources.pl:228
 #, c-format
 msgid "Type of medium:"
 msgstr "Math o gyfrwng:"
 
-#: ../edit-urpm-sources.pl:224 ../edit-urpm-sources.pl:294
-#: ../edit-urpm-sources.pl:380 ../edit-urpm-sources.pl:405
-#: ../edit-urpm-sources.pl:467 ../edit-urpm-sources.pl:548
-#: ../edit-urpm-sources.pl:588 ../edit-urpm-sources.pl:646
-#: ../edit-urpm-sources.pl:786 ../rpmdrake:159 ../rpmdrake:626
-#: ../rpmdrake:1393 ../rpmdrake:1401 ../rpmdrake.pm:500 ../rpmdrake.pm:590
-#: ../rpmdrake.pm:659
+#: ../edit-urpm-sources.pl:233 ../edit-urpm-sources.pl:303
+#: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:414
+#: ../edit-urpm-sources.pl:476 ../edit-urpm-sources.pl:557
+#: ../edit-urpm-sources.pl:597 ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:794 ../rpmdrake:159 ../rpmdrake:676
+#: ../rpmdrake:1418 ../rpmdrake:1426 ../rpmdrake.pm:502 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:661
 #, c-format
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../edit-urpm-sources.pl:226 ../edit-urpm-sources.pl:296
-#: ../edit-urpm-sources.pl:405 ../edit-urpm-sources.pl:457
-#: ../edit-urpm-sources.pl:545 ../edit-urpm-sources.pl:587
-#: ../edit-urpm-sources.pl:639 ../edit-urpm-sources.pl:711
-#: ../edit-urpm-sources.pl:779 ../edit-urpm-sources.pl:832
-#: ../edit-urpm-sources.pl:982 ../rpmdrake:159 ../rpmdrake:626 ../rpmdrake:646
-#: ../rpmdrake:651 ../rpmdrake:1335 ../rpmdrake:1393 ../rpmdrake:1537
-#: ../rpmdrake.pm:191 ../rpmdrake.pm:248 ../rpmdrake.pm:500
+#: ../edit-urpm-sources.pl:235 ../edit-urpm-sources.pl:305
+#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:466
+#: ../edit-urpm-sources.pl:554 ../edit-urpm-sources.pl:596
+#: ../edit-urpm-sources.pl:648 ../edit-urpm-sources.pl:720
+#: ../edit-urpm-sources.pl:787 ../edit-urpm-sources.pl:840
+#: ../edit-urpm-sources.pl:990 ../rpmdrake:159 ../rpmdrake:676 ../rpmdrake:693
+#: ../rpmdrake:698 ../rpmdrake:1360 ../rpmdrake:1418 ../rpmdrake:1561
+#: ../rpmdrake.pm:191 ../rpmdrake.pm:248 ../rpmdrake.pm:502
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../edit-urpm-sources.pl:278
+#: ../edit-urpm-sources.pl:287
 #, c-format
 msgid "Global options for package installation"
 msgstr "Dewisiadau eang ar gyfer gosod pecynnau"
 
-#: ../edit-urpm-sources.pl:280
+#: ../edit-urpm-sources.pl:289
 #, c-format
 msgid "always"
 msgstr "bob tro"
 
-#: ../edit-urpm-sources.pl:281
+#: ../edit-urpm-sources.pl:290
 #, c-format
 msgid "never"
 msgstr "byth"
 
-#: ../edit-urpm-sources.pl:290
+#: ../edit-urpm-sources.pl:299
 #, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Gwirio RPMau i'w gosod:"
 
-#: ../edit-urpm-sources.pl:291
+#: ../edit-urpm-sources.pl:300
 #, c-format
 msgid "Download program to use:"
 msgstr "Llwytho rhaglen i lawr i'w defnyddio:"
 
-#: ../edit-urpm-sources.pl:321
+#: ../edit-urpm-sources.pl:330
 #, c-format
 msgid "Source Removal"
 msgstr "Tynnu Ffynhonnell"
 
-#: ../edit-urpm-sources.pl:322
+#: ../edit-urpm-sources.pl:331
 #, 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:327
+#: ../edit-urpm-sources.pl:336
 #, c-format
 msgid "Please wait, removing medium..."
 msgstr "Arhoswch, tynnu cyfrwng..."
 
-#: ../edit-urpm-sources.pl:364
+#: ../edit-urpm-sources.pl:373
 #, c-format
 msgid "Edit a medium"
 msgstr "Golygu'r cyfrwng"
 
-#: ../edit-urpm-sources.pl:370
+#: ../edit-urpm-sources.pl:379
 #, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Golygu ffynhonnell \"%s\":"
 
-#: ../edit-urpm-sources.pl:384
+#: ../edit-urpm-sources.pl:393
 #, c-format
 msgid "Save changes"
 msgstr "Cadw newidiadau"
 
-#: ../edit-urpm-sources.pl:392 ../edit-urpm-sources.pl:969
+#: ../edit-urpm-sources.pl:401 ../edit-urpm-sources.pl:977
 #, c-format
 msgid "Proxy..."
 msgstr "Dirprwy..."
 
-#: ../edit-urpm-sources.pl:403
+#: ../edit-urpm-sources.pl:412
 #, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
 
-#: ../edit-urpm-sources.pl:404
+#: ../edit-urpm-sources.pl:413
 #, 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:426
+#: ../edit-urpm-sources.pl:435
 #, c-format
 msgid "Configure proxies"
 msgstr "Ffurfweddu'r dirprwyon"
 
-#: ../edit-urpm-sources.pl:436
+#: ../edit-urpm-sources.pl:445
 #, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Gosodiadau dirprwy ar gyfer cyfrwng \"%s\""
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:446
 #, c-format
 msgid "Global proxy settings"
 msgstr "Gosodiadau dirprwy eang"
 
-#: ../edit-urpm-sources.pl:439
+#: ../edit-urpm-sources.pl:448
 #, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
@@ -270,164 +290,164 @@ msgstr ""
 "Os oes angen dirprwy arnoch, rhowch enw gwesteiwr a phorth dewisol "
 "(cystrawen: <proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:442
+#: ../edit-urpm-sources.pl:451
 #, c-format
 msgid "Proxy hostname:"
 msgstr "Enw gwesteiwr y dirprwy:"
 
-#: ../edit-urpm-sources.pl:445
+#: ../edit-urpm-sources.pl:454
 #, 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:448
+#: ../edit-urpm-sources.pl:457
 #, c-format
 msgid "User:"
 msgstr "Defnyddiwr:"
 
-#: ../edit-urpm-sources.pl:516
+#: ../edit-urpm-sources.pl:525
 #, c-format
 msgid "Add a parallel group"
 msgstr "Ychwanegu grŵp paralel"
 
-#: ../edit-urpm-sources.pl:516
+#: ../edit-urpm-sources.pl:525
 #, c-format
 msgid "Edit a parallel group"
 msgstr "Golygu grŵp paralel"
 
-#: ../edit-urpm-sources.pl:527
+#: ../edit-urpm-sources.pl:536
 #, c-format
 msgid "Add a medium limit"
 msgstr "Ychwanegu terfyn cyfrwng"
 
-#: ../edit-urpm-sources.pl:539
+#: ../edit-urpm-sources.pl:548
 #, 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:576
+#: ../edit-urpm-sources.pl:585
 #, c-format
 msgid "Add a host"
 msgstr "Ychwanegu gwesteiwr:"
 
-#: ../edit-urpm-sources.pl:582
+#: ../edit-urpm-sources.pl:591
 #, 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:613
+#: ../edit-urpm-sources.pl:622
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Golygu grŵp paralel\"%s\":"
 
-#: ../edit-urpm-sources.pl:617
+#: ../edit-urpm-sources.pl:626
 #, c-format
 msgid "Group name:"
 msgstr "Enw grŵp:"
 
-#: ../edit-urpm-sources.pl:618
+#: ../edit-urpm-sources.pl:627
 #, c-format
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:629
 #, c-format
 msgid "Media limit:"
 msgstr "Terfyn cyfrwng:"
 
-#: ../edit-urpm-sources.pl:625 ../edit-urpm-sources.pl:632
+#: ../edit-urpm-sources.pl:634 ../edit-urpm-sources.pl:641
 #, c-format
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:633
-#: ../edit-urpm-sources.pl:691 ../edit-urpm-sources.pl:947 ../rpmdrake:1131
+#: ../edit-urpm-sources.pl:635 ../edit-urpm-sources.pl:642
+#: ../edit-urpm-sources.pl:700 ../edit-urpm-sources.pl:955 ../rpmdrake:1154
 #, c-format
 msgid "Remove"
 msgstr "Tynnu"
 
-#: ../edit-urpm-sources.pl:627
+#: ../edit-urpm-sources.pl:636
 #, c-format
 msgid "Hosts:"
 msgstr "Gwesteion:"
 
-#: ../edit-urpm-sources.pl:661
+#: ../edit-urpm-sources.pl:670
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Ffurfweddu urpmi paralel (dosbarthiad gweithredol o urpmi)"
 
-#: ../edit-urpm-sources.pl:664
+#: ../edit-urpm-sources.pl:673
 #, c-format
 msgid "Group"
 msgstr "Grŵp"
 
-#: ../edit-urpm-sources.pl:664
+#: ../edit-urpm-sources.pl:673
 #, c-format
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../edit-urpm-sources.pl:664
+#: ../edit-urpm-sources.pl:673
 #, c-format
 msgid "Media limit"
 msgstr "Terfyn cyfrwng"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:674
 #, c-format
 msgid "Command"
 msgstr "Gorchymyn"
 
-#: ../edit-urpm-sources.pl:675 ../rpmdrake:349 ../rpmdrake:366 ../rpmdrake:488
-#: ../rpmdrake:560
+#: ../edit-urpm-sources.pl:684 ../rpmdrake:353 ../rpmdrake:370 ../rpmdrake:492
+#: ../rpmdrake:608
 #, c-format
 msgid "(none)"
 msgstr "(dim)"
 
-#: ../edit-urpm-sources.pl:695 ../edit-urpm-sources.pl:951
+#: ../edit-urpm-sources.pl:704 ../edit-urpm-sources.pl:959
 #, c-format
 msgid "Edit"
 msgstr "Golygu"
 
-#: ../edit-urpm-sources.pl:703 ../edit-urpm-sources.pl:957
+#: ../edit-urpm-sources.pl:712 ../edit-urpm-sources.pl:965
 #, c-format
 msgid "Add..."
 msgstr "Ychwanegu..."
 
-#: ../edit-urpm-sources.pl:719
+#: ../edit-urpm-sources.pl:728
 #, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Rheoli allweddi pecynnau digidol "
 
-#: ../edit-urpm-sources.pl:723 ../edit-urpm-sources.pl:866
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:874
 #, c-format
 msgid "Medium"
 msgstr "Cyfrwng"
 
-#: ../edit-urpm-sources.pl:728
+#: ../edit-urpm-sources.pl:737
 #, c-format
 msgid "Keys"
 msgstr "Allweddi"
 
-#: ../edit-urpm-sources.pl:747
+#: ../edit-urpm-sources.pl:756
 #, 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:761
+#: ../edit-urpm-sources.pl:769
 #, c-format
 msgid "Add a key"
 msgstr "Ychwanegu allwedd"
 
-#: ../edit-urpm-sources.pl:773
+#: ../edit-urpm-sources.pl:781
 #, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Dewis bysell ti ychwanegu at gyfrwng %s"
 
-#: ../edit-urpm-sources.pl:801
+#: ../edit-urpm-sources.pl:809
 #, c-format
 msgid "Remove a key"
 msgstr "Tynnu allwedd"
 
-#: ../edit-urpm-sources.pl:802
+#: ../edit-urpm-sources.pl:810
 #, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
@@ -436,77 +456,77 @@ msgstr ""
 "Ydych chi'n siŵr eich bod eisiau tynnu allwedd %s o gyfrwng %s?\n"
 "(enw'r allwedd: %s)"
 
-#: ../edit-urpm-sources.pl:820
+#: ../edit-urpm-sources.pl:828
 #, c-format
 msgid "Add a key..."
 msgstr "Ychwanegu allwedd..."
 
-#: ../edit-urpm-sources.pl:824
+#: ../edit-urpm-sources.pl:832
 #, c-format
 msgid "Remove key"
 msgstr "Tynnu allwedd"
 
-#: ../edit-urpm-sources.pl:840
+#: ../edit-urpm-sources.pl:848
 #, c-format
 msgid "Configure media"
 msgstr "Ffurfweddu'r cyfrwng"
 
-#: ../edit-urpm-sources.pl:865
+#: ../edit-urpm-sources.pl:873
 #, c-format
 msgid "Enabled?"
 msgstr "Galluogwyd?"
 
-#: ../edit-urpm-sources.pl:878
+#: ../edit-urpm-sources.pl:886
 #, c-format
 msgid "Update medium"
 msgstr "Diweddaru'r cyfrwng"
 
-#: ../edit-urpm-sources.pl:878
+#: ../edit-urpm-sources.pl:886
 #, c-format
 msgid "Regenerate hdlist"
 msgstr "Atgynhyrchu rhestr"
 
-#: ../edit-urpm-sources.pl:890 ../rpmdrake.pm:583
+#: ../edit-urpm-sources.pl:898 ../rpmdrake.pm:585
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Arhoswch, diweddaru cyfrwng..."
 
-#: ../edit-urpm-sources.pl:894
+#: ../edit-urpm-sources.pl:902
 #, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Arhoswch, cynhyrchu hdlist..."
 
-#: ../edit-urpm-sources.pl:961
+#: ../edit-urpm-sources.pl:969
 #, c-format
 msgid "Add custom..."
 msgstr "Ychwanegu addasiad..."
 
-#: ../edit-urpm-sources.pl:965
+#: ../edit-urpm-sources.pl:973
 #, c-format
 msgid "Update..."
 msgstr "Diweddau..."
 
-#: ../edit-urpm-sources.pl:968
+#: ../edit-urpm-sources.pl:976
 #, c-format
 msgid "Manage keys..."
 msgstr "Rheoli allweddi"
 
-#: ../edit-urpm-sources.pl:970
+#: ../edit-urpm-sources.pl:978
 #, c-format
 msgid "Parallel..."
 msgstr "Paralel..."
 
-#: ../edit-urpm-sources.pl:971
+#: ../edit-urpm-sources.pl:979
 #, c-format
 msgid "Global options..."
 msgstr "Dewisiadau eang..."
 
-#: ../edit-urpm-sources.pl:981
+#: ../edit-urpm-sources.pl:989
 #, c-format
 msgid "Help"
 msgstr "Cymorth"
 
-#: ../edit-urpm-sources.pl:993 ../gurpmi.addmedia:75 ../rpmdrake:1648
+#: ../edit-urpm-sources.pl:1001 ../gurpmi.addmedia:75 ../rpmdrake:1672
 #, c-format
 msgid ""
 "%s\n"
@@ -517,7 +537,7 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../edit-urpm-sources.pl:996
+#: ../edit-urpm-sources.pl:1004
 #, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
@@ -532,7 +552,7 @@ msgstr ""
 "rydych am eu defnyddio ar eich cyfrifiadur. Byddant ar gael i'w gosod fel\n"
 "pecynnau newydd neu er mwyn diweddaru."
 
-#: ../edit-urpm-sources.pl:1008
+#: ../edit-urpm-sources.pl:1016
 #, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
@@ -609,7 +629,7 @@ msgstr "Cywasgiad"
 
 #: ../rpmdrake:169 ../rpmdrake:174 ../rpmdrake:186 ../rpmdrake:197
 #: ../rpmdrake:206 ../rpmdrake:218 ../rpmdrake:230 ../rpmdrake:238
-#: ../rpmdrake:318
+#: ../rpmdrake:322
 #, c-format
 msgid "Other"
 msgstr "Arall"
@@ -1062,87 +1082,147 @@ msgstr "Teganau"
 msgid "Video"
 msgstr "Fideo"
 
-#: ../rpmdrake:372 ../rpmdrake:774 ../rpmdrake:775
+#: ../rpmdrake:376 ../rpmdrake:509 ../rpmdrake:511
 #, c-format
 msgid "(Not available)"
 msgstr "(Dim ar gael)"
 
-#: ../rpmdrake:401 ../rpmdrake:469
+#: ../rpmdrake:405 ../rpmdrake:473
 #, c-format
 msgid "Search results"
 msgstr "Canlyniadau'r chwilio"
 
-#: ../rpmdrake:401
+#: ../rpmdrake:405
 #, c-format
 msgid "Search results (none)"
 msgstr "Canlyniadau'r chwilio (dim)"
 
-#: ../rpmdrake:412 ../rpmdrake:433
+#: ../rpmdrake:416 ../rpmdrake:437
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Arhoswch, chwilio..."
 
-#: ../rpmdrake:431 ../rpmdrake:1171 ../rpmdrake:1433 ../rpmdrake:1647
+#: ../rpmdrake:435 ../rpmdrake:1194 ../rpmdrake:1458 ../rpmdrake:1671
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:436
+#: ../rpmdrake:440
 #, c-format
 msgid "Stop"
 msgstr "Atal"
 
-#: ../rpmdrake:470 ../rpmdrake:589
+#: ../rpmdrake:474 ../rpmdrake:639
 #, c-format
 msgid "Upgradable"
 msgstr "Diweddariadwy"
 
-#: ../rpmdrake:470 ../rpmdrake:589
+#: ../rpmdrake:474 ../rpmdrake:639
 #, c-format
 msgid "Addable"
 msgstr "Ychwanegadwy"
 
-#: ../rpmdrake:472
+#: ../rpmdrake:476
 #, c-format
 msgid "Selected"
 msgstr "Dewiswyd"
 
-#: ../rpmdrake:472
+#: ../rpmdrake:476
 #, c-format
 msgid "Not selected"
 msgstr "Heb ei ddewis"
 
 #: ../rpmdrake:506
 #, c-format
+msgid "Files:\n"
+msgstr "Ffeiliau:\n"
+
+#: ../rpmdrake:511
+#, c-format
+msgid "Changelog:\n"
+msgstr "Cofnod Newid:\n"
+
+#: ../rpmdrake:516
+#, c-format
+msgid "Medium: "
+msgstr "Cyfrwng:"
+
+#: ../rpmdrake:518
+#, c-format
+msgid "Currently installed version: "
+msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
+
+#: ../rpmdrake:526
+#, c-format
+msgid "Name: "
+msgstr "Enw: "
+
+#: ../rpmdrake:527
+#, c-format
+msgid "Version: "
+msgstr "Fersiwn: "
+
+#: ../rpmdrake:528
+#, c-format
+msgid "Size: "
+msgstr "Maint: "
+
+#: ../rpmdrake:528
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:531
+#, c-format
+msgid "Importance: "
+msgstr "Pwysigrwydd: "
+
+#: ../rpmdrake:534
+#, c-format
+msgid "Summary: "
+msgstr "Crynodeb: "
+
+#: ../rpmdrake:537
+#, c-format
+msgid "Reason for update: "
+msgstr "Rheswm am y diweddariad:"
+
+#: ../rpmdrake:539
+#, c-format
+msgid "Description: "
+msgstr "Disgrifiadau: "
+
+#: ../rpmdrake:554
+#, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:524 ../rpmdrake:639 ../rpmdrake:642 ../rpmdrake:1527
+#: ../rpmdrake:571 ../rpmdrake:689 ../rpmdrake:691 ../rpmdrake:1551
 #, c-format
 msgid "More information on package..."
 msgstr "Rhagor o wybodaeth ar becyn..."
 
-#: ../rpmdrake:525
+#: ../rpmdrake:572
 #, c-format
 msgid "Please choose"
 msgstr "Dewiswch"
 
-#: ../rpmdrake:525
+#: ../rpmdrake:572
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../rpmdrake:545
+#: ../rpmdrake:593
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Arhoswch, rhestri pecynnau..."
 
-#: ../rpmdrake:562
+#: ../rpmdrake:610
 #, c-format
 msgid "No update"
 msgstr "Dim diweddariad"
 
-#: ../rpmdrake:563
+#: ../rpmdrake:611
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1153,28 +1233,28 @@ msgstr ""
 "nad oes diweddariad ar gyfer y pecynnau ar eich cyfrifiadur,\n"
 "neu rydych wedi eu gosod i gyd yn barod."
 
-#: ../rpmdrake:583
+#: ../rpmdrake:632
 #, c-format
 msgid "All"
 msgstr "Popeth"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:626 ../rpmdrake:631
+#: ../rpmdrake:676 ../rpmdrake:681
 #, c-format
 msgid "More info"
 msgstr "Rhagor"
 
-#: ../rpmdrake:634 ../rpmdrake:1516
+#: ../rpmdrake:684 ../rpmdrake:1540
 #, c-format
 msgid "Information on packages"
 msgstr "Gwybodaeth am becynnau"
 
-#: ../rpmdrake:659
+#: ../rpmdrake:706
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 
-#: ../rpmdrake:660
+#: ../rpmdrake:707
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1185,12 +1265,12 @@ msgstr ""
 "hefyd: \n"
 "\n"
 
-#: ../rpmdrake:666 ../rpmdrake:675
+#: ../rpmdrake:713 ../rpmdrake:722
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Nid oes modd tynnu rhai pecynnau"
 
-#: ../rpmdrake:667
+#: ../rpmdrake:714
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1199,7 +1279,7 @@ msgstr ""
 "Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
 "\n"
 
-#: ../rpmdrake:676 ../rpmdrake:737
+#: ../rpmdrake:723 ../rpmdrake:785
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1209,12 +1289,12 @@ msgstr ""
 "Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
 "eu dad-ddewis nawr:\n"
 
-#: ../rpmdrake:705
+#: ../rpmdrake:752
 #, c-format
 msgid "Additional packages needed"
 msgstr "Pecynnau ychwanegol angenrheidiol"
 
-#: ../rpmdrake:706
+#: ../rpmdrake:753
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1225,17 +1305,17 @@ msgstr ""
 "hefyd:\n"
 "\n"
 
-#: ../rpmdrake:720
+#: ../rpmdrake:768
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (perthyn i'r rhestr hepgor)"
 
-#: ../rpmdrake:722
+#: ../rpmdrake:770
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Nid oes modd gosod rhai pecynnau"
 
-#: ../rpmdrake:723
+#: ../rpmdrake:771
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1246,177 +1326,122 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:736 ../rpmdrake:1025
+#: ../rpmdrake:784 ../rpmdrake:1048
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Rhaid tynnu rhai pecynnau"
 
-#: ../rpmdrake:758
+#: ../rpmdrake:807
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
 
-#: ../rpmdrake:760
+#: ../rpmdrake:809
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Maint dewiswyd: %d MB"
 
-#: ../rpmdrake:766
+#: ../rpmdrake:814
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Dim disgrifiad ar gael i'r pecyn hwn\n"
 
-#: ../rpmdrake:772
-#, c-format
-msgid "Files:\n"
-msgstr "Ffeiliau:\n"
-
-#: ../rpmdrake:775
-#, c-format
-msgid "Changelog:\n"
-msgstr "Cofnod Newid:\n"
-
-#: ../rpmdrake:777
-#, c-format
-msgid "Medium: "
-msgstr "Cyfrwng:"
-
-#: ../rpmdrake:779
-#, c-format
-msgid "Currently installed version: "
-msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
-
-#: ../rpmdrake:784
-#, c-format
-msgid "Name: "
-msgstr "Enw: "
-
-#: ../rpmdrake:785
-#, c-format
-msgid "Version: "
-msgstr "Fersiwn: "
-
-#: ../rpmdrake:786
-#, c-format
-msgid "Size: "
-msgstr "Maint: "
-
-#: ../rpmdrake:786
-#, c-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:788
-#, c-format
-msgid "Importance: "
-msgstr "Pwysigrwydd: "
-
-#: ../rpmdrake:790
-#, c-format
-msgid "Summary: "
-msgstr "Crynodeb: "
-
-#: ../rpmdrake:792
-#, c-format
-msgid "Reason for update: "
-msgstr "Rheswm am y diweddariad:"
-
-#: ../rpmdrake:794
+#: ../rpmdrake:881
 #, c-format
-msgid "Description: "
-msgstr "Disgrifiadau: "
+msgid "Security updates"
+msgstr "Diweddariadau diogelwch"
 
-#: ../rpmdrake:859
+#: ../rpmdrake:881
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Diweddariad cywiro gwallau"
 
-#: ../rpmdrake:859
+#: ../rpmdrake:881
 #, c-format
 msgid "Normal updates"
 msgstr "Diweddariadau arferol"
 
-#: ../rpmdrake:878
+#: ../rpmdrake:901
 #, c-format
 msgid "%s choices"
 msgstr "%s dewis"
 
-#: ../rpmdrake:878
+#: ../rpmdrake:901
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Dewisiadau Mandrakelinux"
 
-#: ../rpmdrake:881
+#: ../rpmdrake:904
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Pob pecyn, trefn yr wyddor"
 
-#: ../rpmdrake:889
+#: ../rpmdrake:912
 #, c-format
 msgid "All packages, by group"
 msgstr "Pob pecyn, yn ôl grŵp"
 
-#: ../rpmdrake:890
+#: ../rpmdrake:913
 #, c-format
 msgid "All packages, by size"
 msgstr "Pob pecyn, yn ôl maint"
 
-#: ../rpmdrake:891
+#: ../rpmdrake:914
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Pob pecyn, yn ôl dyddiad dewis"
 
-#: ../rpmdrake:895
+#: ../rpmdrake:918
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Pob pecyn, yn ôl yn ôl ffynhonnell eu storfa"
 
-#: ../rpmdrake:896
+#: ../rpmdrake:919
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Pob pecyn, yn ôl diweddariad"
 
-#: ../rpmdrake:900
+#: ../rpmdrake:923
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Gadael, yn ôl dyddiad gosod"
 
-#: ../rpmdrake:974
+#: ../rpmdrake:997
 #, c-format
 msgid "in names"
 msgstr "enwau"
 
-#: ../rpmdrake:976
+#: ../rpmdrake:999
 #, c-format
 msgid "in descriptions"
 msgstr "disgrifiadau"
 
-#: ../rpmdrake:978
+#: ../rpmdrake:1001
 #, c-format
 msgid "in file names"
 msgstr "mewn enwau ffeil"
 
-#: ../rpmdrake:987
+#: ../rpmdrake:1010
 #, c-format
 msgid "Normal information"
 msgstr "Gwybodaeth arferol"
 
-#: ../rpmdrake:987
+#: ../rpmdrake:1010
 #, c-format
 msgid "Maximum information"
 msgstr "Gwybodaeth lawn"
 
-#: ../rpmdrake:1007
+#: ../rpmdrake:1030
 #, c-format
 msgid "You need to select some packages first."
 msgstr "Rhaid dewis rhai pecynnau'n gyntaf."
 
-#: ../rpmdrake:1012
+#: ../rpmdrake:1035
 #, c-format
 msgid "Too many packages are selected"
 msgstr "Mae gormod o becynnau wedi eu dewis"
 
-#: ../rpmdrake:1013
+#: ../rpmdrake:1036
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -1427,7 +1452,7 @@ msgid ""
 "Do you really want to install all the selected packages?"
 msgstr "Rhybudd:"
 
-#: ../rpmdrake:1026
+#: ../rpmdrake:1049
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1442,93 +1467,93 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake:1059
+#: ../rpmdrake:1082
 #, c-format
 msgid "Software Packages Removal"
 msgstr "Tynnu Pecynnau Meddalwedd"
 
-#: ../rpmdrake:1060
+#: ../rpmdrake:1083
 #, c-format
 msgid "Software Packages Update"
 msgstr "Diweddaru Pecynnau Meddalwedd"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1084
 #, c-format
 msgid "Software Packages Installation"
 msgstr "Gosod Pecynnau Meddalwedd"
 
-#: ../rpmdrake:1067 ../rpmdrake:1070 ../rpmdrake:1079 ../rpmdrake:1090
-#: ../rpmdrake:1095
+#: ../rpmdrake:1090 ../rpmdrake:1093 ../rpmdrake:1102 ../rpmdrake:1113
+#: ../rpmdrake:1118
 #, c-format
 msgid "/_File"
 msgstr "/_Ffeil"
 
-#: ../rpmdrake:1070
+#: ../rpmdrake:1093
 #, c-format
 msgid "/_Update media"
 msgstr "/_Diweddaru'r cyfrwng"
 
-#: ../rpmdrake:1079
+#: ../rpmdrake:1102
 #, c-format
 msgid "/_Reset the selection"
 msgstr "/_Ailosod y dewis"
 
-#: ../rpmdrake:1090
+#: ../rpmdrake:1113
 #, c-format
 msgid "/Reload the _packages list"
 msgstr "/_Ail-lwytho'r rhestr pecynnau"
 
-#: ../rpmdrake:1095
+#: ../rpmdrake:1118
 #, c-format
 msgid "/_Quit"
 msgstr "/_Gadael"
 
-#: ../rpmdrake:1096
+#: ../rpmdrake:1119
 #, c-format
 msgid "/_View"
 msgstr "/_Golwg"
 
-#: ../rpmdrake:1098 ../rpmdrake:1099 ../rpmdrake:1106
+#: ../rpmdrake:1121 ../rpmdrake:1122 ../rpmdrake:1129
 #, c-format
 msgid "/_Options"
 msgstr "/_Dewisiadau"
 
-#: ../rpmdrake:1099 ../rpmdrake:1106
+#: ../rpmdrake:1122 ../rpmdrake:1129
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Dangoswch y pecynnau dewis awtomatig"
 
-#: ../rpmdrake:1103 ../rpmdrake:1104
+#: ../rpmdrake:1126 ../rpmdrake:1127
 #, c-format
 msgid "/_Help"
 msgstr "/_Cymorth"
 
-#: ../rpmdrake:1120
+#: ../rpmdrake:1143
 #, c-format
 msgid "Find:"
 msgstr "Canfod:"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1148
 #, c-format
 msgid "Search"
 msgstr "Chwilio"
 
-#: ../rpmdrake:1131
+#: ../rpmdrake:1154
 #, c-format
 msgid "Install"
 msgstr "Gosod"
 
-#: ../rpmdrake:1163
+#: ../rpmdrake:1186
 #, c-format
 msgid "Fatal error"
 msgstr "Gwall terfynol"
 
-#: ../rpmdrake:1164
+#: ../rpmdrake:1187
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Digwyddodd gwall terfynol:%s."
 
-#: ../rpmdrake:1172
+#: ../rpmdrake:1195
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1541,12 +1566,12 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake:1181
+#: ../rpmdrake:1204
 #, c-format
 msgid "Already existing update media"
 msgstr "Cyfrwng diweddaru sy'n bod eisoes"
 
-#: ../rpmdrake:1182
+#: ../rpmdrake:1205
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1563,12 +1588,12 @@ msgstr ""
 "\n"
 "Yna ailgychwyn %s."
 
-#: ../rpmdrake:1192
+#: ../rpmdrake:1215
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "Sut i ddewis drych gyda llaw."
 
-#: ../rpmdrake:1193
+#: ../rpmdrake:1216
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1583,62 +1608,62 @@ msgstr ""
 "\n"
 "Yna ailgychwynnwch %s."
 
-#: ../rpmdrake:1224
+#: ../rpmdrake:1249
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../rpmdrake:1272
+#: ../rpmdrake:1297
 #, c-format
 msgid "Inspecting %s"
 msgstr "Archwilio %s"
 
-#: ../rpmdrake:1291
+#: ../rpmdrake:1316
 #, c-format
 msgid "changes:"
 msgstr "newidiadau:"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1320
 #, c-format
 msgid "Remove .%s"
 msgstr "Tynnu .%s"
 
-#: ../rpmdrake:1297
+#: ../rpmdrake:1322
 #, c-format
 msgid "Use .%s as main file"
 msgstr "Defnyddio .%s fel y brif ffeil"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1324
 #, c-format
 msgid "Do nothing"
 msgstr "Gwneud dim"
 
-#: ../rpmdrake:1312
+#: ../rpmdrake:1337
 #, c-format
 msgid "Installation finished"
 msgstr "Gorffennodd y gosodiad"
 
-#: ../rpmdrake:1327
+#: ../rpmdrake:1352
 #, c-format
 msgid "Inspect..."
 msgstr "Archwilio..."
 
-#: ../rpmdrake:1356 ../rpmdrake:1512
+#: ../rpmdrake:1381 ../rpmdrake:1536
 #, c-format
 msgid "Everything installed successfully"
 msgstr "Gosodwyd popeth yn llwyddiannus"
 
-#: ../rpmdrake:1357 ../rpmdrake:1513
+#: ../rpmdrake:1382 ../rpmdrake:1537
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
-#: ../rpmdrake:1359 ../rpmdrake:1497
+#: ../rpmdrake:1384 ../rpmdrake:1521
 #, c-format
 msgid "Problem during installation"
 msgstr "Anhawster wrth osod"
 
-#: ../rpmdrake:1360 ../rpmdrake:1498 ../rpmdrake:1553
+#: ../rpmdrake:1385 ../rpmdrake:1522 ../rpmdrake:1577
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1649,17 +1674,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1373
+#: ../rpmdrake:1398
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../rpmdrake:1374
+#: ../rpmdrake:1399
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Methu estyn pecynnau ffynhonnell, %s"
 
-#: ../rpmdrake:1375 ../rpmdrake:1444
+#: ../rpmdrake:1400 ../rpmdrake:1469
 #, c-format
 msgid ""
 "\n"
@@ -1672,37 +1697,37 @@ msgstr ""
 "Gwall(au) wedi eu hadrodd:\n"
 "%s"
 
-#: ../rpmdrake:1382
+#: ../rpmdrake:1407
 #, c-format
 msgid "Package installation..."
 msgstr "Gosod pecynnau..."
 
-#: ../rpmdrake:1382
+#: ../rpmdrake:1407
 #, c-format
 msgid "Initializing..."
 msgstr "Ymgychwyn..."
 
-#: ../rpmdrake:1391
+#: ../rpmdrake:1416
 #, c-format
 msgid "Change medium"
 msgstr "Newid cyfrwng"
 
-#: ../rpmdrake:1392
+#: ../rpmdrake:1417
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" i mewn i ddyfais [%s]"
 
-#: ../rpmdrake:1399
+#: ../rpmdrake:1424
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
 
-#: ../rpmdrake:1422
+#: ../rpmdrake:1447
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr "Gwirio llofnodion pecynnau ..."
 
-#: ../rpmdrake:1434
+#: ../rpmdrake:1459
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1717,12 +1742,12 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau gyda'r gosod?"
 
-#: ../rpmdrake:1441 ../rpmdrake:1552
+#: ../rpmdrake:1466 ../rpmdrake:1576
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosodiad"
 
-#: ../rpmdrake:1442
+#: ../rpmdrake:1467
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1735,22 +1760,22 @@ msgstr ""
 "\n"
 "Efallai'r hoffech ddiweddaru eich cronfa ddata o gyfryngau."
 
-#: ../rpmdrake:1456
+#: ../rpmdrake:1480
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Paratoi pecynnau i'w gosod..."
 
-#: ../rpmdrake:1459
+#: ../rpmdrake:1483
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../rpmdrake:1475
+#: ../rpmdrake:1499
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad  ffeil rpm (%s)"
 
-#: ../rpmdrake:1510
+#: ../rpmdrake:1534
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -1763,47 +1788,47 @@ msgstr ""
 "Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
 "mae modd eu harchwilio i weithredu arnynt:"
 
-#: ../rpmdrake:1510
+#: ../rpmdrake:1534
 #, c-format
 msgid "everything was installed correctly"
 msgstr "gosodwyd popeth yn llwyddiannus"
 
-#: ../rpmdrake:1518
+#: ../rpmdrake:1542
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "Mae gan y pecynnau wybodaeth uwchraddio"
 
-#: ../rpmdrake:1530
+#: ../rpmdrake:1554
 #, c-format
 msgid "More information on package... [%s]"
 msgstr "Rhagor o wybodaeth ar becyn... [%s]"
 
-#: ../rpmdrake:1543
+#: ../rpmdrake:1567
 #, c-format
 msgid "No package found for installation."
 msgstr "Heb ganfod pecyn i'w osod"
 
-#: ../rpmdrake:1544
+#: ../rpmdrake:1568
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Gwall anadferadwy: dim pecyn wedi ei ganfod ar gyfer y gosod."
 
-#: ../rpmdrake:1566
+#: ../rpmdrake:1590
 #, c-format
 msgid "Please wait, reading packages database..."
 msgstr "Arhoswch, darllen cronfa ddata'r pecynnau..."
 
-#: ../rpmdrake:1613
+#: ../rpmdrake:1637
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Arhoswch, tynnu'r pecynnau..."
 
-#: ../rpmdrake:1618
+#: ../rpmdrake:1642
 #, c-format
 msgid "Problem during removal"
 msgstr "Problem wrth dynnu"
 
-#: ../rpmdrake:1619
+#: ../rpmdrake:1643
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -1814,7 +1839,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1652
+#: ../rpmdrake:1676
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1827,7 +1852,7 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo o ddewis pa feddalwedd rydych\n"
 "am ei dynnu oddi ar eich cyfrifiadur."
 
-#: ../rpmdrake:1657
+#: ../rpmdrake:1681
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1839,12 +1864,12 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
 "ar eich cyfrifiadur."
 
-#: ../rpmdrake:1662
+#: ../rpmdrake:1686
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Croeso i'r offeryn gosod meddalwedd!"
 
-#: ../rpmdrake:1663
+#: ../rpmdrake:1687
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -2030,12 +2055,12 @@ msgid "China"
 msgstr "Tsiena"
 
 #: ../rpmdrake.pm:340 ../rpmdrake.pm:341 ../rpmdrake.pm:342 ../rpmdrake.pm:343
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:419
 #, c-format
 msgid "United States"
 msgstr "Yr Unol Daleithiau"
 
-#: ../rpmdrake.pm:428
+#: ../rpmdrake.pm:431
 #, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2048,7 +2073,7 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake.pm:432
+#: ../rpmdrake.pm:435
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -2061,23 +2086,23 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake.pm:438
+#: ../rpmdrake.pm:441
 #, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau."
 
-#: ../rpmdrake.pm:439
+#: ../rpmdrake.pm:442
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau o safle gwe Mandrakesoft."
 
-#: ../rpmdrake.pm:446
+#: ../rpmdrake.pm:448
 #, c-format
 msgid "Error during download"
 msgstr "Gwall wrth lwytho i lawr"
 
-#: ../rpmdrake.pm:448
+#: ../rpmdrake.pm:450
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2092,7 +2117,7 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu'r safle, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:453
+#: ../rpmdrake.pm:455
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2107,17 +2132,17 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu safle Mandrakesoft, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:462
+#: ../rpmdrake.pm:464
 #, c-format
 msgid "No mirror"
 msgstr "Dim drych"
 
-#: ../rpmdrake.pm:464
+#: ../rpmdrake.pm:466
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Methu canfod drych addas."
 
-#: ../rpmdrake.pm:465
+#: ../rpmdrake.pm:467
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2132,63 +2157,63 @@ msgstr ""
 "yw pensaernïaeth eich prosesydd yn cael ei gynnal gan Diweddariadau\n"
 "Swyddogol Mandrakelinux."
 
-#: ../rpmdrake.pm:484
+#: ../rpmdrake.pm:486
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Dewiswch ddrych"
 
-#: ../rpmdrake.pm:543
+#: ../rpmdrake.pm:545
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copïo ffeil fel ar gyfer cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:546
+#: ../rpmdrake.pm:548
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Archwilio ffeil cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:549
+#: ../rpmdrake.pm:551
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Archwilio ffeil bell y cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:553
+#: ../rpmdrake.pm:555
 #, c-format
 msgid " done."
 msgstr " gorffen.."
 
-#: ../rpmdrake.pm:557
+#: ../rpmdrake.pm:559
 #, c-format
 msgid " failed!"
 msgstr " methwyd!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:563
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s o gyfrwng %s"
 
-#: ../rpmdrake.pm:565
+#: ../rpmdrake.pm:567
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Cychwyn llwytho %s i lawr..."
 
-#: ../rpmdrake.pm:569
+#: ../rpmdrake.pm:571
 #, 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:572
+#: ../rpmdrake.pm:574
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
 
-#: ../rpmdrake.pm:609
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Gwall estyn pecynnau"
 
-#: ../rpmdrake.pm:610
+#: ../rpmdrake.pm:612
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2205,27 +2230,27 @@ msgstr ""
 "neu nid oes modd ei gyrraedd ar hyn o bryd a dylech geisio eto \n"
 "rhywbryd."
 
-#: ../rpmdrake.pm:641
+#: ../rpmdrake.pm:643
 #, c-format
 msgid "Update media"
 msgstr "Diweddaru'r cyfrwng"
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:651
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Dewiswch y cyfrwng i'w diweddaru:"
 
-#: ../rpmdrake.pm:663
+#: ../rpmdrake.pm:665
 #, c-format
 msgid "Select all"
 msgstr "Dewis popeth"
 
-#: ../rpmdrake.pm:667
+#: ../rpmdrake.pm:669
 #, c-format
 msgid "Update"
 msgstr "Diweddaru"
 
-#: ../rpmdrake.pm:689
+#: ../rpmdrake.pm:691
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2238,7 +2263,7 @@ msgstr ""
 "Gwallau:\n"
 "%s"
 
-#: ../rpmdrake.pm:713 ../rpmdrake.pm:722
+#: ../rpmdrake.pm:715 ../rpmdrake.pm:724
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2249,17 +2274,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:734
+#: ../rpmdrake.pm:736
 #, c-format
 msgid "Unable to create medium."
 msgstr "Methu creu cyfrwng."
 
-#: ../rpmdrake.pm:739
+#: ../rpmdrake.pm:741
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Methu ychwanegu cyfrwng"
 
-#: ../rpmdrake.pm:740
+#: ../rpmdrake.pm:742
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2270,7 +2295,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:753
+#: ../rpmdrake.pm:755
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2281,7 +2306,7 @@ msgstr ""
 "s rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
-#: ../rpmdrake.pm:756
+#: ../rpmdrake.pm:758
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2292,12 +2317,12 @@ msgstr ""
 "Mandrakelinux rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
-#: ../rpmdrake.pm:772
+#: ../rpmdrake.pm:774
 #, c-format
 msgid "Help launched in background"
 msgstr "Cymorth wedi ei gychwyn yn y cefndir"
 
-#: ../rpmdrake.pm:773
+#: ../rpmdrake.pm:775
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
@@ -2574,3 +2599,6 @@ msgstr "Tynnu Meddalwedd"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Rheolwr Cyfrwng Meddalwedd"
+
+#~ msgid "Choose a mirror..."
+#~ msgstr "Dewis drych..."