Updated cy translation

1 files changed, 425 insertions, 251 deletions

diff --git a/po/cy.po b/po/cy.po
index 1a8d5ad5..aa6d4863 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-06 11:49+0200\n"
-"PO-Revision-Date: 2007-09-17 18:56+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"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,8 @@ msgstr ""
 "X-Poedit-Country: UK\n"
 "Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
 
-#: ../MandrivaUpdate:76 ../Rpmdrake/gui.pm:690
+#: ../MandrivaUpdate:76
+#: ../Rpmdrake/gui.pm:690
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -30,32 +31,41 @@ msgstr ""
 "nad oes diweddariad ar gyfer y pecynnau ar eich cyfrifiadur,\n"
 "neu rydych wedi eu gosod i gyd yn barod."
 
-#: ../MandrivaUpdate:105 ../rpmdrake:63 ../rpmdrake:524 ../rpmdrake.pm:195
+#: ../MandrivaUpdate:105
+#: ../rpmdrake:63
+#: ../rpmdrake:524
+#: ../rpmdrake.pm:195
 #, c-format
 msgid "Software Management"
 msgstr "Rheoli Meddalwedd"
 
 #: ../MandrivaUpdate:123
-#, fuzzy, c-format
+#, c-format
 msgid "Here is the list of software package updates"
-msgstr "Diweddaru Pecynnau Meddalwedd"
+msgstr "Dyma restr o ddiweddariadau pecynnau meddalwedd"
 
-#: ../MandrivaUpdate:144 ../Rpmdrake/edit_urpm_sources.pm:1127 ../rpmdrake:454
+#: ../MandrivaUpdate:144
+#: ../Rpmdrake/edit_urpm_sources.pm:1127
+#: ../rpmdrake:454
 #, c-format
 msgid "Help"
 msgstr "Cymorth"
 
-#: ../MandrivaUpdate:148 ../rpmdrake:459 ../rpmdrake.pm:783
+#: ../MandrivaUpdate:148
+#: ../rpmdrake:459
+#: ../rpmdrake.pm:783
 #, c-format
 msgid "Select all"
 msgstr "Dewis popeth"
 
-#: ../MandrivaUpdate:156 ../rpmdrake.pm:787
+#: ../MandrivaUpdate:156
+#: ../rpmdrake.pm:787
 #, c-format
 msgid "Update"
 msgstr "Diweddaru"
 
-#: ../MandrivaUpdate:164 ../rpmdrake:469
+#: ../MandrivaUpdate:164
+#: ../rpmdrake:469
 #, c-format
 msgid "Quit"
 msgstr "Gadael"
@@ -65,7 +75,8 @@ msgstr "Gadael"
 msgid "FTP"
 msgstr "FTP"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:61 ../Rpmdrake/edit_urpm_sources.pm:70
+#: ../Rpmdrake/edit_urpm_sources.pm:61
+#: ../Rpmdrake/edit_urpm_sources.pm:70
 #, c-format
 msgid "Local"
 msgstr "Lleol"
@@ -80,7 +91,8 @@ msgstr "HTTP"
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:64 ../Rpmdrake/edit_urpm_sources.pm:67
+#: ../Rpmdrake/edit_urpm_sources.pm:64
+#: ../Rpmdrake/edit_urpm_sources.pm:67
 #, c-format
 msgid "NFS"
 msgstr "NFS"
@@ -103,27 +115,20 @@ msgstr "Dewis y math o gyfrwng"
 #: ../Rpmdrake/edit_urpm_sources.pm:79
 #, c-format
 msgid ""
-"This step enables you to add sources from a Mandriva Linux web or FTP "
-"mirror.\n"
+"This step enables you to add sources from a Mandriva Linux web or FTP mirror.\n"
 "\n"
 "There are two kinds of official mirrors. You can choose to add sources that\n"
-"contain the complete set of packages of your distribution (usually a "
-"superset\n"
-"of what comes on the standard installation CDs), or sources that provide "
-"the\n"
+"contain the complete set of packages of your distribution (usually a superset\n"
+"of what comes on the standard installation CDs), or sources that provide the\n"
 "official updates for your distribution. (You can add both, but you'll have\n"
 "to do this in two steps.)"
 msgstr ""
 "Dyma sut mae ychwanegu ffynonellau o safle neu ddrych FTP Mandriva Linux\n"
 "\n"
-"Mae yna ddau fath o ddrych swyddogol. Gallwch ddewis i ychwanegu "
-"ffynonellau\n"
-"sy'n cynnwys set gyfan o becynnau ar gyfer eich dosbarthiad (fel rheol uwch "
-"set\n"
-"o'r hyn sydd ar y CDau gosod safonol), neu ffynonellau sy'n darparu'r "
-"diweddariadau\n"
-"swyddogol eich dosbarthiad.. (Mae modd ychwanegu'r ddau ond bydd rhaid "
-"gwneud\n"
+"Mae yna ddau fath o ddrych swyddogol. Gallwch ddewis i ychwanegu ffynonellau\n"
+"sy'n cynnwys set gyfan o becynnau ar gyfer eich dosbarthiad (fel rheol uwch set\n"
+"o'r hyn sydd ar y CDau gosod safonol), neu ffynonellau sy'n darparu'r diweddariadau\n"
+"swyddogol eich dosbarthiad.. (Mae modd ychwanegu'r ddau ond bydd rhaid gwneud\n"
 "hyn mewn dau gam)"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:92
@@ -180,8 +185,10 @@ msgstr "Llwybr y cyfrwng:"
 msgid "FTP server"
 msgstr "Gweinydd FTP"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:151 ../Rpmdrake/edit_urpm_sources.pm:152
-#: ../Rpmdrake/edit_urpm_sources.pm:153 ../Rpmdrake/edit_urpm_sources.pm:438
+#: ../Rpmdrake/edit_urpm_sources.pm:151
+#: ../Rpmdrake/edit_urpm_sources.pm:152
+#: ../Rpmdrake/edit_urpm_sources.pm:153
+#: ../Rpmdrake/edit_urpm_sources.pm:438
 #, c-format
 msgid "URL:"
 msgstr "URL:"
@@ -216,13 +223,15 @@ msgstr "Pori..."
 msgid "Login:"
 msgstr "Mewngofnod:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:199 ../Rpmdrake/edit_urpm_sources.pm:539
+#: ../Rpmdrake/edit_urpm_sources.pm:199
+#: ../Rpmdrake/edit_urpm_sources.pm:539
 #: ../rpmdrake.pm:135
 #, c-format
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:204 ../Rpmdrake/edit_urpm_sources.pm:439
+#: ../Rpmdrake/edit_urpm_sources.pm:204
+#: ../Rpmdrake/edit_urpm_sources.pm:439
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Llwybr perthynol i synthesis/hdlist:"
@@ -271,26 +280,48 @@ msgstr "Ychwanegu cyfrwng:"
 msgid "Type of medium:"
 msgstr "Math o gyfrwng:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:268 ../Rpmdrake/edit_urpm_sources.pm:344
-#: ../Rpmdrake/edit_urpm_sources.pm:448 ../Rpmdrake/edit_urpm_sources.pm:475
-#: ../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:892 ../Rpmdrake/gui.pm:462
-#: ../Rpmdrake/init.pm:136 ../Rpmdrake/pkg.pm:629 ../Rpmdrake/pkg.pm:671
-#: ../rpmdrake.pm:306 ../rpmdrake.pm:621 ../rpmdrake.pm:706 ../rpmdrake.pm:779
+#: ../Rpmdrake/edit_urpm_sources.pm:268
+#: ../Rpmdrake/edit_urpm_sources.pm:344
+#: ../Rpmdrake/edit_urpm_sources.pm:448
+#: ../Rpmdrake/edit_urpm_sources.pm:475
+#: ../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:892
+#: ../Rpmdrake/gui.pm:462
+#: ../Rpmdrake/init.pm:136
+#: ../Rpmdrake/pkg.pm:629
+#: ../Rpmdrake/pkg.pm:671
+#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:621
+#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:779
 #, c-format
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:270 ../Rpmdrake/edit_urpm_sources.pm:346
-#: ../Rpmdrake/edit_urpm_sources.pm:475 ../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:938 ../Rpmdrake/edit_urpm_sources.pm:1128
-#: ../Rpmdrake/gui.pm:462 ../Rpmdrake/gui.pm:478 ../Rpmdrake/gui.pm:483
-#: ../Rpmdrake/init.pm:136 ../Rpmdrake/pkg.pm:474 ../Rpmdrake/pkg.pm:671
-#: ../Rpmdrake/rpmnew.pm:179 ../rpmdrake.pm:126 ../rpmdrake.pm:245
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:621
+#: ../Rpmdrake/edit_urpm_sources.pm:270
+#: ../Rpmdrake/edit_urpm_sources.pm:346
+#: ../Rpmdrake/edit_urpm_sources.pm:475
+#: ../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:938
+#: ../Rpmdrake/edit_urpm_sources.pm:1128
+#: ../Rpmdrake/gui.pm:462
+#: ../Rpmdrake/gui.pm:478
+#: ../Rpmdrake/gui.pm:483
+#: ../Rpmdrake/init.pm:136
+#: ../Rpmdrake/pkg.pm:474
+#: ../Rpmdrake/pkg.pm:671
+#: ../Rpmdrake/rpmnew.pm:179
+#: ../rpmdrake.pm:126
+#: ../rpmdrake.pm:245
+#: ../rpmdrake.pm:309
+#: ../rpmdrake.pm:621
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
@@ -372,8 +403,7 @@ msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:474
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+msgid "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Er mwyn cadw'r newidiadau, rhaid gosod y cyfrwng yn y gyrrwr."
 
 #: ../Rpmdrake/edit_urpm_sources.pm:510
@@ -393,12 +423,8 @@ msgstr "Gosodiadau dirprwy eang"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:525
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Os oes angen dirprwy arnoch, rhowch enw gwesteiwr a phorth dewisol "
-"(cystrawen: <proxyhost[:port]>):"
+msgid "If you need a proxy, enter the hostname and an optional port (syntax: <proxyhost[:port]>):"
+msgstr "Os oes angen dirprwy arnoch, rhowch enw gwesteiwr a phorth dewisol (cystrawen: <proxyhost[:port]>):"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:528
 #, c-format
@@ -465,14 +491,18 @@ msgstr "Protocol:"
 msgid "Media limit:"
 msgstr "Terfyn cyfrwng:"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:721 ../Rpmdrake/edit_urpm_sources.pm:728
-#: ../Rpmdrake/edit_urpm_sources.pm:926 ../Rpmdrake/edit_urpm_sources.pm:1115
+#: ../Rpmdrake/edit_urpm_sources.pm:721
+#: ../Rpmdrake/edit_urpm_sources.pm:728
+#: ../Rpmdrake/edit_urpm_sources.pm:926
+#: ../Rpmdrake/edit_urpm_sources.pm:1115
 #, c-format
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:722 ../Rpmdrake/edit_urpm_sources.pm:729
-#: ../Rpmdrake/edit_urpm_sources.pm:788 ../Rpmdrake/edit_urpm_sources.pm:930
+#: ../Rpmdrake/edit_urpm_sources.pm:722
+#: ../Rpmdrake/edit_urpm_sources.pm:729
+#: ../Rpmdrake/edit_urpm_sources.pm:788
+#: ../Rpmdrake/edit_urpm_sources.pm:930
 #: ../Rpmdrake/edit_urpm_sources.pm:1105
 #, c-format
 msgid "Remove"
@@ -508,8 +538,11 @@ msgstr "Terfyn cyfrwng"
 msgid "Command"
 msgstr "Gorchymyn"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:772 ../Rpmdrake/gui.pm:687
-#: ../Rpmdrake/pkg.pm:100 ../Rpmdrake/pkg.pm:130 ../Rpmdrake/pkg.pm:170
+#: ../Rpmdrake/edit_urpm_sources.pm:772
+#: ../Rpmdrake/gui.pm:687
+#: ../Rpmdrake/pkg.pm:100
+#: ../Rpmdrake/pkg.pm:130
+#: ../Rpmdrake/pkg.pm:170
 #: ../Rpmdrake/rpmnew.pm:77
 #, c-format
 msgid "(none)"
@@ -530,7 +563,8 @@ msgstr "Ychwanegu..."
 msgid "Manage keys for digital signatures of packages"
 msgstr "Rheoli allweddi pecynnau digidol "
 
-#: ../Rpmdrake/edit_urpm_sources.pm:822 ../Rpmdrake/edit_urpm_sources.pm:1036
+#: ../Rpmdrake/edit_urpm_sources.pm:822
+#: ../Rpmdrake/edit_urpm_sources.pm:1036
 #, c-format
 msgid "Medium"
 msgstr "Cyfrwng"
@@ -583,19 +617,26 @@ msgstr ""
 msgid "Configure media"
 msgstr "Ffurfweddu'r cyfrwng"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:954 ../Rpmdrake/edit_urpm_sources.pm:955
-#: ../Rpmdrake/edit_urpm_sources.pm:956 ../rpmdrake:347 ../rpmdrake:350
-#: ../rpmdrake:355 ../rpmdrake:368 ../rpmdrake:369
+#: ../Rpmdrake/edit_urpm_sources.pm:954
+#: ../Rpmdrake/edit_urpm_sources.pm:955
+#: ../Rpmdrake/edit_urpm_sources.pm:956
+#: ../rpmdrake:347
+#: ../rpmdrake:350
+#: ../rpmdrake:355
+#: ../rpmdrake:368
+#: ../rpmdrake:369
 #, c-format
 msgid "/_File"
 msgstr "/_Ffeil"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:955 ../rpmdrake:369
+#: ../Rpmdrake/edit_urpm_sources.pm:955
+#: ../rpmdrake:369
 #, c-format
 msgid "/_Quit"
 msgstr "/_Gadael"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:955 ../rpmdrake:369
+#: ../Rpmdrake/edit_urpm_sources.pm:955
+#: ../rpmdrake:369
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
@@ -610,10 +651,16 @@ msgstr "/_Diweddaru"
 msgid "<control>U"
 msgstr "<control>U"
 
-#: ../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/edit_urpm_sources.pm:962
-#: ../rpmdrake:344 ../rpmdrake:372 ../rpmdrake:376 ../rpmdrake:380
+#: ../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/edit_urpm_sources.pm:962
+#: ../rpmdrake:344
+#: ../rpmdrake:372
+#: ../rpmdrake:376
+#: ../rpmdrake:380
 #: ../rpmdrake:419
 #, c-format
 msgid "/_Options"
@@ -669,51 +716,64 @@ msgstr "/_Dirprwy..."
 msgid "<control>R"
 msgstr "<control>R"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:964 ../Rpmdrake/edit_urpm_sources.pm:965
-#: ../Rpmdrake/edit_urpm_sources.pm:966 ../Rpmdrake/edit_urpm_sources.pm:967
-#: ../rpmdrake:384 ../rpmdrake:385 ../rpmdrake:386 ../rpmdrake:387
+#: ../Rpmdrake/edit_urpm_sources.pm:964
+#: ../Rpmdrake/edit_urpm_sources.pm:965
+#: ../Rpmdrake/edit_urpm_sources.pm:966
+#: ../Rpmdrake/edit_urpm_sources.pm:967
+#: ../rpmdrake:384
+#: ../rpmdrake:385
+#: ../rpmdrake:386
+#: ../rpmdrake:387
 #, c-format
 msgid "/_Help"
 msgstr "/_Cymorth"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:965 ../rpmdrake:385
+#: ../Rpmdrake/edit_urpm_sources.pm:965
+#: ../rpmdrake:385
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Adrodd ar Wall"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:967 ../rpmdrake:387
+#: ../Rpmdrake/edit_urpm_sources.pm:967
+#: ../rpmdrake:387
 #, c-format
 msgid "/_About..."
 msgstr "/_Ynghylch..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:970 ../rpmdrake:390
+#: ../Rpmdrake/edit_urpm_sources.pm:970
+#: ../rpmdrake:390
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:972 ../rpmdrake:392
+#: ../Rpmdrake/edit_urpm_sources.pm:972
+#: ../rpmdrake:392
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Hawlfraint (C) %s Mandriva"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:974 ../rpmdrake:394
+#: ../Rpmdrake/edit_urpm_sources.pm:974
+#: ../rpmdrake:394
 #, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake yw offeryn rheoli pecynnau Mandriva Linux."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:976 ../rpmdrake:396
+#: ../Rpmdrake/edit_urpm_sources.pm:976
+#: ../rpmdrake:396
 #, 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:981 ../rpmdrake:401
+#: ../Rpmdrake/edit_urpm_sources.pm:981
+#: ../rpmdrake:401
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "_: Rhoslyn Prys post@meddal.com\n"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1034 ../Rpmdrake/pkg.pm:214
+#: ../Rpmdrake/edit_urpm_sources.pm:1034
+#: ../Rpmdrake/pkg.pm:214
 #, c-format
 msgid "Enabled"
 msgstr "Galluogwyd"
@@ -749,7 +809,8 @@ msgstr ""
 msgid "Edit"
 msgstr "Golygu"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1143 ../Rpmdrake/init.pm:142
+#: ../Rpmdrake/edit_urpm_sources.pm:1143
+#: ../Rpmdrake/init.pm:142
 #: ../gurpmi.addmedia:99
 #, c-format
 msgid ""
@@ -794,12 +855,14 @@ msgstr ""
 msgid "None"
 msgstr "Dim"
 
-#: ../Rpmdrake/gui.pm:81 ../Rpmdrake/gui.pm:155
+#: ../Rpmdrake/gui.pm:81
+#: ../Rpmdrake/gui.pm:155
 #, c-format
 msgid "Importance: "
 msgstr "Pwysigrwydd: "
 
-#: ../Rpmdrake/gui.pm:82 ../Rpmdrake/gui.pm:163
+#: ../Rpmdrake/gui.pm:82
+#: ../Rpmdrake/gui.pm:163
 #, c-format
 msgid "Reason for update: "
 msgstr "Rheswm am y diweddariad:"
@@ -809,7 +872,8 @@ msgstr "Rheswm am y diweddariad:"
 msgid "Security advisory"
 msgstr "Diweddariadau diogelwch"
 
-#: ../Rpmdrake/gui.pm:94 ../Rpmdrake/gui.pm:165
+#: ../Rpmdrake/gui.pm:94
+#: ../Rpmdrake/gui.pm:165
 #, c-format
 msgid "No description"
 msgstr "Dim disgrifiad"
@@ -819,32 +883,39 @@ msgstr "Dim disgrifiad"
 msgid "Details:"
 msgstr "Manylion:"
 
-#: ../Rpmdrake/gui.pm:100 ../Rpmdrake/gui.pm:150
+#: ../Rpmdrake/gui.pm:100
+#: ../Rpmdrake/gui.pm:150
 #, c-format
 msgid "Version: "
 msgstr "Fersiwn: "
 
-#: ../Rpmdrake/gui.pm:103 ../Rpmdrake/gui.pm:145
+#: ../Rpmdrake/gui.pm:103
+#: ../Rpmdrake/gui.pm:145
 #, c-format
 msgid "Currently installed version: "
 msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
 
-#: ../Rpmdrake/gui.pm:106 ../Rpmdrake/gui.pm:151
+#: ../Rpmdrake/gui.pm:106
+#: ../Rpmdrake/gui.pm:151
 #, c-format
 msgid "Architecture: "
 msgstr "Pensaernïaeth:"
 
-#: ../Rpmdrake/gui.pm:107 ../Rpmdrake/gui.pm:152
+#: ../Rpmdrake/gui.pm:107
+#: ../Rpmdrake/gui.pm:152
 #, c-format
 msgid "Size: "
 msgstr "Maint: "
 
-#: ../Rpmdrake/gui.pm:107 ../Rpmdrake/gui.pm:152
+#: ../Rpmdrake/gui.pm:107
+#: ../Rpmdrake/gui.pm:152
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../Rpmdrake/gui.pm:108 ../Rpmdrake/gui.pm:144 ../rpmdrake.pm:838
+#: ../Rpmdrake/gui.pm:108
+#: ../Rpmdrake/gui.pm:144
+#: ../rpmdrake.pm:838
 #, c-format
 msgid "Medium: "
 msgstr "Cyfrwng:"
@@ -854,8 +925,11 @@ msgstr "Cyfrwng:"
 msgid "Files:"
 msgstr "Ffeiliau:"
 
-#: ../Rpmdrake/gui.pm:118 ../Rpmdrake/gui.pm:123 ../Rpmdrake/gui.pm:137
-#: ../Rpmdrake/gui.pm:139 ../Rpmdrake/pkg.pm:136
+#: ../Rpmdrake/gui.pm:118
+#: ../Rpmdrake/gui.pm:123
+#: ../Rpmdrake/gui.pm:137
+#: ../Rpmdrake/gui.pm:139
+#: ../Rpmdrake/pkg.pm:136
 #, c-format
 msgid "(Not available)"
 msgstr "(Dim ar gael)"
@@ -890,7 +964,9 @@ msgstr "Crynodeb: "
 msgid "Description: "
 msgstr "Disgrifiadau: "
 
-#: ../Rpmdrake/gui.pm:359 ../Rpmdrake/pkg.pm:681 ../rpmdrake.pm:762
+#: ../Rpmdrake/gui.pm:359
+#: ../Rpmdrake/pkg.pm:681
+#: ../rpmdrake.pm:762
 #: ../rpmdrake.pm:877
 #, c-format
 msgid "Warning"
@@ -905,7 +981,9 @@ msgstr ""
 "Mae'r pecyn \"%s\" yn rhestr hepgor urpmi.\n"
 "Hoffech chi ei ddewis beth bynnag?"
 
-#: ../Rpmdrake/gui.pm:453 ../Rpmdrake/gui.pm:482 ../Rpmdrake/gui.pm:484
+#: ../Rpmdrake/gui.pm:453
+#: ../Rpmdrake/gui.pm:482
+#: ../Rpmdrake/gui.pm:484
 #, c-format
 msgid "More information on package..."
 msgstr "Rhagor o wybodaeth ar becyn..."
@@ -926,7 +1004,8 @@ 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:462 ../Rpmdrake/gui.pm:467
+#: ../Rpmdrake/gui.pm:462
+#: ../Rpmdrake/gui.pm:467
 #, c-format
 msgid "More info"
 msgstr "Rhagor"
@@ -948,7 +1027,8 @@ msgid ""
 "removed:"
 msgstr "Oherwydd eu dibyniaethau, rhaid tynnu'r pecynnau canlynol  hefyd:"
 
-#: ../Rpmdrake/gui.pm:509 ../Rpmdrake/gui.pm:518
+#: ../Rpmdrake/gui.pm:509
+#: ../Rpmdrake/gui.pm:518
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Nid oes modd tynnu rhai pecynnau"
@@ -962,7 +1042,8 @@ msgstr ""
 "Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:519 ../Rpmdrake/gui.pm:586
+#: ../Rpmdrake/gui.pm:519
+#: ../Rpmdrake/gui.pm:586
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1025,7 +1106,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:585 ../Rpmdrake/pkg.pm:563
+#: ../Rpmdrake/gui.pm:585
+#: ../Rpmdrake/pkg.pm:563
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Rhaid tynnu rhai pecynnau"
@@ -1056,12 +1138,14 @@ msgid ""
 "Do you really want to install all the selected packages?"
 msgstr "Rhybudd:"
 
-#: ../Rpmdrake/gui.pm:652 ../Rpmdrake/pkg.pm:250
+#: ../Rpmdrake/gui.pm:652
+#: ../Rpmdrake/pkg.pm:250
 #, c-format
 msgid "Fatal error"
 msgstr "Gwall terfynol"
 
-#: ../Rpmdrake/gui.pm:653 ../Rpmdrake/pkg.pm:251
+#: ../Rpmdrake/gui.pm:653
+#: ../Rpmdrake/pkg.pm:251
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Digwyddodd gwall terfynol:%s."
@@ -1076,17 +1160,20 @@ msgstr "Arhoswch, rhestri pecynnau..."
 msgid "No update"
 msgstr "Dim diweddariad"
 
-#: ../Rpmdrake/gui.pm:713 ../rpmdrake:229
+#: ../Rpmdrake/gui.pm:713
+#: ../rpmdrake:229
 #, c-format
 msgid "All"
 msgstr "Popeth"
 
-#: ../Rpmdrake/gui.pm:722 ../rpmdrake:132
+#: ../Rpmdrake/gui.pm:722
+#: ../rpmdrake:132
 #, c-format
 msgid "Upgradable"
 msgstr "Diweddariadwy"
 
-#: ../Rpmdrake/gui.pm:722 ../rpmdrake:132
+#: ../Rpmdrake/gui.pm:722
+#: ../rpmdrake:132
 #, c-format
 msgid "Addable"
 msgstr "Ychwanegadwy"
@@ -1101,8 +1188,11 @@ msgstr "Dim disgrifiad ar gael i'r pecyn hwn\n"
 msgid "Accessibility"
 msgstr "Hygyrchedd"
 
-#: ../Rpmdrake/icon.pm:36 ../Rpmdrake/icon.pm:37 ../Rpmdrake/icon.pm:38
-#: ../Rpmdrake/icon.pm:39 ../Rpmdrake/icon.pm:40
+#: ../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"
@@ -1122,15 +1212,25 @@ msgstr "Llosgi CD"
 msgid "Compression"
 msgstr "Cywasgiad"
 
-#: ../Rpmdrake/icon.pm:40 ../Rpmdrake/icon.pm:46 ../Rpmdrake/icon.pm:57
-#: ../Rpmdrake/icon.pm:71 ../Rpmdrake/icon.pm:89 ../Rpmdrake/icon.pm:110
-#: ../Rpmdrake/icon.pm:123 ../Rpmdrake/icon.pm:134 ../Rpmdrake/pkg.pm:77
+#: ../Rpmdrake/icon.pm:40
+#: ../Rpmdrake/icon.pm:46
+#: ../Rpmdrake/icon.pm:57
+#: ../Rpmdrake/icon.pm:71
+#: ../Rpmdrake/icon.pm:89
+#: ../Rpmdrake/icon.pm:110
+#: ../Rpmdrake/icon.pm:123
+#: ../Rpmdrake/icon.pm:134
+#: ../Rpmdrake/pkg.pm:77
 #, c-format
 msgid "Other"
 msgstr "Arall"
 
-#: ../Rpmdrake/icon.pm:41 ../Rpmdrake/icon.pm:42 ../Rpmdrake/icon.pm:43
-#: ../Rpmdrake/icon.pm:44 ../Rpmdrake/icon.pm:45 ../Rpmdrake/icon.pm:46
+#: ../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"
@@ -1160,16 +1260,27 @@ msgstr "Llenyddiaeth"
 msgid "Communications"
 msgstr "Cyfathrebu"
 
-#: ../Rpmdrake/icon.pm:48 ../Rpmdrake/icon.pm:52
+#: ../Rpmdrake/icon.pm:48
+#: ../Rpmdrake/icon.pm:52
 #, c-format
 msgid "Databases"
 msgstr "Cronfeydd Data"
 
-#: ../Rpmdrake/icon.pm:49 ../Rpmdrake/icon.pm:50 ../Rpmdrake/icon.pm:51
-#: ../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:172 ../Rpmdrake/icon.pm:173
+#: ../Rpmdrake/icon.pm:49
+#: ../Rpmdrake/icon.pm:50
+#: ../Rpmdrake/icon.pm:51
+#: ../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:172
+#: ../Rpmdrake/icon.pm:173
 #: ../Rpmdrake/icon.pm:174
 #, c-format
 msgid "Development"
@@ -1221,7 +1332,8 @@ msgid "Python"
 msgstr "Python"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../Rpmdrake/icon.pm:61 ../Rpmdrake/icon.pm:149
+#: ../Rpmdrake/icon.pm:61
+#: ../Rpmdrake/icon.pm:149
 #, c-format
 msgid "X11"
 msgstr "X11"
@@ -1246,9 +1358,15 @@ msgstr "Efelychwyr"
 msgid "File tools"
 msgstr "Offer ffeiliau"
 
-#: ../Rpmdrake/icon.pm:66 ../Rpmdrake/icon.pm:67 ../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:66
+#: ../Rpmdrake/icon.pm:67
+#: ../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
 #, c-format
 msgid "Games"
 msgstr "Gemau"
@@ -1288,9 +1406,15 @@ msgstr "Chwaraeon"
 msgid "Strategy"
 msgstr "Strategaeth"
 
-#: ../Rpmdrake/icon.pm:75 ../Rpmdrake/icon.pm:76 ../Rpmdrake/icon.pm:79
-#: ../Rpmdrake/icon.pm:80 ../Rpmdrake/icon.pm:83 ../Rpmdrake/icon.pm:86
-#: ../Rpmdrake/icon.pm:89 ../Rpmdrake/icon.pm:90 ../Rpmdrake/icon.pm:93
+#: ../Rpmdrake/icon.pm:75
+#: ../Rpmdrake/icon.pm:76
+#: ../Rpmdrake/icon.pm:79
+#: ../Rpmdrake/icon.pm:80
+#: ../Rpmdrake/icon.pm:83
+#: ../Rpmdrake/icon.pm:86
+#: ../Rpmdrake/icon.pm:89
+#: ../Rpmdrake/icon.pm:90
+#: ../Rpmdrake/icon.pm:93
 #: ../Rpmdrake/icon.pm:96
 #, c-format
 msgid "Graphical desktop"
@@ -1353,20 +1477,29 @@ msgstr "Graffigau"
 msgid "Monitoring"
 msgstr "Monitro"
 
-#: ../Rpmdrake/icon.pm:101 ../Rpmdrake/icon.pm:102
+#: ../Rpmdrake/icon.pm:101
+#: ../Rpmdrake/icon.pm:102
 #, c-format
 msgid "Multimedia"
 msgstr "Amlgyfrwng"
 
-#: ../Rpmdrake/icon.pm:102 ../Rpmdrake/icon.pm:153
+#: ../Rpmdrake/icon.pm:102
+#: ../Rpmdrake/icon.pm:153
 #, c-format
 msgid "Video"
 msgstr "Fideo"
 
-#: ../Rpmdrake/icon.pm:103 ../Rpmdrake/icon.pm:104 ../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:133
+#: ../Rpmdrake/icon.pm:103
+#: ../Rpmdrake/icon.pm:104
+#: ../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:133
 #, c-format
 msgid "Networking"
 msgstr "Rhwydweithio"
@@ -1391,7 +1524,8 @@ msgstr "IRC"
 msgid "Instant messaging"
 msgstr "Negesu Chwim"
 
-#: ../Rpmdrake/icon.pm:108 ../Rpmdrake/icon.pm:179
+#: ../Rpmdrake/icon.pm:108
+#: ../Rpmdrake/icon.pm:179
 #, c-format
 msgid "Mail"
 msgstr "E-bost"
@@ -1426,9 +1560,15 @@ msgstr "Allweddi Cyhoeddus"
 msgid "Publishing"
 msgstr "Cyhoeddi"
 
-#: ../Rpmdrake/icon.pm:116 ../Rpmdrake/icon.pm:117 ../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:116
+#: ../Rpmdrake/icon.pm:117
+#: ../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
 #, c-format
 msgid "Sciences"
 msgstr "Gwyddorau"
@@ -1478,13 +1618,27 @@ msgstr "Cregyn"
 msgid "Sound"
 msgstr "Sain"
 
-#: ../Rpmdrake/icon.pm:127 ../Rpmdrake/icon.pm:128 ../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:127
+#: ../Rpmdrake/icon.pm:128
+#: ../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
 #, c-format
 msgid "System"
 msgstr "System"
@@ -1499,9 +1653,14 @@ msgstr "Sail"
 msgid "Cluster"
 msgstr "Clwstwr"
 
-#: ../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:157
+#: ../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:157
 #, c-format
 msgid "Configuration"
 msgstr "Ffurfweddu"
@@ -1521,13 +1680,17 @@ msgstr "Caledwedd"
 msgid "Packaging"
 msgstr "Pecynnu"
 
-#: ../Rpmdrake/icon.pm:136 ../Rpmdrake/icon.pm:145
+#: ../Rpmdrake/icon.pm:136
+#: ../Rpmdrake/icon.pm:145
 #, c-format
 msgid "Printing"
 msgstr "Argraffu"
 
-#: ../Rpmdrake/icon.pm:137 ../Rpmdrake/icon.pm:138 ../Rpmdrake/icon.pm:139
-#: ../Rpmdrake/icon.pm:140 ../Rpmdrake/icon.pm:141
+#: ../Rpmdrake/icon.pm:137
+#: ../Rpmdrake/icon.pm:138
+#: ../Rpmdrake/icon.pm:139
+#: ../Rpmdrake/icon.pm:140
+#: ../Rpmdrake/icon.pm:141
 #, c-format
 msgid "Fonts"
 msgstr "Ffontiau"
@@ -1587,9 +1750,15 @@ msgstr "Offer testun"
 msgid "Toys"
 msgstr "Teganau"
 
-#: ../Rpmdrake/icon.pm:156 ../Rpmdrake/icon.pm:157 ../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:156
+#: ../Rpmdrake/icon.pm:157
+#: ../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
 #, c-format
 msgid "Workstation"
@@ -1600,7 +1769,8 @@ msgstr "Man Gwaith"
 msgid "Console Tools"
 msgstr "Offer y Consol"
 
-#: ../Rpmdrake/icon.pm:159 ../Rpmdrake/icon.pm:174
+#: ../Rpmdrake/icon.pm:159
+#: ../Rpmdrake/icon.pm:174
 #, c-format
 msgid "Documentation"
 msgstr "Dogfennaeth"
@@ -1635,8 +1805,11 @@ msgstr "Gweithfan Swyddfa"
 msgid "Scientific Workstation"
 msgstr "Man Gwaith Gwyddonol"
 
-#: ../Rpmdrake/icon.pm:166 ../Rpmdrake/icon.pm:168 ../Rpmdrake/icon.pm:169
-#: ../Rpmdrake/icon.pm:170 ../Rpmdrake/icon.pm:171
+#: ../Rpmdrake/icon.pm:166
+#: ../Rpmdrake/icon.pm:168
+#: ../Rpmdrake/icon.pm:169
+#: ../Rpmdrake/icon.pm:170
+#: ../Rpmdrake/icon.pm:171
 #, c-format
 msgid "Graphical Environment"
 msgstr "Amgylchedd Graffig"
@@ -1661,9 +1834,14 @@ msgstr "Man Gwaith KDE"
 msgid "Other Graphical Desktops"
 msgstr "Byrddau Gwaith Graffigol Eraill"
 
-#: ../Rpmdrake/icon.pm:175 ../Rpmdrake/icon.pm:176 ../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:175
+#: ../Rpmdrake/icon.pm:176
+#: ../Rpmdrake/icon.pm:177
+#: ../Rpmdrake/icon.pm:178
+#: ../Rpmdrake/icon.pm:179
+#: ../Rpmdrake/icon.pm:180
+#: ../Rpmdrake/icon.pm:181
+#: ../Rpmdrake/icon.pm:182
 #, c-format
 msgid "Server"
 msgstr "Gweinydd"
@@ -1710,12 +1888,8 @@ msgstr "  --auto                 derbyn atebion rhagosodedig i gwestiynau"
 
 #: ../Rpmdrake/init.pm:41
 #, 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-first      display changelog before filelist in the description window"
+msgstr "  --changelog-first      dangos cofnod newid cyn filelist yn y ffenestr disgrifio"
 
 #: ../Rpmdrake/init.pm:42
 #, c-format
@@ -1724,31 +1898,23 @@ msgstr "  --media=medium1,..     terfyn i'r cyfrwng hwn"
 
 #: ../Rpmdrake/init.pm:43
 #, c-format
-msgid ""
-"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgid "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr "  --merge-all-rpmnew     cynnig uno pob ffeil  .rpmnew/.rpmsave"
 
 #: ../Rpmdrake/init.pm:44
 #, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
-msgstr ""
-"  --mode=MODE            gosod modd (gosod (rhagosodedig), tynnu, diweddaru)"
+msgstr "  --mode=MODE            gosod modd (gosod (rhagosodedig), tynnu, diweddaru)"
 
 #: ../Rpmdrake/init.pm:45
 #, c-format
-msgid ""
-"  --justdb               update the database, but do not modify the "
-"filesystem"
-msgstr ""
-"  --justdb               diweddaru'r gronfa ddata ond nid newid y system "
-"ffeil"
+msgid "  --justdb               update the database, but do not modify the filesystem"
+msgstr "  --justdb               diweddaru'r gronfa ddata ond nid newid y system ffeil"
 
 #: ../Rpmdrake/init.pm:46
 #, c-format
-msgid ""
-"  --no-confirmation      don't ask first confirmation question in update mode"
-msgstr ""
-"  --no-confirmation      peidio gofyn cwestiwn cadarnhau ym modd diweddaru"
+msgid "  --no-confirmation      don't ask first confirmation question in update mode"
+msgstr "  --no-confirmation      peidio gofyn cwestiwn cadarnhau ym modd diweddaru"
 
 #: ../Rpmdrake/init.pm:47
 #, c-format
@@ -1762,12 +1928,8 @@ msgstr "  --no-verify-rpm        peidio gwirio llofnod pecynnau"
 
 #: ../Rpmdrake/init.pm:49
 #, c-format
-msgid ""
-"  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
-"\" machine to show needed deps"
-msgstr ""
-"  --parallel=alias,host  ym modd paralel, defnyddio grŵp \"alias\" , "
-"defnyddio peiriant  \"host\" i ddangos deps angenrheidiol"
+msgid "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host\" machine to show needed deps"
+msgstr "  --parallel=alias,host  ym modd paralel, defnyddio grŵp \"alias\" , defnyddio peiriant  \"host\" i ddangos deps angenrheidiol"
 
 #: ../Rpmdrake/init.pm:50
 #, c-format
@@ -1786,11 +1948,8 @@ msgstr "  --rpm-root=path        defnyddio root arall ar gyfer gosod rpm"
 
 #: ../Rpmdrake/init.pm:53
 #, c-format
-msgid ""
-"  --urpmi-root           use another root for urpmi db & rpm installation"
-msgstr ""
-"  --urpmi-root                 defnyddio root arall ar gyfer gosod urpmi db "
-"ac rpm."
+msgid "  --urpmi-root           use another root for urpmi db & rpm installation"
+msgstr "  --urpmi-root                 defnyddio root arall ar gyfer gosod urpmi db ac rpm."
 
 #: ../Rpmdrake/init.pm:54
 #, c-format
@@ -1833,7 +1992,8 @@ msgstr ""
 "Ni fydd modd i chi greu newidiadau i'r system.\n"
 "ond bydd modd i chi bori'r gronfa ddata presennol."
 
-#: ../Rpmdrake/init.pm:141 ../Rpmdrake/init.pm:166
+#: ../Rpmdrake/init.pm:141
+#: ../Rpmdrake/init.pm:166
 #, c-format
 msgid "Welcome"
 msgstr "Croeso"
@@ -1893,7 +2053,8 @@ 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:194 ../Rpmdrake/pkg.pm:563
+#: ../Rpmdrake/pkg.pm:194
+#: ../Rpmdrake/pkg.pm:563
 #, c-format
 msgid "Confirmation"
 msgstr "Gwiriad"
@@ -1922,7 +2083,7 @@ msgid "Already existing update media"
 msgstr "Cyfrwng diweddaru sy'n bod eisoes"
 
 #: ../Rpmdrake/pkg.pm:209
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1932,7 +2093,7 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 "Mae gennych o leiaf un cyfrwng diweddaru wedi ei ffurfweddu,\n"
-"ond maen nhw i gyd wedi eu hanalluogi. Dylech redeg y Rheolwr\n"
+"ond mae'n nhw i gyd wedi eu hanalluogi. Dylech redeg y Rheolwr\n"
 "Cyfrwng Meddalwedd i alluogi o leiaf un (gwirio yn y golofn \"%s\")\n"
 "\n"
 "\n"
@@ -1958,18 +2119,23 @@ msgstr ""
 "\n"
 "Yna ailgychwynnwch %s."
 
-#: ../Rpmdrake/pkg.pm:275 ../Rpmdrake/pkg.pm:578 ../Rpmdrake/pkg.pm:748
+#: ../Rpmdrake/pkg.pm:275
+#: ../Rpmdrake/pkg.pm:578
+#: ../Rpmdrake/pkg.pm:748
 #: ../rpmdrake.pm:334
 #, c-format
 msgid "Please wait"
 msgstr "Arhoswch"
 
-#: ../Rpmdrake/pkg.pm:275 ../Rpmdrake/pkg.pm:578
+#: ../Rpmdrake/pkg.pm:275
+#: ../Rpmdrake/pkg.pm:578
 #, c-format
 msgid "Package installation..."
 msgstr "Gosod pecynnau..."
 
-#: ../Rpmdrake/pkg.pm:275 ../Rpmdrake/pkg.pm:578 ../Rpmdrake/pkg.pm:748
+#: ../Rpmdrake/pkg.pm:275
+#: ../Rpmdrake/pkg.pm:578
+#: ../Rpmdrake/pkg.pm:748
 #, c-format
 msgid "Initializing..."
 msgstr "Ymgychwyn..."
@@ -1979,7 +2145,8 @@ msgstr "Ymgychwyn..."
 msgid "Reading updates description"
 msgstr "Darllen disgrifiad diweddariadau"
 
-#: ../Rpmdrake/pkg.pm:291 ../Rpmdrake/pkg.pm:367
+#: ../Rpmdrake/pkg.pm:291
+#: ../Rpmdrake/pkg.pm:367
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
@@ -2019,17 +2186,21 @@ msgstr "Gwybodaeth uwchraddio am becyn %s"
 msgid "Could not create temporary directory '%s'"
 msgstr "Methu creu'r cyfeiriadur dros dro '%s'"
 
-#: ../Rpmdrake/pkg.pm:491 ../Rpmdrake/pkg.pm:725
+#: ../Rpmdrake/pkg.pm:491
+#: ../Rpmdrake/pkg.pm:725
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
-#: ../Rpmdrake/pkg.pm:495 ../Rpmdrake/pkg.pm:701
+#: ../Rpmdrake/pkg.pm:495
+#: ../Rpmdrake/pkg.pm:701
 #, c-format
 msgid "Problem during installation"
 msgstr "Anhawster wrth osod"
 
-#: ../Rpmdrake/pkg.pm:496 ../Rpmdrake/pkg.pm:515 ../Rpmdrake/pkg.pm:703
+#: ../Rpmdrake/pkg.pm:496
+#: ../Rpmdrake/pkg.pm:515
+#: ../Rpmdrake/pkg.pm:703
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -2040,7 +2211,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:514 ../Rpmdrake/pkg.pm:691
+#: ../Rpmdrake/pkg.pm:514
+#: ../Rpmdrake/pkg.pm:691
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosodiad"
@@ -2055,7 +2227,8 @@ msgstr "Methu estyn pecynnau ffynhonnell."
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Methu estyn pecynnau ffynhonnell, %s"
 
-#: ../Rpmdrake/pkg.pm:546 ../Rpmdrake/pkg.pm:694
+#: ../Rpmdrake/pkg.pm:546
+#: ../Rpmdrake/pkg.pm:694
 #, c-format
 msgid ""
 "\n"
@@ -2072,15 +2245,15 @@ msgstr ""
 #, c-format
 msgid "The following package is going to be installed:"
 msgid_plural "The following %d packages are going to be installed:"
-msgstr[0] ""
-msgstr[1] ""
+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:565
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tynnu un pecyn?"
+msgstr[1] "Tynnu %d pecyn?"
 
 #: ../Rpmdrake/pkg.pm:567
 #, c-format
@@ -2127,13 +2300,18 @@ msgstr "Gosod pecyn `%s' (%s/%s)..."
 msgid "Total: %s/%s"
 msgstr "Cyfanswm: %s/%s"
 
-#: ../Rpmdrake/pkg.pm:623 ../Rpmdrake/pkg.pm:710 ../Rpmdrake/pkg.pm:730
-#: ../rpmdrake.pm:749 ../rpmdrake.pm:836 ../rpmdrake.pm:860
+#: ../Rpmdrake/pkg.pm:623
+#: ../Rpmdrake/pkg.pm:710
+#: ../Rpmdrake/pkg.pm:730
+#: ../rpmdrake.pm:749
+#: ../rpmdrake.pm:836
+#: ../rpmdrake.pm:860
 #, c-format
 msgid "Error"
 msgstr "Gwall"
 
-#: ../Rpmdrake/pkg.pm:628 ../Rpmdrake/pkg.pm:633
+#: ../Rpmdrake/pkg.pm:628
+#: ../Rpmdrake/pkg.pm:633
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Llwytho pecynnau i lawr ' %s'..."
@@ -2199,7 +2377,8 @@ msgstr ""
 "Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
 "mae modd eu harchwilio i weithredu arnynt:"
 
-#: ../Rpmdrake/pkg.pm:748 ../Rpmdrake/pkg.pm:764
+#: ../Rpmdrake/pkg.pm:748
+#: ../Rpmdrake/pkg.pm:764
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Arhoswch, tynnu'r pecynnau..."
@@ -2232,14 +2411,11 @@ msgstr "Newidiadau:"
 
 #: ../Rpmdrake/rpmnew.pm:111
 #, c-format
-msgid ""
-"You can either remove the .%s file, use it as main file or do nothing. If "
-"unsure, keep the current file (\"%s\")."
-msgstr ""
-"Mae modd un ai tynnu'r ffel .%s, ei defnyddio fel y brif ffeil neu gwneud "
-"dim. Os ydych cyn ansicr, cadwch y ffeil bresennol (\"%s\")"
+msgid "You can either remove the .%s file, use it as main file or do nothing. If unsure, keep the current file (\"%s\")."
+msgstr "Mae modd un ai tynnu'r ffel .%s, ei defnyddio fel y brif ffeil neu gwneud dim. Os ydych cyn ansicr, cadwch y ffeil bresennol (\"%s\")"
 
-#: ../Rpmdrake/rpmnew.pm:112 ../Rpmdrake/rpmnew.pm:117
+#: ../Rpmdrake/rpmnew.pm:112
+#: ../Rpmdrake/rpmnew.pm:117
 #, c-format
 msgid "Remove .%s"
 msgstr "Tynnu .%s"
@@ -2264,7 +2440,8 @@ msgstr "Gorffennodd y gosodiad"
 msgid "Inspect..."
 msgstr "Archwilio..."
 
-#: ../Rpmdrake/rpmnew.pm:189 ../rpmdrake:68
+#: ../Rpmdrake/rpmnew.pm:189
+#: ../rpmdrake:68
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Arhoswch, chwilio..."
@@ -2311,7 +2488,8 @@ msgstr "Llwyddiant wrth ychwanegu cyfrwng %s."
 msgid "Successfully added medium `%s'."
 msgstr "Llwyddiant wrth ychwanegu cyfrwng '%s'"
 
-#: ../rpmdrake:56 ../rpmdrake:131
+#: ../rpmdrake:56
+#: ../rpmdrake:131
 #, c-format
 msgid "Search results"
 msgstr "Canlyniadau'r chwilio"
@@ -2436,7 +2614,8 @@ msgstr "Diweddariad cywiro gwallau"
 msgid "Normal updates"
 msgstr "Diweddariadau arferol"
 
-#: ../rpmdrake:300 ../rpmdrake:305
+#: ../rpmdrake:300
+#: ../rpmdrake:305
 #, c-format
 msgid "in names"
 msgstr "mewn enwau"
@@ -2486,7 +2665,8 @@ msgstr "/_Ail-lwytho'r rhestr pecynnau"
 msgid "/_Media Manager"
 msgstr "/_Rheolwr Cyfrwng"
 
-#: ../rpmdrake:380 ../rpmdrake:419
+#: ../rpmdrake:380
+#: ../rpmdrake:419
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Dangoswch y pecynnau dewis awtomatig"
@@ -2523,10 +2703,8 @@ msgstr "Gallwch edrych ar y pecynnau drwy'r rhestr categorïau ar y chwith."
 
 #: ../rpmdrake:487
 #, 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."
+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:488
 #, c-format
@@ -2558,7 +2736,8 @@ msgstr "Enw Defnyddiwr:"
 msgid "Software Packages Removal"
 msgstr "Tynnu Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:191 ../rpmdrake.pm:195
+#: ../rpmdrake.pm:191
+#: ../rpmdrake.pm:195
 #, c-format
 msgid "Software Packages Update"
 msgstr "Diweddaru Pecynnau Meddalwedd"
@@ -2633,7 +2812,8 @@ msgstr "Yr Almaen"
 msgid "Danmark"
 msgstr "Denmarc"
 
-#: ../rpmdrake.pm:423 ../rpmdrake.pm:427
+#: ../rpmdrake.pm:423
+#: ../rpmdrake.pm:427
 #, c-format
 msgid "Greece"
 msgstr "Groeg"
@@ -2733,7 +2913,10 @@ msgstr "Y Deyrnas Unedig"
 msgid "China"
 msgstr "Tsiena"
 
-#: ../rpmdrake.pm:444 ../rpmdrake.pm:445 ../rpmdrake.pm:446 ../rpmdrake.pm:447
+#: ../rpmdrake.pm:444
+#: ../rpmdrake.pm:445
+#: ../rpmdrake.pm:446
+#: ../rpmdrake.pm:447
 #, c-format
 msgid "United States"
 msgstr "Yr Unol Daleithiau"
@@ -2764,7 +2947,8 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../rpmdrake.pm:555 ../rpmdrake.pm:593
+#: ../rpmdrake.pm:555
+#: ../rpmdrake.pm:593
 #, c-format
 msgid "Mirror choice"
 msgstr "Dewis drychau"
@@ -2905,15 +3089,13 @@ msgstr "Gwall estyn pecynnau"
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
-"you should use the Software Media Manager to remove it and re-add it in "
-"order\n"
+"you should use the Software Media Manager to remove it and re-add it in order\n"
 "to reconfigure it, either it is currently unreachable and you should retry\n"
 "later."
 msgstr ""
 "Mae'n amhosibl estyn y rhestr o becynnau newydd o gyfrwng '%s'.\n"
 "Un ai mae'r cyfrwng wedi ei gam ffurfweddu ac os felly dylech ddefnyddio'r\n"
-"Rheolwr Cyfrwng Meddalwedd i'w dynnu a'i ailosod fel bo modd ei ail "
-"ffurfweddu,\n"
+"Rheolwr Cyfrwng Meddalwedd i'w dynnu a'i ailosod fel bo modd ei ail ffurfweddu,\n"
 "neu nid oes modd ei gyrraedd ar hyn o bryd a dylech geisio eto \n"
 "rhywbryd."
 
@@ -2924,8 +3106,7 @@ msgstr "Diweddaru'r cyfrwng"
 
 #: ../rpmdrake.pm:762
 #, c-format
-msgid ""
-"No active medium found. You must enable some media to be able to update them."
+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:769
@@ -2946,7 +3127,8 @@ msgstr ""
 "Gwallau:\n"
 "%s"
 
-#: ../rpmdrake.pm:837 ../rpmdrake.pm:848
+#: ../rpmdrake.pm:837
+#: ../rpmdrake.pm:848
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2981,23 +3163,19 @@ msgstr ""
 #: ../rpmdrake.pm:879
 #, c-format
 msgid ""
-"Your medium `%s', used for updates, does not match the version of %s you're "
-"running (%s).\n"
+"Your medium `%s', used for updates, does not match the version of %s you're running (%s).\n"
 "It will be disabled."
 msgstr ""
-"Nid yw eich cyfrwng '%s', ar gyfer diweddariadau, yn cydweddu â'r fersiwn o %"
-"s rydych yn ei redeg (%s).\n"
+"Nid yw eich cyfrwng '%s', ar gyfer diweddariadau, yn cydweddu â'r fersiwn o %s rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
 #: ../rpmdrake.pm:882
 #, c-format
 msgid ""
-"Your medium `%s', used for updates, does not match the version of Mandriva "
-"Linux you're running (%s).\n"
+"Your medium `%s', used for updates, does not match the version of Mandriva Linux you're running (%s).\n"
 "It will be disabled."
 msgstr ""
-"Nid yw eich cyfrwng '%s', ar gyfer diweddariadau, yn cydweddu â'r fersiwn o "
-"Mandriva Linux rydych yn ei redeg (%s).\n"
+"Nid yw eich cyfrwng '%s', ar gyfer diweddariadau, yn cydweddu â'r fersiwn o Mandriva Linux rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
 #: ../rpmdrake.pm:899
@@ -3007,11 +3185,8 @@ msgstr "Cymorth wedi ei gychwyn yn y cefndir"
 
 #: ../rpmdrake.pm:900
 #, c-format
-msgid ""
-"The help window has been started, it should appear shortly on your desktop."
-msgstr ""
-"Mae'r ffenestr cymorth wedi ei hagor, dylai ymddangos ar eich bwrdd gwaith "
-"cyn hir."
+msgid "The help window has been started, it should appear shortly on your desktop."
+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"
@@ -3281,8 +3456,7 @@ msgstr "Pori'r Holl Feddalwedd"
 
 #: 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"
+msgstr "Gwyneb graffigol ar gyfer pori pecynnau sydd wedi eu gosod ac sydd ar gael"
 
 #: data/rpmdrake.desktop.in.h:2
 msgid "Install & Remove Software"
@@ -3293,10 +3467,10 @@ msgid "Software Media Manager"
 msgstr "Rheolwr Cyfrwng Meddalwedd"
 
 #: mime/gurpmi.addmedia.desktop.in.h:1
-#, fuzzy
 msgid "Add urpmi media"
-msgstr "/_Diweddaru'r cyfrwng"
+msgstr "Ychwanegu cyfrwng urpmi"
 
 #: mime/x-urpmi-media.desktop.in.h:1
 msgid "Urpmi medium info"
-msgstr ""
+msgstr "Gwybodaeth cyfrwng urpmi"
+