sync with code

1 files changed, 535 insertions, 586 deletions

diff --git a/po/cy.po b/po/cy.po
index d16b920b..a2c71d58 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: 2008-01-23 18:32+0100\n"
+"POT-Creation-Date: 2008-02-06 15:47+0100\n"
 "PO-Revision-Date: 2007-09-19 23:14+0100\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Poedit-Country: UK\n"
 "Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
 
-#: ../MandrivaUpdate:86 ../Rpmdrake/gui.pm:726
+#: ../MandrivaUpdate:86 ../Rpmdrake/gui.pm:754
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -30,7 +30,7 @@ msgstr ""
 "nad oes diweddariad ar gyfer y pecynnau ar eich cyfrifiadur,\n"
 "neu rydych wedi eu gosod i gyd yn barod."
 
-#: ../MandrivaUpdate:109 ../rpmdrake:80 ../rpmdrake:561 ../rpmdrake.pm:193
+#: ../MandrivaUpdate:109 ../rpmdrake:81 ../rpmdrake:566 ../rpmdrake.pm:192
 #, c-format
 msgid "Software Management"
 msgstr "Rheoli Meddalwedd"
@@ -45,37 +45,37 @@ msgstr "Dyma restr o ddiweddariadau pecynnau meddalwedd"
 msgid "Name"
 msgstr "Enw"
 
-#: ../MandrivaUpdate:133 ../rpmdrake:203
+#: ../MandrivaUpdate:133 ../rpmdrake:204
 #, c-format
 msgid "Version"
 msgstr "Fersiwn "
 
-#: ../MandrivaUpdate:134 ../rpmdrake:207
+#: ../MandrivaUpdate:134 ../rpmdrake:208
 #, c-format
 msgid "Release"
 msgstr ""
 
-#: ../MandrivaUpdate:135 ../rpmdrake:211
+#: ../MandrivaUpdate:135 ../rpmdrake:212
 #, c-format
 msgid "Arch"
 msgstr "Arch"
 
-#: ../MandrivaUpdate:148 ../Rpmdrake/edit_urpm_sources.pm:1133
+#: ../MandrivaUpdate:148 ../Rpmdrake/edit_urpm_sources.pm:1134
 #, c-format
 msgid "Help"
 msgstr "Cymorth"
 
-#: ../MandrivaUpdate:152 ../rpmdrake:495 ../rpmdrake.pm:770
+#: ../MandrivaUpdate:152 ../rpmdrake:500 ../rpmdrake.pm:769
 #, c-format
 msgid "Select all"
 msgstr "Dewis popeth"
 
-#: ../MandrivaUpdate:165 ../rpmdrake.pm:774
+#: ../MandrivaUpdate:165 ../rpmdrake.pm:773
 #, c-format
 msgid "Update"
 msgstr "Diweddaru"
 
-#: ../MandrivaUpdate:173 ../rpmdrake:506
+#: ../MandrivaUpdate:173 ../rpmdrake:511
 #, c-format
 msgid "Quit"
 msgstr "Gadael"
@@ -225,8 +225,8 @@ msgstr "Pori..."
 msgid "Login:"
 msgstr "Mewngofnod:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:198 ../Rpmdrake/edit_urpm_sources.pm:538
-#: ../rpmdrake.pm:134
+#: ../Rpmdrake/edit_urpm_sources.pm:198 ../Rpmdrake/edit_urpm_sources.pm:539
+#: ../rpmdrake.pm:133
 #, c-format
 msgid "Password:"
 msgstr "Cyfrinair:"
@@ -282,24 +282,24 @@ msgstr "Math o gyfrwng:"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:267 ../Rpmdrake/edit_urpm_sources.pm:343
 #: ../Rpmdrake/edit_urpm_sources.pm:447 ../Rpmdrake/edit_urpm_sources.pm:474
-#: ../Rpmdrake/edit_urpm_sources.pm:555 ../Rpmdrake/edit_urpm_sources.pm:642
-#: ../Rpmdrake/edit_urpm_sources.pm:683 ../Rpmdrake/edit_urpm_sources.pm:741
-#: ../Rpmdrake/edit_urpm_sources.pm:890 ../Rpmdrake/gui.pm:491
-#: ../Rpmdrake/init.pm:136 ../Rpmdrake/pkg.pm:608 ../Rpmdrake/pkg.pm:650
-#: ../rpmdrake.pm:302 ../rpmdrake.pm:620 ../rpmdrake.pm:693 ../rpmdrake.pm:766
+#: ../Rpmdrake/edit_urpm_sources.pm:556 ../Rpmdrake/edit_urpm_sources.pm:643
+#: ../Rpmdrake/edit_urpm_sources.pm:684 ../Rpmdrake/edit_urpm_sources.pm:742
+#: ../Rpmdrake/edit_urpm_sources.pm:891 ../Rpmdrake/gui.pm:519
+#: ../Rpmdrake/init.pm:136 ../Rpmdrake/pkg.pm:202 ../Rpmdrake/pkg.pm:697
+#: ../rpmdrake.pm:301 ../rpmdrake.pm:619 ../rpmdrake.pm:692 ../rpmdrake.pm:765
 #, c-format
 msgid "Cancel"
 msgstr "Diddymu"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:269 ../Rpmdrake/edit_urpm_sources.pm:345
-#: ../Rpmdrake/edit_urpm_sources.pm:474 ../Rpmdrake/edit_urpm_sources.pm:545
-#: ../Rpmdrake/edit_urpm_sources.pm:639 ../Rpmdrake/edit_urpm_sources.pm:682
-#: ../Rpmdrake/edit_urpm_sources.pm:734 ../Rpmdrake/edit_urpm_sources.pm:807
-#: ../Rpmdrake/edit_urpm_sources.pm:936 ../Rpmdrake/edit_urpm_sources.pm:1134
-#: ../Rpmdrake/gui.pm:491 ../Rpmdrake/gui.pm:507 ../Rpmdrake/gui.pm:512
-#: ../Rpmdrake/init.pm:136 ../Rpmdrake/pkg.pm:444 ../Rpmdrake/pkg.pm:650
-#: ../Rpmdrake/rpmnew.pm:180 ../rpmdrake.pm:125 ../rpmdrake.pm:240
-#: ../rpmdrake.pm:305 ../rpmdrake.pm:620
+#: ../Rpmdrake/edit_urpm_sources.pm:474 ../Rpmdrake/edit_urpm_sources.pm:546
+#: ../Rpmdrake/edit_urpm_sources.pm:640 ../Rpmdrake/edit_urpm_sources.pm:683
+#: ../Rpmdrake/edit_urpm_sources.pm:735 ../Rpmdrake/edit_urpm_sources.pm:808
+#: ../Rpmdrake/edit_urpm_sources.pm:937 ../Rpmdrake/edit_urpm_sources.pm:1135
+#: ../Rpmdrake/gui.pm:519 ../Rpmdrake/gui.pm:535 ../Rpmdrake/gui.pm:540
+#: ../Rpmdrake/init.pm:136 ../Rpmdrake/pkg.pm:517 ../Rpmdrake/pkg.pm:697
+#: ../Rpmdrake/rpmnew.pm:180 ../rpmdrake.pm:124 ../rpmdrake.pm:239
+#: ../rpmdrake.pm:304 ../rpmdrake.pm:619
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
@@ -390,17 +390,17 @@ msgstr "Er mwyn cadw'r newidiadau, rhaid gosod y cyfrwng yn y gyrrwr."
 msgid "Configure proxies"
 msgstr "Ffurfweddu'r dirprwyon"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:521
+#: ../Rpmdrake/edit_urpm_sources.pm:522
 #, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Gosodiadau dirprwy ar gyfer cyfrwng \"%s\""
 
-#: ../Rpmdrake/edit_urpm_sources.pm:522
+#: ../Rpmdrake/edit_urpm_sources.pm:523
 #, c-format
 msgid "Global proxy settings"
 msgstr "Gosodiadau dirprwy eang"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:524
+#: ../Rpmdrake/edit_urpm_sources.pm:525
 #, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
@@ -409,142 +409,142 @@ msgstr ""
 "Os oes angen dirprwy arnoch, rhowch enw gwesteiwr a phorth dewisol "
 "(cystrawen: <proxyhost[:port]>):"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:527
+#: ../Rpmdrake/edit_urpm_sources.pm:528
 #, c-format
 msgid "Proxy hostname:"
 msgstr "Enw gwesteiwr y dirprwy:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:530
+#: ../Rpmdrake/edit_urpm_sources.pm:531
 #, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Mae modd i chi enwi defnyddiwr/cyfrinair ar gyfer dilysiad dirprwy:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:533
+#: ../Rpmdrake/edit_urpm_sources.pm:534
 #, c-format
 msgid "User:"
 msgstr "Defnyddiwr:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:608
+#: ../Rpmdrake/edit_urpm_sources.pm:609
 #, c-format
 msgid "Add a parallel group"
 msgstr "Ychwanegu grŵp paralel"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:608
+#: ../Rpmdrake/edit_urpm_sources.pm:609
 #, c-format
 msgid "Edit a parallel group"
 msgstr "Golygu grŵp paralel"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:620
+#: ../Rpmdrake/edit_urpm_sources.pm:621
 #, c-format
 msgid "Add a medium limit"
 msgstr "Ychwanegu terfyn cyfrwng"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:633
+#: ../Rpmdrake/edit_urpm_sources.pm:634
 #, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Dewiswch gyfrwng i ychwanegu at derfyn y cyfrwng:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:670
+#: ../Rpmdrake/edit_urpm_sources.pm:671
 #, c-format
 msgid "Add a host"
 msgstr "Ychwanegu gwesteiwr:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:677
+#: ../Rpmdrake/edit_urpm_sources.pm:678
 #, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Teipiwch enw gwesteiwr neu IP y gwestai i'w ychwanegu:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:708
+#: ../Rpmdrake/edit_urpm_sources.pm:709
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Golygu grŵp paralel\"%s\":"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:712
+#: ../Rpmdrake/edit_urpm_sources.pm:713
 #, c-format
 msgid "Group name:"
 msgstr "Enw grŵp:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:713
+#: ../Rpmdrake/edit_urpm_sources.pm:714
 #, c-format
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:715
+#: ../Rpmdrake/edit_urpm_sources.pm:716
 #, c-format
 msgid "Media limit:"
 msgstr "Terfyn cyfrwng:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:720 ../Rpmdrake/edit_urpm_sources.pm:727
-#: ../Rpmdrake/edit_urpm_sources.pm:924 ../Rpmdrake/edit_urpm_sources.pm:1121
+#: ../Rpmdrake/edit_urpm_sources.pm:721 ../Rpmdrake/edit_urpm_sources.pm:728
+#: ../Rpmdrake/edit_urpm_sources.pm:925 ../Rpmdrake/edit_urpm_sources.pm:1122
 #, c-format
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:721 ../Rpmdrake/edit_urpm_sources.pm:728
-#: ../Rpmdrake/edit_urpm_sources.pm:787 ../Rpmdrake/edit_urpm_sources.pm:928
-#: ../Rpmdrake/edit_urpm_sources.pm:1111
+#: ../Rpmdrake/edit_urpm_sources.pm:722 ../Rpmdrake/edit_urpm_sources.pm:729
+#: ../Rpmdrake/edit_urpm_sources.pm:788 ../Rpmdrake/edit_urpm_sources.pm:929
+#: ../Rpmdrake/edit_urpm_sources.pm:1112
 #, c-format
 msgid "Remove"
 msgstr "Tynnu"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:722
+#: ../Rpmdrake/edit_urpm_sources.pm:723
 #, c-format
 msgid "Hosts:"
 msgstr "Gwesteion:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:756
+#: ../Rpmdrake/edit_urpm_sources.pm:757
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Ffurfweddu urpmi paralel (dosbarthiad gweithredol o urpmi)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:760
+#: ../Rpmdrake/edit_urpm_sources.pm:761
 #, c-format
 msgid "Group"
 msgstr "Grŵp"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:760
+#: ../Rpmdrake/edit_urpm_sources.pm:761
 #, c-format
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:760
+#: ../Rpmdrake/edit_urpm_sources.pm:761
 #, c-format
 msgid "Media limit"
 msgstr "Terfyn cyfrwng"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:761
+#: ../Rpmdrake/edit_urpm_sources.pm:762
 #, c-format
 msgid "Command"
 msgstr "Gorchymyn"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:771 ../Rpmdrake/gui.pm:723
-#: ../Rpmdrake/pkg.pm:102 ../Rpmdrake/pkg.pm:132 ../Rpmdrake/pkg.pm:147
-#: ../Rpmdrake/rpmnew.pm:78
+#: ../Rpmdrake/edit_urpm_sources.pm:772 ../Rpmdrake/gui.pm:751
+#: ../Rpmdrake/pkg.pm:115 ../Rpmdrake/pkg.pm:161 ../Rpmdrake/pkg.pm:169
+#: ../Rpmdrake/pkg.pm:191 ../Rpmdrake/rpmnew.pm:77
 #, c-format
 msgid "(none)"
 msgstr "(dim)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:791
+#: ../Rpmdrake/edit_urpm_sources.pm:792
 #, c-format
 msgid "Edit..."
 msgstr "Golygu..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:799
+#: ../Rpmdrake/edit_urpm_sources.pm:800
 #, c-format
 msgid "Add..."
 msgstr "Ychwanegu..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:815
+#: ../Rpmdrake/edit_urpm_sources.pm:816
 #, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Rheoli allweddi pecynnau digidol "
 
-#: ../Rpmdrake/edit_urpm_sources.pm:821 ../Rpmdrake/edit_urpm_sources.pm:1035
+#: ../Rpmdrake/edit_urpm_sources.pm:822 ../Rpmdrake/edit_urpm_sources.pm:1036
 #, c-format
 msgid "Medium"
 msgstr "Cyfrwng"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:828
+#: ../Rpmdrake/edit_urpm_sources.pm:829
 #, c-format
 msgid ""
 "_:cryptographic keys\n"
@@ -553,32 +553,32 @@ msgstr ""
 "_:cryptographic keys\n"
 "Allweddi"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:851
+#: ../Rpmdrake/edit_urpm_sources.pm:852
 #, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "heb ganfod enw, nid yw'r allwedd yn bodoli yng nghylch allwedd rpm"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:864
+#: ../Rpmdrake/edit_urpm_sources.pm:865
 #, c-format
 msgid "Add a key"
 msgstr "Ychwanegu allwedd"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:877
+#: ../Rpmdrake/edit_urpm_sources.pm:878
 #, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Dewis bysell ti ychwanegu at gyfrwng %s"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:883
+#: ../Rpmdrake/edit_urpm_sources.pm:884
 #, c-format
 msgid "Close"
 msgstr "Cau"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:905
+#: ../Rpmdrake/edit_urpm_sources.pm:906
 #, c-format
 msgid "Remove a key"
 msgstr "Tynnu allwedd"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:906
+#: ../Rpmdrake/edit_urpm_sources.pm:907
 #, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
@@ -587,162 +587,162 @@ msgstr ""
 "Ydych chi'n siŵr eich bod eisiau tynnu allwedd %s o gyfrwng %s?\n"
 "(enw'r allwedd: %s)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:945 ../Rpmdrake/edit_urpm_sources.pm:1104
+#: ../Rpmdrake/edit_urpm_sources.pm:946 ../Rpmdrake/edit_urpm_sources.pm:1105
 #, c-format
 msgid "Configure media"
 msgstr "Ffurfweddu'r cyfrwng"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:952 ../Rpmdrake/edit_urpm_sources.pm:953
-#: ../Rpmdrake/edit_urpm_sources.pm:954 ../rpmdrake:386 ../rpmdrake:389
-#: ../rpmdrake:394 ../rpmdrake:409 ../rpmdrake:410
+#: ../Rpmdrake/edit_urpm_sources.pm:953 ../Rpmdrake/edit_urpm_sources.pm:954
+#: ../Rpmdrake/edit_urpm_sources.pm:955 ../rpmdrake:391 ../rpmdrake:394
+#: ../rpmdrake:399 ../rpmdrake:414 ../rpmdrake:415
 #, c-format
 msgid "/_File"
 msgstr "/_Ffeil"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:953 ../rpmdrake:410
+#: ../Rpmdrake/edit_urpm_sources.pm:954 ../rpmdrake:415
 #, c-format
 msgid "/_Quit"
 msgstr "/_Gadael"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:953 ../rpmdrake:410
+#: ../Rpmdrake/edit_urpm_sources.pm:954 ../rpmdrake:415
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:954
+#: ../Rpmdrake/edit_urpm_sources.pm:955
 #, c-format
 msgid "/_Update"
 msgstr "/_Diweddaru"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:954
+#: ../Rpmdrake/edit_urpm_sources.pm:955
 #, c-format
 msgid "<control>U"
 msgstr "<control>U"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:955 ../Rpmdrake/edit_urpm_sources.pm:956
-#: ../Rpmdrake/edit_urpm_sources.pm:957 ../Rpmdrake/edit_urpm_sources.pm:958
-#: ../Rpmdrake/edit_urpm_sources.pm:959 ../Rpmdrake/edit_urpm_sources.pm:960
-#: ../rpmdrake:383 ../rpmdrake:413 ../rpmdrake:417 ../rpmdrake:421
-#: ../rpmdrake:460
+#: ../Rpmdrake/edit_urpm_sources.pm:956 ../Rpmdrake/edit_urpm_sources.pm:957
+#: ../Rpmdrake/edit_urpm_sources.pm:958 ../Rpmdrake/edit_urpm_sources.pm:959
+#: ../Rpmdrake/edit_urpm_sources.pm:960 ../Rpmdrake/edit_urpm_sources.pm:961
+#: ../rpmdrake:388 ../rpmdrake:418 ../rpmdrake:422 ../rpmdrake:426
+#: ../rpmdrake:465
 #, c-format
 msgid "/_Options"
 msgstr "/_Dewisiadau"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:956
+#: ../Rpmdrake/edit_urpm_sources.pm:957
 #, c-format
 msgid "/_Global options"
 msgstr "/_Dewisiadau eang..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:956
+#: ../Rpmdrake/edit_urpm_sources.pm:957
 #, c-format
 msgid "<control>G"
 msgstr "<control>G"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:957
+#: ../Rpmdrake/edit_urpm_sources.pm:958
 #, c-format
 msgid "/_Add a custom medium"
 msgstr "/_Ychwanegu cyfrwng addasu"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:957
+#: ../Rpmdrake/edit_urpm_sources.pm:958
 #, c-format
 msgid "<control>A"
 msgstr "<control>A"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:958
+#: ../Rpmdrake/edit_urpm_sources.pm:959
 #, c-format
 msgid "/Manage _keys"
 msgstr "/_Rheoli allweddi"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:958
+#: ../Rpmdrake/edit_urpm_sources.pm:959
 #, c-format
 msgid "<control>K"
 msgstr "<control>K"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:959
+#: ../Rpmdrake/edit_urpm_sources.pm:960
 #, c-format
 msgid "/_Parallel"
 msgstr "/_Paralel"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:959
+#: ../Rpmdrake/edit_urpm_sources.pm:960
 #, c-format
 msgid "<control>P"
 msgstr "<control>P"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:960
+#: ../Rpmdrake/edit_urpm_sources.pm:961
 #, c-format
 msgid "/P_roxy"
 msgstr "/_Dirprwy..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:960
+#: ../Rpmdrake/edit_urpm_sources.pm:961
 #, c-format
 msgid "<control>R"
 msgstr "<control>R"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:962 ../Rpmdrake/edit_urpm_sources.pm:963
-#: ../Rpmdrake/edit_urpm_sources.pm:964 ../Rpmdrake/edit_urpm_sources.pm:965
-#: ../rpmdrake:425 ../rpmdrake:426 ../rpmdrake:427 ../rpmdrake:428
+#: ../Rpmdrake/edit_urpm_sources.pm:963 ../Rpmdrake/edit_urpm_sources.pm:964
+#: ../Rpmdrake/edit_urpm_sources.pm:965 ../Rpmdrake/edit_urpm_sources.pm:966
+#: ../rpmdrake:430 ../rpmdrake:431 ../rpmdrake:432 ../rpmdrake:433
 #, c-format
 msgid "/_Help"
 msgstr "/_Cymorth"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:963 ../rpmdrake:426
+#: ../Rpmdrake/edit_urpm_sources.pm:964 ../rpmdrake:431
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Adrodd ar Wall"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:965 ../rpmdrake:428
+#: ../Rpmdrake/edit_urpm_sources.pm:966 ../rpmdrake:433
 #, c-format
 msgid "/_About..."
 msgstr "/_Ynghylch..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:968 ../rpmdrake:431
+#: ../Rpmdrake/edit_urpm_sources.pm:969 ../rpmdrake:436
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:970 ../rpmdrake:433
+#: ../Rpmdrake/edit_urpm_sources.pm:971 ../rpmdrake:438
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Hawlfraint (C) %s Mandriva"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:972 ../rpmdrake:435
+#: ../Rpmdrake/edit_urpm_sources.pm:973 ../rpmdrake:440
 #, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake yw offeryn rheoli pecynnau Mandriva Linux."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:974 ../rpmdrake:437
+#: ../Rpmdrake/edit_urpm_sources.pm:975 ../rpmdrake:442
 #, 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>")
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../Rpmdrake/edit_urpm_sources.pm:979 ../rpmdrake:442
+#: ../Rpmdrake/edit_urpm_sources.pm:980 ../rpmdrake:447
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "_: Rhoslyn Prys post@meddal.com\n"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1032 ../Rpmdrake/pkg.pm:203
+#: ../Rpmdrake/edit_urpm_sources.pm:1033 ../Rpmdrake/pkg.pm:272
 #, c-format
 msgid "Enabled"
 msgstr "Galluogwyd"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1033
+#: ../Rpmdrake/edit_urpm_sources.pm:1034
 #, c-format
 msgid "Updates"
 msgstr "Diweddariadau"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1034
+#: ../Rpmdrake/edit_urpm_sources.pm:1035
 #, c-format
 msgid "Type"
 msgstr "Math"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1050
+#: ../Rpmdrake/edit_urpm_sources.pm:1051
 #, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "Mae angen diweddaru'r cyfrwng i fod yn ddefnyddiol. Diweddaru?"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1081
+#: ../Rpmdrake/edit_urpm_sources.pm:1082
 #, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
@@ -753,12 +753,12 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1115
+#: ../Rpmdrake/edit_urpm_sources.pm:1116
 #, c-format
 msgid "Edit"
 msgstr "Golygu"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1149 ../Rpmdrake/init.pm:143
+#: ../Rpmdrake/edit_urpm_sources.pm:1150 ../Rpmdrake/init.pm:143
 #: ../gurpmi.addmedia:103
 #, c-format
 msgid ""
@@ -770,7 +770,7 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1152
+#: ../Rpmdrake/edit_urpm_sources.pm:1153
 #, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
@@ -785,7 +785,7 @@ msgstr ""
 "rydych am eu defnyddio ar eich cyfrifiadur. Byddant ar gael i'w gosod fel\n"
 "pecynnau newydd neu er mwyn diweddaru."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1168
+#: ../Rpmdrake/edit_urpm_sources.pm:1169
 #, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
@@ -803,116 +803,126 @@ msgstr ""
 msgid "None"
 msgstr "Dim"
 
-#: ../Rpmdrake/gui.pm:98 ../Rpmdrake/gui.pm:172
+#: ../Rpmdrake/formatting.pm:103
+#, c-format
+msgid "%s of additional disk space will be used."
+msgstr "Bydd %s o le ychwanegol ar ddisg yn cael ei ddefnyddio."
+
+#: ../Rpmdrake/formatting.pm:104
+#, c-format
+msgid "%s of disk space will be freed."
+msgstr "Bydd %s o le ar ddisg ar gael."
+
+#: ../Rpmdrake/gui.pm:94 ../Rpmdrake/gui.pm:173 ../Rpmdrake/gui.pm:175
+#: ../Rpmdrake/pkg.pm:183
+#, c-format
+msgid "(Not available)"
+msgstr "(Dim ar gael)"
+
+#: ../Rpmdrake/gui.pm:120 ../Rpmdrake/gui.pm:191
 #, c-format
 msgid "Importance: "
 msgstr "Pwysigrwydd: "
 
-#: ../Rpmdrake/gui.pm:99 ../Rpmdrake/gui.pm:180
+#: ../Rpmdrake/gui.pm:121 ../Rpmdrake/gui.pm:199
 #, c-format
 msgid "Reason for update: "
 msgstr "Rheswm am y diweddariad:"
 
-#: ../Rpmdrake/gui.pm:103
+#: ../Rpmdrake/gui.pm:125
 #, c-format
 msgid "Security advisory"
 msgstr "Diweddariadau diogelwch"
 
-#: ../Rpmdrake/gui.pm:111 ../Rpmdrake/gui.pm:182
+#: ../Rpmdrake/gui.pm:133 ../Rpmdrake/gui.pm:201
 #, c-format
 msgid "No description"
 msgstr "Dim disgrifiad"
 
-#: ../Rpmdrake/gui.pm:114
+#: ../Rpmdrake/gui.pm:136
 #, c-format
 msgid "Details:"
 msgstr "Manylion:"
 
-#: ../Rpmdrake/gui.pm:117 ../Rpmdrake/gui.pm:167
+#: ../Rpmdrake/gui.pm:139 ../Rpmdrake/gui.pm:186
 #, c-format
 msgid "Version: "
 msgstr "Fersiwn: "
 
-#: ../Rpmdrake/gui.pm:120 ../Rpmdrake/gui.pm:162
+#: ../Rpmdrake/gui.pm:142 ../Rpmdrake/gui.pm:181
 #, c-format
 msgid "Currently installed version: "
 msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
 
-#: ../Rpmdrake/gui.pm:123 ../Rpmdrake/gui.pm:168
+#: ../Rpmdrake/gui.pm:145 ../Rpmdrake/gui.pm:187
 #, c-format
 msgid "Architecture: "
 msgstr "Pensaernïaeth:"
 
-#: ../Rpmdrake/gui.pm:124 ../Rpmdrake/gui.pm:169
+#: ../Rpmdrake/gui.pm:146 ../Rpmdrake/gui.pm:188
 #, c-format
 msgid "Size: "
 msgstr "Maint: "
 
-#: ../Rpmdrake/gui.pm:124 ../Rpmdrake/gui.pm:169
+#: ../Rpmdrake/gui.pm:146 ../Rpmdrake/gui.pm:188
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../Rpmdrake/gui.pm:125 ../Rpmdrake/gui.pm:161 ../rpmdrake.pm:825
+#: ../Rpmdrake/gui.pm:147 ../Rpmdrake/gui.pm:180 ../rpmdrake.pm:824
 #, c-format
 msgid "Medium: "
 msgstr "Cyfrwng:"
 
-#: ../Rpmdrake/gui.pm:131
+#: ../Rpmdrake/gui.pm:153
 #, c-format
 msgid "Files:"
 msgstr "Ffeiliau:"
 
-#: ../Rpmdrake/gui.pm:135 ../Rpmdrake/gui.pm:140 ../Rpmdrake/gui.pm:154
-#: ../Rpmdrake/gui.pm:156 ../Rpmdrake/pkg.pm:138
-#, c-format
-msgid "(Not available)"
-msgstr "(Dim ar gael)"
-
-#: ../Rpmdrake/gui.pm:139
+#: ../Rpmdrake/gui.pm:161
 #, c-format
 msgid "Changelog:"
 msgstr "Cofnod Newid:"
 
-#: ../Rpmdrake/gui.pm:151
+#: ../Rpmdrake/gui.pm:170
 #, c-format
 msgid "Files:\n"
 msgstr "Ffeiliau:\n"
 
-#: ../Rpmdrake/gui.pm:156
+#: ../Rpmdrake/gui.pm:175
 #, c-format
 msgid "Changelog:\n"
 msgstr "Cofnod Newid:\n"
 
-#: ../Rpmdrake/gui.pm:166
+#: ../Rpmdrake/gui.pm:185
 #, c-format
 msgid "Name: "
 msgstr "Enw: "
 
-#: ../Rpmdrake/gui.pm:176
+#: ../Rpmdrake/gui.pm:195
 #, c-format
 msgid "Summary: "
 msgstr "Crynodeb: "
 
-#: ../Rpmdrake/gui.pm:182
+#: ../Rpmdrake/gui.pm:201
 #, c-format
 msgid "Description: "
 msgstr "Disgrifiadau: "
 
-#: ../Rpmdrake/gui.pm:380 ../Rpmdrake/pkg.pm:660 ../rpmdrake.pm:749
-#: ../rpmdrake.pm:864
+#: ../Rpmdrake/gui.pm:400 ../Rpmdrake/gui.pm:406 ../Rpmdrake/pkg.pm:707
+#: ../rpmdrake.pm:748 ../rpmdrake.pm:863
 #, c-format
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../Rpmdrake/gui.pm:385
+#: ../Rpmdrake/gui.pm:401
 #, fuzzy, c-format
 msgid "Removing package %s would break your system"
 msgstr ""
 "Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:390
+#: ../Rpmdrake/gui.pm:406
 #, c-format
 msgid ""
 "The \"%s\" package is in urpmi skip list.\n"
@@ -921,60 +931,60 @@ msgstr ""
 "Mae'r pecyn \"%s\" yn rhestr hepgor urpmi.\n"
 "Hoffech chi ei ddewis beth bynnag?"
 
-#: ../Rpmdrake/gui.pm:474 ../Rpmdrake/gui.pm:503 ../Rpmdrake/gui.pm:505
+#: ../Rpmdrake/gui.pm:501 ../Rpmdrake/gui.pm:531 ../Rpmdrake/gui.pm:533
 #, c-format
 msgid "More information on package..."
 msgstr "Rhagor o wybodaeth ar becyn..."
 
-#: ../Rpmdrake/gui.pm:476
+#: ../Rpmdrake/gui.pm:503
 #, c-format
 msgid "Please choose"
 msgstr "Dewiswch"
 
-#: ../Rpmdrake/gui.pm:477
+#: ../Rpmdrake/gui.pm:504
 #, c-format
 msgid "The following package is needed:"
 msgstr "Mae angen y pecyn canlynol:"
 
-#: ../Rpmdrake/gui.pm:477
+#: ../Rpmdrake/gui.pm:504
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../Rpmdrake/gui.pm:491 ../Rpmdrake/gui.pm:496
+#: ../Rpmdrake/gui.pm:519 ../Rpmdrake/gui.pm:524
 #, c-format
 msgid "More info"
 msgstr "Rhagor"
 
-#: ../Rpmdrake/gui.pm:498
+#: ../Rpmdrake/gui.pm:526
 #, c-format
 msgid "Information on packages"
 msgstr "Gwybodaeth am becynnau"
 
-#: ../Rpmdrake/gui.pm:526
+#: ../Rpmdrake/gui.pm:554
 #, c-format
 msgid "Checking dependencies of package..."
 msgstr ""
 
-#: ../Rpmdrake/gui.pm:533
+#: ../Rpmdrake/gui.pm:561
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 
-#: ../Rpmdrake/gui.pm:534
+#: ../Rpmdrake/gui.pm:562
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "Oherwydd eu dibyniaethau, rhaid tynnu'r pecynnau canlynol  hefyd:"
 
-#: ../Rpmdrake/gui.pm:540 ../Rpmdrake/gui.pm:550
+#: ../Rpmdrake/gui.pm:568 ../Rpmdrake/gui.pm:578
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Nid oes modd tynnu rhai pecynnau"
 
-#: ../Rpmdrake/gui.pm:541
+#: ../Rpmdrake/gui.pm:569
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -983,7 +993,7 @@ msgstr ""
 "Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:551 ../Rpmdrake/gui.pm:620
+#: ../Rpmdrake/gui.pm:579 ../Rpmdrake/gui.pm:648
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -993,12 +1003,12 @@ msgstr ""
 "Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
 "eu dad-ddewis nawr:\n"
 
-#: ../Rpmdrake/gui.pm:581
+#: ../Rpmdrake/gui.pm:609
 #, c-format
 msgid "Additional packages needed"
 msgstr "Pecynnau ychwanegol angenrheidiol"
 
-#: ../Rpmdrake/gui.pm:582
+#: ../Rpmdrake/gui.pm:610
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1009,22 +1019,22 @@ msgstr ""
 "hefyd:\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:596
+#: ../Rpmdrake/gui.pm:624
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (perthyn i'r rhestr hepgor)"
 
-#: ../Rpmdrake/gui.pm:600
+#: ../Rpmdrake/gui.pm:628
 #, c-format
 msgid "One package cannot be installed"
 msgstr "Nid oes modd gosod un pecyn"
 
-#: ../Rpmdrake/gui.pm:600
+#: ../Rpmdrake/gui.pm:628
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Nid oes modd gosod rhai pecynnau"
 
-#: ../Rpmdrake/gui.pm:602
+#: ../Rpmdrake/gui.pm:630
 #, c-format
 msgid ""
 "Sorry, the following package cannot be selected:\n"
@@ -1035,7 +1045,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:603
+#: ../Rpmdrake/gui.pm:631
 #, c-format
 msgid ""
 "Sorry, the following packages can't be selected:\n"
@@ -1046,27 +1056,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:619 ../Rpmdrake/pkg.pm:536
+#: ../Rpmdrake/gui.pm:647 ../Rpmdrake/pkg.pm:609
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Rhaid tynnu rhai pecynnau"
 
-#: ../Rpmdrake/gui.pm:652
+#: ../Rpmdrake/gui.pm:680
 #, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "Gwall: %s i weld wedi ei osod fel darllen yn unig."
 
-#: ../Rpmdrake/gui.pm:656
+#: ../Rpmdrake/gui.pm:684
 #, c-format
 msgid "You need to select some packages first."
 msgstr "Rhaid dewis rhai pecynnau'n gyntaf."
 
-#: ../Rpmdrake/gui.pm:661
+#: ../Rpmdrake/gui.pm:689
 #, c-format
 msgid "Too many packages are selected"
 msgstr "Mae gormod o becynnau wedi eu dewis"
 
-#: ../Rpmdrake/gui.pm:662
+#: ../Rpmdrake/gui.pm:690
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -1077,42 +1087,42 @@ msgid ""
 "Do you really want to install all the selected packages?"
 msgstr "Rhybudd:"
 
-#: ../Rpmdrake/gui.pm:688 ../Rpmdrake/open_db.pm:74
+#: ../Rpmdrake/gui.pm:716 ../Rpmdrake/open_db.pm:75
 #, c-format
 msgid "Fatal error"
 msgstr "Gwall terfynol"
 
-#: ../Rpmdrake/gui.pm:689 ../Rpmdrake/open_db.pm:75
+#: ../Rpmdrake/gui.pm:717 ../Rpmdrake/open_db.pm:76
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Digwyddodd gwall terfynol:%s."
 
-#: ../Rpmdrake/gui.pm:707
+#: ../Rpmdrake/gui.pm:735
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Arhoswch, rhestri pecynnau..."
 
-#: ../Rpmdrake/gui.pm:725
+#: ../Rpmdrake/gui.pm:753
 #, c-format
 msgid "No update"
 msgstr "Dim diweddariad"
 
-#: ../Rpmdrake/gui.pm:749 ../rpmdrake:267
+#: ../Rpmdrake/gui.pm:777 ../rpmdrake:269
 #, c-format
 msgid "All"
 msgstr "Popeth"
 
-#: ../Rpmdrake/gui.pm:758 ../rpmdrake:141
+#: ../Rpmdrake/gui.pm:786 ../rpmdrake:142
 #, c-format
 msgid "Upgradable"
 msgstr "Diweddariadwy"
 
-#: ../Rpmdrake/gui.pm:758 ../rpmdrake:141
+#: ../Rpmdrake/gui.pm:786 ../rpmdrake:142
 #, c-format
 msgid "Addable"
 msgstr "Ychwanegadwy"
 
-#: ../Rpmdrake/gui.pm:778
+#: ../Rpmdrake/gui.pm:806
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Dim disgrifiad ar gael i'r pecyn hwn\n"
@@ -1904,23 +1914,54 @@ msgstr "Mae'r offeryn gosod meddalwedd yn gallu gosod ffynonellau cyfryngau"
 msgid "Do you want to add media sources now?"
 msgstr "Ydych chi'n siŵr eich bod eisiau ychwanegu ffynonellau cyfrwng nawr?"
 
-#: ../Rpmdrake/pkg.pm:121
+#: ../Rpmdrake/pkg.pm:126
+#, c-format
+msgid "Getting information from XML meta-data from %s..."
+msgstr ""
+
+#: ../Rpmdrake/pkg.pm:130
+#, c-format
+msgid "Getting '%s' from XML meta-data..."
+msgstr ""
+
+#: ../Rpmdrake/pkg.pm:133 ../Rpmdrake/pkg.pm:305 ../Rpmdrake/pkg.pm:627
+#: ../Rpmdrake/pkg.pm:778 ../rpmdrake.pm:329
+#, c-format
+msgid "Please wait"
+msgstr "Arhoswch"
+
+#: ../Rpmdrake/pkg.pm:145
 #, c-format
 msgid "No xml info for medium \"%s\", only partial result for package %s"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:123
+#: ../Rpmdrake/pkg.pm:147
 #, c-format
 msgid ""
 "No xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:200 ../Rpmdrake/pkg.pm:554
+#: ../Rpmdrake/pkg.pm:201 ../Rpmdrake/pkg.pm:206
+#, c-format
+msgid "Downloading package `%s'..."
+msgstr "Llwytho pecynnau i lawr ' %s'..."
+
+#: ../Rpmdrake/pkg.pm:208
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% o %s wedi ei gwblhau, Amser = %s, cyflymder = %s"
+
+#: ../Rpmdrake/pkg.pm:209
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% wedi ei gwblhau, cyflymder = %s"
+
+#: ../Rpmdrake/pkg.pm:252 ../Rpmdrake/pkg.pm:609
 #, c-format
 msgid "Confirmation"
 msgstr "Gwiriad"
 
-#: ../Rpmdrake/pkg.pm:184
+#: ../Rpmdrake/pkg.pm:253
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1933,17 +1974,17 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../Rpmdrake/pkg.pm:188
+#: ../Rpmdrake/pkg.pm:257
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Peidio gofyn y tro nesaf"
 
-#: ../Rpmdrake/pkg.pm:197
+#: ../Rpmdrake/pkg.pm:266
 #, c-format
 msgid "Already existing update media"
 msgstr "Cyfrwng diweddaru sy'n bod eisoes"
 
-#: ../Rpmdrake/pkg.pm:198
+#: ../Rpmdrake/pkg.pm:267
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1960,14 +2001,14 @@ msgstr ""
 "\n"
 "Yna ail gychwyn %s."
 
-#: ../Rpmdrake/pkg.pm:208
+#: ../Rpmdrake/pkg.pm:277
 #, c-format
 msgid ""
 "You have no configured update media. MandrivaUpdate cannot operate without "
 "any update media."
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:209 ../rpmdrake.pm:548
+#: ../Rpmdrake/pkg.pm:278 ../rpmdrake.pm:547
 #, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
@@ -1980,12 +2021,12 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../Rpmdrake/pkg.pm:216
+#: ../Rpmdrake/pkg.pm:285
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "Sut i ddewis drych gyda llaw."
 
-#: ../Rpmdrake/pkg.pm:217
+#: ../Rpmdrake/pkg.pm:286
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -2000,78 +2041,72 @@ msgstr ""
 "\n"
 "Yna ailgychwynnwch %s."
 
-#: ../Rpmdrake/pkg.pm:236 ../Rpmdrake/pkg.pm:557 ../Rpmdrake/pkg.pm:731
-#: ../rpmdrake.pm:330
-#, c-format
-msgid "Please wait"
-msgstr "Arhoswch"
-
-#: ../Rpmdrake/pkg.pm:236 ../Rpmdrake/pkg.pm:557
+#: ../Rpmdrake/pkg.pm:305 ../Rpmdrake/pkg.pm:627
 #, c-format
 msgid "Package installation..."
 msgstr "Gosod pecynnau..."
 
-#: ../Rpmdrake/pkg.pm:236 ../Rpmdrake/pkg.pm:557 ../Rpmdrake/pkg.pm:731
+#: ../Rpmdrake/pkg.pm:305 ../Rpmdrake/pkg.pm:627 ../Rpmdrake/pkg.pm:778
 #, c-format
 msgid "Initializing..."
 msgstr "Ymgychwyn..."
 
-#: ../Rpmdrake/pkg.pm:249
+#: ../Rpmdrake/pkg.pm:318
 #, c-format
 msgid "Reading updates description"
 msgstr "Darllen disgrifiad diweddariadau"
 
-#: ../Rpmdrake/pkg.pm:255 ../Rpmdrake/pkg.pm:331
+#: ../Rpmdrake/pkg.pm:324 ../Rpmdrake/pkg.pm:400
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../Rpmdrake/pkg.pm:261
+#: ../Rpmdrake/pkg.pm:330
 #, c-format
 msgid "Please wait, listing base packages..."
 msgstr "Arhoswch, rhestri pecynnau sail..."
 
-#: ../Rpmdrake/pkg.pm:298
+#: ../Rpmdrake/pkg.pm:367
 #, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "Arhoswch, canfod pecynnau sydd wedi eu gosod..."
 
-#: ../Rpmdrake/pkg.pm:424
+#: ../Rpmdrake/pkg.pm:497
 #, c-format
 msgid "Upgrade information"
 msgstr "Gwybodaeth uwchraddio"
 
-#: ../Rpmdrake/pkg.pm:426
+#: ../Rpmdrake/pkg.pm:499
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "Mae gan y pecynnau wybodaeth uwchraddio"
 
-#: ../Rpmdrake/pkg.pm:434
+#: ../Rpmdrake/pkg.pm:507
 #, c-format
 msgid "Upgrade information about this package"
 msgstr "Gwybodaeth uwchraddio am y pecyn hwn"
 
-#: ../Rpmdrake/pkg.pm:437
+#: ../Rpmdrake/pkg.pm:510
 #, c-format
 msgid "Upgrade information about package %s"
 msgstr "Gwybodaeth uwchraddio am becyn %s"
 
-#: ../Rpmdrake/pkg.pm:453
+#: ../Rpmdrake/pkg.pm:526
 #, c-format
 msgid "Could not create temporary directory '%s'"
 msgstr "Methu creu'r cyfeiriadur dros dro '%s'"
 
-#: ../Rpmdrake/pkg.pm:461 ../Rpmdrake/pkg.pm:707
+#: ../Rpmdrake/pkg.pm:534 ../Rpmdrake/pkg.pm:754
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
-#: ../Rpmdrake/pkg.pm:465 ../Rpmdrake/pkg.pm:681
+#: ../Rpmdrake/pkg.pm:538 ../Rpmdrake/pkg.pm:728
 #, c-format
 msgid "Problem during installation"
 msgstr "Anhawster wrth osod"
 
-#: ../Rpmdrake/pkg.pm:466 ../Rpmdrake/pkg.pm:486 ../Rpmdrake/pkg.pm:683
+#: ../Rpmdrake/pkg.pm:539 ../Rpmdrake/pkg.pm:559 ../Rpmdrake/pkg.pm:730
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -2082,27 +2117,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:485 ../Rpmdrake/pkg.pm:671
+#: ../Rpmdrake/pkg.pm:558 ../Rpmdrake/pkg.pm:718
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosodiad"
 
-#: ../Rpmdrake/pkg.pm:505
+#: ../Rpmdrake/pkg.pm:578
 #, c-format
 msgid "Checking validity of requested packages..."
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:516
+#: ../Rpmdrake/pkg.pm:589
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../Rpmdrake/pkg.pm:517
+#: ../Rpmdrake/pkg.pm:590
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Methu estyn pecynnau ffynhonnell, %s"
 
-#: ../Rpmdrake/pkg.pm:518 ../Rpmdrake/pkg.pm:674
+#: ../Rpmdrake/pkg.pm:591 ../Rpmdrake/pkg.pm:721
 #, c-format
 msgid ""
 "\n"
@@ -2115,102 +2150,77 @@ msgstr ""
 "Gwall(au) wedi eu hadrodd:\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:533
+#: ../Rpmdrake/pkg.pm:606
 #, c-format
 msgid "The following package is going to be installed:"
 msgid_plural "The following %d packages are going to be installed:"
 msgstr[0] "Mae'r pecyn canlynol yn mynd i gael ei osod:"
 msgstr[1] "Mae'r %s becyn canlynol yn mynd i gael eu gosod:"
 
-#: ../Rpmdrake/pkg.pm:539
+#: ../Rpmdrake/pkg.pm:612
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Tynnu un pecyn?"
 msgstr[1] "Tynnu %d pecyn?"
 
-#: ../Rpmdrake/pkg.pm:541
+#: ../Rpmdrake/pkg.pm:614
 #, c-format
 msgid "The following package has to be removed for others to be upgraded:"
 msgstr "Cafodd y pecyn canlynol ei dynnu i eraill gael eu diweddaru:"
 
-#: ../Rpmdrake/pkg.pm:542
+#: ../Rpmdrake/pkg.pm:615
 #, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
 msgstr "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru:"
 
-#: ../Rpmdrake/pkg.pm:545
-#, c-format
-msgid "%s of additional disk space will be used."
-msgstr "Bydd %s o le ychwanegol ar ddisg yn cael ei ddefnyddio."
-
-#: ../Rpmdrake/pkg.pm:546
-#, c-format
-msgid "%s of disk space will be freed."
-msgstr "Bydd %s o le ar ddisg ar gael."
-
-#: ../Rpmdrake/pkg.pm:548
+#: ../Rpmdrake/pkg.pm:618
 #, c-format
 msgid "Is it ok to continue?"
 msgstr "Ydi hi'n iawn parhau?"
 
-#: ../Rpmdrake/pkg.pm:570
+#: ../Rpmdrake/pkg.pm:639
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Paratoi pecynnau i'w gosod..."
 
-#: ../Rpmdrake/pkg.pm:570
+#: ../Rpmdrake/pkg.pm:639
 #, c-format
 msgid "Preparing package installation transaction..."
 msgstr "Paratoi trafod gosod pecyn..."
 
-#: ../Rpmdrake/pkg.pm:573
+#: ../Rpmdrake/pkg.pm:642
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:574
+#: ../Rpmdrake/pkg.pm:643
 #, c-format
 msgid "Total: %s/%s"
 msgstr "Cyfanswm: %s/%s"
 
-#: ../Rpmdrake/pkg.pm:602 ../Rpmdrake/pkg.pm:690 ../Rpmdrake/pkg.pm:713
-#: ../rpmdrake.pm:736 ../rpmdrake.pm:823 ../rpmdrake.pm:847
+#: ../Rpmdrake/pkg.pm:671 ../Rpmdrake/pkg.pm:737 ../Rpmdrake/pkg.pm:760
+#: ../rpmdrake.pm:735 ../rpmdrake.pm:822 ../rpmdrake.pm:846
 #, c-format
 msgid "Error"
 msgstr "Gwall"
 
-#: ../Rpmdrake/pkg.pm:607 ../Rpmdrake/pkg.pm:612
-#, c-format
-msgid "Downloading package `%s'..."
-msgstr "Llwytho pecynnau i lawr ' %s'..."
-
-#: ../Rpmdrake/pkg.pm:614
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% o %s wedi ei gwblhau, Amser = %s, cyflymder = %s"
-
-#: ../Rpmdrake/pkg.pm:615
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% wedi ei gwblhau, cyflymder = %s"
-
-#: ../Rpmdrake/pkg.pm:648
+#: ../Rpmdrake/pkg.pm:695
 #, c-format
 msgid "Change medium"
 msgstr "Newid cyfrwng"
 
-#: ../Rpmdrake/pkg.pm:649
+#: ../Rpmdrake/pkg.pm:696
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" i mewn i ddyfais [%s]"
 
-#: ../Rpmdrake/pkg.pm:653
+#: ../Rpmdrake/pkg.pm:700
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "Gwirio llofnodion pecynnau ..."
 
-#: ../Rpmdrake/pkg.pm:672
+#: ../Rpmdrake/pkg.pm:719
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -2223,22 +2233,22 @@ msgstr ""
 "\n"
 "Efallai'r hoffech ddiweddaru eich cronfa ddata o gyfryngau."
 
-#: ../Rpmdrake/pkg.pm:682
+#: ../Rpmdrake/pkg.pm:729
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "Methodd trafod gosod %d"
 
-#: ../Rpmdrake/pkg.pm:691
+#: ../Rpmdrake/pkg.pm:738
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Gwall anadferadwy: dim pecyn wedi ei ganfod ar gyfer y gosod."
 
-#: ../Rpmdrake/pkg.pm:694
+#: ../Rpmdrake/pkg.pm:741
 #, c-format
 msgid "Inspecting configuration files..."
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:702
+#: ../Rpmdrake/pkg.pm:749
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2251,22 +2261,22 @@ msgstr ""
 "Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
 "mae modd eu harchwilio i weithredu arnynt:"
 
-#: ../Rpmdrake/pkg.pm:708
+#: ../Rpmdrake/pkg.pm:755
 #, c-format
 msgid "Looking for \"README\" files..."
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:731 ../Rpmdrake/pkg.pm:747
+#: ../Rpmdrake/pkg.pm:778 ../Rpmdrake/pkg.pm:794
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Arhoswch, tynnu'r pecynnau..."
 
-#: ../Rpmdrake/pkg.pm:760
+#: ../Rpmdrake/pkg.pm:807
 #, c-format
 msgid "Problem during removal"
 msgstr "Problem wrth dynnu"
 
-#: ../Rpmdrake/pkg.pm:761
+#: ../Rpmdrake/pkg.pm:808
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -2277,7 +2287,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/rpmnew.pm:79
+#: ../Rpmdrake/rpmnew.pm:78
 #, c-format
 msgid "Inspecting %s"
 msgstr "Archwilio %s"
@@ -2321,7 +2331,7 @@ msgstr "Gorffennodd y gosodiad"
 msgid "Inspect..."
 msgstr "Archwilio..."
 
-#: ../Rpmdrake/rpmnew.pm:190 ../rpmdrake:85
+#: ../Rpmdrake/rpmnew.pm:190 ../rpmdrake:86
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Arhoswch, chwilio..."
@@ -2368,414 +2378,419 @@ msgstr "Llwyddiant wrth ychwanegu cyfrwng %s."
 msgid "Successfully added medium `%s'."
 msgstr "Llwyddiant wrth ychwanegu cyfrwng '%s'"
 
-#: ../rpmdrake:57 ../rpmdrake:140
+#: ../rpmdrake:58 ../rpmdrake:141
 #, c-format
 msgid "Search results"
 msgstr "Canlyniadau'r chwilio"
 
-#: ../rpmdrake:90
+#: ../rpmdrake:91
 #, c-format
 msgid "Stop"
 msgstr "Atal"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:144
 #, c-format
 msgid "Selected"
 msgstr "Dewiswyd"
 
-#: ../rpmdrake:143
+#: ../rpmdrake:144
 #, c-format
 msgid "Not selected"
 msgstr "Heb ei ddewis"
 
-#: ../rpmdrake:151
+#: ../rpmdrake:152
 #, c-format
 msgid "Search results (none)"
 msgstr "Canlyniadau'r chwilio (dim)"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:173
 #, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Dewiswyd: %s / Lle gwag ar ddisg: %s"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:200
 #, c-format
 msgid "Package"
 msgstr "Pecyn"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:270
 #, c-format
 msgid "Installed"
 msgstr "Gosodwyd"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:271
 #, c-format
 msgid "Not installed"
 msgstr "Heb eu gosod"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:272
 #, c-format
 msgid "%s choices"
 msgstr "%s dewis"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:272
 #, c-format
 msgid "Mandriva Linux choices"
 msgstr "Dewisiadau Mandriva Linux"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:274
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Pob pecyn, trefn yr wyddor"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:275
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Pob pecyn, yn ôl diweddariad"
 
-#: ../rpmdrake:274
+#: ../rpmdrake:276
 #, c-format
 msgid "All packages, by size"
 msgstr "Pob pecyn, yn ôl maint"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:277
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Pob pecyn, yn ôl dyddiad dewis"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:278
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Gadael, yn ôl dyddiad gosod"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:279
 #, c-format
 msgid "All packages, by group"
 msgstr "Pob pecyn, yn ôl grŵp"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:281
 #, c-format
 msgid "Backports"
 msgstr "Ad-ddiweddaru"
 
-#: ../rpmdrake:280
+#: ../rpmdrake:282
+#, fuzzy, c-format
+msgid "Meta packages"
+msgstr "Pecyn"
+
+#: ../rpmdrake:283
 #, c-format
 msgid "All updates"
 msgstr "Pob diweddariad"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:284
 #, c-format
 msgid "Security updates"
 msgstr "Diweddariadau diogelwch"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:285
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Diweddariad cywiro gwallau"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:286
 #, c-format
 msgid "Normal updates"
 msgstr "Diweddariadau arferol"
 
-#: ../rpmdrake:338 ../rpmdrake:343
+#: ../rpmdrake:343 ../rpmdrake:348
 #, c-format
 msgid "in names"
 msgstr "mewn enwau"
 
-#: ../rpmdrake:339
+#: ../rpmdrake:344
 #, c-format
 msgid "in descriptions"
 msgstr "mewn disgrifiadau"
 
-#: ../rpmdrake:340
+#: ../rpmdrake:345
 #, c-format
 msgid "in summaries"
 msgstr "mewn crynodebau"
 
-#: ../rpmdrake:341
+#: ../rpmdrake:346
 #, c-format
 msgid "in file names"
 msgstr "mewn enwau ffeil"
 
-#: ../rpmdrake:383
+#: ../rpmdrake:388
 #, c-format
 msgid "/_Select dependencies without asking"
 msgstr "/_Dewis dibyniaethau heb ofyn"
 
-#: ../rpmdrake:389
+#: ../rpmdrake:394
 #, c-format
 msgid "/_Update media"
 msgstr "/_Diweddaru'r cyfrwng"
 
-#: ../rpmdrake:394
+#: ../rpmdrake:399
 #, c-format
 msgid "/_Reset the selection"
 msgstr "/_Ailosod y dewis"
 
-#: ../rpmdrake:409
+#: ../rpmdrake:414
 #, c-format
 msgid "/Reload the _packages list"
 msgstr "/_Ail-lwytho'r rhestr pecynnau"
 
-#: ../rpmdrake:417
+#: ../rpmdrake:422
 #, c-format
 msgid "/_Media Manager"
 msgstr "/_Rheolwr Cyfrwng"
 
-#: ../rpmdrake:421 ../rpmdrake:460
+#: ../rpmdrake:426 ../rpmdrake:465
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Dangoswch y pecynnau dewis awtomatig"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:480
 #, c-format
 msgid "Find:"
 msgstr "Canfod:"
 
-#: ../rpmdrake:484
+#: ../rpmdrake:489
 #, c-format
 msgid "Search"
 msgstr "Chwilio"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:491
 #, c-format
 msgid "Clear"
 msgstr "Clirio"
 
-#: ../rpmdrake:502
+#: ../rpmdrake:507
 #, c-format
 msgid "Apply"
 msgstr "Gosod"
 
-#: ../rpmdrake:522
+#: ../rpmdrake:527
 #, c-format
 msgid "Quick Introduction"
 msgstr "Cyflwyniad Cyflym"
 
-#: ../rpmdrake:523
+#: ../rpmdrake:528
 #, 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:524
+#: ../rpmdrake:529
 #, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 "Gallwch ddarllen gwybodaeth am y pecynnau drwy glicio ar y rhestr ar y dde."
 
-#: ../rpmdrake:525
+#: ../rpmdrake:530
 #, 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:106
+#: ../rpmdrake.pm:105
 #, c-format
 msgid "Software Update"
 msgstr "Diweddaru Meddalwedd"
 
-#: ../rpmdrake.pm:106
+#: ../rpmdrake.pm:105
 #, c-format
 msgid "Mandriva Linux Update"
 msgstr "Diweddaru Mandriva Linux"
 
-#: ../rpmdrake.pm:133
+#: ../rpmdrake.pm:132
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Rhowch eich hawl i gael mynediad dirprwy\n"
 
-#: ../rpmdrake.pm:134
+#: ../rpmdrake.pm:133
 #, c-format
 msgid "User name:"
 msgstr "Enw Defnyddiwr:"
 
-#: ../rpmdrake.pm:188
+#: ../rpmdrake.pm:187
 #, c-format
 msgid "Software Packages Removal"
 msgstr "Tynnu Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:189 ../rpmdrake.pm:193
+#: ../rpmdrake.pm:188 ../rpmdrake.pm:192
 #, c-format
 msgid "Software Packages Update"
 msgstr "Diweddaru Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:190
+#: ../rpmdrake.pm:189
 #, c-format
 msgid "Software Packages Installation"
 msgstr "Gosod Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:231
+#: ../rpmdrake.pm:230
 #, c-format
 msgid "No"
 msgstr "Na"
 
-#: ../rpmdrake.pm:235
+#: ../rpmdrake.pm:234
 #, c-format
 msgid "Yes"
 msgstr "Iawn"
 
-#: ../rpmdrake.pm:286
+#: ../rpmdrake.pm:285
 #, c-format
 msgid "Info..."
 msgstr "Gwybodaeth..."
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:411
 #, c-format
 msgid "Austria"
 msgstr "Awstria"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:412
 #, c-format
 msgid "Australia"
 msgstr "Awstralia"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:413
 #, c-format
 msgid "Belgium"
 msgstr "Gwlad Belg"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:414
 #, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:415
 #, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:416
 #, c-format
 msgid "Switzerland"
 msgstr "Y Swistir"
 
-#: ../rpmdrake.pm:418
+#: ../rpmdrake.pm:417
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:418
 #, c-format
 msgid "Czech Republic"
 msgstr "Gweriniaeth Tsiec"
 
-#: ../rpmdrake.pm:420
+#: ../rpmdrake.pm:419
 #, c-format
 msgid "Germany"
 msgstr "Yr Almaen"
 
-#: ../rpmdrake.pm:421
+#: ../rpmdrake.pm:420
 #, c-format
 msgid "Danmark"
 msgstr "Denmarc"
 
-#: ../rpmdrake.pm:422 ../rpmdrake.pm:426
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:425
 #, c-format
 msgid "Greece"
 msgstr "Groeg"
 
-#: ../rpmdrake.pm:423
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Spain"
 msgstr "Sbaen"
 
-#: ../rpmdrake.pm:424
+#: ../rpmdrake.pm:423
 #, c-format
 msgid "Finland"
 msgstr "Ffindir"
 
-#: ../rpmdrake.pm:425
+#: ../rpmdrake.pm:424
 #, c-format
 msgid "France"
 msgstr "Ffrainc"
 
-#: ../rpmdrake.pm:427
+#: ../rpmdrake.pm:426
 #, c-format
 msgid "Hungary"
 msgstr "Hwngari"
 
-#: ../rpmdrake.pm:428
+#: ../rpmdrake.pm:427
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:429
+#: ../rpmdrake.pm:428
 #, c-format
 msgid "Italy"
 msgstr "Yr Eidal"
 
-#: ../rpmdrake.pm:430
+#: ../rpmdrake.pm:429
 #, c-format
 msgid "Japan"
 msgstr "Siapan"
 
-#: ../rpmdrake.pm:431
+#: ../rpmdrake.pm:430
 #, c-format
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:432
+#: ../rpmdrake.pm:431
 #, c-format
 msgid "Netherlands"
 msgstr "Yr Iseldiroedd"
 
-#: ../rpmdrake.pm:433
+#: ../rpmdrake.pm:432
 #, c-format
 msgid "Norway"
 msgstr "Norwy"
 
-#: ../rpmdrake.pm:434
+#: ../rpmdrake.pm:433
 #, c-format
 msgid "Poland"
 msgstr "Gwlad Pwyl"
 
-#: ../rpmdrake.pm:435
+#: ../rpmdrake.pm:434
 #, c-format
 msgid "Portugal"
 msgstr "Portiwgal"
 
-#: ../rpmdrake.pm:436
+#: ../rpmdrake.pm:435
 #, c-format
 msgid "Russia"
 msgstr "Rwsia"
 
-#: ../rpmdrake.pm:437
+#: ../rpmdrake.pm:436
 #, c-format
 msgid "Sweden"
 msgstr "Sweden"
 
-#: ../rpmdrake.pm:438
+#: ../rpmdrake.pm:437
 #, c-format
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:439
+#: ../rpmdrake.pm:438
 #, c-format
 msgid "Slovakia"
 msgstr "Slofacia"
 
-#: ../rpmdrake.pm:440
+#: ../rpmdrake.pm:439
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:441
+#: ../rpmdrake.pm:440
 #, c-format
 msgid "United Kingdom"
 msgstr "Y Deyrnas Unedig"
 
-#: ../rpmdrake.pm:442
+#: ../rpmdrake.pm:441
 #, c-format
 msgid "China"
 msgstr "Tsiena"
 
-#: ../rpmdrake.pm:443 ../rpmdrake.pm:444 ../rpmdrake.pm:445 ../rpmdrake.pm:446
+#: ../rpmdrake.pm:442 ../rpmdrake.pm:443 ../rpmdrake.pm:444 ../rpmdrake.pm:445
 #, c-format
 msgid "United States"
 msgstr "Yr Unol Daleithiau"
 
-#: ../rpmdrake.pm:544
+#: ../rpmdrake.pm:543
 #, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2788,27 +2803,27 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../rpmdrake.pm:554 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:553 ../rpmdrake.pm:591
 #, c-format
 msgid "Mirror choice"
 msgstr "Dewis drychau"
 
-#: ../rpmdrake.pm:557
+#: ../rpmdrake.pm:556
 #, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau."
 
-#: ../rpmdrake.pm:558
+#: ../rpmdrake.pm:557
 #, 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:565
+#: ../rpmdrake.pm:564
 #, c-format
 msgid "Error during download"
 msgstr "Gwall wrth lwytho i lawr"
 
-#: ../rpmdrake.pm:567
+#: ../rpmdrake.pm:566
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2823,7 +2838,7 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu'r safle, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:572
+#: ../rpmdrake.pm:571
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2838,17 +2853,17 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu safle Mandriva, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:582
+#: ../rpmdrake.pm:581
 #, c-format
 msgid "No mirror"
 msgstr "Dim drych"
 
-#: ../rpmdrake.pm:584
+#: ../rpmdrake.pm:583
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Methu canfod drych addas."
 
-#: ../rpmdrake.pm:585
+#: ../rpmdrake.pm:584
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2863,68 +2878,68 @@ msgstr ""
 "yw pensaernïaeth eich prosesydd yn cael ei gynnal gan Diweddariadau\n"
 "Swyddogol Mandriva Linux."
 
-#: ../rpmdrake.pm:604
+#: ../rpmdrake.pm:603
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Dewiswch ddrych"
 
-#: ../rpmdrake.pm:645
+#: ../rpmdrake.pm:644
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copïo ffeil fel ar gyfer cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:648
+#: ../rpmdrake.pm:647
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Archwilio ffeil cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:651
+#: ../rpmdrake.pm:650
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Archwilio ffeil bell y cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:655
+#: ../rpmdrake.pm:654
 #, c-format
 msgid " done."
 msgstr " gorffen.."
 
-#: ../rpmdrake.pm:659
+#: ../rpmdrake.pm:658
 #, c-format
 msgid " failed!"
 msgstr " methwyd!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:663
+#: ../rpmdrake.pm:662
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s o gyfrwng %s"
 
-#: ../rpmdrake.pm:667
+#: ../rpmdrake.pm:666
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Cychwyn llwytho %s i lawr..."
 
-#: ../rpmdrake.pm:671
+#: ../rpmdrake.pm:670
 #, 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:674
+#: ../rpmdrake.pm:673
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
 
-#: ../rpmdrake.pm:685
+#: ../rpmdrake.pm:684
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Arhoswch, diweddaru cyfrwng..."
 
-#: ../rpmdrake.pm:712
+#: ../rpmdrake.pm:711
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Gwall estyn pecynnau"
 
-#: ../rpmdrake.pm:713
+#: ../rpmdrake.pm:712
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2941,23 +2956,23 @@ msgstr ""
 "neu nid oes modd ei gyrraedd ar hyn o bryd a dylech geisio eto \n"
 "rhywbryd."
 
-#: ../rpmdrake.pm:744
+#: ../rpmdrake.pm:743
 #, c-format
 msgid "Update media"
 msgstr "Diweddaru'r cyfrwng"
 
-#: ../rpmdrake.pm:749
+#: ../rpmdrake.pm:748
 #, 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:756
+#: ../rpmdrake.pm:755
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Dewiswch y cyfrwng i'w diweddaru:"
 
-#: ../rpmdrake.pm:803
+#: ../rpmdrake.pm:802
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2970,7 +2985,7 @@ msgstr ""
 "Gwallau:\n"
 "%s"
 
-#: ../rpmdrake.pm:824 ../rpmdrake.pm:835
+#: ../rpmdrake.pm:823 ../rpmdrake.pm:834
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2981,17 +2996,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:847
+#: ../rpmdrake.pm:846
 #, c-format
 msgid "Unable to create medium."
 msgstr "Methu creu cyfrwng."
 
-#: ../rpmdrake.pm:852
+#: ../rpmdrake.pm:851
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Methu ychwanegu cyfrwng"
 
-#: ../rpmdrake.pm:853
+#: ../rpmdrake.pm:852
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -3002,7 +3017,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:866
+#: ../rpmdrake.pm:865
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -3013,7 +3028,7 @@ msgstr ""
 "s rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
-#: ../rpmdrake.pm:869
+#: ../rpmdrake.pm:868
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
@@ -3024,12 +3039,12 @@ msgstr ""
 "Mandriva Linux rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
-#: ../rpmdrake.pm:900
+#: ../rpmdrake.pm:899
 #, c-format
 msgid "Help launched in background"
 msgstr "Cymorth wedi ei gychwyn yn y cefndir"
 
-#: ../rpmdrake.pm:901
+#: ../rpmdrake.pm:900
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
@@ -3037,292 +3052,226 @@ msgstr ""
 "Mae'r ffenestr cymorth wedi ei hagor, dylai ymddangos ar eich bwrdd gwaith "
 "cyn hir."
 
-#: ../grpmi/curl_download/curl_download.xs:86
-msgid "Download directory does not exist"
-msgstr "Rhaid i'r cyfeiriadur lle bwriedir gofod y llwytho i lawr fodoli"
+#: ../data/rpmdrake-browse-only.desktop.in.h:1
+msgid "A graphical front end for browsing installed & available packages"
+msgstr "Gwyneb graffigol ar gyfer gosod, tynnu a diweddaru pecynnau"
 
-#: ../grpmi/curl_download/curl_download.xs:89
-#: ../grpmi/curl_download/curl_download.xs:213
-msgid "Out of memory\n"
-msgstr "Dim cof\n"
+#: ../data/rpmdrake-browse-only.desktop.in.h:2
+msgid "Browse Available Software"
+msgstr "Pori'r Holl Feddalwedd"
 
-#: ../grpmi/curl_download/curl_download.xs:102
-msgid "Could not open output file in append mode"
-msgstr "Methu agor ffeil allbwn i'r modd atodi"
+#: ../data/rpmdrake.desktop.in.h:1
+msgid "A graphical front end for installing, removing and updating packages"
+msgstr ""
+"Gwyneb graffigol ar gyfer pori pecynnau sydd wedi eu gosod ac sydd ar gael"
 
-#: ../grpmi/curl_download/curl_download.xs:133
-msgid "Unsupported protocol\n"
-msgstr "Protocol nad yw'n cael ei gynnal\n"
+#: ../data/rpmdrake.desktop.in.h:2
+msgid "Install & Remove Software"
+msgstr "Gosod a Thynnu  Meddalwedd"
 
-#: ../grpmi/curl_download/curl_download.xs:136
-msgid "Failed init\n"
-msgstr "Methodd y cychwyn\n"
+#: ../data/rpmdrake-sources.desktop.in.h:1
+msgid "Software Media Manager"
+msgstr "Rheolwr Cyfrwng Meddalwedd"
 
-#: ../grpmi/curl_download/curl_download.xs:139
-msgid "Bad URL format\n"
-msgstr "Fformat URL gwallus\n"
+#: ../mime/gurpmi.addmedia.desktop.in.h:1
+msgid "Add urpmi media"
+msgstr "Ychwanegu cyfrwng urpmi"
 
-#: ../grpmi/curl_download/curl_download.xs:142
-msgid "Bad user format in URL\n"
-msgstr "Fformat defnyddiwr gwael yn yr URL\n"
+#: ../mime/x-urpmi-media.desktop.in.h:1
+msgid "Urpmi medium info"
+msgstr "Gwybodaeth cyfrwng urpmi"
 
-#: ../grpmi/curl_download/curl_download.xs:145
-msgid "Couldn't resolve proxy\n"
-msgstr "Methu dadelfennu'r dirprwy\n"
+#~ msgid "Download directory does not exist"
+#~ msgstr "Rhaid i'r cyfeiriadur lle bwriedir gofod y llwytho i lawr fodoli"
 
-#: ../grpmi/curl_download/curl_download.xs:148
-msgid "Couldn't resolve host\n"
-msgstr "Methu dadelfennu'r gwesteiwr\n"
+#~ msgid "Out of memory\n"
+#~ msgstr "Dim cof\n"
 
-#: ../grpmi/curl_download/curl_download.xs:151
-msgid "Couldn't connect\n"
-msgstr "Methu cysylltu\n"
+#~ msgid "Could not open output file in append mode"
+#~ msgstr "Methu agor ffeil allbwn i'r modd atodi"
 
-#: ../grpmi/curl_download/curl_download.xs:154
-msgid "FTP unexpected server reply\n"
-msgstr "Ateb annisgwyl gan y gweinydd FTP\n"
+#~ msgid "Unsupported protocol\n"
+#~ msgstr "Protocol nad yw'n cael ei gynnal\n"
 
-#: ../grpmi/curl_download/curl_download.xs:157
-msgid "FTP access denied\n"
-msgstr "Mynediad FTP wedi ei wrthod\n"
+#~ msgid "Failed init\n"
+#~ msgstr "Methodd y cychwyn\n"
 
-#: ../grpmi/curl_download/curl_download.xs:160
-msgid "FTP user password incorrect\n"
-msgstr "Cyfrinair defnyddiwr FTP yn anghywir\n"
+#~ msgid "Bad URL format\n"
+#~ msgstr "Fformat URL gwallus\n"
 
-#: ../grpmi/curl_download/curl_download.xs:163
-msgid "FTP unexpected PASS reply\n"
-msgstr "Ateb PASS annisgwyl FTP\n"
+#~ msgid "Bad user format in URL\n"
+#~ msgstr "Fformat defnyddiwr gwael yn yr URL\n"
 
-#: ../grpmi/curl_download/curl_download.xs:166
-msgid "FTP unexpected USER reply\n"
-msgstr "Ateb USER gweinydd FTP\n"
+#~ msgid "Couldn't resolve proxy\n"
+#~ msgstr "Methu dadelfennu'r dirprwy\n"
 
-#: ../grpmi/curl_download/curl_download.xs:169
-msgid "FTP unexpected PASV reply\n"
-msgstr "Ateb PASV gweinydd FTP\n"
+#~ msgid "Couldn't resolve host\n"
+#~ msgstr "Methu dadelfennu'r gwesteiwr\n"
 
-#: ../grpmi/curl_download/curl_download.xs:172
-msgid "FTP unexpected 227 format\n"
-msgstr "Fformat rhyfedd 227 FTP\n"
+#~ msgid "Couldn't connect\n"
+#~ msgstr "Methu cysylltu\n"
 
-#: ../grpmi/curl_download/curl_download.xs:175
-msgid "FTP can't get host\n"
-msgstr "Methu canfod gwesteiwr FTP\n"
+#~ msgid "FTP unexpected server reply\n"
+#~ msgstr "Ateb annisgwyl gan y gweinydd FTP\n"
 
-#: ../grpmi/curl_download/curl_download.xs:178
-msgid "FTP can't reconnect\n"
-msgstr "FTP yn methu ailgysylltu\n"
+#~ msgid "FTP access denied\n"
+#~ msgstr "Mynediad FTP wedi ei wrthod\n"
 
-#: ../grpmi/curl_download/curl_download.xs:181
-msgid "FTP couldn't set binary\n"
-msgstr "FTP yn methu gosod deuaidd\n"
+#~ msgid "FTP user password incorrect\n"
+#~ msgstr "Cyfrinair defnyddiwr FTP yn anghywir\n"
 
-#: ../grpmi/curl_download/curl_download.xs:184
-msgid "Partial file\n"
-msgstr "Rhan o ffeil\n"
+#~ msgid "FTP unexpected PASS reply\n"
+#~ msgstr "Ateb PASS annisgwyl FTP\n"
 
-#: ../grpmi/curl_download/curl_download.xs:187
-msgid "FTP couldn't RETR file\n"
-msgstr "FTP yn methu RETR ffeil\n"
+#~ msgid "FTP unexpected USER reply\n"
+#~ msgstr "Ateb USER gweinydd FTP\n"
 
-#: ../grpmi/curl_download/curl_download.xs:190
-msgid "FTP write error\n"
-msgstr "Gwall ysgrifennu FTP\n"
+#~ msgid "FTP unexpected PASV reply\n"
+#~ msgstr "Ateb PASV gweinydd FTP\n"
 
-#: ../grpmi/curl_download/curl_download.xs:195
-msgid "FTP quote error\n"
-msgstr "Gwall dyfynnu FTP\n"
+#~ msgid "FTP unexpected 227 format\n"
+#~ msgstr "Fformat rhyfedd 227 FTP\n"
 
-#: ../grpmi/curl_download/curl_download.xs:198
-msgid "HTTP not found\n"
-msgstr "http  heb ganfod\n"
+#~ msgid "FTP can't get host\n"
+#~ msgstr "Methu canfod gwesteiwr FTP\n"
 
-#: ../grpmi/curl_download/curl_download.xs:201
-msgid "Write error\n"
-msgstr "Gwall ysgrifennu\n"
+#~ msgid "FTP can't reconnect\n"
+#~ msgstr "FTP yn methu ailgysylltu\n"
 
-#: ../grpmi/curl_download/curl_download.xs:204
-msgid "User name illegally specified\n"
-msgstr "Enw defnyddiwr wedi ei bennu'n anghyfreithlon\n"
+#~ msgid "FTP couldn't set binary\n"
+#~ msgstr "FTP yn methu gosod deuaidd\n"
 
-#: ../grpmi/curl_download/curl_download.xs:207
-msgid "FTP couldn't STOR file\n"
-msgstr "FTP yn methu STOR ffeil\n"
+#~ msgid "Partial file\n"
+#~ msgstr "Rhan o ffeil\n"
 
-#: ../grpmi/curl_download/curl_download.xs:210
-msgid "Read error\n"
-msgstr "Gwall darllen\n"
+#~ msgid "FTP couldn't RETR file\n"
+#~ msgstr "FTP yn methu RETR ffeil\n"
 
-#: ../grpmi/curl_download/curl_download.xs:216
-msgid "Time out\n"
-msgstr "Amser allan\n"
+#~ msgid "FTP write error\n"
+#~ msgstr "Gwall ysgrifennu FTP\n"
 
-#: ../grpmi/curl_download/curl_download.xs:219
-msgid "FTP couldn't set ASCII\n"
-msgstr "FTP yn methu gosod ASCII\n"
+#~ msgid "FTP quote error\n"
+#~ msgstr "Gwall dyfynnu FTP\n"
 
-#: ../grpmi/curl_download/curl_download.xs:222
-msgid "FTP PORT failed\n"
-msgstr "Methodd PORT ftp\n"
+#~ msgid "HTTP not found\n"
+#~ msgstr "http  heb ganfod\n"
 
-#: ../grpmi/curl_download/curl_download.xs:225
-msgid "FTP couldn't use REST\n"
-msgstr "FTP yn methu gosod REST\n"
+#~ msgid "Write error\n"
+#~ msgstr "Gwall ysgrifennu\n"
 
-#: ../grpmi/curl_download/curl_download.xs:228
-msgid "FTP couldn't get size\n"
-msgstr "FTP yn methu canfod maint\n"
+#~ msgid "User name illegally specified\n"
+#~ msgstr "Enw defnyddiwr wedi ei bennu'n anghyfreithlon\n"
 
-#: ../grpmi/curl_download/curl_download.xs:231
-msgid "HTTP range error\n"
-msgstr "Gwall amrediad FTP\n"
+#~ msgid "FTP couldn't STOR file\n"
+#~ msgstr "FTP yn methu STOR ffeil\n"
 
-#: ../grpmi/curl_download/curl_download.xs:234
-msgid "HTTP POST error\n"
-msgstr "Gwall POST HTTP\n"
+#~ msgid "Read error\n"
+#~ msgstr "Gwall darllen\n"
 
-#: ../grpmi/curl_download/curl_download.xs:237
-msgid "SSL connect error\n"
-msgstr "Gwall cysylltiad ssl\n"
+#~ msgid "Time out\n"
+#~ msgstr "Amser allan\n"
 
-#: ../grpmi/curl_download/curl_download.xs:240
-msgid "FTP bad download resume\n"
-msgstr "FTP yn methu ailgychwyn llwytho i lawr\n"
+#~ msgid "FTP couldn't set ASCII\n"
+#~ msgstr "FTP yn methu gosod ASCII\n"
 
-#: ../grpmi/curl_download/curl_download.xs:243
-msgid "File couldn't read file\n"
-msgstr "Y ffeil yn methu darllen ffeil\n"
+#~ msgid "FTP PORT failed\n"
+#~ msgstr "Methodd PORT ftp\n"
 
-#: ../grpmi/curl_download/curl_download.xs:246
-msgid "LDAP cannot bind\n"
-msgstr "LDAP yn methu amlapio\n"
+#~ msgid "FTP couldn't use REST\n"
+#~ msgstr "FTP yn methu gosod REST\n"
 
-#: ../grpmi/curl_download/curl_download.xs:249
-msgid "LDAP search failed\n"
-msgstr "Methodd chwilio LDAP\n"
+#~ msgid "FTP couldn't get size\n"
+#~ msgstr "FTP yn methu canfod maint\n"
 
-#: ../grpmi/curl_download/curl_download.xs:252
-msgid "Library not found\n"
-msgstr "Llyfrgell  heb ei ganfod\n"
+#~ msgid "HTTP range error\n"
+#~ msgstr "Gwall amrediad FTP\n"
 
-#: ../grpmi/curl_download/curl_download.xs:255
-msgid "Function not found\n"
-msgstr "Heb ganfod swyddogaeth\n"
+#~ msgid "HTTP POST error\n"
+#~ msgstr "Gwall POST HTTP\n"
 
-#: ../grpmi/curl_download/curl_download.xs:258
-msgid "Aborted by callback\n"
-msgstr "Atal gan callback\n"
+#~ msgid "SSL connect error\n"
+#~ msgstr "Gwall cysylltiad ssl\n"
 
-#: ../grpmi/curl_download/curl_download.xs:261
-msgid "Bad function argument\n"
-msgstr "Arg swyddogaeth wael\n"
+#~ msgid "FTP bad download resume\n"
+#~ msgstr "FTP yn methu ailgychwyn llwytho i lawr\n"
 
-#: ../grpmi/curl_download/curl_download.xs:264
-msgid "Bad calling order\n"
-msgstr "Trefn galw gwallus\n"
+#~ msgid "File couldn't read file\n"
+#~ msgstr "Y ffeil yn methu darllen ffeil\n"
 
-#: ../grpmi/curl_download/curl_download.xs:267
-msgid "HTTP Interface operation failed\n"
-msgstr "Methodd gweithrediad rhyngwyneb HTTP\n"
+#~ msgid "LDAP cannot bind\n"
+#~ msgstr "LDAP yn methu amlapio\n"
 
-#: ../grpmi/curl_download/curl_download.xs:270
-msgid "my_getpass() returns fail\n"
-msgstr "Methodd dychweliad my_getpass()\n"
+#~ msgid "LDAP search failed\n"
+#~ msgstr "Methodd chwilio LDAP\n"
 
-#: ../grpmi/curl_download/curl_download.xs:273
-msgid "catch endless re-direct loops\n"
-msgstr "cipio cylchedd ailgyfeirio diddiwedd\n"
+#~ msgid "Library not found\n"
+#~ msgstr "Llyfrgell  heb ei ganfod\n"
 
-#: ../grpmi/curl_download/curl_download.xs:276
-msgid "User specified an unknown option\n"
-msgstr "Enwodd y defnyddiwr ddewis anhysbys\n"
+#~ msgid "Function not found\n"
+#~ msgstr "Heb ganfod swyddogaeth\n"
 
-#: ../grpmi/curl_download/curl_download.xs:279
-msgid "Malformed telnet option\n"
-msgstr "Dewis telnet anffurfiedig\n"
+#~ msgid "Aborted by callback\n"
+#~ msgstr "Atal gan callback\n"
 
-#: ../grpmi/curl_download/curl_download.xs:282
-msgid "removed after 7.7.3\n"
-msgstr "tynnwyd ar ôl 7.7.3\n"
+#~ msgid "Bad function argument\n"
+#~ msgstr "Arg swyddogaeth wael\n"
 
-#: ../grpmi/curl_download/curl_download.xs:285
-msgid "peer's certificate wasn't ok\n"
-msgstr "nid oedd y dystysgrif gyfoed yn iawn\n"
+#~ msgid "Bad calling order\n"
+#~ msgstr "Trefn galw gwallus\n"
 
-#: ../grpmi/curl_download/curl_download.xs:288
-msgid "when this is a specific error\n"
-msgstr "pan yw hwn yn wall penodol\n"
+#~ msgid "HTTP Interface operation failed\n"
+#~ msgstr "Methodd gweithrediad rhyngwyneb HTTP\n"
 
-#: ../grpmi/curl_download/curl_download.xs:291
-msgid "SSL crypto engine not found\n"
-msgstr "Heb ganfod peiriant cudd SSL\n"
+#~ msgid "my_getpass() returns fail\n"
+#~ msgstr "Methodd dychweliad my_getpass()\n"
 
-#: ../grpmi/curl_download/curl_download.xs:294
-msgid "can not set SSL crypto engine as default\n"
-msgstr "methu gosod peiriant cudd SSL fel rhagosodedig\n"
+#~ msgid "catch endless re-direct loops\n"
+#~ msgstr "cipio cylchedd ailgyfeirio diddiwedd\n"
 
-#: ../grpmi/curl_download/curl_download.xs:297
-msgid "failed sending network data\n"
-msgstr "methu anfon data rhwydwaith\n"
+#~ msgid "User specified an unknown option\n"
+#~ msgstr "Enwodd y defnyddiwr ddewis anhysbys\n"
 
-#: ../grpmi/curl_download/curl_download.xs:300
-msgid "failure in receiving network data\n"
-msgstr "methu derbyn data rhwydwaith\n"
+#~ msgid "Malformed telnet option\n"
+#~ msgstr "Dewis telnet anffurfiedig\n"
 
-#: ../grpmi/curl_download/curl_download.xs:303
-msgid "share is in use\n"
-msgstr "rhannu'n cael ei ddefnyddio\n"
+#~ msgid "removed after 7.7.3\n"
+#~ msgstr "tynnwyd ar ôl 7.7.3\n"
 
-#: ../grpmi/curl_download/curl_download.xs:306
-msgid "problem with the local certificate\n"
-msgstr "anhawster gyda'r dystysgrif leol\n"
+#~ msgid "peer's certificate wasn't ok\n"
+#~ msgstr "nid oedd y dystysgrif gyfoed yn iawn\n"
 
-#: ../grpmi/curl_download/curl_download.xs:309
-msgid "couldn't use specified cipher\n"
-msgstr "methu defnyddio'r seiffer enwyd\n"
+#~ msgid "when this is a specific error\n"
+#~ msgstr "pan yw hwn yn wall penodol\n"
 
-#: ../grpmi/curl_download/curl_download.xs:312
-msgid "problem with the CA cert (path?)\n"
-msgstr "anhawster gyda thystysgrif CA (llwybr?)\n"
+#~ msgid "SSL crypto engine not found\n"
+#~ msgstr "Heb ganfod peiriant cudd SSL\n"
 
-#: ../grpmi/curl_download/curl_download.xs:315
-msgid "Unrecognized transfer encoding\n"
-msgstr "Amgodio trosglwyddo anhysbys\n"
+#~ msgid "can not set SSL crypto engine as default\n"
+#~ msgstr "methu gosod peiriant cudd SSL fel rhagosodedig\n"
 
-#: ../grpmi/curl_download/curl_download.xs:320
-#, c-format
-msgid "Unknown error code %d\n"
-msgstr "Gwall cod anhysbys %d\n"
+#~ msgid "failed sending network data\n"
+#~ msgstr "methu anfon data rhwydwaith\n"
 
-#: ../data/rpmdrake-browse-only.desktop.in.h:1
-msgid "A graphical front end for browsing installed & available packages"
-msgstr "Gwyneb graffigol ar gyfer gosod, tynnu a diweddaru pecynnau"
+#~ msgid "failure in receiving network data\n"
+#~ msgstr "methu derbyn data rhwydwaith\n"
 
-#: ../data/rpmdrake-browse-only.desktop.in.h:2
-msgid "Browse Available Software"
-msgstr "Pori'r Holl Feddalwedd"
+#~ msgid "share is in use\n"
+#~ msgstr "rhannu'n cael ei ddefnyddio\n"
 
-#: ../data/rpmdrake.desktop.in.h:1
-msgid "A graphical front end for installing, removing and updating packages"
-msgstr ""
-"Gwyneb graffigol ar gyfer pori pecynnau sydd wedi eu gosod ac sydd ar gael"
+#~ msgid "problem with the local certificate\n"
+#~ msgstr "anhawster gyda'r dystysgrif leol\n"
 
-#: ../data/rpmdrake.desktop.in.h:2
-msgid "Install & Remove Software"
-msgstr "Gosod a Thynnu  Meddalwedd"
+#~ msgid "couldn't use specified cipher\n"
+#~ msgstr "methu defnyddio'r seiffer enwyd\n"
 
-#: ../data/rpmdrake-sources.desktop.in.h:1
-msgid "Software Media Manager"
-msgstr "Rheolwr Cyfrwng Meddalwedd"
+#~ msgid "problem with the CA cert (path?)\n"
+#~ msgstr "anhawster gyda thystysgrif CA (llwybr?)\n"
 
-#: ../mime/gurpmi.addmedia.desktop.in.h:1
-msgid "Add urpmi media"
-msgstr "Ychwanegu cyfrwng urpmi"
+#~ msgid "Unrecognized transfer encoding\n"
+#~ msgstr "Amgodio trosglwyddo anhysbys\n"
 
-#: ../mime/x-urpmi-media.desktop.in.h:1
-msgid "Urpmi medium info"
-msgstr "Gwybodaeth cyfrwng urpmi"
+#~ msgid "Unknown error code %d\n"
+#~ msgstr "Gwall cod anhysbys %d\n"
 
 #~ msgid ""
 #~ "This step enables you to add sources from a Mandriva Linux web or FTP "