fixed gettext use (partial)

1 files changed, 1077 insertions, 1048 deletions

diff --git a/po/cy.po b/po/cy.po
index 734a6646..3da2a99f 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: 2006-12-21 17:11+0100\n"
+"POT-Creation-Date: 2007-02-23 15:31+0100\n"
 "PO-Revision-Date: 2007-01-09 18:13+0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -19,12 +19,12 @@ msgstr ""
 "X-Poedit-Country: UK\n"
 "Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
 
-#: ../edit-urpm-sources.pl:85
+#: ../Rpmdrake/edit_urpm_sources.pm:67
 #, c-format
 msgid "Choose media type"
 msgstr "Dewis y math o gyfrwng"
 
-#: ../edit-urpm-sources.pl:86
+#: ../Rpmdrake/edit_urpm_sources.pm:68
 #, 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)"
 
-#: ../edit-urpm-sources.pl:94
+#: ../Rpmdrake/edit_urpm_sources.pm:76
 #, c-format
 msgid "Distribution sources"
 msgstr "Ffynonellau dosbarthu"
 
-#: ../edit-urpm-sources.pl:94
+#: ../Rpmdrake/edit_urpm_sources.pm:76
 #, c-format
 msgid "Official updates"
 msgstr "Diweddariadau swyddogol"
 
-#: ../edit-urpm-sources.pl:97
+#: ../Rpmdrake/edit_urpm_sources.pm:79
 #, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
@@ -79,103 +79,104 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../edit-urpm-sources.pl:111
+#: ../Rpmdrake/edit_urpm_sources.pm:93
 #, c-format
 msgid "Please wait, adding media..."
 msgstr "Arhoswch, ychwanegu cyfrwng..."
 
-#: ../edit-urpm-sources.pl:144
+#: ../Rpmdrake/edit_urpm_sources.pm:126
 #, c-format
 msgid "Add a medium"
 msgstr "Ychwanegu cyfrwng"
 
-#: ../edit-urpm-sources.pl:146
+#: ../Rpmdrake/edit_urpm_sources.pm:130
 #, c-format
 msgid "Local files"
 msgstr "Ffeiliau lleol"
 
-#: ../edit-urpm-sources.pl:146
+#: ../Rpmdrake/edit_urpm_sources.pm:130
 #, c-format
 msgid "Path:"
 msgstr "Llwybr:"
 
-#: ../edit-urpm-sources.pl:147
+#: ../Rpmdrake/edit_urpm_sources.pm:131
 #, c-format
 msgid "FTP server"
 msgstr "Gweinydd FTP"
 
-#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
-#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#: ../Rpmdrake/edit_urpm_sources.pm:131 ../Rpmdrake/edit_urpm_sources.pm:132
+#: ../Rpmdrake/edit_urpm_sources.pm:133 ../Rpmdrake/edit_urpm_sources.pm:402
 #, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:148
+#: ../Rpmdrake/edit_urpm_sources.pm:132
 #, c-format
 msgid "RSYNC server"
 msgstr "Gweinydd RSYNC"
 
-#: ../edit-urpm-sources.pl:149
+#: ../Rpmdrake/edit_urpm_sources.pm:133
 #, c-format
 msgid "HTTP server"
 msgstr "Gweinydd HTTP"
 
-#: ../edit-urpm-sources.pl:150
+#: ../Rpmdrake/edit_urpm_sources.pm:134
 #, c-format
 msgid "Removable device"
 msgstr "Dyfais symudol"
 
-#: ../edit-urpm-sources.pl:150
+#: ../Rpmdrake/edit_urpm_sources.pm:134
 #, c-format
 msgid "Path or mount point:"
 msgstr "Llwybr neu bwynt gosod:"
 
-#: ../edit-urpm-sources.pl:169
+#: ../Rpmdrake/edit_urpm_sources.pm:152
 #, c-format
 msgid "Browse..."
 msgstr "Pori..."
 
-#: ../edit-urpm-sources.pl:196
+#: ../Rpmdrake/edit_urpm_sources.pm:179
 #, c-format
 msgid "Login:"
 msgstr "Mewngofnod:"
 
-#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#: ../Rpmdrake/edit_urpm_sources.pm:179 ../Rpmdrake/edit_urpm_sources.pm:488
+#: ../rpmdrake.pm:131
 #, c-format
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#: ../Rpmdrake/edit_urpm_sources.pm:184 ../Rpmdrake/edit_urpm_sources.pm:403
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Llwybr perthynol i synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:203
+#: ../Rpmdrake/edit_urpm_sources.pm:186
 #, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Os yn wag bydd synthesis/hdlistyn cael ei holi'n awtomatic"
 
-#: ../edit-urpm-sources.pl:208
+#: ../Rpmdrake/edit_urpm_sources.pm:191
 #, c-format
 msgid "Name:"
 msgstr "Enw:"
 
-#: ../edit-urpm-sources.pl:216
+#: ../Rpmdrake/edit_urpm_sources.pm:199
 #, c-format
 msgid "Create media for a whole distribution"
 msgstr "Creu cyfrwng ar gyfer dosbarthiad cyfan"
 
-#: ../edit-urpm-sources.pl:227
+#: ../Rpmdrake/edit_urpm_sources.pm:210
 #, c-format
 msgid "Search this media for updates"
 msgstr "Chwilio'rcyfrwng am ddiweddariadau"
 
-#: ../edit-urpm-sources.pl:237
+#: ../Rpmdrake/edit_urpm_sources.pm:220
 #, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Mae angen llanw y ddau gofnod cyntaf, o leiaf."
 
-#: ../edit-urpm-sources.pl:241
+#: ../Rpmdrake/edit_urpm_sources.pm:224
 #, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
@@ -184,131 +185,132 @@ msgstr ""
 "Mae yna gyfrwng o'r enw yna eisoes, hoffech chi\n"
 "ei amnewid?"
 
-#: ../edit-urpm-sources.pl:252
+#: ../Rpmdrake/edit_urpm_sources.pm:236
 #, c-format
 msgid "Adding a medium:"
 msgstr "Ychwanegu cyfrwng:"
 
-#: ../edit-urpm-sources.pl:254
+#: ../Rpmdrake/edit_urpm_sources.pm:238
 #, c-format
 msgid "Type of medium:"
 msgstr "Math o gyfrwng:"
 
-#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
-#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
-#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
-#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
-#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
-#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#: ../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
 #, c-format
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
-#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
-#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
-#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
-#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
-#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
-#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
-#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#: ../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
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../edit-urpm-sources.pl:321
+#: ../Rpmdrake/edit_urpm_sources.pm:307
 #, c-format
 msgid "Global options for package installation"
 msgstr "Dewisiadau eang ar gyfer gosod pecynnau"
 
-#: ../edit-urpm-sources.pl:323
+#: ../Rpmdrake/edit_urpm_sources.pm:310
 #, c-format
 msgid "always"
 msgstr "bob tro"
 
-#: ../edit-urpm-sources.pl:324
+#: ../Rpmdrake/edit_urpm_sources.pm:311
 #, c-format
 msgid "never"
 msgstr "byth"
 
-#: ../edit-urpm-sources.pl:333
+#: ../Rpmdrake/edit_urpm_sources.pm:320
 #, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Gwirio RPMau i'w gosod:"
 
-#: ../edit-urpm-sources.pl:334
+#: ../Rpmdrake/edit_urpm_sources.pm:321
 #, c-format
 msgid "Download program to use:"
 msgstr "Llwytho rhaglen i lawr i'w defnyddio:"
 
-#: ../edit-urpm-sources.pl:364
+#: ../Rpmdrake/edit_urpm_sources.pm:351
 #, c-format
 msgid "Source Removal"
 msgstr "Tynnu Ffynhonnell"
 
-#: ../edit-urpm-sources.pl:365
+#: ../Rpmdrake/edit_urpm_sources.pm:352
 #, 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:370
+#: ../Rpmdrake/edit_urpm_sources.pm:357
 #, c-format
 msgid "Please wait, removing medium..."
 msgstr "Arhoswch, tynnu cyfrwng..."
 
-#: ../edit-urpm-sources.pl:405
+#: ../Rpmdrake/edit_urpm_sources.pm:392
 #, c-format
 msgid "Edit a medium"
 msgstr "Golygu'r cyfrwng"
 
-#: ../edit-urpm-sources.pl:411
+#: ../Rpmdrake/edit_urpm_sources.pm:399
 #, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Golygu ffynhonnell \"%s\":"
 
-#: ../edit-urpm-sources.pl:416
+#: ../Rpmdrake/edit_urpm_sources.pm:404
 #, c-format
 msgid "Downloader:"
 msgstr "Llwythwr i Lawr:"
 
-#: ../edit-urpm-sources.pl:428
+#: ../Rpmdrake/edit_urpm_sources.pm:416
 #, c-format
 msgid "Save changes"
 msgstr "Cadw newidiadau"
 
-#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#: ../Rpmdrake/edit_urpm_sources.pm:425 ../Rpmdrake/edit_urpm_sources.pm:1019
 #, c-format
 msgid "Proxy..."
 msgstr "Dirprwy..."
 
-#: ../edit-urpm-sources.pl:449
+#: ../Rpmdrake/edit_urpm_sources.pm:437
 #, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
 
-#: ../edit-urpm-sources.pl:450
+#: ../Rpmdrake/edit_urpm_sources.pm:438
 #, 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:471
+#: ../Rpmdrake/edit_urpm_sources.pm:459
 #, c-format
 msgid "Configure proxies"
 msgstr "Ffurfweddu'r dirprwyon"
 
-#: ../edit-urpm-sources.pl:482
+#: ../Rpmdrake/edit_urpm_sources.pm:471
 #, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Gosodiadau dirprwy ar gyfer cyfrwng \"%s\""
 
-#: ../edit-urpm-sources.pl:483
+#: ../Rpmdrake/edit_urpm_sources.pm:472
 #, c-format
 msgid "Global proxy settings"
 msgstr "Gosodiadau dirprwy eang"
 
-#: ../edit-urpm-sources.pl:485
+#: ../Rpmdrake/edit_urpm_sources.pm:474
 #, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
@@ -317,139 +319,140 @@ msgstr ""
 "Os oes angen dirprwy arnoch, rhowch enw gwesteiwr a phorth dewisol "
 "(cystrawen: <proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:488
+#: ../Rpmdrake/edit_urpm_sources.pm:477
 #, c-format
 msgid "Proxy hostname:"
 msgstr "Enw gwesteiwr y dirprwy:"
 
-#: ../edit-urpm-sources.pl:491
+#: ../Rpmdrake/edit_urpm_sources.pm:480
 #, 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:494
+#: ../Rpmdrake/edit_urpm_sources.pm:483
 #, c-format
 msgid "User:"
 msgstr "Defnyddiwr:"
 
-#: ../edit-urpm-sources.pl:566
+#: ../Rpmdrake/edit_urpm_sources.pm:555
 #, c-format
 msgid "Add a parallel group"
 msgstr "Ychwanegu grŵp paralel"
 
-#: ../edit-urpm-sources.pl:566
+#: ../Rpmdrake/edit_urpm_sources.pm:555
 #, c-format
 msgid "Edit a parallel group"
 msgstr "Golygu grŵp paralel"
 
-#: ../edit-urpm-sources.pl:577
+#: ../Rpmdrake/edit_urpm_sources.pm:567
 #, c-format
 msgid "Add a medium limit"
 msgstr "Ychwanegu terfyn cyfrwng"
 
-#: ../edit-urpm-sources.pl:589
+#: ../Rpmdrake/edit_urpm_sources.pm:580
 #, 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:626
+#: ../Rpmdrake/edit_urpm_sources.pm:617
 #, c-format
 msgid "Add a host"
 msgstr "Ychwanegu gwesteiwr:"
 
-#: ../edit-urpm-sources.pl:632
+#: ../Rpmdrake/edit_urpm_sources.pm:624
 #, 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:663
+#: ../Rpmdrake/edit_urpm_sources.pm:655
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Golygu grŵp paralel\"%s\":"
 
-#: ../edit-urpm-sources.pl:667
+#: ../Rpmdrake/edit_urpm_sources.pm:659
 #, c-format
 msgid "Group name:"
 msgstr "Enw grŵp:"
 
-#: ../edit-urpm-sources.pl:668
+#: ../Rpmdrake/edit_urpm_sources.pm:660
 #, c-format
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../edit-urpm-sources.pl:670
+#: ../Rpmdrake/edit_urpm_sources.pm:662
 #, c-format
 msgid "Media limit:"
 msgstr "Terfyn cyfrwng:"
 
-#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#: ../Rpmdrake/edit_urpm_sources.pm:667 ../Rpmdrake/edit_urpm_sources.pm:674
 #, c-format
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#: ../Rpmdrake/edit_urpm_sources.pm:668 ../Rpmdrake/edit_urpm_sources.pm:675
+#: ../Rpmdrake/edit_urpm_sources.pm:734 ../Rpmdrake/edit_urpm_sources.pm:997
 #, c-format
 msgid "Remove"
 msgstr "Tynnu"
 
-#: ../edit-urpm-sources.pl:677
+#: ../Rpmdrake/edit_urpm_sources.pm:669
 #, c-format
 msgid "Hosts:"
 msgstr "Gwesteion:"
 
-#: ../edit-urpm-sources.pl:711
+#: ../Rpmdrake/edit_urpm_sources.pm:703
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Ffurfweddu urpmi paralel (dosbarthiad gweithredol o urpmi)"
 
-#: ../edit-urpm-sources.pl:714
+#: ../Rpmdrake/edit_urpm_sources.pm:707
 #, c-format
 msgid "Group"
 msgstr "Grŵp"
 
-#: ../edit-urpm-sources.pl:714
+#: ../Rpmdrake/edit_urpm_sources.pm:707
 #, c-format
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../edit-urpm-sources.pl:714
+#: ../Rpmdrake/edit_urpm_sources.pm:707
 #, c-format
 msgid "Media limit"
 msgstr "Terfyn cyfrwng"
 
-#: ../edit-urpm-sources.pl:715
+#: ../Rpmdrake/edit_urpm_sources.pm:708
 #, c-format
 msgid "Command"
 msgstr "Gorchymyn"
 
-#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
-#: ../rpmdrake:882 ../rpmdrake:1773
+#: ../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
 #, c-format
 msgid "(none)"
 msgstr "(dim)"
 
-#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#: ../Rpmdrake/edit_urpm_sources.pm:738 ../Rpmdrake/edit_urpm_sources.pm:1001
 #, c-format
 msgid "Edit..."
 msgstr "Golygu..."
 
-#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#: ../Rpmdrake/edit_urpm_sources.pm:746 ../Rpmdrake/edit_urpm_sources.pm:1007
 #, c-format
 msgid "Add..."
 msgstr "Ychwanegu..."
 
-#: ../edit-urpm-sources.pl:769
+#: ../Rpmdrake/edit_urpm_sources.pm:762
 #, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Rheoli allweddi pecynnau digidol "
 
-#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#: ../Rpmdrake/edit_urpm_sources.pm:768 ../Rpmdrake/edit_urpm_sources.pm:932
 #, c-format
 msgid "Medium"
 msgstr "Cyfrwng"
 
-#: ../edit-urpm-sources.pl:780
+#: ../Rpmdrake/edit_urpm_sources.pm:774
 #, c-format
 msgid ""
 "_:cryptographic keys\n"
@@ -458,32 +461,32 @@ msgstr ""
 "_:cryptographic keys\n"
 "Allweddi"
 
-#: ../edit-urpm-sources.pl:803
+#: ../Rpmdrake/edit_urpm_sources.pm:797
 #, 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:816
+#: ../Rpmdrake/edit_urpm_sources.pm:810
 #, c-format
 msgid "Add a key"
 msgstr "Ychwanegu allwedd"
 
-#: ../edit-urpm-sources.pl:828
+#: ../Rpmdrake/edit_urpm_sources.pm:823
 #, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Dewis bysell ti ychwanegu at gyfrwng %s"
 
-#: ../edit-urpm-sources.pl:834
+#: ../Rpmdrake/edit_urpm_sources.pm:829
 #, c-format
 msgid "Close"
 msgstr "Cau"
 
-#: ../edit-urpm-sources.pl:856
+#: ../Rpmdrake/edit_urpm_sources.pm:851
 #, c-format
 msgid "Remove a key"
 msgstr "Tynnu allwedd"
 
-#: ../edit-urpm-sources.pl:857
+#: ../Rpmdrake/edit_urpm_sources.pm:852
 #, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
@@ -492,37 +495,37 @@ msgstr ""
 "Ydych chi'n siŵr eich bod eisiau tynnu allwedd %s o gyfrwng %s?\n"
 "(enw'r allwedd: %s)"
 
-#: ../edit-urpm-sources.pl:875
+#: ../Rpmdrake/edit_urpm_sources.pm:870
 #, c-format
 msgid "Add a key..."
 msgstr "Ychwanegu allwedd..."
 
-#: ../edit-urpm-sources.pl:879
+#: ../Rpmdrake/edit_urpm_sources.pm:874
 #, c-format
 msgid "Remove key"
 msgstr "Tynnu allwedd"
 
-#: ../edit-urpm-sources.pl:895
+#: ../Rpmdrake/edit_urpm_sources.pm:890
 #, c-format
 msgid "Configure media"
 msgstr "Ffurfweddu'r cyfrwng"
 
-#: ../edit-urpm-sources.pl:934
+#: ../Rpmdrake/edit_urpm_sources.pm:930
 #, c-format
-msgid "Enabled?"
-msgstr "Galluogwyd?"
+msgid "Enabled"
+msgstr "Galluogwyd"
 
-#: ../edit-urpm-sources.pl:935
+#: ../Rpmdrake/edit_urpm_sources.pm:931
 #, c-format
-msgid "Updates?"
-msgstr "Diweddariadau?"
+msgid "Updates"
+msgstr "Diweddariadau"
 
-#: ../edit-urpm-sources.pl:951
+#: ../Rpmdrake/edit_urpm_sources.pm:947
 #, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "Mae angen diweddaru'r cyfrwng i fod yn ddefnyddiol. Diweddaru?"
 
-#: ../edit-urpm-sources.pl:981
+#: ../Rpmdrake/edit_urpm_sources.pm:977
 #, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
@@ -533,37 +536,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:1015
+#: ../Rpmdrake/edit_urpm_sources.pm:1011
 #, c-format
 msgid "Add custom..."
 msgstr "Ychwanegu addasiad..."
 
-#: ../edit-urpm-sources.pl:1019
+#: ../Rpmdrake/edit_urpm_sources.pm:1015
 #, c-format
 msgid "Update..."
 msgstr "Diweddau..."
 
-#: ../edit-urpm-sources.pl:1022
+#: ../Rpmdrake/edit_urpm_sources.pm:1018
 #, c-format
 msgid "Manage keys..."
 msgstr "Rheoli allweddi"
 
-#: ../edit-urpm-sources.pl:1024
+#: ../Rpmdrake/edit_urpm_sources.pm:1020
 #, c-format
 msgid "Parallel..."
 msgstr "Paralel..."
 
-#: ../edit-urpm-sources.pl:1025
+#: ../Rpmdrake/edit_urpm_sources.pm:1021
 #, c-format
 msgid "Global options..."
 msgstr "Dewisiadau eang..."
 
-#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#: ../Rpmdrake/edit_urpm_sources.pm:1031 ../rpmdrake:472
 #, c-format
 msgid "Help"
 msgstr "Cymorth"
 
-#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#: ../Rpmdrake/edit_urpm_sources.pm:1044 ../Rpmdrake/init.pm:125
+#: ../gurpmi.addmedia:93
 #, c-format
 msgid ""
 "%s\n"
@@ -574,7 +578,7 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../edit-urpm-sources.pl:1054
+#: ../Rpmdrake/edit_urpm_sources.pm:1047
 #, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
@@ -589,7 +593,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:1067
+#: ../Rpmdrake/edit_urpm_sources.pm:1063
 #, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
@@ -602,1324 +606,1084 @@ msgstr ""
 "arall ar fwrdd gwaith arall, neu a ydych yn gosod pecynnau\n"
 " eraill hefyd?"
 
-#: ../gurpmi.addmedia:88
+#: ../Rpmdrake/gui.pm:59 ../Rpmdrake/gui.pm:116
 #, c-format
-msgid "Unable to add medium, wrong or missing arguments"
-msgstr "Methu ychwanegu cyfrwng, ymresymiadau anghywir neu goll."
+msgid "Importance: "
+msgstr "Pwysigrwydd: "
 
-#: ../gurpmi.addmedia:102
+#: ../Rpmdrake/gui.pm:60 ../Rpmdrake/gui.pm:124
 #, c-format
-msgid ""
-"You are about to add new packages media, %s.\n"
-"That means you will be able to add new software packages\n"
-"to your system from these new media."
-msgstr ""
-"Rydych ar fin gosod cyfrwng pecynnau newydd, %s.\n"
-"Mae hyn yn golygu y bydd modd gosod pecynnau meddalwedd\n"
-"newydd i'ch system o'r cyfrwng hwnnw."
+msgid "Reason for update: "
+msgstr "Rheswm am y diweddariad:"
 
-#: ../gurpmi.addmedia:105
+#: ../Rpmdrake/gui.pm:64
 #, c-format
-msgid ""
-"You are about to add a new packages medium, `%s'.\n"
-"That means you will be able to add new software packages\n"
-"to your system from that new medium."
-msgstr ""
-"Rydych ar fin gosod cyfrwng pecynnau newydd, %s'.\n"
-"Mae hyn yn golygu y bydd modd gosod pecynnau meddalwedd\n"
-"newydd i'ch system o'r cyfrwng hwnnw."
+msgid "Security advisory"
+msgstr "Diweddariadau diogelwch"
 
-#: ../gurpmi.addmedia:130
+#: ../Rpmdrake/gui.pm:72 ../Rpmdrake/gui.pm:126
 #, c-format
-msgid "Successfully added media %s."
-msgstr "Llwyddiant wrth ychwanegu cyfrwng %s."
+msgid "No description"
+msgstr "Dim disgrifiad"
 
-#: ../gurpmi.addmedia:131
+#: ../Rpmdrake/gui.pm:75
 #, c-format
-msgid "Successfully added medium `%s'."
-msgstr "Llwyddiant wrth ychwanegu cyfrwng '%s'"
+msgid "Files:"
+msgstr "Ffeiliau:"
 
-#: ../rpmdrake:39
+#: ../Rpmdrake/gui.pm:79 ../Rpmdrake/gui.pm:84 ../Rpmdrake/gui.pm:98
+#: ../Rpmdrake/gui.pm:100 ../Rpmdrake/pkg.pm:135
 #, c-format
-msgid "Usage: %s [OPTION]..."
-msgstr "Defnyddi: %s [DEWIS]..."
+msgid "(Not available)"
+msgstr "(Dim ar gael)"
 
-#: ../rpmdrake:40
+#: ../Rpmdrake/gui.pm:83
 #, c-format
-msgid ""
-"  --changelog-first      display changelog before filelist in the "
-"description window"
-msgstr ""
-"  --changelog-first      dangos cofnod newid cyn filelist yn y ffenestr "
-"disgrifio"
+msgid "Changelog:"
+msgstr "Cofnod Newid:"
 
-#: ../rpmdrake:41
+#: ../Rpmdrake/gui.pm:95
 #, c-format
-msgid "  --media=medium1,..     limit to given media"
-msgstr "  --media=medium1,..     terfyn i'r cyfrwng hwn"
+msgid "Files:\n"
+msgstr "Ffeiliau:\n"
+
+#: ../Rpmdrake/gui.pm:100
+#, c-format
+msgid "Changelog:\n"
+msgstr "Cofnod Newid:\n"
+
+#: ../Rpmdrake/gui.pm:105 ../rpmdrake.pm:813
+#, c-format
+msgid "Medium: "
+msgstr "Cyfrwng:"
+
+#: ../Rpmdrake/gui.pm:106
+#, c-format
+msgid "Currently installed version: "
+msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
+
+#: ../Rpmdrake/gui.pm:110
+#, c-format
+msgid "Name: "
+msgstr "Enw: "
+
+#: ../Rpmdrake/gui.pm:111
+#, c-format
+msgid "Version: "
+msgstr "Fersiwn: "
+
+#: ../Rpmdrake/gui.pm:112
+#, c-format
+msgid "Architecture: "
+msgstr "Pensaernïaeth:"
+
+#: ../Rpmdrake/gui.pm:113
+#, c-format
+msgid "Size: "
+msgstr "Maint: "
+
+#: ../Rpmdrake/gui.pm:113
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../Rpmdrake/gui.pm:120
+#, c-format
+msgid "Summary: "
+msgstr "Crynodeb: "
+
+#: ../Rpmdrake/gui.pm:126
+#, c-format
+msgid "Description: "
+msgstr "Disgrifiadau: "
+
+#: ../Rpmdrake/gui.pm:453 ../Rpmdrake/gui.pm:490 ../Rpmdrake/gui.pm:492
+#, c-format
+msgid "More information on package..."
+msgstr "Rhagor o wybodaeth ar becyn..."
+
+#: ../Rpmdrake/gui.pm:455
+#, c-format
+msgid "Please choose"
+msgstr "Dewiswch"
+
+#: ../Rpmdrake/gui.pm:456
+#, c-format
+msgid "The following package is needed:"
+msgstr "Mae angen y pecyn canlynol:"
+
+#: ../Rpmdrake/gui.pm:456
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../rpmdrake:42
+#. -PO: Keep it short, this is gonna be on a button
+#: ../Rpmdrake/gui.pm:478 ../Rpmdrake/gui.pm:483
+#, c-format
+msgid "More info"
+msgstr "Rhagor"
+
+#: ../Rpmdrake/gui.pm:485
+#, c-format
+msgid "Information on packages"
+msgstr "Gwybodaeth am becynnau"
+
+#: ../Rpmdrake/gui.pm:508
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
+
+#: ../Rpmdrake/gui.pm:509
 #, c-format
 msgid ""
-"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
-msgstr "  --merge-all-rpmnew     cynnig uno pob ffeil  .rpmnew/.rpmsave"
+"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:43
+#: ../Rpmdrake/gui.pm:515 ../Rpmdrake/gui.pm:524
 #, c-format
-msgid "  --mode=MODE            set mode (install (default), remove, update)"
+msgid "Some packages can't be removed"
+msgstr "Nid oes modd tynnu rhai pecynnau"
+
+#: ../Rpmdrake/gui.pm:516
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
-"  --mode=MODE            gosod modd (gosod (rhagosodedig), tynnu, diweddaru)"
+"Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
+"\n"
 
-#: ../rpmdrake:44
+#: ../Rpmdrake/gui.pm:525 ../Rpmdrake/gui.pm:592
 #, c-format
 msgid ""
-"  --no-confirmation      don't ask first confirmation question in update mode"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
-"  --no-confirmation      peidio gofyn cwestiwn cadarnhau ym modd diweddaru"
+"Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
+"eu dad-ddewis nawr:\n"
 
-#: ../rpmdrake:45
+#: ../Rpmdrake/gui.pm:554
 #, c-format
-msgid "  --no-media-update      don't update media at startup"
-msgstr "  --no-media-update    peidio diweddaru cyfrwng wrth gychwyn"
+msgid "Additional packages needed"
+msgstr "Pecynnau ychwanegol angenrheidiol"
 
-#: ../rpmdrake:46
+#: ../Rpmdrake/gui.pm:555
 #, c-format
-msgid "  --no-verify-rpm        don't verify packages signatures"
-msgstr "  --no-verify-rpm        peidio gwirio llofnod pecynnau"
+msgid ""
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
+msgstr ""
+"I fodloni dibyniaethau, mae angen gosod y pecyn(nau) canlynol\n"
+"hefyd:\n"
+"\n"
+
+#: ../Rpmdrake/gui.pm:569
+#, c-format
+msgid "%s (belongs to the skip list)"
+msgstr "%s (perthyn i'r rhestr hepgor)"
+
+#: ../Rpmdrake/gui.pm:573
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgstr "Nid oes modd gosod un pecyn"
 
-#: ../rpmdrake:47
+#: ../Rpmdrake/gui.pm:573
 #, c-format
+msgid "Some packages can't be installed"
+msgstr "Nid oes modd gosod rhai pecynnau"
+
+#: ../Rpmdrake/gui.pm:575
+#, fuzzy, c-format
 msgid ""
-"  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
-"\" machine to show needed deps"
+"Sorry, the following package cannot be selected:\n"
+"\n"
+"%s"
 msgstr ""
-"  --parallel=alias,host  ym modd paralel, defnyddio grŵp \"alias\" , "
-"defnyddio peiriant  \"host\" i ddangos deps angenrheidiol"
+"Yn anffodus, nid oes modd dewis y pecyn canlynol:\n"
+"\n"
+"%s"
+
+#: ../Rpmdrake/gui.pm:576
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr ""
+"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:48
+#: ../Rpmdrake/gui.pm:591 ../Rpmdrake/pkg.pm:486
 #, c-format
-msgid "  --pkg-nosel=pkg1,..    show only these packages"
-msgstr "  --pkg-nosel=pkg1,..    dangos y pecynnau yma'n unig"
+msgid "Some packages need to be removed"
+msgstr "Rhaid tynnu rhai pecynnau"
 
-#: ../rpmdrake:49
+#: ../Rpmdrake/gui.pm:622
 #, c-format
-msgid "  --pkg-sel=pkg1,..      preselect these packages"
-msgstr "  --pkg-sel=pkg1,..      rhag ddewis y pecynnau yma"
+msgid "Error: %s appears to be mounted read-only."
+msgstr "Gwall: %s i weld wedi ei osod fel darllen yn unig."
 
-#: ../rpmdrake:50
+#: ../Rpmdrake/gui.pm:626
 #, c-format
-msgid "  --root                 force to run as root"
-msgstr "  --root                 gorfodi ei redeg fel root"
+msgid "You need to select some packages first."
+msgstr "Rhaid dewis rhai pecynnau'n gyntaf."
 
-#: ../rpmdrake:51
+#: ../Rpmdrake/gui.pm:631
 #, c-format
-msgid "  --search=pkg           run search for \"pkg\""
-msgstr "  --search=pkg           chwilio am \"pkg\""
+msgid "Too many packages are selected"
+msgstr "Mae gormod o becynnau wedi eu dewis"
 
-#: ../rpmdrake:205
+#: ../Rpmdrake/gui.pm:632
 #, c-format
-msgid "Running in user mode"
-msgstr "Rhedeg ym modd defnyddiwr"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr "Rhybudd:"
 
-#: ../rpmdrake:206
+#: ../Rpmdrake/gui.pm:664
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "Arhoswch, rhestri pecynnau..."
+
+#: ../Rpmdrake/gui.pm:682
+#, c-format
+msgid "No update"
+msgstr "Dim diweddariad"
+
+#: ../Rpmdrake/gui.pm:683
 #, c-format
 msgid ""
-"You are launching this program as a normal user.\n"
-"You will not be able to perform modifications on the system,\n"
-"but you may still browse the existing database."
+"The list of updates is empty. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
 msgstr ""
-"Rydych yn cychwyn y rhaglen fel defnyddiwr cyffredin.\n"
-"Ni fydd modd i chi greu newidiadau i'r system.\n"
-"ond bydd modd i chi bori'r gronfa ddata presennol."
+"Mae'r rhestr diweddariadau'n wag. Mae hyn yn golygu un ai\n"
+"nad oes diweddariad ar gyfer y pecynnau ar eich cyfrifiadur,\n"
+"neu rydych wedi eu gosod i gyd yn barod."
 
-#: ../rpmdrake:214
+#: ../Rpmdrake/gui.pm:706 ../rpmdrake:256
+#, c-format
+msgid "All"
+msgstr "Popeth"
+
+#: ../Rpmdrake/gui.pm:715 ../rpmdrake:142
+#, c-format
+msgid "Upgradable"
+msgstr "Diweddariadwy"
+
+#: ../Rpmdrake/gui.pm:715 ../rpmdrake:142
+#, c-format
+msgid "Addable"
+msgstr "Ychwanegadwy"
+
+#: ../Rpmdrake/gui.pm:735
+#, 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
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Digwyddodd gwall terfynol:%s."
+
+#: ../Rpmdrake/icon.pm:35
 #, c-format
 msgid "Accessibility"
 msgstr "Hygyrchedd"
 
-#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
-#: ../rpmdrake:219
+#: ../Rpmdrake/icon.pm:36 ../Rpmdrake/icon.pm:37 ../Rpmdrake/icon.pm:38
+#: ../Rpmdrake/icon.pm:39 ../Rpmdrake/icon.pm:40
 #, c-format
 msgid "Archiving"
 msgstr "Archifo"
 
-#: ../rpmdrake:216
+#: ../Rpmdrake/icon.pm:37
 #, c-format
 msgid "Backup"
 msgstr "Wrth Gefn"
 
-#: ../rpmdrake:217
+#: ../Rpmdrake/icon.pm:38
 #, c-format
 msgid "Cd burning"
 msgstr "Llosgi CD"
 
-#: ../rpmdrake:218
+#: ../Rpmdrake/icon.pm:39
 #, c-format
 msgid "Compression"
 msgstr "Cywasgiad"
 
-#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
-#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
-#: ../rpmdrake:426
+#: ../Rpmdrake/icon.pm:40 ../Rpmdrake/icon.pm:46 ../Rpmdrake/icon.pm:60
+#: ../Rpmdrake/icon.pm:73 ../Rpmdrake/icon.pm:91 ../Rpmdrake/icon.pm:112
+#: ../Rpmdrake/icon.pm:125 ../Rpmdrake/icon.pm:135 ../Rpmdrake/pkg.pm:75
 #, c-format
 msgid "Other"
 msgstr "Arall"
 
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#: ../rpmdrake:224 ../rpmdrake:225
+#: ../Rpmdrake/icon.pm:41 ../Rpmdrake/icon.pm:42 ../Rpmdrake/icon.pm:43
+#: ../Rpmdrake/icon.pm:44 ../Rpmdrake/icon.pm:45 ../Rpmdrake/icon.pm:46
 #, c-format
 msgid "Books"
 msgstr "Llyfrau"
 
-#: ../rpmdrake:221
+#: ../Rpmdrake/icon.pm:42
 #, c-format
 msgid "Computer books"
 msgstr "Llyfrau cyfrifiadurol"
 
-#: ../rpmdrake:222
+#: ../Rpmdrake/icon.pm:43
 #, c-format
 msgid "Faqs"
 msgstr "Cwestiynau poblogaidd"
 
-#: ../rpmdrake:223
+#: ../Rpmdrake/icon.pm:44
 #, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:224
+#: ../Rpmdrake/icon.pm:45
 #, c-format
 msgid "Literature"
 msgstr "Llenyddiaeth"
 
-#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#: ../Rpmdrake/icon.pm:47 ../Rpmdrake/icon.pm:48 ../Rpmdrake/icon.pm:49
 #, c-format
 msgid "Cluster"
 msgstr "Clwstwr"
 
-#: ../rpmdrake:227
+#: ../Rpmdrake/icon.pm:48
 #, c-format
 msgid "Message Passing"
 msgstr "Pasio Negeseuon"
 
-#: ../rpmdrake:228
+#: ../Rpmdrake/icon.pm:49
 #, c-format
 msgid "Queueing Services"
 msgstr "Gwasanaethau Ciwio"
 
-#: ../rpmdrake:229
+#: ../Rpmdrake/icon.pm:50
 #, c-format
 msgid "Communications"
 msgstr "Cyfathrebu"
 
-#: ../rpmdrake:230 ../rpmdrake:234
+#: ../Rpmdrake/icon.pm:51 ../Rpmdrake/icon.pm:55
 #, c-format
 msgid "Databases"
 msgstr "Cronfeydd Data"
 
-#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#: ../Rpmdrake/icon.pm:52 ../Rpmdrake/icon.pm:53 ../Rpmdrake/icon.pm:54
+#: ../Rpmdrake/icon.pm:55 ../Rpmdrake/icon.pm:56 ../Rpmdrake/icon.pm:57
+#: ../Rpmdrake/icon.pm:58 ../Rpmdrake/icon.pm:59 ../Rpmdrake/icon.pm:60
+#: ../Rpmdrake/icon.pm:61 ../Rpmdrake/icon.pm:62 ../Rpmdrake/icon.pm:63
+#: ../Rpmdrake/icon.pm:174 ../Rpmdrake/icon.pm:175 ../Rpmdrake/icon.pm:176
 #, c-format
 msgid "Development"
 msgstr "Datblygiad"
 
-#: ../rpmdrake:232
+#: ../Rpmdrake/icon.pm:53
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:233
+#: ../Rpmdrake/icon.pm:54
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:235
+#: ../Rpmdrake/icon.pm:56
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME a GTK+"
 
-#: ../rpmdrake:236
+#: ../Rpmdrake/icon.pm:57
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:237
+#: ../Rpmdrake/icon.pm:58
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE a Qt"
 
-#: ../rpmdrake:238
+#: ../Rpmdrake/icon.pm:59
 #, c-format
 msgid "Kernel"
 msgstr "Cnewyllyn"
 
-#: ../rpmdrake:240
+#: ../Rpmdrake/icon.pm:61
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:241
+#: ../Rpmdrake/icon.pm:62
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: ../rpmdrake:242
+#: ../Rpmdrake/icon.pm:63
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:243
+#: ../Rpmdrake/icon.pm:64
 #, c-format
 msgid "Editors"
 msgstr "Golygyddion"
 
-#: ../rpmdrake:244
+#: ../Rpmdrake/icon.pm:65
 #, c-format
 msgid "Education"
 msgstr "Addysg"
 
-#: ../rpmdrake:245
+#: ../Rpmdrake/icon.pm:66
 #, c-format
 msgid "Emulators"
 msgstr "Efelychwyr"
 
-#: ../rpmdrake:246
+#: ../Rpmdrake/icon.pm:67
 #, c-format
 msgid "File tools"
 msgstr "Offer ffeiliau"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:255
+#: ../Rpmdrake/icon.pm:68 ../Rpmdrake/icon.pm:69 ../Rpmdrake/icon.pm:70
+#: ../Rpmdrake/icon.pm:71 ../Rpmdrake/icon.pm:72 ../Rpmdrake/icon.pm:73
+#: ../Rpmdrake/icon.pm:74 ../Rpmdrake/icon.pm:75 ../Rpmdrake/icon.pm:76
 #, c-format
 msgid "Games"
 msgstr "Gemau"
 
-#: ../rpmdrake:248
+#: ../Rpmdrake/icon.pm:69
 #, c-format
 msgid "Adventure"
 msgstr "Antur"
 
-#: ../rpmdrake:249
+#: ../Rpmdrake/icon.pm:70
 #, c-format
 msgid "Arcade"
 msgstr "Arcêd"
 
-#: ../rpmdrake:250
+#: ../Rpmdrake/icon.pm:71
 #, c-format
 msgid "Boards"
 msgstr "Byrddau"
 
-#: ../rpmdrake:251
+#: ../Rpmdrake/icon.pm:72
 #, c-format
 msgid "Cards"
 msgstr "Cardiau"
 
-#: ../rpmdrake:253
+#: ../Rpmdrake/icon.pm:74
 #, c-format
 msgid "Puzzles"
 msgstr "Posau"
 
-#: ../rpmdrake:254
+#: ../Rpmdrake/icon.pm:75
 #, c-format
 msgid "Sports"
 msgstr "Chwaraeon"
 
-#: ../rpmdrake:255
+#: ../Rpmdrake/icon.pm:76
 #, c-format
 msgid "Strategy"
 msgstr "Strategaeth"
 
-#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
-#: ../rpmdrake:274 ../rpmdrake:277
+#: ../Rpmdrake/icon.pm:77 ../Rpmdrake/icon.pm:78 ../Rpmdrake/icon.pm:81
+#: ../Rpmdrake/icon.pm:82 ../Rpmdrake/icon.pm:85 ../Rpmdrake/icon.pm:88
+#: ../Rpmdrake/icon.pm:91 ../Rpmdrake/icon.pm:92 ../Rpmdrake/icon.pm:95
+#: ../Rpmdrake/icon.pm:98
 #, c-format
 msgid "Graphical desktop"
 msgstr "Bwrdd gwaith graffigol"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../Rpmdrake/icon.pm:80
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:260
+#: ../Rpmdrake/icon.pm:81
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM seiliedig"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:263
+#: ../Rpmdrake/icon.pm:84
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:266
+#: ../Rpmdrake/icon.pm:87
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:269
+#: ../Rpmdrake/icon.pm:90
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:273
+#: ../Rpmdrake/icon.pm:94
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:276
+#: ../Rpmdrake/icon.pm:97
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:279
+#: ../Rpmdrake/icon.pm:100
 #, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
-#: ../rpmdrake:280
+#: ../Rpmdrake/icon.pm:101
 #, c-format
 msgid "Graphics"
 msgstr "Graffigau"
 
-#: ../rpmdrake:281
+#: ../Rpmdrake/icon.pm:102
 #, c-format
 msgid "Monitoring"
 msgstr "Monitro"
 
-#: ../rpmdrake:282 ../rpmdrake:283
+#: ../Rpmdrake/icon.pm:103 ../Rpmdrake/icon.pm:104
 #, c-format
 msgid "Multimedia"
 msgstr "Amlgyfrwng"
 
-#: ../rpmdrake:283 ../rpmdrake:334
+#: ../Rpmdrake/icon.pm:104 ../Rpmdrake/icon.pm:155
 #, c-format
 msgid "Video"
 msgstr "Fideo"
 
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
-#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#: ../Rpmdrake/icon.pm:105 ../Rpmdrake/icon.pm:106 ../Rpmdrake/icon.pm:107
+#: ../Rpmdrake/icon.pm:108 ../Rpmdrake/icon.pm:109 ../Rpmdrake/icon.pm:110
+#: ../Rpmdrake/icon.pm:111 ../Rpmdrake/icon.pm:112 ../Rpmdrake/icon.pm:113
+#: ../Rpmdrake/icon.pm:114 ../Rpmdrake/icon.pm:134
 #, c-format
 msgid "Networking"
 msgstr "Rhwydweithio"
 
-#: ../rpmdrake:285
+#: ../Rpmdrake/icon.pm:106
 #, c-format
 msgid "Chat"
 msgstr "Sgwrs"
 
-#: ../rpmdrake:286
+#: ../Rpmdrake/icon.pm:107
 #, c-format
 msgid "File transfer"
 msgstr "Trosglwyddo ffeiliau"
 
-#: ../rpmdrake:287
+#: ../Rpmdrake/icon.pm:108
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:288
+#: ../Rpmdrake/icon.pm:109
 #, c-format
 msgid "Instant messaging"
 msgstr "Negesu Chwim"
 
-#: ../rpmdrake:289 ../rpmdrake:360
+#: ../Rpmdrake/icon.pm:110 ../Rpmdrake/icon.pm:181
 #, c-format
 msgid "Mail"
 msgstr "E-bost"
 
-#: ../rpmdrake:290
+#: ../Rpmdrake/icon.pm:111
 #, c-format
 msgid "News"
 msgstr "Newyddion"
 
-#: ../rpmdrake:292
+#: ../Rpmdrake/icon.pm:113
 #, c-format
 msgid "Remote access"
 msgstr "Mynediad pell"
 
-#: ../rpmdrake:293
+#: ../Rpmdrake/icon.pm:114
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:294
+#: ../Rpmdrake/icon.pm:115
 #, c-format
 msgid "Office"
 msgstr "Swyddfa"
 
-#: ../rpmdrake:295
+#: ../Rpmdrake/icon.pm:116
 #, c-format
 msgid "Public Keys"
 msgstr "Allweddi Cyhoeddus"
 
-#: ../rpmdrake:296
+#: ../Rpmdrake/icon.pm:117
 #, c-format
 msgid "Publishing"
 msgstr "Cyhoeddi"
 
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
-#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
-#: ../rpmdrake:305
+#: ../Rpmdrake/icon.pm:118 ../Rpmdrake/icon.pm:119 ../Rpmdrake/icon.pm:120
+#: ../Rpmdrake/icon.pm:121 ../Rpmdrake/icon.pm:122 ../Rpmdrake/icon.pm:123
+#: ../Rpmdrake/icon.pm:124 ../Rpmdrake/icon.pm:125 ../Rpmdrake/icon.pm:126
 #, c-format
 msgid "Sciences"
 msgstr "Gwyddorau"
 
-#: ../rpmdrake:298
+#: ../Rpmdrake/icon.pm:119
 #, c-format
 msgid "Astronomy"
 msgstr "Astroleg"
 
-#: ../rpmdrake:299
+#: ../Rpmdrake/icon.pm:120
 #, c-format
 msgid "Biology"
 msgstr "Bywydeg"
 
-#: ../rpmdrake:300
+#: ../Rpmdrake/icon.pm:121
 #, c-format
 msgid "Chemistry"
 msgstr "Cemeg"
 
-#: ../rpmdrake:301
+#: ../Rpmdrake/icon.pm:122
 #, c-format
 msgid "Computer science"
 msgstr "Gwyddor Cyfrifiadureg"
 
-#: ../rpmdrake:302
+#: ../Rpmdrake/icon.pm:123
 #, c-format
 msgid "Geosciences"
 msgstr "Gwyddorau Daear"
 
-#: ../rpmdrake:303
+#: ../Rpmdrake/icon.pm:124
 #, c-format
 msgid "Mathematics"
 msgstr "Mathemateg"
 
-#: ../rpmdrake:305
+#: ../Rpmdrake/icon.pm:126
 #, c-format
 msgid "Physics"
 msgstr "Ffiseg"
 
-#: ../rpmdrake:306
+#: ../Rpmdrake/icon.pm:127
 #, c-format
 msgid "Shells"
 msgstr "Cregyn"
 
-#: ../rpmdrake:307
+#: ../Rpmdrake/icon.pm:128
 #, c-format
 msgid "Sound"
 msgstr "Sain"
 
-#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
-#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
-#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
-#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
-#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
-#: ../rpmdrake:328
+#: ../Rpmdrake/icon.pm:129 ../Rpmdrake/icon.pm:130 ../Rpmdrake/icon.pm:131
+#: ../Rpmdrake/icon.pm:132 ../Rpmdrake/icon.pm:133 ../Rpmdrake/icon.pm:134
+#: ../Rpmdrake/icon.pm:135 ../Rpmdrake/icon.pm:136 ../Rpmdrake/icon.pm:137
+#: ../Rpmdrake/icon.pm:138 ../Rpmdrake/icon.pm:139 ../Rpmdrake/icon.pm:140
+#: ../Rpmdrake/icon.pm:141 ../Rpmdrake/icon.pm:142 ../Rpmdrake/icon.pm:143
+#: ../Rpmdrake/icon.pm:144 ../Rpmdrake/icon.pm:145 ../Rpmdrake/icon.pm:146
+#: ../Rpmdrake/icon.pm:147 ../Rpmdrake/icon.pm:148 ../Rpmdrake/icon.pm:149
 #, c-format
 msgid "System"
 msgstr "System"
 
-#: ../rpmdrake:309
+#: ../Rpmdrake/icon.pm:130
 #, c-format
 msgid "Base"
 msgstr "Sail"
 
-#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
-#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#: ../Rpmdrake/icon.pm:131 ../Rpmdrake/icon.pm:132 ../Rpmdrake/icon.pm:133
+#: ../Rpmdrake/icon.pm:134 ../Rpmdrake/icon.pm:135 ../Rpmdrake/icon.pm:136
+#: ../Rpmdrake/icon.pm:137 ../Rpmdrake/icon.pm:159
 #, c-format
 msgid "Configuration"
 msgstr "Ffurfweddu"
 
-#: ../rpmdrake:311
+#: ../Rpmdrake/icon.pm:132
 #, c-format
 msgid "Boot and Init"
 msgstr "Cychwyn ac Ymgychwyn"
 
-#: ../rpmdrake:312
+#: ../Rpmdrake/icon.pm:133
 #, c-format
 msgid "Hardware"
 msgstr "Caledwedd"
 
-#: ../rpmdrake:315
+#: ../Rpmdrake/icon.pm:136
 #, c-format
 msgid "Packaging"
 msgstr "Pecynnu"
 
-#: ../rpmdrake:316
+#: ../Rpmdrake/icon.pm:137
 #, c-format
 msgid "Printing"
 msgstr "Argraffu"
 
-#: ../rpmdrake:317
+#: ../Rpmdrake/icon.pm:138
 #, c-format
 msgid "Deploiement"
 msgstr "Defnyddio"
 
-#: ../rpmdrake:318
+#: ../Rpmdrake/icon.pm:139
 #, c-format
 msgid "Deployment"
 msgstr "Defnyddio"
 
-#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
-#: ../rpmdrake:323
+#: ../Rpmdrake/icon.pm:140 ../Rpmdrake/icon.pm:141 ../Rpmdrake/icon.pm:142
+#: ../Rpmdrake/icon.pm:143 ../Rpmdrake/icon.pm:144
 #, c-format
 msgid "Fonts"
 msgstr "Ffontiau"
 
-#: ../rpmdrake:320
+#: ../Rpmdrake/icon.pm:141
 #, c-format
 msgid "Console"
 msgstr "Consol"
 
-#: ../rpmdrake:321
+#: ../Rpmdrake/icon.pm:142
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:322
+#: ../Rpmdrake/icon.pm:143
 #, c-format
 msgid "Type1"
 msgstr "Math 1"
 
-#: ../rpmdrake:323
+#: ../Rpmdrake/icon.pm:144
 #, c-format
 msgid "X11 bitmap"
 msgstr "Didfap X11"
 
-#: ../rpmdrake:324
+#: ../Rpmdrake/icon.pm:145
 #, c-format
 msgid "Internationalization"
 msgstr "Rhyngwladoli"
 
-#: ../rpmdrake:325
+#: ../Rpmdrake/icon.pm:146
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Cnewyllyn a chaledwedd."
 
-#: ../rpmdrake:326
+#: ../Rpmdrake/icon.pm:147
 #, c-format
 msgid "Libraries"
 msgstr "Llyfrgelloedd"
 
-#: ../rpmdrake:327
+#: ../Rpmdrake/icon.pm:148
 #, c-format
 msgid "Servers"
 msgstr "Gweinyddion"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:330
+#: ../Rpmdrake/icon.pm:151
 #, c-format
 msgid "X11"
 msgstr "X11"
 
-#: ../rpmdrake:331
+#: ../Rpmdrake/icon.pm:152
 #, c-format
 msgid "Terminals"
 msgstr "Terfynellau"
 
-#: ../rpmdrake:332
+#: ../Rpmdrake/icon.pm:153
 #, c-format
 msgid "Text tools"
 msgstr "Offer testun"
 
-#: ../rpmdrake:333
+#: ../Rpmdrake/icon.pm:154
 #, c-format
 msgid "Toys"
 msgstr "Teganau"
 
-#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
-#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
-#: ../rpmdrake:345 ../rpmdrake:346
+#: ../Rpmdrake/icon.pm:158 ../Rpmdrake/icon.pm:159 ../Rpmdrake/icon.pm:160
+#: ../Rpmdrake/icon.pm:161 ../Rpmdrake/icon.pm:162 ../Rpmdrake/icon.pm:163
+#: ../Rpmdrake/icon.pm:164 ../Rpmdrake/icon.pm:165 ../Rpmdrake/icon.pm:166
+#: ../Rpmdrake/icon.pm:167
 #, c-format
 msgid "Workstation"
 msgstr "Man Gwaith"
 
-#: ../rpmdrake:339
+#: ../Rpmdrake/icon.pm:160
 #, c-format
 msgid "Console Tools"
 msgstr "Offer y Consol"
 
-#: ../rpmdrake:340 ../rpmdrake:355
+#: ../Rpmdrake/icon.pm:161 ../Rpmdrake/icon.pm:176
 #, c-format
 msgid "Documentation"
 msgstr "Dogfennaeth"
 
-#: ../rpmdrake:341
+#: ../Rpmdrake/icon.pm:162
 #, c-format
 msgid "Game station"
 msgstr "Man chwarae"
 
-#: ../rpmdrake:342
+#: ../Rpmdrake/icon.pm:163
 #, c-format
 msgid "Internet station"
 msgstr "Man Rhyngrwyd"
 
-#: ../rpmdrake:343
+#: ../Rpmdrake/icon.pm:164
 #, c-format
 msgid "Multimedia station"
 msgstr "Man aml-gyfrwng"
 
-#: ../rpmdrake:344
+#: ../Rpmdrake/icon.pm:165
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Cyfrifiadur Rhwydwaith (cleient)"
 
-#: ../rpmdrake:345
+#: ../Rpmdrake/icon.pm:166
 #, c-format
 msgid "Office Workstation"
 msgstr "Gweithfan Swyddfa"
 
-#: ../rpmdrake:346
+#: ../Rpmdrake/icon.pm:167
 #, c-format
 msgid "Scientific Workstation"
 msgstr "Man Gwaith Gwyddonol"
 
-#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
-#: ../rpmdrake:352
+#: ../Rpmdrake/icon.pm:168 ../Rpmdrake/icon.pm:170 ../Rpmdrake/icon.pm:171
+#: ../Rpmdrake/icon.pm:172 ../Rpmdrake/icon.pm:173
 #, c-format
 msgid "Graphical Environment"
 msgstr "Amgylchedd Graffig"
 
-#: ../rpmdrake:349
+#: ../Rpmdrake/icon.pm:170
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Man Gwaith Gnome"
 
-#: ../rpmdrake:350
+#: ../Rpmdrake/icon.pm:171
 #, c-format
 msgid "IceWm Desktop"
 msgstr "Bwrdd Gwaith IceWm"
 
-#: ../rpmdrake:351
+#: ../Rpmdrake/icon.pm:172
 #, c-format
 msgid "KDE Workstation"
 msgstr "Man Gwaith KDE"
 
-#: ../rpmdrake:352
+#: ../Rpmdrake/icon.pm:173
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Byrddau Gwaith Graffigol Eraill"
 
-#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
-#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#: ../Rpmdrake/icon.pm:177 ../Rpmdrake/icon.pm:178 ../Rpmdrake/icon.pm:179
+#: ../Rpmdrake/icon.pm:180 ../Rpmdrake/icon.pm:181 ../Rpmdrake/icon.pm:182
+#: ../Rpmdrake/icon.pm:183 ../Rpmdrake/icon.pm:184
 #, c-format
 msgid "Server"
 msgstr "Gweinydd"
 
-#: ../rpmdrake:357
+#: ../Rpmdrake/icon.pm:178
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: ../rpmdrake:358
+#: ../Rpmdrake/icon.pm:179
 #, c-format
 msgid "Database"
 msgstr "Cronfa Ddata"
 
-#: ../rpmdrake:359
+#: ../Rpmdrake/icon.pm:180
 #, c-format
 msgid "Firewall/Router"
 msgstr "Mur Gwarchod/Llwybrydd"
 
-#: ../rpmdrake:361
+#: ../Rpmdrake/icon.pm:182
 #, c-format
 msgid "Mail/Groupware/News"
 msgstr "E-bost/Grwpwar/Newyddion"
 
-#: ../rpmdrake:362
+#: ../Rpmdrake/icon.pm:183
 #, c-format
 msgid "Network Computer server"
 msgstr "Gweinydd Cyfrifiadur Rhwydwaith"
 
-#: ../rpmdrake:363
+#: ../Rpmdrake/icon.pm:184
 #, c-format
 msgid "Web/FTP"
 msgstr "Gwe/FTP"
 
-#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
-#: ../rpmdrake:724
-#, c-format
-msgid "(Not available)"
-msgstr "(Dim ar gael)"
-
-#: ../rpmdrake:534 ../rpmdrake:616
-#, c-format
-msgid "Search results"
-msgstr "Canlyniadau'r chwilio"
-
-#: ../rpmdrake:534
-#, c-format
-msgid "Search results (none)"
-msgstr "Canlyniadau'r chwilio (dim)"
-
-#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
-#, c-format
-msgid "Please wait, searching..."
-msgstr "Arhoswch, chwilio..."
-
-#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
-#, c-format
-msgid "Software Management"
-msgstr "Rheoli Meddalwedd"
-
-#: ../rpmdrake:578
-#, c-format
-msgid "Stop"
-msgstr "Atal"
-
-#: ../rpmdrake:617 ../rpmdrake:917
-#, c-format
-msgid "Upgradable"
-msgstr "Diweddariadwy"
-
-#: ../rpmdrake:617 ../rpmdrake:917
-#, c-format
-msgid "Addable"
-msgstr "Ychwanegadwy"
-
-#: ../rpmdrake:619
-#, c-format
-msgid "Selected"
-msgstr "Dewiswyd"
-
-#: ../rpmdrake:619
-#, c-format
-msgid "Not selected"
-msgstr "Heb ei ddewis"
-
-#: ../rpmdrake:683 ../rpmdrake:740
-#, c-format
-msgid "Importance: "
-msgstr "Pwysigrwydd: "
-
-#: ../rpmdrake:684 ../rpmdrake:748
-#, c-format
-msgid "Reason for update: "
-msgstr "Rheswm am y diweddariad:"
-
-#: ../rpmdrake:688
-#, c-format
-msgid "Security advisory"
-msgstr "Diweddariadau diogelwch"
-
-#: ../rpmdrake:696 ../rpmdrake:750
-#, c-format
-msgid "No description"
-msgstr "Dim disgrifiad"
-
-#: ../rpmdrake:699
-#, c-format
-msgid "Files:"
-msgstr "Ffeiliau:"
-
-#: ../rpmdrake:707
-#, c-format
-msgid "Changelog:"
-msgstr "Cofnod Newid:"
-
-#: ../rpmdrake:719
-#, c-format
-msgid "Files:\n"
-msgstr "Ffeiliau:\n"
-
-#: ../rpmdrake:724
-#, c-format
-msgid "Changelog:\n"
-msgstr "Cofnod Newid:\n"
-
-#: ../rpmdrake:729 ../rpmdrake.pm:809
-#, c-format
-msgid "Medium: "
-msgstr "Cyfrwng:"
-
-#: ../rpmdrake:730
-#, c-format
-msgid "Currently installed version: "
-msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
-
-#: ../rpmdrake:734
-#, c-format
-msgid "Name: "
-msgstr "Enw: "
-
-#: ../rpmdrake:735
-#, c-format
-msgid "Version: "
-msgstr "Fersiwn: "
-
-#: ../rpmdrake:736
-#, c-format
-msgid "Architecture: "
-msgstr "Pensaernïaeth:"
-
-#: ../rpmdrake:737
+#: ../Rpmdrake/init.pm:40
 #, c-format
-msgid "Size: "
-msgstr "Maint: "
-
-#: ../rpmdrake:737
-#, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Usage: %s [OPTION]..."
+msgstr "Defnyddi: %s [DEWIS]..."
 
-#: ../rpmdrake:744
+#: ../Rpmdrake/init.pm:41
 #, c-format
-msgid "Summary: "
-msgstr "Crynodeb: "
+msgid ""
+"  --changelog-first      display changelog before filelist in the "
+"description window"
+msgstr ""
+"  --changelog-first      dangos cofnod newid cyn filelist yn y ffenestr "
+"disgrifio"
 
-#: ../rpmdrake:750
+#: ../Rpmdrake/init.pm:42
 #, c-format
-msgid "Description: "
-msgstr "Disgrifiadau: "
+msgid "  --media=medium1,..     limit to given media"
+msgstr "  --media=medium1,..     terfyn i'r cyfrwng hwn"
 
-#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#: ../Rpmdrake/init.pm:43
 #, c-format
-msgid "More information on package..."
-msgstr "Rhagor o wybodaeth ar becyn..."
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgstr "  --merge-all-rpmnew     cynnig uno pob ffeil  .rpmnew/.rpmsave"
 
-#: ../rpmdrake:825
+#: ../Rpmdrake/init.pm:44
 #, c-format
-msgid "Please choose"
-msgstr "Dewiswch"
+msgid "  --mode=MODE            set mode (install (default), remove, update)"
+msgstr ""
+"  --mode=MODE            gosod modd (gosod (rhagosodedig), tynnu, diweddaru)"
 
-#: ../rpmdrake:825
+#: ../Rpmdrake/init.pm:45
 #, c-format
-msgid "The following package is needed:"
-msgid_plural "One of the following packages is needed:"
-msgstr[0] "Mae angen y pecyn canlynol:"
-msgstr[1] "Mae angen un o'r pecynnau canlynol:"
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
+msgstr ""
+"  --no-confirmation      peidio gofyn cwestiwn cadarnhau ym modd diweddaru"
 
-#: ../rpmdrake:866
+#: ../Rpmdrake/init.pm:46
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Arhoswch, rhestri pecynnau..."
+msgid "  --no-media-update      don't update media at startup"
+msgstr "  --no-media-update    peidio diweddaru cyfrwng wrth gychwyn"
 
-#: ../rpmdrake:884
+#: ../Rpmdrake/init.pm:47
 #, c-format
-msgid "No update"
-msgstr "Dim diweddariad"
+msgid "  --no-verify-rpm        don't verify packages signatures"
+msgstr "  --no-verify-rpm        peidio gwirio llofnod pecynnau"
 
-#: ../rpmdrake:885
+#: ../Rpmdrake/init.pm:48
 #, c-format
 msgid ""
-"The list of updates is empty. This means that either there is\n"
-"no available update for the packages installed on your computer,\n"
-"or you already installed all of them."
+"  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
+"\" machine to show needed deps"
 msgstr ""
-"Mae'r rhestr diweddariadau'n wag. Mae hyn yn golygu un ai\n"
-"nad oes diweddariad ar gyfer y pecynnau ar eich cyfrifiadur,\n"
-"neu rydych wedi eu gosod i gyd yn barod."
-
-#: ../rpmdrake:908 ../rpmdrake:1171
-#, c-format
-msgid "All"
-msgstr "Popeth"
-
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:956 ../rpmdrake:961
-#, c-format
-msgid "More info"
-msgstr "Rhagor"
+"  --parallel=alias,host  ym modd paralel, defnyddio grŵp \"alias\" , "
+"defnyddio peiriant  \"host\" i ddangos deps angenrheidiol"
 
-#: ../rpmdrake:964
+#: ../Rpmdrake/init.pm:49
 #, c-format
-msgid "Information on packages"
-msgstr "Gwybodaeth am becynnau"
+msgid "  --pkg-nosel=pkg1,..    show only these packages"
+msgstr "  --pkg-nosel=pkg1,..    dangos y pecynnau yma'n unig"
 
-#: ../rpmdrake:987
+#: ../Rpmdrake/init.pm:50
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
+msgid "  --pkg-sel=pkg1,..      preselect these packages"
+msgstr "  --pkg-sel=pkg1,..      rhag ddewis y pecynnau yma"
 
-#: ../rpmdrake:988
+#: ../Rpmdrake/init.pm:51
 #, 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:"
+msgid "  --root                 force to run as root"
+msgstr "  --root                 gorfodi ei redeg fel root"
 
-#: ../rpmdrake:994 ../rpmdrake:1003
+#: ../Rpmdrake/init.pm:52
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "Nid oes modd tynnu rhai pecynnau"
+msgid "  --search=pkg           run search for \"pkg\""
+msgstr "  --search=pkg           chwilio am \"pkg\""
 
-#: ../rpmdrake:995
+#: ../Rpmdrake/init.pm:116
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
-"\n"
+msgid "Running in user mode"
+msgstr "Rhedeg ym modd defnyddiwr"
 
-#: ../rpmdrake:1004 ../rpmdrake:1070
+#: ../Rpmdrake/init.pm:117
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+"You are launching this program as a normal user.\n"
+"You will not be able to perform modifications on the system,\n"
+"but you may still browse the existing database."
 msgstr ""
-"Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
-"eu dad-ddewis nawr:\n"
+"Rydych yn cychwyn y rhaglen fel defnyddiwr cyffredin.\n"
+"Ni fydd modd i chi greu newidiadau i'r system.\n"
+"ond bydd modd i chi bori'r gronfa ddata presennol."
 
-#: ../rpmdrake:1033
+#: ../Rpmdrake/init.pm:124
 #, c-format
-msgid "Additional packages needed"
-msgstr "Pecynnau ychwanegol angenrheidiol"
+msgid "Welcome"
+msgstr "Croeso"
 
-#: ../rpmdrake:1034
+#: ../Rpmdrake/init.pm:129
 #, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"Welcome to the software removal tool!\n"
 "\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
-"I fodloni dibyniaethau, mae angen gosod y pecyn(nau) canlynol\n"
-"hefyd:\n"
+"Croeso i'r offeryn tynnu meddalwedd!\n"
 "\n"
+"Bydd yr offeryn hwn yn eich cynorthwyo i ddewis pa feddalwedd rydych\n"
+"am ei dynnu oddi ar eich cyfrifiadur."
 
-#: ../rpmdrake:1049
-#, c-format
-msgid "%s (belongs to the skip list)"
-msgstr "%s (perthyn i'r rhestr hepgor)"
-
-#: ../rpmdrake:1053
-#, c-format
-msgid "One package cannot be installed"
-msgid_plural "Some packages can't be installed"
-msgstr[0] "Nid oes modd gosod un pecyn"
-msgstr[1] "Nid oes modd gosod rhai pecynnau"
-
-#: ../rpmdrake:1054
+#: ../Rpmdrake/init.pm:134
 #, c-format
 msgid ""
-"Sorry, the following package cannot be selected:\n"
-"\n"
-"%s"
-msgid_plural ""
-"Sorry, the following packages can't be selected:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"Yn anffodus, nid oes modd dewis y pecyn canlynol:\n"
-"\n"
-"%s"
-msgstr[1] ""
-"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
+"Welcome to %s!\n"
 "\n"
-"%s"
-
-#: ../rpmdrake:1069 ../rpmdrake:1924
-#, c-format
-msgid "Some packages need to be removed"
-msgstr "Rhaid tynnu rhai pecynnau"
-
-#: ../rpmdrake:1098
-#, c-format
-msgid "Selected: %s / Free disk space: %s"
-msgstr "Dewiswyd: %s / Lle gwag ar ddisg: %s"
-
-#: ../rpmdrake:1099
-#, c-format
-msgid "Selected size: %d MB"
-msgstr "Maint dewiswyd: %d MB"
-
-#: ../rpmdrake:1104
-#, c-format
-msgid "Description not available for this package\n"
-msgstr "Dim disgrifiad ar gael i'r pecyn hwn\n"
-
-#: ../rpmdrake:1110 ../rpmdrake:1506
-#, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Digwyddodd gwall terfynol:%s."
-
-#: ../rpmdrake:1171
-#, c-format
-msgid "Installed"
-msgstr "Gosodwyd"
-
-#: ../rpmdrake:1171
-#, c-format
-msgid "Non installed"
-msgstr "Heb eu gosod"
-
-#: ../rpmdrake:1172
-#, c-format
-msgid "%s choices"
-msgstr "%s dewis"
-
-#: ../rpmdrake:1172
-#, c-format
-msgid "Mandriva Linux choices"
-msgstr "Dewisiadau Mandriva Linux"
-
-#: ../rpmdrake:1174
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Pob pecyn, trefn yr wyddor"
-
-#: ../rpmdrake:1175
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Pob pecyn, yn ôl diweddariad"
-
-#: ../rpmdrake:1176
-#, c-format
-msgid "All packages, by size"
-msgstr "Pob pecyn, yn ôl maint"
-
-#: ../rpmdrake:1177
-#, c-format
-msgid "All packages, by selection state"
-msgstr "Pob pecyn, yn ôl dyddiad dewis"
-
-#: ../rpmdrake:1178
-#, c-format
-msgid "Leaves only, sorted by install date"
-msgstr "Gadael, yn ôl dyddiad gosod"
-
-#: ../rpmdrake:1179
-#, c-format
-msgid "All packages, by group"
-msgstr "Pob pecyn, yn ôl grŵp"
-
-#: ../rpmdrake:1181
-#, c-format
-msgid "All updates"
-msgstr "Pob diweddariad"
-
-#: ../rpmdrake:1181
-#, c-format
-msgid "Security updates"
-msgstr "Diweddariadau diogelwch"
-
-#: ../rpmdrake:1181
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Diweddariad cywiro gwallau"
-
-#: ../rpmdrake:1181
-#, c-format
-msgid "Normal updates"
-msgstr "Diweddariadau arferol"
-
-#: ../rpmdrake:1244
-#, c-format
-msgid "in names"
-msgstr "mewn enwau"
-
-#: ../rpmdrake:1246
-#, c-format
-msgid "in descriptions"
-msgstr "mewn disgrifiadau"
-
-#: ../rpmdrake:1248
-#, c-format
-msgid "in file names"
-msgstr "mewn enwau ffeil"
-
-#: ../rpmdrake:1275
-#, c-format
-msgid "Error: %s appears to be mounted read-only."
-msgstr "Gwall: %s i weld wedi ei osod fel darllen yn unig."
-
-#: ../rpmdrake:1279
-#, c-format
-msgid "You need to select some packages first."
-msgstr "Rhaid dewis rhai pecynnau'n gyntaf."
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"Croeso i %s!\n"
+"Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
+"ar eich cyfrifiadur."
 
-#: ../rpmdrake:1284
+#: ../Rpmdrake/init.pm:139
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Mae gormod o becynnau wedi eu dewis"
+msgid "Welcome to the software installation tool!"
+msgstr "Croeso i'r offeryn gosod meddalwedd!"
 
-#: ../rpmdrake:1285
+#: ../Rpmdrake/init.pm:140
 #, c-format
 msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"Welcome to the software installation tool!\n"
 "\n"
-"Do you really want to install all the selected packages?"
-msgstr "Rhybudd:"
-
-#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
-#: ../rpmdrake:1353
-#, c-format
-msgid "/_File"
-msgstr "/_Ffeil"
-
-#: ../rpmdrake:1320
-#, c-format
-msgid "/_Update media"
-msgstr "/_Diweddaru'r cyfrwng"
-
-#: ../rpmdrake:1331
-#, c-format
-msgid "/_Reset the selection"
-msgstr "/_Ailosod y dewis"
-
-#: ../rpmdrake:1344
-#, c-format
-msgid "/Reload the _packages list"
-msgstr "/_Ail-lwytho'r rhestr pecynnau"
-
-#: ../rpmdrake:1353
-#, c-format
-msgid "/_Quit"
-msgstr "/_Gadael"
-
-#: ../rpmdrake:1353
-#, c-format
-msgid "<control>Q"
-msgstr "<control>Q"
-
-#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
-#, c-format
-msgid "/_Options"
-msgstr "/_Dewisiadau"
-
-#: ../rpmdrake:1357
-#, c-format
-msgid "/_Media Manager"
-msgstr "/_Rheolwr Cyfrwng"
-
-#: ../rpmdrake:1360 ../rpmdrake:1390
-#, c-format
-msgid "/_Show automatically selected packages"
-msgstr "/_Dangoswch y pecynnau dewis awtomatig"
-
-#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
-#, c-format
-msgid "/_Help"
-msgstr "/_Cymorth"
-
-#: ../rpmdrake:1365
-#, c-format
-msgid "/_Report Bug"
-msgstr "/_Adrodd ar Wall"
-
-#: ../rpmdrake:1367
-#, c-format
-msgid "/_About..."
-msgstr "/_Ynghylch..."
-
-#: ../rpmdrake:1370
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:1372
-#, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Hawlfraint (C) %s Mandriva"
-
-#: ../rpmdrake:1374
-#, c-format
-msgid "Rpmdrake is Mandriva Linux package management tool."
-msgstr "Rpmdrake yw offeryn rheoli pecynnau Mandriva Linux."
-
-#: ../rpmdrake:1376
-#, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
-
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1381
-#, c-format
-msgid "_: Translator(s) name(s) & email(s)\n"
-msgstr "_: Rhoslyn Prys post@meddal.com\n"
-
-#: ../rpmdrake:1405
-#, c-format
-msgid "Find:"
-msgstr "Canfod:"
-
-#: ../rpmdrake:1414
-#, c-format
-msgid "Search"
-msgstr "Chwilio"
-
-#: ../rpmdrake:1416
-#, c-format
-msgid "Clear"
-msgstr "Clirio"
-
-#: ../rpmdrake:1430 ../rpmdrake.pm:760
-#, c-format
-msgid "Select all"
-msgstr "Dewis popeth"
-
-#: ../rpmdrake:1437
-#, c-format
-msgid "Apply"
-msgstr "Gosod"
-
-#: ../rpmdrake:1441
-#, c-format
-msgid "Quit"
-msgstr "Gadael"
-
-#: ../rpmdrake:1457
-#, c-format
-msgid "Quick Introduction"
-msgstr "Cyflwyniad Cyflym"
-
-#: ../rpmdrake:1458
-#, c-format
-msgid "You can browse the packages through the categories tree on the left."
-msgstr "Gallwch edrych ar y pecynnau drwy'r rhestr categorïau ar y chwith."
-
-#: ../rpmdrake:1459
-#, c-format
-msgid ""
-"You can view information about a package by clicking on it on the right list."
+"Your Mandriva Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
-"Gallwch ddarllen gwybodaeth am y pecynnau drwy glicio ar y rhestr ar y dde."
-
-#: ../rpmdrake:1460
-#, c-format
-msgid "To install, update or remove a package, just click on its \"checkbox\"."
-msgstr "I osod, diweddaru neu dynnu rhaglen, cliciwch ar ei \"flwch ticio\"."
+"Croeso i'r offeryn gosod meddalwedd!\n"
+"\n"
+"Mae eich system Mandriva Linux yn cynnwys rhai miloedd o becynnau\n"
+"meddalwedd ar CDROM neu DVD.  Bydd yr offeryn hwn yn eich cynorthwyo\n"
+"i ddewis pa feddalwedd i osod ar eich cyfrifiadur."
 
-#: ../rpmdrake:1505
+#: ../Rpmdrake/pkg.pm:188
 #, c-format
 msgid "Fatal error"
 msgstr "Gwall terfynol"
 
-#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#: ../Rpmdrake/pkg.pm:193 ../Rpmdrake/pkg.pm:499 ../rpmdrake.pm:316
 #, c-format
 msgid "Please wait"
 msgstr "Arhoswch"
 
-#: ../rpmdrake:1510 ../rpmdrake:1935
+#: ../Rpmdrake/pkg.pm:193 ../Rpmdrake/pkg.pm:499
 #, c-format
 msgid "Package installation..."
 msgstr "Gosod pecynnau..."
 
-#: ../rpmdrake:1510 ../rpmdrake:1935
+#: ../Rpmdrake/pkg.pm:193 ../Rpmdrake/pkg.pm:499
 #, c-format
 msgid "Initializing..."
 msgstr "Ymgychwyn..."
 
-#: ../rpmdrake:1533 ../rpmdrake:1924
+#: ../Rpmdrake/pkg.pm:215 ../Rpmdrake/pkg.pm:486
 #, c-format
 msgid "Confirmation"
 msgstr "Gwiriad"
 
-#: ../rpmdrake:1534
+#: ../Rpmdrake/pkg.pm:216
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1932,12 +1696,12 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../rpmdrake:1543
+#: ../Rpmdrake/pkg.pm:225
 #, c-format
 msgid "Already existing update media"
 msgstr "Cyfrwng diweddaru sy'n bod eisoes"
 
-#: ../rpmdrake:1544
+#: ../Rpmdrake/pkg.pm:226
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1954,12 +1718,12 @@ msgstr ""
 "\n"
 "Yna ailgychwyn %s."
 
-#: ../rpmdrake:1555
+#: ../Rpmdrake/pkg.pm:237
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "Sut i ddewis drych gyda llaw."
 
-#: ../rpmdrake:1556
+#: ../Rpmdrake/pkg.pm:238
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1974,72 +1738,37 @@ msgstr ""
 "\n"
 "Yna ailgychwynnwch %s."
 
-#: ../rpmdrake:1570
+#: ../Rpmdrake/pkg.pm:252
 #, c-format
 msgid "Reading updates description"
 msgstr "Darllen disgrifiad diweddariadau"
 
-#: ../rpmdrake:1596 ../rpmdrake:1673
+#: ../Rpmdrake/pkg.pm:278 ../Rpmdrake/pkg.pm:358
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../rpmdrake:1604
+#: ../Rpmdrake/pkg.pm:286
 #, c-format
 msgid "Please wait, listing base packages..."
 msgstr "Arhoswch, rhestri pecynnau sail..."
 
-#: ../rpmdrake:1640
+#: ../Rpmdrake/pkg.pm:323
 #, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "Arhoswch, canfod pecynnau sydd wedi eu gosod..."
 
-#: ../rpmdrake:1774
-#, c-format
-msgid "Inspecting %s"
-msgstr "Archwilio %s"
-
-#: ../rpmdrake:1797
-#, c-format
-msgid "changes:"
-msgstr "newidiadau:"
-
-#: ../rpmdrake:1805
-#, c-format
-msgid "Remove .%s"
-msgstr "Tynnu .%s"
-
-#: ../rpmdrake:1809
-#, c-format
-msgid "Use .%s as main file"
-msgstr "Defnyddio .%s fel y brif ffeil"
-
-#: ../rpmdrake:1813
-#, c-format
-msgid "Do nothing"
-msgstr "Gwneud dim"
-
-#: ../rpmdrake:1829
-#, c-format
-msgid "Installation finished"
-msgstr "Gorffennodd y gosodiad"
-
-#: ../rpmdrake:1844
-#, c-format
-msgid "Inspect..."
-msgstr "Archwilio..."
-
-#: ../rpmdrake:1877 ../rpmdrake:2070
+#: ../Rpmdrake/pkg.pm:440 ../Rpmdrake/pkg.pm:635
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
-#: ../rpmdrake:1881 ../rpmdrake:2050
+#: ../Rpmdrake/pkg.pm:444 ../Rpmdrake/pkg.pm:615
 #, c-format
 msgid "Problem during installation"
 msgstr "Anhawster wrth osod"
 
-#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#: ../Rpmdrake/pkg.pm:445 ../Rpmdrake/pkg.pm:616 ../Rpmdrake/pkg.pm:674
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -2050,17 +1779,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1901
+#: ../Rpmdrake/pkg.pm:464
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../rpmdrake:1902
+#: ../Rpmdrake/pkg.pm:465
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Methu estyn pecynnau ffynhonnell, %s"
 
-#: ../rpmdrake:1903 ../rpmdrake:2001
+#: ../Rpmdrake/pkg.pm:466 ../Rpmdrake/pkg.pm:566
 #, c-format
 msgid ""
 "\n"
@@ -2073,71 +1802,65 @@ msgstr ""
 "Gwall(au) wedi eu hadrodd:\n"
 "%s"
 
-#. -PO: in singular form, we use %2\$
-#: ../rpmdrake:1921
-#, c-format
+#: ../Rpmdrake/pkg.pm:483
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following package is going to be installed:\n"
-"%2$s\n"
+"To satisfy dependencies, the following package is going to be installed:"
 msgid_plural ""
-"To satisfy dependencies, the following %d packages are going to be "
-"installed:\n"
-"%s\n"
-msgstr[0] ""
-"I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod:\n"
-"%2$s\n"
-msgstr[1] ""
-"I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod:\n"
-"%s\n"
+"To satisfy dependencies, the following %d packages are going to be installed:"
+msgstr[0] "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod:"
+msgstr[1] "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod:"
 
-#: ../rpmdrake:1926
+#: ../Rpmdrake/pkg.pm:488
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Tynnu un pecyn?"
 msgstr[1] "Tynnu %d pecyn?"
 
-#: ../rpmdrake:1927
-#, c-format
+#: ../Rpmdrake/pkg.pm:490
+#, fuzzy, c-format
 msgid "The following package has to be removed for others to be upgraded:"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:"
-msgstr[0] ""
-"Cafodd y pecynnau canlynol eu tynnu i eraill gael eu diweddaru:"
-msgstr[1] ""
-"Cafodd y pecyn canlynol ei dynnu i eraill gael eu diweddaru:"
+msgstr "Cafodd y pecynnau canlynol eu tynnu i eraill gael eu diweddaru:"
 
-#: ../rpmdrake:1927
+#: ../Rpmdrake/pkg.pm:491
+#, fuzzy, 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.\n"
+"%s"
+
+#: ../Rpmdrake/pkg.pm:491
 #, c-format
 msgid "Is it ok to continue?"
 msgstr "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake:1944
+#: ../Rpmdrake/pkg.pm:509
 #, c-format
 msgid "Change medium"
 msgstr "Newid cyfrwng"
 
-#: ../rpmdrake:1945
+#: ../Rpmdrake/pkg.pm:510
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" i mewn i ddyfais [%s]"
 
-#: ../rpmdrake:1952
+#: ../Rpmdrake/pkg.pm:517
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
 
-#: ../rpmdrake:1972
+#: ../Rpmdrake/pkg.pm:537
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "Gwirio llofnodion pecynnau ..."
 
-#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#: ../Rpmdrake/pkg.pm:550 ../rpmdrake.pm:743 ../rpmdrake.pm:852
 #, c-format
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../rpmdrake:1986
+#: ../Rpmdrake/pkg.pm:551
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -2152,12 +1875,12 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau gyda'r gosod?"
 
-#: ../rpmdrake:1998 ../rpmdrake:2108
+#: ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:673
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosodiad"
 
-#: ../rpmdrake:1999
+#: ../Rpmdrake/pkg.pm:564
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -2170,27 +1893,27 @@ msgstr ""
 "\n"
 "Efallai'r hoffech ddiweddaru eich cronfa ddata o gyfryngau."
 
-#: ../rpmdrake:2013
+#: ../Rpmdrake/pkg.pm:578
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Paratoi pecynnau i'w gosod..."
 
-#: ../rpmdrake:2013
+#: ../Rpmdrake/pkg.pm:578
 #, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
 
-#: ../rpmdrake:2016
+#: ../Rpmdrake/pkg.pm:581
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../rpmdrake:2031
+#: ../Rpmdrake/pkg.pm:596
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad at ffeil rpm (%s)"
 
-#: ../rpmdrake:2065
+#: ../Rpmdrake/pkg.pm:630
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2203,47 +1926,48 @@ msgstr ""
 "Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
 "mae modd eu harchwilio i weithredu arnynt:"
 
-#: ../rpmdrake:2073
+#: ../Rpmdrake/pkg.pm:638
 #, c-format
 msgid "Upgrade information"
 msgstr "Gwybodaeth uwchraddio"
 
-#: ../rpmdrake:2075
+#: ../Rpmdrake/pkg.pm:640
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "Mae gan y pecynnau wybodaeth uwchraddio"
 
-#: ../rpmdrake:2083
+#: ../Rpmdrake/pkg.pm:648
 #, c-format
 msgid "Upgrade information about this package"
 msgstr "Gwybodaeth uwchraddio am y pecyn hwn"
 
-#: ../rpmdrake:2086
+#: ../Rpmdrake/pkg.pm:651
 #, c-format
 msgid "Upgrade information about package %s"
 msgstr "Gwybodaeth uwchraddio am becyn %s"
 
-#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#: ../Rpmdrake/pkg.pm:663 ../rpmdrake.pm:730 ../rpmdrake.pm:811
+#: ../rpmdrake.pm:835
 #, c-format
 msgid "Error"
 msgstr "Gwall"
 
-#: ../rpmdrake:2099
+#: ../Rpmdrake/pkg.pm:664
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Gwall anadferadwy: dim pecyn wedi ei ganfod ar gyfer y gosod."
 
-#: ../rpmdrake:2124
+#: ../Rpmdrake/pkg.pm:689
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Arhoswch, tynnu'r pecynnau..."
 
-#: ../rpmdrake:2135
+#: ../Rpmdrake/pkg.pm:700
 #, c-format
 msgid "Problem during removal"
 msgstr "Problem wrth dynnu"
 
-#: ../rpmdrake:2136
+#: ../Rpmdrake/pkg.pm:701
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -2254,72 +1978,363 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:2168
+#: ../Rpmdrake/rpmnew.pm:81
 #, c-format
-msgid "Welcome"
-msgstr "Croeso"
+msgid "Inspecting %s"
+msgstr "Archwilio %s"
+
+#: ../Rpmdrake/rpmnew.pm:104
+#, c-format
+msgid "Changes:"
+msgstr "Newidiadau:"
 
-#: ../rpmdrake:2173
+#: ../Rpmdrake/rpmnew.pm:112
+#, c-format
+msgid "Remove .%s"
+msgstr "Tynnu .%s"
+
+#: ../Rpmdrake/rpmnew.pm:116
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Defnyddio .%s fel y brif ffeil"
+
+#: ../Rpmdrake/rpmnew.pm:120
+#, c-format
+msgid "Do nothing"
+msgstr "Gwneud dim"
+
+#: ../Rpmdrake/rpmnew.pm:136
+#, c-format
+msgid "Installation finished"
+msgstr "Gorffennodd y gosodiad"
+
+#: ../Rpmdrake/rpmnew.pm:151
+#, c-format
+msgid "Inspect..."
+msgstr "Archwilio..."
+
+#: ../Rpmdrake/rpmnew.pm:169 ../rpmdrake:70 ../rpmdrake:98
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Arhoswch, chwilio..."
+
+#: ../gurpmi.addmedia:83
+#, c-format
+msgid "Unable to add medium, wrong or missing arguments"
+msgstr "Methu ychwanegu cyfrwng, ymresymiadau anghywir neu goll."
+
+#: ../gurpmi.addmedia:97
 #, c-format
 msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
 msgstr ""
-"Croeso i'r offeryn tynnu meddalwedd!\n"
-"\n"
-"Bydd yr offeryn hwn yn eich cynorthwyo i ddewis pa feddalwedd rydych\n"
-"am ei dynnu oddi ar eich cyfrifiadur."
+"Rydych ar fin gosod cyfrwng pecynnau newydd, %s.\n"
+"Mae hyn yn golygu y bydd modd gosod pecynnau meddalwedd\n"
+"newydd i'ch system o'r cyfrwng hwnnw."
 
-#: ../rpmdrake:2178
+#: ../gurpmi.addmedia:100
 #, c-format
 msgid ""
-"Welcome to %s!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+"You are about to add a new packages medium, `%s'.\n"
+"That means you will be able to add new software packages\n"
+"to your system from that new medium."
 msgstr ""
-"Croeso i %s!\n"
-"Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
-"ar eich cyfrifiadur."
+"Rydych ar fin gosod cyfrwng pecynnau newydd, %s'.\n"
+"Mae hyn yn golygu y bydd modd gosod pecynnau meddalwedd\n"
+"newydd i'ch system o'r cyfrwng hwnnw."
 
-#: ../rpmdrake:2183
+#: ../gurpmi.addmedia:125
 #, c-format
-msgid "Welcome to the software installation tool!"
-msgstr "Croeso i'r offeryn gosod meddalwedd!"
+msgid "Successfully added media %s."
+msgstr "Llwyddiant wrth ychwanegu cyfrwng %s."
+
+#: ../gurpmi.addmedia:126
+#, c-format
+msgid "Successfully added medium `%s'."
+msgstr "Llwyddiant wrth ychwanegu cyfrwng '%s'"
+
+#: ../rpmdrake:59 ../rpmdrake:141
+#, c-format
+msgid "Search results"
+msgstr "Canlyniadau'r chwilio"
 
-#: ../rpmdrake:2184
+#: ../rpmdrake:59
+#, c-format
+msgid "Search results (none)"
+msgstr "Canlyniadau'r chwilio (dim)"
+
+#: ../rpmdrake:93 ../rpmdrake:187 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "Rheoli Meddalwedd"
+
+#: ../rpmdrake:103
+#, c-format
+msgid "Stop"
+msgstr "Atal"
+
+#: ../rpmdrake:144
+#, c-format
+msgid "Selected"
+msgstr "Dewiswyd"
+
+#: ../rpmdrake:144
+#, c-format
+msgid "Not selected"
+msgstr "Heb ei ddewis"
+
+#: ../rpmdrake:200
+#, c-format
+msgid "Selected: %s / Free disk space: %s"
+msgstr "Dewiswyd: %s / Lle gwag ar ddisg: %s"
+
+#: ../rpmdrake:201
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Maint dewiswyd: %d MB"
+
+#: ../rpmdrake:256
+#, c-format
+msgid "Installed"
+msgstr "Gosodwyd"
+
+#: ../rpmdrake:256
+#, c-format
+msgid "Non installed"
+msgstr "Heb eu gosod"
+
+#: ../rpmdrake:257
+#, c-format
+msgid "%s choices"
+msgstr "%s dewis"
+
+#: ../rpmdrake:257
+#, c-format
+msgid "Mandriva Linux choices"
+msgstr "Dewisiadau Mandriva Linux"
+
+#: ../rpmdrake:259
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Pob pecyn, trefn yr wyddor"
+
+#: ../rpmdrake:260
+#, c-format
+msgid "All packages, by update availability"
+msgstr "Pob pecyn, yn ôl diweddariad"
+
+#: ../rpmdrake:261
+#, c-format
+msgid "All packages, by size"
+msgstr "Pob pecyn, yn ôl maint"
+
+#: ../rpmdrake:262
+#, c-format
+msgid "All packages, by selection state"
+msgstr "Pob pecyn, yn ôl dyddiad dewis"
+
+#: ../rpmdrake:263
+#, c-format
+msgid "Leaves only, sorted by install date"
+msgstr "Gadael, yn ôl dyddiad gosod"
+
+#: ../rpmdrake:264
+#, c-format
+msgid "All packages, by group"
+msgstr "Pob pecyn, yn ôl grŵp"
+
+#: ../rpmdrake:266
+#, c-format
+msgid "All updates"
+msgstr "Pob diweddariad"
+
+#: ../rpmdrake:266
+#, c-format
+msgid "Security updates"
+msgstr "Diweddariadau diogelwch"
+
+#: ../rpmdrake:266
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Diweddariad cywiro gwallau"
+
+#: ../rpmdrake:266
+#, c-format
+msgid "Normal updates"
+msgstr "Diweddariadau arferol"
+
+#: ../rpmdrake:327
+#, c-format
+msgid "in names"
+msgstr "mewn enwau"
+
+#: ../rpmdrake:329
+#, c-format
+msgid "in descriptions"
+msgstr "mewn disgrifiadau"
+
+#: ../rpmdrake:331
+#, c-format
+msgid "in file names"
+msgstr "mewn enwau ffeil"
+
+#: ../rpmdrake:362 ../rpmdrake:365 ../rpmdrake:376 ../rpmdrake:389
+#: ../rpmdrake:398
+#, c-format
+msgid "/_File"
+msgstr "/_Ffeil"
+
+#: ../rpmdrake:365
+#, c-format
+msgid "/_Update media"
+msgstr "/_Diweddaru'r cyfrwng"
+
+#: ../rpmdrake:376
+#, c-format
+msgid "/_Reset the selection"
+msgstr "/_Ailosod y dewis"
+
+#: ../rpmdrake:389
+#, c-format
+msgid "/Reload the _packages list"
+msgstr "/_Ail-lwytho'r rhestr pecynnau"
+
+#: ../rpmdrake:398
+#, c-format
+msgid "/_Quit"
+msgstr "/_Gadael"
+
+#: ../rpmdrake:398
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../rpmdrake:401 ../rpmdrake:402 ../rpmdrake:407 ../rpmdrake:437
+#, c-format
+msgid "/_Options"
+msgstr "/_Dewisiadau"
+
+#: ../rpmdrake:402
+#, c-format
+msgid "/_Media Manager"
+msgstr "/_Rheolwr Cyfrwng"
+
+#: ../rpmdrake:407 ../rpmdrake:437
+#, c-format
+msgid "/_Show automatically selected packages"
+msgstr "/_Dangoswch y pecynnau dewis awtomatig"
+
+#: ../rpmdrake:411 ../rpmdrake:412 ../rpmdrake:413 ../rpmdrake:414
+#, c-format
+msgid "/_Help"
+msgstr "/_Cymorth"
+
+#: ../rpmdrake:412
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Adrodd ar Wall"
+
+#: ../rpmdrake:414
+#, c-format
+msgid "/_About..."
+msgstr "/_Ynghylch..."
+
+#: ../rpmdrake:417
+#, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
+
+#: ../rpmdrake:419
+#, c-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr "Hawlfraint (C) %s Mandriva"
+
+#: ../rpmdrake:421
+#, c-format
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr "Rpmdrake yw offeryn rheoli pecynnau Mandriva Linux."
+
+#: ../rpmdrake:423
+#, 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
+#, c-format
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr "_: Rhoslyn Prys post@meddal.com\n"
+
+#: ../rpmdrake:452
+#, c-format
+msgid "Find:"
+msgstr "Canfod:"
+
+#: ../rpmdrake:461
+#, c-format
+msgid "Search"
+msgstr "Chwilio"
+
+#: ../rpmdrake:463
+#, c-format
+msgid "Clear"
+msgstr "Clirio"
+
+#: ../rpmdrake:477 ../rpmdrake.pm:764
+#, c-format
+msgid "Select all"
+msgstr "Dewis popeth"
+
+#: ../rpmdrake:484
+#, c-format
+msgid "Apply"
+msgstr "Gosod"
+
+#: ../rpmdrake:488
+#, c-format
+msgid "Quit"
+msgstr "Gadael"
+
+#: ../rpmdrake:504
+#, c-format
+msgid "Quick Introduction"
+msgstr "Cyflwyniad Cyflym"
+
+#: ../rpmdrake:505
+#, 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
 #, c-format
 msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandriva Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
+"You can view information about a package by clicking on it on the right list."
 msgstr ""
-"Croeso i'r offeryn gosod meddalwedd!\n"
-"\n"
-"Mae eich system Mandriva Linux yn cynnwys rhai miloedd o becynnau\n"
-"meddalwedd ar CDROM neu DVD.  Bydd yr offeryn hwn yn eich cynorthwyo\n"
-"i ddewis pa feddalwedd i osod ar eich cyfrifiadur."
+"Gallwch ddarllen gwybodaeth am y pecynnau drwy glicio ar y rhestr ar y dde."
+
+#: ../rpmdrake:507
+#, 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:104
+#: ../rpmdrake.pm:103
 #, c-format
 msgid "Software Update"
 msgstr "Diweddaru Meddalwedd"
 
-#: ../rpmdrake.pm:104
+#: ../rpmdrake.pm:103
 #, c-format
 msgid "Mandriva Linux Update"
 msgstr "Diweddaru Mandriva Linux"
 
-#: ../rpmdrake.pm:131
+#: ../rpmdrake.pm:130
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Rhowch eich hawl i gael mynediad dirprwy\n"
 
-#: ../rpmdrake.pm:132
+#: ../rpmdrake.pm:131
 #, c-format
 msgid "User name:"
 msgstr "Enw Defnyddiwr:"
@@ -2329,7 +2344,7 @@ msgstr "Enw Defnyddiwr:"
 msgid "Software Packages Removal"
 msgstr "Tynnu Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:176
+#: ../rpmdrake.pm:176 ../rpmdrake.pm:180
 #, c-format
 msgid "Software Packages Update"
 msgstr "Diweddaru Pecynnau Meddalwedd"
@@ -2339,177 +2354,177 @@ msgstr "Diweddaru Pecynnau Meddalwedd"
 msgid "Software Packages Installation"
 msgstr "Gosod Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:219
+#: ../rpmdrake.pm:220
 #, c-format
 msgid "No"
 msgstr "Na"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:224
 #, c-format
 msgid "Yes"
 msgstr "Iawn"
 
-#: ../rpmdrake.pm:273
+#: ../rpmdrake.pm:274
 #, c-format
 msgid "Info..."
 msgstr "Gwybodaeth..."
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:395
 #, c-format
 msgid "Austria"
 msgstr "Awstria"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:396
 #, c-format
 msgid "Australia"
 msgstr "Awstralia"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:397
 #, c-format
 msgid "Belgium"
 msgstr "Gwlad Belg"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:398
 #, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:399
 #, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:400
 #, c-format
 msgid "Switzerland"
 msgstr "Y Swistir"
 
-#: ../rpmdrake.pm:396
+#: ../rpmdrake.pm:401
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:402
 #, c-format
 msgid "Czech Republic"
 msgstr "Gweriniaeth Tsiec"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:403
 #, c-format
 msgid "Germany"
 msgstr "Yr Almaen"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:404
 #, c-format
 msgid "Danmark"
 msgstr "Denmarc"
 
-#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#: ../rpmdrake.pm:405 ../rpmdrake.pm:409
 #, c-format
 msgid "Greece"
 msgstr "Groeg"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:406
 #, c-format
 msgid "Spain"
 msgstr "Sbaen"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:407
 #, c-format
 msgid "Finland"
 msgstr "Ffindir"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:408
 #, c-format
 msgid "France"
 msgstr "Ffrainc"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:410
 #, c-format
 msgid "Hungary"
 msgstr "Hwngari"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:411
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:412
 #, c-format
 msgid "Italy"
 msgstr "Yr Eidal"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:413
 #, c-format
 msgid "Japan"
 msgstr "Siapan"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:414
 #, c-format
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:415
 #, c-format
 msgid "Netherlands"
 msgstr "Yr Iseldiroedd"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:416
 #, c-format
 msgid "Norway"
 msgstr "Norwy"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:417
 #, c-format
 msgid "Poland"
 msgstr "Gwlad Pwyl"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:418
 #, c-format
 msgid "Portugal"
 msgstr "Portiwgal"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:419
 #, c-format
 msgid "Russia"
 msgstr "Rwsia"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:420
 #, c-format
 msgid "Sweden"
 msgstr "Sweden"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:421
 #, c-format
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Slovakia"
 msgstr "Slofacia"
 
-#: ../rpmdrake.pm:418
+#: ../rpmdrake.pm:423
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:424
 #, c-format
 msgid "United Kingdom"
 msgstr "Y Deyrnas Unedig"
 
-#: ../rpmdrake.pm:420
+#: ../rpmdrake.pm:425
 #, c-format
 msgid "China"
 msgstr "Tsiena"
 
-#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#: ../rpmdrake.pm:426 ../rpmdrake.pm:427 ../rpmdrake.pm:428 ../rpmdrake.pm:429
 #, c-format
 msgid "United States"
 msgstr "Yr Unol Daleithiau"
 
-#: ../rpmdrake.pm:521
+#: ../rpmdrake.pm:526
 #, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2522,7 +2537,7 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../rpmdrake.pm:525
+#: ../rpmdrake.pm:530
 #, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
@@ -2535,27 +2550,27 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:536 ../rpmdrake.pm:574
 #, c-format
 msgid "Mirror choice"
 msgstr "Dewis drychau"
 
-#: ../rpmdrake.pm:534
+#: ../rpmdrake.pm:539
 #, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau."
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:540
 #, 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:542
+#: ../rpmdrake.pm:547
 #, c-format
 msgid "Error during download"
 msgstr "Gwall wrth lwytho i lawr"
 
-#: ../rpmdrake.pm:544
+#: ../rpmdrake.pm:549
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2570,7 +2585,7 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu'r safle, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:549
+#: ../rpmdrake.pm:554
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2585,17 +2600,17 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu safle Mandriva, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:559
+#: ../rpmdrake.pm:564
 #, c-format
 msgid "No mirror"
 msgstr "Dim drych"
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:566
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Methu canfod drych addas."
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:567
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2610,68 +2625,68 @@ msgstr ""
 "yw pensaernïaeth eich prosesydd yn cael ei gynnal gan Diweddariadau\n"
 "Swyddogol Mandriva Linux."
 
-#: ../rpmdrake.pm:581
+#: ../rpmdrake.pm:586
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Dewiswch ddrych"
 
-#: ../rpmdrake.pm:634
+#: ../rpmdrake.pm:639
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copïo ffeil fel ar gyfer cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:637
+#: ../rpmdrake.pm:642
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Archwilio ffeil cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:645
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Archwilio ffeil bell y cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:644
+#: ../rpmdrake.pm:649
 #, c-format
 msgid " done."
 msgstr " gorffen.."
 
-#: ../rpmdrake.pm:648
+#: ../rpmdrake.pm:653
 #, c-format
 msgid " failed!"
 msgstr " methwyd!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:652
+#: ../rpmdrake.pm:657
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s o gyfrwng %s"
 
-#: ../rpmdrake.pm:656
+#: ../rpmdrake.pm:661
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Cychwyn llwytho %s i lawr..."
 
-#: ../rpmdrake.pm:660
+#: ../rpmdrake.pm:665
 #, 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:663
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
 
-#: ../rpmdrake.pm:674
+#: ../rpmdrake.pm:679
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Arhoswch, diweddaru cyfrwng..."
 
-#: ../rpmdrake.pm:702
+#: ../rpmdrake.pm:706
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Gwall estyn pecynnau"
 
-#: ../rpmdrake.pm:703
+#: ../rpmdrake.pm:707
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2688,28 +2703,28 @@ msgstr ""
 "neu nid oes modd ei gyrraedd ar hyn o bryd a dylech geisio eto \n"
 "rhywbryd."
 
-#: ../rpmdrake.pm:734
+#: ../rpmdrake.pm:738
 #, c-format
 msgid "Update media"
 msgstr "Diweddaru'r cyfrwng"
 
-#: ../rpmdrake.pm:739
+#: ../rpmdrake.pm:743
 #, 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:746
+#: ../rpmdrake.pm:750
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Dewiswch y cyfrwng i'w diweddaru:"
 
-#: ../rpmdrake.pm:764
+#: ../rpmdrake.pm:768
 #, c-format
 msgid "Update"
 msgstr "Diweddaru"
 
-#: ../rpmdrake.pm:785
+#: ../rpmdrake.pm:789
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2722,7 +2737,7 @@ msgstr ""
 "Gwallau:\n"
 "%s"
 
-#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2733,17 +2748,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:831
+#: ../rpmdrake.pm:835
 #, c-format
 msgid "Unable to create medium."
 msgstr "Methu creu cyfrwng."
 
-#: ../rpmdrake.pm:836
+#: ../rpmdrake.pm:840
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Methu ychwanegu cyfrwng"
 
-#: ../rpmdrake.pm:837
+#: ../rpmdrake.pm:841
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2754,7 +2769,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:850
+#: ../rpmdrake.pm:854
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2765,7 +2780,7 @@ msgstr ""
 "s rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
-#: ../rpmdrake.pm:853
+#: ../rpmdrake.pm:857
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
@@ -2776,12 +2791,12 @@ msgstr ""
 "Mandriva Linux rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
-#: ../rpmdrake.pm:870
+#: ../rpmdrake.pm:874
 #, c-format
 msgid "Help launched in background"
 msgstr "Cymorth wedi ei gychwyn yn y cefndir"
 
-#: ../rpmdrake.pm:871
+#: ../rpmdrake.pm:875
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
@@ -3058,3 +3073,17 @@ msgstr "Tynnu Meddalwedd"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Rheolwr Cyfrwng Meddalwedd"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed:\n"
+#~ "%2$s\n"
+#~ msgid_plural ""
+#~ "To satisfy dependencies, the following %d packages are going to be "
+#~ "installed:\n"
+#~ "%s\n"
+#~ msgstr[0] ""
+#~ "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod:\n"
+#~ "%2$s\n"
+#~ msgstr[1] ""
+#~ "I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod:\n"
+#~ "%s\n"