sync with code

1 files changed, 304 insertions, 307 deletions

diff --git a/po/cy.po b/po/cy.po
index 123707dd..127d5028 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:31+0200\n"
+"POT-Creation-Date: 2007-08-10 19:06+0200\n"
 "PO-Revision-Date: 2007-03-02 20:31-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Poedit-Country: UK\n"
 "Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
 
-#: ../MandrivaUpdate:76 ../Rpmdrake/gui.pm:687
+#: ../MandrivaUpdate:76 ../Rpmdrake/gui.pm:689
 #, 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:105 ../rpmdrake:90 ../rpmdrake:525 ../rpmdrake.pm:189
+#: ../MandrivaUpdate:105 ../rpmdrake:90 ../rpmdrake:539 ../rpmdrake.pm:187
 #, c-format
 msgid "Software Management"
 msgstr "Rheoli Meddalwedd"
@@ -40,22 +40,22 @@ msgstr "Rheoli Meddalwedd"
 msgid "Here is the list of software package updates"
 msgstr "Diweddaru Pecynnau Meddalwedd"
 
-#: ../MandrivaUpdate:144 ../Rpmdrake/edit_urpm_sources.pm:1081 ../rpmdrake:454
+#: ../MandrivaUpdate:144 ../Rpmdrake/edit_urpm_sources.pm:1081 ../rpmdrake:468
 #, c-format
 msgid "Help"
 msgstr "Cymorth"
 
-#: ../MandrivaUpdate:148 ../rpmdrake:459 ../rpmdrake.pm:778
+#: ../MandrivaUpdate:148 ../rpmdrake:473 ../rpmdrake.pm:775
 #, c-format
 msgid "Select all"
 msgstr "Dewis popeth"
 
-#: ../MandrivaUpdate:156 ../rpmdrake.pm:782
+#: ../MandrivaUpdate:156 ../rpmdrake.pm:779
 #, c-format
 msgid "Update"
 msgstr "Diweddaru"
 
-#: ../MandrivaUpdate:164 ../rpmdrake:469
+#: ../MandrivaUpdate:164 ../rpmdrake:483
 #, c-format
 msgid "Quit"
 msgstr "Gadael"
@@ -240,9 +240,9 @@ msgstr "Math o gyfrwng:"
 #: ../Rpmdrake/edit_urpm_sources.pm:447 ../Rpmdrake/edit_urpm_sources.pm:474
 #: ../Rpmdrake/edit_urpm_sources.pm:540 ../Rpmdrake/edit_urpm_sources.pm:627
 #: ../Rpmdrake/edit_urpm_sources.pm:668 ../Rpmdrake/edit_urpm_sources.pm:726
-#: ../Rpmdrake/edit_urpm_sources.pm:876 ../Rpmdrake/gui.pm:459
-#: ../Rpmdrake/init.pm:132 ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:611
-#: ../rpmdrake.pm:301 ../rpmdrake.pm:616 ../rpmdrake.pm:701 ../rpmdrake.pm:774
+#: ../Rpmdrake/edit_urpm_sources.pm:876 ../Rpmdrake/gui.pm:461
+#: ../Rpmdrake/init.pm:133 ../Rpmdrake/pkg.pm:627 ../Rpmdrake/pkg.pm:669
+#: ../rpmdrake.pm:298 ../rpmdrake.pm:613 ../rpmdrake.pm:698 ../rpmdrake.pm:771
 #, c-format
 msgid "Cancel"
 msgstr "Diddymu"
@@ -252,10 +252,10 @@ msgstr "Diddymu"
 #: ../Rpmdrake/edit_urpm_sources.pm:624 ../Rpmdrake/edit_urpm_sources.pm:667
 #: ../Rpmdrake/edit_urpm_sources.pm:719 ../Rpmdrake/edit_urpm_sources.pm:792
 #: ../Rpmdrake/edit_urpm_sources.pm:922 ../Rpmdrake/edit_urpm_sources.pm:1082
-#: ../Rpmdrake/gui.pm:459 ../Rpmdrake/gui.pm:475 ../Rpmdrake/gui.pm:480
-#: ../Rpmdrake/init.pm:132 ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:807
-#: ../Rpmdrake/rpmnew.pm:172 ../rpmdrake.pm:125 ../rpmdrake.pm:239
-#: ../rpmdrake.pm:304 ../rpmdrake.pm:616
+#: ../Rpmdrake/gui.pm:461 ../Rpmdrake/gui.pm:477 ../Rpmdrake/gui.pm:482
+#: ../Rpmdrake/init.pm:133 ../Rpmdrake/pkg.pm:473 ../Rpmdrake/pkg.pm:669
+#: ../Rpmdrake/rpmnew.pm:179 ../rpmdrake.pm:125 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:301 ../rpmdrake.pm:613
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
@@ -473,8 +473,8 @@ msgstr "Terfyn cyfrwng"
 msgid "Command"
 msgstr "Gorchymyn"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:756 ../Rpmdrake/gui.pm:684
-#: ../Rpmdrake/pkg.pm:97 ../Rpmdrake/pkg.pm:127 ../Rpmdrake/pkg.pm:167
+#: ../Rpmdrake/edit_urpm_sources.pm:756 ../Rpmdrake/gui.pm:686
+#: ../Rpmdrake/pkg.pm:98 ../Rpmdrake/pkg.pm:128 ../Rpmdrake/pkg.pm:168
 #: ../Rpmdrake/rpmnew.pm:77
 #, c-format
 msgid "(none)"
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Configure media"
 msgstr "Ffurfweddu'r cyfrwng"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:977
+#: ../Rpmdrake/edit_urpm_sources.pm:977 ../Rpmdrake/pkg.pm:204
 #, c-format
 msgid "Enabled"
 msgstr "Galluogwyd"
@@ -599,7 +599,7 @@ msgstr "Paralel..."
 msgid "Global options..."
 msgstr "Dewisiadau eang..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1097 ../Rpmdrake/init.pm:138
+#: ../Rpmdrake/edit_urpm_sources.pm:1097 ../Rpmdrake/init.pm:139
 #: ../gurpmi.addmedia:99
 #, c-format
 msgid ""
@@ -694,7 +694,7 @@ msgstr "Maint: "
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../Rpmdrake/gui.pm:108 ../Rpmdrake/gui.pm:144 ../rpmdrake.pm:827
+#: ../Rpmdrake/gui.pm:108 ../Rpmdrake/gui.pm:144 ../rpmdrake.pm:824
 #, c-format
 msgid "Medium: "
 msgstr "Cyfrwng:"
@@ -705,7 +705,7 @@ msgid "Files:"
 msgstr "Ffeiliau:"
 
 #: ../Rpmdrake/gui.pm:118 ../Rpmdrake/gui.pm:123 ../Rpmdrake/gui.pm:137
-#: ../Rpmdrake/gui.pm:139 ../Rpmdrake/pkg.pm:133
+#: ../Rpmdrake/gui.pm:139 ../Rpmdrake/pkg.pm:134
 #, c-format
 msgid "(Not available)"
 msgstr "(Dim ar gael)"
@@ -740,55 +740,55 @@ msgstr "Crynodeb: "
 msgid "Description: "
 msgstr "Disgrifiadau: "
 
-#: ../Rpmdrake/gui.pm:443 ../Rpmdrake/gui.pm:471 ../Rpmdrake/gui.pm:473
+#: ../Rpmdrake/gui.pm:444 ../Rpmdrake/gui.pm:473 ../Rpmdrake/gui.pm:475
 #, c-format
 msgid "More information on package..."
 msgstr "Rhagor o wybodaeth ar becyn..."
 
-#: ../Rpmdrake/gui.pm:445
+#: ../Rpmdrake/gui.pm:446
 #, c-format
 msgid "Please choose"
 msgstr "Dewiswch"
 
-#: ../Rpmdrake/gui.pm:446
+#: ../Rpmdrake/gui.pm:447
 #, c-format
 msgid "The following package is needed:"
 msgstr "Mae angen y pecyn canlynol:"
 
-#: ../Rpmdrake/gui.pm:446
+#: ../Rpmdrake/gui.pm:447
 #, 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:459 ../Rpmdrake/gui.pm:464
+#: ../Rpmdrake/gui.pm:461 ../Rpmdrake/gui.pm:466
 #, c-format
 msgid "More info"
 msgstr "Rhagor"
 
-#: ../Rpmdrake/gui.pm:466
+#: ../Rpmdrake/gui.pm:468
 #, c-format
 msgid "Information on packages"
 msgstr "Gwybodaeth am becynnau"
 
-#: ../Rpmdrake/gui.pm:499
+#: ../Rpmdrake/gui.pm:501
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 
-#: ../Rpmdrake/gui.pm:500
+#: ../Rpmdrake/gui.pm:502
 #, 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:506 ../Rpmdrake/gui.pm:515
+#: ../Rpmdrake/gui.pm:508 ../Rpmdrake/gui.pm:517
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Nid oes modd tynnu rhai pecynnau"
 
-#: ../Rpmdrake/gui.pm:507
+#: ../Rpmdrake/gui.pm:509
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -797,7 +797,7 @@ msgstr ""
 "Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:516 ../Rpmdrake/gui.pm:583
+#: ../Rpmdrake/gui.pm:518 ../Rpmdrake/gui.pm:585
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -807,12 +807,12 @@ msgstr ""
 "Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
 "eu dad-ddewis nawr:\n"
 
-#: ../Rpmdrake/gui.pm:545
+#: ../Rpmdrake/gui.pm:547
 #, c-format
 msgid "Additional packages needed"
 msgstr "Pecynnau ychwanegol angenrheidiol"
 
-#: ../Rpmdrake/gui.pm:546
+#: ../Rpmdrake/gui.pm:548
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -823,22 +823,22 @@ msgstr ""
 "hefyd:\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:560
+#: ../Rpmdrake/gui.pm:562
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (perthyn i'r rhestr hepgor)"
 
-#: ../Rpmdrake/gui.pm:564
+#: ../Rpmdrake/gui.pm:566
 #, c-format
 msgid "One package cannot be installed"
 msgstr "Nid oes modd gosod un pecyn"
 
-#: ../Rpmdrake/gui.pm:564
+#: ../Rpmdrake/gui.pm:566
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Nid oes modd gosod rhai pecynnau"
 
-#: ../Rpmdrake/gui.pm:566
+#: ../Rpmdrake/gui.pm:568
 #, c-format
 msgid ""
 "Sorry, the following package cannot be selected:\n"
@@ -849,7 +849,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:567
+#: ../Rpmdrake/gui.pm:569
 #, c-format
 msgid ""
 "Sorry, the following packages can't be selected:\n"
@@ -860,27 +860,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:582 ../Rpmdrake/pkg.pm:526
+#: ../Rpmdrake/gui.pm:584 ../Rpmdrake/pkg.pm:561
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Rhaid tynnu rhai pecynnau"
 
-#: ../Rpmdrake/gui.pm:613
+#: ../Rpmdrake/gui.pm:615
 #, 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:617
+#: ../Rpmdrake/gui.pm:619
 #, c-format
 msgid "You need to select some packages first."
 msgstr "Rhaid dewis rhai pecynnau'n gyntaf."
 
-#: ../Rpmdrake/gui.pm:622
+#: ../Rpmdrake/gui.pm:624
 #, c-format
 msgid "Too many packages are selected"
 msgstr "Mae gormod o becynnau wedi eu dewis"
 
-#: ../Rpmdrake/gui.pm:623
+#: ../Rpmdrake/gui.pm:625
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -891,42 +891,42 @@ msgid ""
 "Do you really want to install all the selected packages?"
 msgstr "Rhybudd:"
 
-#: ../Rpmdrake/gui.pm:649 ../Rpmdrake/pkg.pm:230
+#: ../Rpmdrake/gui.pm:651 ../Rpmdrake/pkg.pm:238
 #, c-format
 msgid "Fatal error"
 msgstr "Gwall terfynol"
 
-#: ../Rpmdrake/gui.pm:650 ../Rpmdrake/pkg.pm:231
+#: ../Rpmdrake/gui.pm:652 ../Rpmdrake/pkg.pm:239
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Digwyddodd gwall terfynol:%s."
 
-#: ../Rpmdrake/gui.pm:668
+#: ../Rpmdrake/gui.pm:670
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Arhoswch, rhestri pecynnau..."
 
-#: ../Rpmdrake/gui.pm:686
+#: ../Rpmdrake/gui.pm:688
 #, c-format
 msgid "No update"
 msgstr "Dim diweddariad"
 
-#: ../Rpmdrake/gui.pm:710 ../rpmdrake:239
+#: ../Rpmdrake/gui.pm:712 ../rpmdrake:239
 #, c-format
 msgid "All"
 msgstr "Popeth"
 
-#: ../Rpmdrake/gui.pm:719 ../rpmdrake:144
+#: ../Rpmdrake/gui.pm:721 ../rpmdrake:144
 #, c-format
 msgid "Upgradable"
 msgstr "Diweddariadwy"
 
-#: ../Rpmdrake/gui.pm:719 ../rpmdrake:144
+#: ../Rpmdrake/gui.pm:721 ../rpmdrake:144
 #, c-format
 msgid "Addable"
 msgstr "Ychwanegadwy"
 
-#: ../Rpmdrake/gui.pm:739
+#: ../Rpmdrake/gui.pm:741
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Dim disgrifiad ar gael i'r pecyn hwn\n"
@@ -959,7 +959,7 @@ 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:74
+#: ../Rpmdrake/icon.pm:123 ../Rpmdrake/icon.pm:134 ../Rpmdrake/pkg.pm:75
 #, c-format
 msgid "Other"
 msgstr "Arall"
@@ -1540,6 +1540,11 @@ msgstr "Defnyddi: %s [DEWIS]..."
 
 #: ../Rpmdrake/init.pm:40
 #, c-format
+msgid "  --auto                 assume default answers to questions"
+msgstr ""
+
+#: ../Rpmdrake/init.pm:41
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -1547,41 +1552,41 @@ msgstr ""
 "  --changelog-first      dangos cofnod newid cyn filelist yn y ffenestr "
 "disgrifio"
 
-#: ../Rpmdrake/init.pm:41
+#: ../Rpmdrake/init.pm:42
 #, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     terfyn i'r cyfrwng hwn"
 
-#: ../Rpmdrake/init.pm:42
+#: ../Rpmdrake/init.pm:43
 #, c-format
 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:43
+#: ../Rpmdrake/init.pm:44
 #, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            gosod modd (gosod (rhagosodedig), tynnu, diweddaru)"
 
-#: ../Rpmdrake/init.pm:44
+#: ../Rpmdrake/init.pm:45
 #, c-format
 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:45
+#: ../Rpmdrake/init.pm:46
 #, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update    peidio diweddaru cyfrwng wrth gychwyn"
 
-#: ../Rpmdrake/init.pm:46
+#: ../Rpmdrake/init.pm:47
 #, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        peidio gwirio llofnod pecynnau"
 
-#: ../Rpmdrake/init.pm:47
+#: ../Rpmdrake/init.pm:48
 #, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
@@ -1590,37 +1595,37 @@ msgstr ""
 "  --parallel=alias,host  ym modd paralel, defnyddio grŵp \"alias\" , "
 "defnyddio peiriant  \"host\" i ddangos deps angenrheidiol"
 
-#: ../Rpmdrake/init.pm:48
+#: ../Rpmdrake/init.pm:49
 #, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    dangos y pecynnau yma'n unig"
 
-#: ../Rpmdrake/init.pm:49
+#: ../Rpmdrake/init.pm:50
 #, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      rhag ddewis y pecynnau yma"
 
-#: ../Rpmdrake/init.pm:50
+#: ../Rpmdrake/init.pm:51
 #, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 gorfodi ei redeg fel root"
 
-#: ../Rpmdrake/init.pm:51
+#: ../Rpmdrake/init.pm:52
 #, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           chwilio am \"pkg\""
 
-#: ../Rpmdrake/init.pm:52
+#: ../Rpmdrake/init.pm:53
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - argraffu rhif fersiwn yr offeryn.\n"
 
-#: ../Rpmdrake/init.pm:129
+#: ../Rpmdrake/init.pm:130
 #, c-format
 msgid "Running in user mode"
 msgstr "Rhedeg ym modd defnyddiwr"
 
-#: ../Rpmdrake/init.pm:130
+#: ../Rpmdrake/init.pm:131
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -1631,12 +1636,12 @@ msgstr ""
 "Ni fydd modd i chi greu newidiadau i'r system.\n"
 "ond bydd modd i chi bori'r gronfa ddata presennol."
 
-#: ../Rpmdrake/init.pm:137 ../Rpmdrake/init.pm:162
+#: ../Rpmdrake/init.pm:138 ../Rpmdrake/init.pm:163
 #, c-format
 msgid "Welcome"
 msgstr "Croeso"
 
-#: ../Rpmdrake/init.pm:142
+#: ../Rpmdrake/init.pm:143
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1649,7 +1654,7 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis pa feddalwedd rydych\n"
 "am ei dynnu oddi ar eich cyfrifiadur."
 
-#: ../Rpmdrake/init.pm:147
+#: ../Rpmdrake/init.pm:148
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1661,12 +1666,12 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
 "ar eich cyfrifiadur."
 
-#: ../Rpmdrake/init.pm:152
+#: ../Rpmdrake/init.pm:153
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Croeso i'r offeryn gosod meddalwedd!"
 
-#: ../Rpmdrake/init.pm:153
+#: ../Rpmdrake/init.pm:154
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -1681,22 +1686,22 @@ msgstr ""
 "meddalwedd ar CDROM neu DVD.  Bydd yr offeryn hwn yn eich cynorthwyo\n"
 "i ddewis pa feddalwedd i osod ar eich cyfrifiadur."
 
-#: ../Rpmdrake/init.pm:164
+#: ../Rpmdrake/init.pm:165
 #, c-format
 msgid "The software installation tool can set up media sources."
 msgstr ""
 
-#: ../Rpmdrake/init.pm:165
+#: ../Rpmdrake/init.pm:166
 #, fuzzy, c-format
 msgid "Do you want to add media sources now?"
 msgstr "Ydych chi'n siŵr eich bod eisiau tynnu ffynhonnell \"%s\"?"
 
-#: ../Rpmdrake/pkg.pm:187 ../Rpmdrake/pkg.pm:526
+#: ../Rpmdrake/pkg.pm:188 ../Rpmdrake/pkg.pm:561
 #, c-format
 msgid "Confirmation"
 msgstr "Gwiriad"
 
-#: ../Rpmdrake/pkg.pm:188
+#: ../Rpmdrake/pkg.pm:189
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1709,12 +1714,12 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../Rpmdrake/pkg.pm:197
+#: ../Rpmdrake/pkg.pm:198
 #, c-format
 msgid "Already existing update media"
 msgstr "Cyfrwng diweddaru sy'n bod eisoes"
 
-#: ../Rpmdrake/pkg.pm:198
+#: ../Rpmdrake/pkg.pm:199
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1731,12 +1736,12 @@ msgstr ""
 "\n"
 "Yna ailgychwyn %s."
 
-#: ../Rpmdrake/pkg.pm:209
+#: ../Rpmdrake/pkg.pm:210
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "Sut i ddewis drych gyda llaw."
 
-#: ../Rpmdrake/pkg.pm:210
+#: ../Rpmdrake/pkg.pm:211
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1751,58 +1756,78 @@ msgstr ""
 "\n"
 "Yna ailgychwynnwch %s."
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541 ../Rpmdrake/pkg.pm:828
-#: ../rpmdrake.pm:329
+#: ../Rpmdrake/pkg.pm:258 ../Rpmdrake/pkg.pm:576 ../Rpmdrake/pkg.pm:742
+#: ../rpmdrake.pm:326
 #, c-format
 msgid "Please wait"
 msgstr "Arhoswch"
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541
+#: ../Rpmdrake/pkg.pm:258 ../Rpmdrake/pkg.pm:576
 #, c-format
 msgid "Package installation..."
 msgstr "Gosod pecynnau..."
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541 ../Rpmdrake/pkg.pm:828
+#: ../Rpmdrake/pkg.pm:258 ../Rpmdrake/pkg.pm:576 ../Rpmdrake/pkg.pm:742
 #, c-format
 msgid "Initializing..."
 msgstr "Ymgychwyn..."
 
-#: ../Rpmdrake/pkg.pm:261
+#: ../Rpmdrake/pkg.pm:268
 #, c-format
 msgid "Reading updates description"
 msgstr "Darllen disgrifiad diweddariadau"
 
-#: ../Rpmdrake/pkg.pm:287 ../Rpmdrake/pkg.pm:364
+#: ../Rpmdrake/pkg.pm:294 ../Rpmdrake/pkg.pm:371
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../Rpmdrake/pkg.pm:293
+#: ../Rpmdrake/pkg.pm:300
 #, c-format
 msgid "Please wait, listing base packages..."
 msgstr "Arhoswch, rhestri pecynnau sail..."
 
-#: ../Rpmdrake/pkg.pm:330
+#: ../Rpmdrake/pkg.pm:337
 #, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "Arhoswch, canfod pecynnau sydd wedi eu gosod..."
 
-#: ../Rpmdrake/pkg.pm:447
+#: ../Rpmdrake/pkg.pm:453
+#, c-format
+msgid "Upgrade information"
+msgstr "Gwybodaeth uwchraddio"
+
+#: ../Rpmdrake/pkg.pm:455
+#, c-format
+msgid "These packages come with upgrade information"
+msgstr "Mae gan y pecynnau wybodaeth uwchraddio"
+
+#: ../Rpmdrake/pkg.pm:463
+#, c-format
+msgid "Upgrade information about this package"
+msgstr "Gwybodaeth uwchraddio am y pecyn hwn"
+
+#: ../Rpmdrake/pkg.pm:466
+#, c-format
+msgid "Upgrade information about package %s"
+msgstr "Gwybodaeth uwchraddio am becyn %s"
+
+#: ../Rpmdrake/pkg.pm:482
 #, c-format
 msgid "Could not create temporary directory '%s'"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:455 ../Rpmdrake/pkg.pm:782
+#: ../Rpmdrake/pkg.pm:490 ../Rpmdrake/pkg.pm:723
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
-#: ../Rpmdrake/pkg.pm:459 ../Rpmdrake/pkg.pm:762
+#: ../Rpmdrake/pkg.pm:494 ../Rpmdrake/pkg.pm:699
 #, c-format
 msgid "Problem during installation"
 msgstr "Anhawster wrth osod"
 
-#: ../Rpmdrake/pkg.pm:460 ../Rpmdrake/pkg.pm:479 ../Rpmdrake/pkg.pm:764
+#: ../Rpmdrake/pkg.pm:495 ../Rpmdrake/pkg.pm:514 ../Rpmdrake/pkg.pm:701
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1813,22 +1838,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:478 ../Rpmdrake/pkg.pm:751
+#: ../Rpmdrake/pkg.pm:513 ../Rpmdrake/pkg.pm:689
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosodiad"
 
-#: ../Rpmdrake/pkg.pm:507
+#: ../Rpmdrake/pkg.pm:542
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../Rpmdrake/pkg.pm:508
+#: ../Rpmdrake/pkg.pm:543
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Methu estyn pecynnau ffynhonnell, %s"
 
-#: ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:754
+#: ../Rpmdrake/pkg.pm:544 ../Rpmdrake/pkg.pm:692
 #, c-format
 msgid ""
 "\n"
@@ -1841,142 +1866,97 @@ msgstr ""
 "Gwall(au) wedi eu hadrodd:\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:523
+#: ../Rpmdrake/pkg.pm:558
 #, fuzzy, c-format
 msgid "The following package is going to be installed:"
 msgid_plural "The following %d packages are going to be installed:"
 msgstr[0] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael ei osod:"
 msgstr[1] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu gosod:"
 
-#: ../Rpmdrake/pkg.pm:528
+#: ../Rpmdrake/pkg.pm:563
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Tynnu %d pecyn?"
 msgstr[1] "Tynnu %d pecyn?"
 
-#: ../Rpmdrake/pkg.pm:530
+#: ../Rpmdrake/pkg.pm:565
 #, 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:531
+#: ../Rpmdrake/pkg.pm:566
 #, 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:531
+#: ../Rpmdrake/pkg.pm:566
 #, c-format
 msgid "Is it ok to continue?"
 msgstr "Ydi hi'n iawn parhau?"
 
-#: ../Rpmdrake/pkg.pm:561
-#, c-format
-msgid "Change medium"
-msgstr "Newid cyfrwng"
-
-#: ../Rpmdrake/pkg.pm:562
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Rhowch gyfrwng \"%s\" i mewn i ddyfais [%s]"
-
-#: ../Rpmdrake/pkg.pm:585
+#: ../Rpmdrake/pkg.pm:589
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Paratoi pecynnau i'w gosod..."
 
-#: ../Rpmdrake/pkg.pm:585
+#: ../Rpmdrake/pkg.pm:589
 #, fuzzy, c-format
 msgid "Preparing package installation transaction..."
 msgstr "Paratoi pecynnau i'w gosod..."
 
-#: ../Rpmdrake/pkg.pm:588
+#: ../Rpmdrake/pkg.pm:592
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:589
+#: ../Rpmdrake/pkg.pm:593
 #, c-format
 msgid "Total: %s/%s"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:610 ../Rpmdrake/pkg.pm:615
+#: ../Rpmdrake/pkg.pm:621 ../Rpmdrake/pkg.pm:708 ../rpmdrake.pm:741
+#: ../rpmdrake.pm:822 ../rpmdrake.pm:846
+#, c-format
+msgid "Error"
+msgstr "Gwall"
+
+#: ../Rpmdrake/pkg.pm:626 ../Rpmdrake/pkg.pm:631
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Llwytho pecynnau i lawr ' %s'..."
 
-#: ../Rpmdrake/pkg.pm:617
+#: ../Rpmdrake/pkg.pm:633
 #, 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:618
+#: ../Rpmdrake/pkg.pm:634
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% wedi ei gwblhau, cyflymder = %s"
 
-#: ../Rpmdrake/pkg.pm:639
-#, c-format
-msgid "Verifying package signatures..."
-msgstr "Gwirio llofnodion pecynnau ..."
-
-#: ../Rpmdrake/pkg.pm:652 ../rpmdrake.pm:757 ../rpmdrake.pm:866
+#: ../Rpmdrake/pkg.pm:667
 #, c-format
-msgid "Warning"
-msgstr "Rhybudd"
-
-#: ../Rpmdrake/pkg.pm:653
-#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you want to continue installation?"
-msgstr ""
-"Mae gan y pecynnau canlynol lofnod gwallus:\n"
-"\n"
-"%s\n"
-"\n"
-"Ydi hi'n iawn parhau gyda'r gosod?"
-
-#: ../Rpmdrake/pkg.pm:666
-#, c-format
-msgid "installing %s from %s"
-msgstr "gosod %s o %s"
+msgid "Change medium"
+msgstr "Newid cyfrwng"
 
 #: ../Rpmdrake/pkg.pm:668
 #, c-format
-msgid "installing %s"
-msgstr "gosod %s"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Rhowch gyfrwng \"%s\" i mewn i ddyfais [%s]"
 
 #: ../Rpmdrake/pkg.pm:672
 #, c-format
-msgid "removing %s"
-msgstr "tynnu %s"
-
-#: ../Rpmdrake/pkg.pm:698 ../Rpmdrake/pkg.pm:716 ../Rpmdrake/pkg.pm:811
-#: ../rpmdrake.pm:744 ../rpmdrake.pm:825 ../rpmdrake.pm:849
-#, c-format
-msgid "Error"
-msgstr "Gwall"
-
-#: ../Rpmdrake/pkg.pm:699 ../Rpmdrake/pkg.pm:717 ../Rpmdrake/pkg.pm:730
-#, c-format
-msgid "Installation failed:"
-msgstr "Methodd y gosod:"
-
-#: ../Rpmdrake/pkg.pm:700
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
+msgid "Verifying package signatures..."
+msgstr "Gwirio llofnodion pecynnau ..."
 
-#: ../Rpmdrake/pkg.pm:718
+#: ../Rpmdrake/pkg.pm:678 ../rpmdrake.pm:754 ../rpmdrake.pm:863
 #, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Mwy o orfodaeth gyda'r gosod?  (--force)? (y/N)"
+msgid "Warning"
+msgstr "Rhybudd"
 
-#: ../Rpmdrake/pkg.pm:752
+#: ../Rpmdrake/pkg.pm:690
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1989,12 +1969,17 @@ msgstr ""
 "\n"
 "Efallai'r hoffech ddiweddaru eich cronfa ddata o gyfryngau."
 
-#: ../Rpmdrake/pkg.pm:763
+#: ../Rpmdrake/pkg.pm:700
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Methodd y gosodiad"
 
-#: ../Rpmdrake/pkg.pm:777
+#: ../Rpmdrake/pkg.pm:709
+#, 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:718
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2007,42 +1992,17 @@ msgstr ""
 "Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
 "mae modd eu harchwilio i weithredu arnynt:"
 
-#: ../Rpmdrake/pkg.pm:787
-#, c-format
-msgid "Upgrade information"
-msgstr "Gwybodaeth uwchraddio"
-
-#: ../Rpmdrake/pkg.pm:789
-#, c-format
-msgid "These packages come with upgrade information"
-msgstr "Mae gan y pecynnau wybodaeth uwchraddio"
-
-#: ../Rpmdrake/pkg.pm:797
-#, c-format
-msgid "Upgrade information about this package"
-msgstr "Gwybodaeth uwchraddio am y pecyn hwn"
-
-#: ../Rpmdrake/pkg.pm:800
-#, c-format
-msgid "Upgrade information about package %s"
-msgstr "Gwybodaeth uwchraddio am becyn %s"
-
-#: ../Rpmdrake/pkg.pm:812
-#, 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:828 ../Rpmdrake/pkg.pm:845
+#: ../Rpmdrake/pkg.pm:742 ../Rpmdrake/pkg.pm:758
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Arhoswch, tynnu'r pecynnau..."
 
-#: ../Rpmdrake/pkg.pm:856
+#: ../Rpmdrake/pkg.pm:769
 #, c-format
 msgid "Problem during removal"
 msgstr "Problem wrth dynnu"
 
-#: ../Rpmdrake/pkg.pm:857
+#: ../Rpmdrake/pkg.pm:770
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -2075,27 +2035,27 @@ msgstr ""
 msgid "Remove .%s"
 msgstr "Tynnu .%s"
 
-#: ../Rpmdrake/rpmnew.pm:114
+#: ../Rpmdrake/rpmnew.pm:121
 #, c-format
 msgid "Use .%s as main file"
 msgstr "Defnyddio .%s fel y brif ffeil"
 
-#: ../Rpmdrake/rpmnew.pm:118
+#: ../Rpmdrake/rpmnew.pm:125
 #, c-format
 msgid "Do nothing"
 msgstr "Gwneud dim"
 
-#: ../Rpmdrake/rpmnew.pm:149
+#: ../Rpmdrake/rpmnew.pm:156
 #, c-format
 msgid "Installation finished"
 msgstr "Gorffennodd y gosodiad"
 
-#: ../Rpmdrake/rpmnew.pm:164
+#: ../Rpmdrake/rpmnew.pm:171
 #, c-format
 msgid "Inspect..."
 msgstr "Archwilio..."
 
-#: ../Rpmdrake/rpmnew.pm:182 ../rpmdrake:68 ../rpmdrake:95
+#: ../Rpmdrake/rpmnew.pm:189 ../rpmdrake:68 ../rpmdrake:95
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Arhoswch, chwilio..."
@@ -2262,131 +2222,137 @@ msgstr "mewn disgrifiadau"
 msgid "in file names"
 msgstr "mewn enwau ffeil"
 
-#: ../rpmdrake:345 ../rpmdrake:348 ../rpmdrake:359 ../rpmdrake:372
-#: ../rpmdrake:381
+#: ../rpmdrake:344 ../rpmdrake:386 ../rpmdrake:390 ../rpmdrake:394
+#: ../rpmdrake:433
+#, c-format
+msgid "/_Options"
+msgstr "/_Dewisiadau"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "/_Auto solve dependancies"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:350 ../rpmdrake:361 ../rpmdrake:374
+#: ../rpmdrake:383
 #, c-format
 msgid "/_File"
 msgstr "/_Ffeil"
 
-#: ../rpmdrake:348
+#: ../rpmdrake:350
 #, c-format
 msgid "/_Update media"
 msgstr "/_Diweddaru'r cyfrwng"
 
-#: ../rpmdrake:359
+#: ../rpmdrake:361
 #, c-format
 msgid "/_Reset the selection"
 msgstr "/_Ailosod y dewis"
 
-#: ../rpmdrake:372
+#: ../rpmdrake:374
 #, c-format
 msgid "/Reload the _packages list"
 msgstr "/_Ail-lwytho'r rhestr pecynnau"
 
-#: ../rpmdrake:381
+#: ../rpmdrake:383
 #, c-format
 msgid "/_Quit"
 msgstr "/_Gadael"
 
-#: ../rpmdrake:381
+#: ../rpmdrake:383
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:384 ../rpmdrake:385 ../rpmdrake:389 ../rpmdrake:419
-#, c-format
-msgid "/_Options"
-msgstr "/_Dewisiadau"
-
-#: ../rpmdrake:385
+#: ../rpmdrake:390
 #, c-format
 msgid "/_Media Manager"
 msgstr "/_Rheolwr Cyfrwng"
 
-#: ../rpmdrake:389 ../rpmdrake:419
+#: ../rpmdrake:394 ../rpmdrake:433
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Dangoswch y pecynnau dewis awtomatig"
 
-#: ../rpmdrake:393 ../rpmdrake:394 ../rpmdrake:395 ../rpmdrake:396
+#: ../rpmdrake:398 ../rpmdrake:399 ../rpmdrake:400 ../rpmdrake:401
 #, c-format
 msgid "/_Help"
 msgstr "/_Cymorth"
 
-#: ../rpmdrake:394
+#: ../rpmdrake:399
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Adrodd ar Wall"
 
-#: ../rpmdrake:396
+#: ../rpmdrake:401
 #, c-format
 msgid "/_About..."
 msgstr "/_Ynghylch..."
 
-#: ../rpmdrake:399
+#: ../rpmdrake:404
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:401
+#: ../rpmdrake:406
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Hawlfraint (C) %s Mandriva"
 
-#: ../rpmdrake:403
+#: ../rpmdrake:408
 #, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake yw offeryn rheoli pecynnau Mandriva Linux."
 
-#: ../rpmdrake:405
+#: ../rpmdrake:410
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:410
+#: ../rpmdrake:415
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "_: Rhoslyn Prys post@meddal.com\n"
 
-#: ../rpmdrake:434
+#: ../rpmdrake:448
 #, c-format
 msgid "Find:"
 msgstr "Canfod:"
 
-#: ../rpmdrake:443
+#: ../rpmdrake:457
 #, c-format
 msgid "Search"
 msgstr "Chwilio"
 
-#: ../rpmdrake:445
+#: ../rpmdrake:459
 #, c-format
 msgid "Clear"
 msgstr "Clirio"
 
-#: ../rpmdrake:465
+#: ../rpmdrake:479
 #, c-format
 msgid "Apply"
 msgstr "Gosod"
 
-#: ../rpmdrake:485
+#: ../rpmdrake:499
 #, c-format
 msgid "Quick Introduction"
 msgstr "Cyflwyniad Cyflym"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:500
 #, 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:487
+#: ../rpmdrake:501
 #, 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:488
+#: ../rpmdrake:502
 #, 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\"."
@@ -2411,192 +2377,192 @@ msgstr "Rhowch eich hawl i gael mynediad dirprwy\n"
 msgid "User name:"
 msgstr "Enw Defnyddiwr:"
 
-#: ../rpmdrake.pm:184
+#: ../rpmdrake.pm:182
 #, c-format
 msgid "Software Packages Removal"
 msgstr "Tynnu Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:185 ../rpmdrake.pm:189
+#: ../rpmdrake.pm:183 ../rpmdrake.pm:187
 #, c-format
 msgid "Software Packages Update"
 msgstr "Diweddaru Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:186
+#: ../rpmdrake.pm:184
 #, c-format
 msgid "Software Packages Installation"
 msgstr "Gosod Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:230
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "No"
 msgstr "Na"
 
-#: ../rpmdrake.pm:234
+#: ../rpmdrake.pm:232
 #, c-format
 msgid "Yes"
 msgstr "Iawn"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:282
 #, c-format
 msgid "Info..."
 msgstr "Gwybodaeth..."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:405
 #, c-format
 msgid "Austria"
 msgstr "Awstria"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:406
 #, c-format
 msgid "Australia"
 msgstr "Awstralia"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:407
 #, c-format
 msgid "Belgium"
 msgstr "Gwlad Belg"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:408
 #, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:409
 #, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:410
 #, c-format
 msgid "Switzerland"
 msgstr "Y Swistir"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:411
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:412
 #, c-format
 msgid "Czech Republic"
 msgstr "Gweriniaeth Tsiec"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:413
 #, c-format
 msgid "Germany"
 msgstr "Yr Almaen"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:414
 #, c-format
 msgid "Danmark"
 msgstr "Denmarc"
 
-#: ../rpmdrake.pm:418 ../rpmdrake.pm:422
+#: ../rpmdrake.pm:415 ../rpmdrake.pm:419
 #, c-format
 msgid "Greece"
 msgstr "Groeg"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:416
 #, c-format
 msgid "Spain"
 msgstr "Sbaen"
 
-#: ../rpmdrake.pm:420
+#: ../rpmdrake.pm:417
 #, c-format
 msgid "Finland"
 msgstr "Ffindir"
 
-#: ../rpmdrake.pm:421
+#: ../rpmdrake.pm:418
 #, c-format
 msgid "France"
 msgstr "Ffrainc"
 
-#: ../rpmdrake.pm:423
+#: ../rpmdrake.pm:420
 #, c-format
 msgid "Hungary"
 msgstr "Hwngari"
 
-#: ../rpmdrake.pm:424
+#: ../rpmdrake.pm:421
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:425
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Italy"
 msgstr "Yr Eidal"
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:423
 #, c-format
 msgid "Japan"
 msgstr "Siapan"
 
-#: ../rpmdrake.pm:427
+#: ../rpmdrake.pm:424
 #, c-format
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:428
+#: ../rpmdrake.pm:425
 #, c-format
 msgid "Netherlands"
 msgstr "Yr Iseldiroedd"
 
-#: ../rpmdrake.pm:429
+#: ../rpmdrake.pm:426
 #, c-format
 msgid "Norway"
 msgstr "Norwy"
 
-#: ../rpmdrake.pm:430
+#: ../rpmdrake.pm:427
 #, c-format
 msgid "Poland"
 msgstr "Gwlad Pwyl"
 
-#: ../rpmdrake.pm:431
+#: ../rpmdrake.pm:428
 #, c-format
 msgid "Portugal"
 msgstr "Portiwgal"
 
-#: ../rpmdrake.pm:432
+#: ../rpmdrake.pm:429
 #, c-format
 msgid "Russia"
 msgstr "Rwsia"
 
-#: ../rpmdrake.pm:433
+#: ../rpmdrake.pm:430
 #, c-format
 msgid "Sweden"
 msgstr "Sweden"
 
-#: ../rpmdrake.pm:434
+#: ../rpmdrake.pm:431
 #, c-format
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:435
+#: ../rpmdrake.pm:432
 #, c-format
 msgid "Slovakia"
 msgstr "Slofacia"
 
-#: ../rpmdrake.pm:436
+#: ../rpmdrake.pm:433
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:437
+#: ../rpmdrake.pm:434
 #, c-format
 msgid "United Kingdom"
 msgstr "Y Deyrnas Unedig"
 
-#: ../rpmdrake.pm:438
+#: ../rpmdrake.pm:435
 #, c-format
 msgid "China"
 msgstr "Tsiena"
 
-#: ../rpmdrake.pm:439 ../rpmdrake.pm:440 ../rpmdrake.pm:441 ../rpmdrake.pm:442
+#: ../rpmdrake.pm:436 ../rpmdrake.pm:437 ../rpmdrake.pm:438 ../rpmdrake.pm:439
 #, c-format
 msgid "United States"
 msgstr "Yr Unol Daleithiau"
 
-#: ../rpmdrake.pm:540
+#: ../rpmdrake.pm:537
 #, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2609,7 +2575,7 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../rpmdrake.pm:544
+#: ../rpmdrake.pm:541
 #, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
@@ -2622,27 +2588,27 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../rpmdrake.pm:550 ../rpmdrake.pm:588
+#: ../rpmdrake.pm:547 ../rpmdrake.pm:585
 #, c-format
 msgid "Mirror choice"
 msgstr "Dewis drychau"
 
-#: ../rpmdrake.pm:553
+#: ../rpmdrake.pm:550
 #, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau."
 
-#: ../rpmdrake.pm:554
+#: ../rpmdrake.pm:551
 #, 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:561
+#: ../rpmdrake.pm:558
 #, c-format
 msgid "Error during download"
 msgstr "Gwall wrth lwytho i lawr"
 
-#: ../rpmdrake.pm:563
+#: ../rpmdrake.pm:560
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2657,7 +2623,7 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu'r safle, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:568
+#: ../rpmdrake.pm:565
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2672,17 +2638,17 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu safle Mandriva, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:575
 #, c-format
 msgid "No mirror"
 msgstr "Dim drych"
 
-#: ../rpmdrake.pm:580
+#: ../rpmdrake.pm:577
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Methu canfod drych addas."
 
-#: ../rpmdrake.pm:581
+#: ../rpmdrake.pm:578
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2697,68 +2663,68 @@ msgstr ""
 "yw pensaernïaeth eich prosesydd yn cael ei gynnal gan Diweddariadau\n"
 "Swyddogol Mandriva Linux."
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:597
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Dewiswch ddrych"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:650
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copïo ffeil fel ar gyfer cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:656
+#: ../rpmdrake.pm:653
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Archwilio ffeil cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:659
+#: ../rpmdrake.pm:656
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Archwilio ffeil bell y cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:663
+#: ../rpmdrake.pm:660
 #, c-format
 msgid " done."
 msgstr " gorffen.."
 
-#: ../rpmdrake.pm:667
+#: ../rpmdrake.pm:664
 #, c-format
 msgid " failed!"
 msgstr " methwyd!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:671
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s o gyfrwng %s"
 
-#: ../rpmdrake.pm:675
+#: ../rpmdrake.pm:672
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Cychwyn llwytho %s i lawr..."
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:676
 #, 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:682
+#: ../rpmdrake.pm:679
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
 
-#: ../rpmdrake.pm:693
+#: ../rpmdrake.pm:690
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Arhoswch, diweddaru cyfrwng..."
 
-#: ../rpmdrake.pm:720
+#: ../rpmdrake.pm:717
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Gwall estyn pecynnau"
 
-#: ../rpmdrake.pm:721
+#: ../rpmdrake.pm:718
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2775,23 +2741,23 @@ msgstr ""
 "neu nid oes modd ei gyrraedd ar hyn o bryd a dylech geisio eto \n"
 "rhywbryd."
 
-#: ../rpmdrake.pm:752
+#: ../rpmdrake.pm:749
 #, c-format
 msgid "Update media"
 msgstr "Diweddaru'r cyfrwng"
 
-#: ../rpmdrake.pm:757
+#: ../rpmdrake.pm:754
 #, 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:764
+#: ../rpmdrake.pm:761
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Dewiswch y cyfrwng i'w diweddaru:"
 
-#: ../rpmdrake.pm:803
+#: ../rpmdrake.pm:800
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2804,7 +2770,7 @@ msgstr ""
 "Gwallau:\n"
 "%s"
 
-#: ../rpmdrake.pm:826 ../rpmdrake.pm:837
+#: ../rpmdrake.pm:823 ../rpmdrake.pm:834
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2815,17 +2781,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:849
+#: ../rpmdrake.pm:846
 #, c-format
 msgid "Unable to create medium."
 msgstr "Methu creu cyfrwng."
 
-#: ../rpmdrake.pm:854
+#: ../rpmdrake.pm:851
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Methu ychwanegu cyfrwng"
 
-#: ../rpmdrake.pm:855
+#: ../rpmdrake.pm:852
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2836,7 +2802,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:868
+#: ../rpmdrake.pm:865
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2847,7 +2813,7 @@ msgstr ""
 "s rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
-#: ../rpmdrake.pm:871
+#: ../rpmdrake.pm:868
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
@@ -2858,12 +2824,12 @@ msgstr ""
 "Mandriva Linux rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
-#: ../rpmdrake.pm:888
+#: ../rpmdrake.pm:885
 #, c-format
 msgid "Help launched in background"
 msgstr "Cymorth wedi ei gychwyn yn y cefndir"
 
-#: ../rpmdrake.pm:889
+#: ../rpmdrake.pm:886
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
@@ -3141,6 +3107,37 @@ msgstr "Tynnu Meddalwedd"
 msgid "Software Media Manager"
 msgstr "Rheolwr Cyfrwng Meddalwedd"
 
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation?"
+#~ msgstr ""
+#~ "Mae gan y pecynnau canlynol lofnod gwallus:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Ydi hi'n iawn parhau gyda'r gosod?"
+
+#~ msgid "installing %s from %s"
+#~ msgstr "gosod %s o %s"
+
+#~ msgid "installing %s"
+#~ msgstr "gosod %s"
+
+#~ msgid "removing %s"
+#~ msgstr "tynnu %s"
+
+#~ msgid "Installation failed:"
+#~ msgstr "Methodd y gosod:"
+
+#~ msgid "Try installation without checking dependencies? (y/N) "
+#~ msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
+
+#~ msgid "Try harder to install (--force)? (y/N) "
+#~ msgstr "Mwy o orfodaeth gyda'r gosod?  (--force)? (y/N)"
+
 #~ msgid "Preparing..."
 #~ msgstr "Paratoi..."