s/Mandrake/Mandriva/

1 files changed, 447 insertions, 359 deletions

diff --git a/po/cy.po b/po/cy.po
index 1aef637f..0e5ab3ec 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -1,4 +1,4 @@
-# Latest versions of po files are at http://www.mandrakelinux.com/l10n/cy.php3
+# Latest versions of po files are at http://www.mandrivalinux.com/l10n/cy.php3
 #
 # Welsh translation of %s
 # Copyright (C) 1999 Free Software Foundation, Inc.
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2005-03-02 10:52+0100\n"
+"POT-Creation-Date: 2005-05-05 22:04+0200\n"
 "PO-Revision-Date: 2005-01-23 22:36-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -26,7 +26,7 @@ msgstr "Dewis y math o gyfrwng"
 #: ../edit-urpm-sources.pl:67
 #, c-format
 msgid ""
-"This step enables you to add sources from a Mandrakelinux web or FTP "
+"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"
@@ -37,7 +37,7 @@ msgid ""
 "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 drych FTP Mandrakelinux\n"
+"Dyma sut mae ychwanegu ffynonellau o safle neu drych FTP Mandriva Linux\n"
 "\n"
 "Mae yna ddau fath o ddrych swyddogol. Gallwch ddewis i ychwanegu "
 "ffynonellau\n"
@@ -65,7 +65,7 @@ msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
 "\n"
-"I need to contact the Mandrakesoft website to get the mirror list.\n"
+"I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
 "\n"
 "Is it ok to continue?"
@@ -73,7 +73,7 @@ msgstr ""
 "Bydd yn ceisio gosod yr holl ffynnonellau swyddogol sy'n cyd-fynd\n"
 "â'ch dosbarthiad (%s).\n"
 "\n"
-"Mae angen i mi gysylltu â safle gwe Mandrakesoft i gael y rhestr\n"
+"Mae angen i mi gysylltu â safle gwe Mandriva i gael y rhestr\n"
 "drychau. Gwiriwch fod eich rhwydwaith yn rhedeg.\n"
 "\n"
 "Ydi hi'n iawn parhau?"
@@ -134,7 +134,7 @@ msgstr "Pori..."
 msgid "Login:"
 msgstr "Mewngofnod:"
 
-#: ../edit-urpm-sources.pl:170 ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:170 ../edit-urpm-sources.pl:459 ../rpmdrake.pm:123
 #, c-format
 msgid "Password:"
 msgstr "Cyfrinair:"
@@ -187,9 +187,9 @@ msgstr "Math o gyfrwng:"
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:414
 #: ../edit-urpm-sources.pl:476 ../edit-urpm-sources.pl:557
 #: ../edit-urpm-sources.pl:597 ../edit-urpm-sources.pl:655
-#: ../edit-urpm-sources.pl:794 ../rpmdrake:164 ../rpmdrake:699
-#: ../rpmdrake:1502 ../rpmdrake:1510 ../rpmdrake.pm:504 ../rpmdrake.pm:594
-#: ../rpmdrake.pm:663
+#: ../edit-urpm-sources.pl:794 ../rpmdrake:165 ../rpmdrake:701
+#: ../rpmdrake:1505 ../rpmdrake:1513 ../rpmdrake.pm:539 ../rpmdrake.pm:628
+#: ../rpmdrake.pm:697
 #, c-format
 msgid "Cancel"
 msgstr "Dileu"
@@ -199,9 +199,9 @@ msgstr "Dileu"
 #: ../edit-urpm-sources.pl:554 ../edit-urpm-sources.pl:596
 #: ../edit-urpm-sources.pl:648 ../edit-urpm-sources.pl:720
 #: ../edit-urpm-sources.pl:787 ../edit-urpm-sources.pl:840
-#: ../edit-urpm-sources.pl:990 ../rpmdrake:164 ../rpmdrake:699 ../rpmdrake:716
-#: ../rpmdrake:721 ../rpmdrake:1444 ../rpmdrake:1502 ../rpmdrake:1647
-#: ../rpmdrake.pm:192 ../rpmdrake.pm:249 ../rpmdrake.pm:504
+#: ../edit-urpm-sources.pl:990 ../rpmdrake:165 ../rpmdrake:701 ../rpmdrake:718
+#: ../rpmdrake:723 ../rpmdrake:1446 ../rpmdrake:1505 ../rpmdrake:1648
+#: ../rpmdrake.pm:114 ../rpmdrake.pm:224 ../rpmdrake.pm:281 ../rpmdrake.pm:539
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
@@ -372,7 +372,7 @@ msgid "Add"
 msgstr "Ychwanegu"
 
 #: ../edit-urpm-sources.pl:635 ../edit-urpm-sources.pl:642
-#: ../edit-urpm-sources.pl:700 ../edit-urpm-sources.pl:955 ../rpmdrake:1179
+#: ../edit-urpm-sources.pl:700 ../edit-urpm-sources.pl:955 ../rpmdrake:1181
 #, c-format
 msgid "Remove"
 msgstr "Tynnu"
@@ -407,8 +407,8 @@ msgstr "Terfyn cyfrwng"
 msgid "Command"
 msgstr "Gorchymyn"
 
-#: ../edit-urpm-sources.pl:684 ../rpmdrake:363 ../rpmdrake:380 ../rpmdrake:511
-#: ../rpmdrake:627
+#: ../edit-urpm-sources.pl:684 ../rpmdrake:364 ../rpmdrake:382 ../rpmdrake:516
+#: ../rpmdrake:629
 #, c-format
 msgid "(none)"
 msgstr "(dim)"
@@ -435,8 +435,10 @@ msgstr "Cyfrwng"
 
 #: ../edit-urpm-sources.pl:737
 #, c-format
-msgid "Keys"
-msgstr "Allweddi"
+msgid ""
+"_:cryptographic keys\n"
+"Keys"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:756
 #, c-format
@@ -497,7 +499,7 @@ msgstr "Diweddaru'r cyfrwng"
 msgid "Regenerate hdlist"
 msgstr "Atgynhyrchu rhestr"
 
-#: ../edit-urpm-sources.pl:898 ../rpmdrake.pm:587
+#: ../edit-urpm-sources.pl:898 ../rpmdrake.pm:621
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Arhoswch, diweddaru cyfrwng..."
@@ -537,7 +539,7 @@ msgstr "Dewisiadau eang..."
 msgid "Help"
 msgstr "Cymorth"
 
-#: ../edit-urpm-sources.pl:1002 ../gurpmi.addmedia:75 ../rpmdrake:1758
+#: ../edit-urpm-sources.pl:1002 ../gurpmi.addmedia:74 ../rpmdrake:1759
 #, c-format
 msgid ""
 "%s\n"
@@ -576,12 +578,12 @@ msgstr ""
 "arall ar fwrdd gwaith arall, neu a ydych yn gosod pecynnau\n"
 " eraill hefyd?"
 
-#: ../gurpmi.addmedia:70
+#: ../gurpmi.addmedia:69
 #, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Methu ychwanegu cyfrwng, ymresymiadau anghywir neu goll."
 
-#: ../gurpmi.addmedia:78
+#: ../gurpmi.addmedia:77
 #, c-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
@@ -592,22 +594,92 @@ msgstr ""
 "Mae hyn yn golygu y bydd modd gosod pecynnau meddalwedd\n"
 "newydd i'ch system o'r cyfrwng hwnnw."
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:86
 #, c-format
 msgid "Successfully added medium `%s'."
 msgstr "Llwyddiant wrth ychwanegu cyfrwng '%s'"
 
-#: ../rpmdrake:28
+#: ../rpmdrake:31
 #, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Defnyddi: %s [DEWIS]..."
 
-#: ../rpmdrake:161
+#: ../rpmdrake:32
+#, c-format
+msgid ""
+"  --changelog-first      display changelog before filelist in the "
+"description window"
+msgstr ""
+
+#: ../rpmdrake:33
+#, c-format
+msgid "  --media=medium1,..     limit to given media"
+msgstr ""
+
+#: ../rpmdrake:34
+#, c-format
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgstr ""
+
+#: ../rpmdrake:35
+#, c-format
+msgid "  --mode=MODE            set mode (install (default), remove, update)"
+msgstr ""
+
+#: ../rpmdrake:36
+#, c-format
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
+msgstr ""
+
+#: ../rpmdrake:37
+#, fuzzy, c-format
+msgid "  --no-media-update      don't update media at startup"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
+
+#: ../rpmdrake:38
+#, fuzzy, c-format
+msgid "  --no-verify-rpm        don't verify packages signatures"
+msgstr "  --name          - argraffu enwau pecyn yn unig \n"
+
+#: ../rpmdrake:39
+#, c-format
+msgid ""
+"  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
+"\" machine to show needed deps"
+msgstr ""
+
+#: ../rpmdrake:40
+#, c-format
+msgid "  --pkg-nosel=pkg1,..    show only these packages"
+msgstr ""
+
+#: ../rpmdrake:41
+#, c-format
+msgid "  --pkg-sel=pkg1,..      preselect these packages"
+msgstr ""
+
+#: ../rpmdrake:42
+#, fuzzy, c-format
+msgid "  --root                 force to run as root"
+msgstr ""
+"\n"
+"                     Adroddiad Daemon DrakBackup \n"
+"\n"
+"\n"
+
+#: ../rpmdrake:43
+#, c-format
+msgid "  --search=pkg           run search for \"pkg\""
+msgstr ""
+
+#: ../rpmdrake:162
 #, c-format
 msgid "Running in user mode"
 msgstr "Rhedeg ym modd defnyddiwr"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:163
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -618,632 +690,628 @@ msgstr ""
 "Ni fydd modd i chi greu newidiadau i'r system.\n"
 "ond bydd modd i chi bori'r gronfa ddata presennol."
 
-#: ../rpmdrake:171
+#: ../rpmdrake:172
 #, c-format
 msgid "Accessibility"
 msgstr "Hygyrchedd"
 
-#: ../rpmdrake:172 ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #, c-format
 msgid "Archiving"
 msgstr "Archifo"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:173
 #, c-format
 msgid "Backup"
 msgstr "Wrth Gefn"
 
-#: ../rpmdrake:173
+#: ../rpmdrake:174
 #, c-format
 msgid "Cd burning"
 msgstr "Llosgi CD"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:175
 #, c-format
 msgid "Compression"
 msgstr "Cywasgiad"
 
-#: ../rpmdrake:175 ../rpmdrake:180 ../rpmdrake:192 ../rpmdrake:203
-#: ../rpmdrake:212 ../rpmdrake:224 ../rpmdrake:236 ../rpmdrake:244
-#: ../rpmdrake:332
+#: ../rpmdrake:176 ../rpmdrake:181 ../rpmdrake:193 ../rpmdrake:204
+#: ../rpmdrake:213 ../rpmdrake:225 ../rpmdrake:237 ../rpmdrake:245
+#: ../rpmdrake:333
 #, c-format
 msgid "Other"
 msgstr "Arall"
 
-#: ../rpmdrake:176 ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179
-#: ../rpmdrake:180
+#: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
+#: ../rpmdrake:181
 #, c-format
 msgid "Books"
 msgstr "Llyfrau"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:177
 #, c-format
 msgid "Computer books"
 msgstr "Llyfrau cyfrifiadurol"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:178
 #, c-format
 msgid "Faqs"
 msgstr "Cwestiynau poblogaidd"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:179
 #, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:180
 #, c-format
 msgid "Literature"
 msgstr "Llenyddiaeth"
 
-#: ../rpmdrake:181 ../rpmdrake:182
+#: ../rpmdrake:182 ../rpmdrake:183
 #, c-format
 msgid "Cluster"
 msgstr "Clwstwr"
 
-#: ../rpmdrake:181
+#: ../rpmdrake:182
 #, c-format
 msgid "Message Passing"
 msgstr "Pasio Negeseuon"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:183
 #, c-format
 msgid "Queueing Services"
 msgstr "Gwasanaethau Ciwio"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:184
 #, c-format
 msgid "Communications"
 msgstr "Cyfathrebu"
 
-#: ../rpmdrake:184 ../rpmdrake:187
+#: ../rpmdrake:185 ../rpmdrake:188
 #, c-format
 msgid "Databases"
 msgstr "Cronfeydd Data"
 
-#: ../rpmdrake:185 ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#: ../rpmdrake:193 ../rpmdrake:194
+#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192 ../rpmdrake:193
+#: ../rpmdrake:194 ../rpmdrake:195
 #, c-format
 msgid "Development"
 msgstr "Datblygiad"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:186
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:187
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:189
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME a GTK+"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:190
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:191
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE a Qt"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:192
 #, c-format
 msgid "Kernel"
 msgstr "Cnewyllyn"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:194
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:195
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:196
 #, c-format
 msgid "Editors"
 msgstr "Golygyddion"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:197
 #, c-format
 msgid "Education"
 msgstr "Addysg"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:198
 #, c-format
 msgid "Emulators"
 msgstr "Efelychwyr"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:199
 #, c-format
 msgid "File tools"
 msgstr "Offer ffeilio"
 
-#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202 ../rpmdrake:203
+#: ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206 ../rpmdrake:207
 #, c-format
 msgid "Games"
 msgstr "Gemau"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:200
 #, c-format
 msgid "Adventure"
 msgstr "Antur"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:201
 #, c-format
 msgid "Arcade"
 msgstr "Arcêd"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:202
 #, c-format
 msgid "Boards"
 msgstr "Byrddau"
 
-#: ../rpmdrake:202
+#: ../rpmdrake:203
 #, c-format
 msgid "Cards"
 msgstr "Cardiau"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:205
 #, c-format
 msgid "Puzzles"
 msgstr "Posau"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:206
 #, c-format
 msgid "Sports"
 msgstr "Chwaraeon"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:207
 #, c-format
 msgid "Strategy"
 msgstr "Strategaeth"
 
-#: ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209 ../rpmdrake:210
-#: ../rpmdrake:211 ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214
+#: ../rpmdrake:208 ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
 #, c-format
 msgid "Graphical desktop"
 msgstr "Bwrdd gwaith graffigol"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:208
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:208
+#: ../rpmdrake:209
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM seiliedig"
 
-#: ../rpmdrake:209
+#: ../rpmdrake:210
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:211
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:212
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:213
+#: ../rpmdrake:214
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:214
+#: ../rpmdrake:215
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:216
 #, c-format
 msgid "Graphics"
 msgstr "Graffigau"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:217
 #, c-format
 msgid "Monitoring"
 msgstr "Monitro"
 
-#: ../rpmdrake:217
+#: ../rpmdrake:218
 #, c-format
 msgid "Multimedia"
 msgstr "Amlgyfrwng"
 
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
-#: ../rpmdrake:226 ../rpmdrake:243
+#: ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+#: ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226
+#: ../rpmdrake:227 ../rpmdrake:244
 #, c-format
 msgid "Networking"
 msgstr "Rhwydweithio"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:219
 #, c-format
 msgid "Chat"
 msgstr "Sgwrs"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:220
 #, c-format
 msgid "File transfer"
 msgstr "Trosglwyddo ffeiliau"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:221
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:222
 #, c-format
 msgid "Instant messaging"
 msgstr "Negesu Chwim"
 
-#: ../rpmdrake:222
+#: ../rpmdrake:223
 #, c-format
 msgid "Mail"
 msgstr "E-bost"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:224
 #, c-format
 msgid "News"
 msgstr "Newyddion"
 
-#: ../rpmdrake:225
+#: ../rpmdrake:226
 #, c-format
 msgid "Remote access"
 msgstr "Mynediad pell"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:227
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:228
 #, c-format
 msgid "Office"
 msgstr "Swyddfa"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:229
 #, c-format
 msgid "Public Keys"
 msgstr "Allweddi Cyhoeddus"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:230
 #, c-format
 msgid "Publishing"
 msgstr "Cyhoeddi"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
 #, c-format
 msgid "Sciences"
 msgstr "Gwyddorau"
 
-#: ../rpmdrake:230
+#: ../rpmdrake:231
 #, c-format
 msgid "Astronomy"
 msgstr "Astroleg"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:232
 #, c-format
 msgid "Biology"
 msgstr "Bywydeg"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:233
 #, c-format
 msgid "Chemistry"
 msgstr "Cemeg"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:234
 #, c-format
 msgid "Computer science"
 msgstr "Gwyddor Cyfrifiadureg"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:235
 #, c-format
 msgid "Geosciences"
 msgstr "Gwyddorau Daear"
 
-#: ../rpmdrake:235
+#: ../rpmdrake:236
 #, c-format
 msgid "Mathematics"
 msgstr "Mathemateg"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:238
 #, c-format
 msgid "Physics"
 msgstr "Ffiseg"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:239
 #, c-format
 msgid "Shells"
 msgstr "Cregyn"
 
-#: ../rpmdrake:239
+#: ../rpmdrake:240
 #, c-format
 msgid "Sound"
 msgstr "Sain"
 
-#: ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242 ../rpmdrake:243
-#: ../rpmdrake:244 ../rpmdrake:245 ../rpmdrake:246 ../rpmdrake:247
-#: ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250 ../rpmdrake:251
-#: ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254 ../rpmdrake:255
-#: ../rpmdrake:256 ../rpmdrake:257
+#: ../rpmdrake:241 ../rpmdrake:242 ../rpmdrake:243 ../rpmdrake:244
+#: ../rpmdrake:245 ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248
+#: ../rpmdrake:249 ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252
+#: ../rpmdrake:253 ../rpmdrake:254 ../rpmdrake:255 ../rpmdrake:256
+#: ../rpmdrake:257 ../rpmdrake:258
 #, c-format
 msgid "System"
 msgstr "System"
 
-#: ../rpmdrake:240
+#: ../rpmdrake:241
 #, c-format
 msgid "Base"
 msgstr "Sail"
 
-#: ../rpmdrake:241 ../rpmdrake:242 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:245 ../rpmdrake:246
+#: ../rpmdrake:242 ../rpmdrake:243 ../rpmdrake:244 ../rpmdrake:245
+#: ../rpmdrake:246 ../rpmdrake:247
 #, c-format
 msgid "Configuration"
 msgstr "Ffurfweddu"
 
-#: ../rpmdrake:241
+#: ../rpmdrake:242
 #, c-format
 msgid "Boot and Init"
 msgstr "Cychwyn ac Ymgychwyn"
 
-#: ../rpmdrake:242
+#: ../rpmdrake:243
 #, c-format
 msgid "Hardware"
 msgstr "Caledwedd"
 
-#: ../rpmdrake:245
+#: ../rpmdrake:246
 #, c-format
 msgid "Packaging"
 msgstr "Pecynnu"
 
-#: ../rpmdrake:246
+#: ../rpmdrake:247
 #, c-format
 msgid "Printing"
 msgstr "Argraffu"
 
-#: ../rpmdrake:247
+#: ../rpmdrake:248
 #, c-format
 msgid "Deploiement"
 msgstr "Defnyddio"
 
-#: ../rpmdrake:248
+#: ../rpmdrake:249
 #, c-format
 msgid "Deployment"
 msgstr "Defnyddio"
 
-#: ../rpmdrake:249 ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
 #, c-format
 msgid "Fonts"
 msgstr "Ffontiau"
 
-#: ../rpmdrake:249
+#: ../rpmdrake:250
 #, c-format
 msgid "Console"
 msgstr "Consol"
 
-#: ../rpmdrake:250
+#: ../rpmdrake:251
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:251
+#: ../rpmdrake:252
 #, c-format
 msgid "Type1"
 msgstr "Math 1"
 
-#: ../rpmdrake:252
+#: ../rpmdrake:253
 #, c-format
 msgid "X11 bitmap"
 msgstr "Didfap X11"
 
-#: ../rpmdrake:253
+#: ../rpmdrake:254
 #, c-format
 msgid "Internationalization"
 msgstr "Rhyngwladoli"
 
-#: ../rpmdrake:254
+#: ../rpmdrake:255
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Cnewyllyn a chaledwedd."
 
-#: ../rpmdrake:255
+#: ../rpmdrake:256
 #, c-format
 msgid "Libraries"
 msgstr "Llyfrgelloedd"
 
-#: ../rpmdrake:256
+#: ../rpmdrake:257
 #, c-format
 msgid "Servers"
 msgstr "Gweinyddion"
 
-#: ../rpmdrake:257
+#: ../rpmdrake:258
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:258
+#: ../rpmdrake:259
 #, c-format
 msgid "Terminals"
 msgstr "Terfynellau"
 
-#: ../rpmdrake:259
+#: ../rpmdrake:260
 #, c-format
 msgid "Text tools"
 msgstr "Offer testun"
 
-#: ../rpmdrake:260
+#: ../rpmdrake:261
 #, c-format
 msgid "Toys"
 msgstr "Teganau"
 
-#: ../rpmdrake:261
+#: ../rpmdrake:262
 #, c-format
 msgid "Video"
 msgstr "Fideo"
 
-#: ../rpmdrake:386 ../rpmdrake:528 ../rpmdrake:530
+#: ../rpmdrake:388 ../rpmdrake:533 ../rpmdrake:535
 #, c-format
 msgid "(Not available)"
 msgstr "(Dim ar gael)"
 
-#: ../rpmdrake:415 ../rpmdrake:492
+#: ../rpmdrake:417 ../rpmdrake:497
 #, c-format
 msgid "Search results"
 msgstr "Canlyniadau'r chwilio"
 
-#: ../rpmdrake:415
+#: ../rpmdrake:417
 #, c-format
 msgid "Search results (none)"
 msgstr "Canlyniadau'r chwilio (dim)"
 
-#: ../rpmdrake:426 ../rpmdrake:450
+#: ../rpmdrake:428 ../rpmdrake:455
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Arhoswch, chwilio..."
 
-#: ../rpmdrake:445 ../rpmdrake:1233 ../rpmdrake:1543 ../rpmdrake:1757
+#: ../rpmdrake:450 ../rpmdrake:576 ../rpmdrake:1235 ../rpmdrake:1546
+#: ../rpmdrake:1758
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:455
+#: ../rpmdrake:460
 #, c-format
 msgid "Stop"
 msgstr "Atal"
 
-#: ../rpmdrake:493 ../rpmdrake:662
+#: ../rpmdrake:498 ../rpmdrake:664
 #, c-format
 msgid "Upgradable"
 msgstr "Diweddariadwy"
 
-#: ../rpmdrake:493 ../rpmdrake:662
+#: ../rpmdrake:498 ../rpmdrake:664
 #, c-format
 msgid "Addable"
 msgstr "Ychwanegadwy"
 
-#: ../rpmdrake:495
+#: ../rpmdrake:500
 #, c-format
 msgid "Selected"
 msgstr "Dewiswyd"
 
-#: ../rpmdrake:495
+#: ../rpmdrake:500
 #, c-format
 msgid "Not selected"
 msgstr "Heb ei ddewis"
 
-#: ../rpmdrake:525
+#: ../rpmdrake:530
 #, c-format
 msgid "Files:\n"
 msgstr "Ffeiliau:\n"
 
-#: ../rpmdrake:530
+#: ../rpmdrake:535
 #, c-format
 msgid "Changelog:\n"
 msgstr "Cofnod Newid:\n"
 
-#: ../rpmdrake:535
+#: ../rpmdrake:540
 #, c-format
 msgid "Medium: "
 msgstr "Cyfrwng:"
 
-#: ../rpmdrake:537
+#: ../rpmdrake:542
 #, c-format
 msgid "Currently installed version: "
 msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
 
-#: ../rpmdrake:545
+#: ../rpmdrake:550
 #, c-format
 msgid "Name: "
 msgstr "Enw: "
 
-#: ../rpmdrake:546
+#: ../rpmdrake:551
 #, c-format
 msgid "Version: "
 msgstr "Fersiwn: "
 
-#: ../rpmdrake:547
+#: ../rpmdrake:552
 #, c-format
 msgid "Size: "
 msgstr "Maint: "
 
-#: ../rpmdrake:547
+#: ../rpmdrake:552
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:550
+#: ../rpmdrake:555
 #, c-format
 msgid "Importance: "
 msgstr "Pwysigrwydd: "
 
-#: ../rpmdrake:553
+#: ../rpmdrake:558
 #, c-format
 msgid "Summary: "
 msgstr "Crynodeb: "
 
-#: ../rpmdrake:556
+#: ../rpmdrake:561
 #, c-format
 msgid "Reason for update: "
 msgstr "Rheswm am y diweddariad:"
 
-#: ../rpmdrake:558
+#: ../rpmdrake:563
 #, c-format
 msgid "Description: "
 msgstr "Disgrifiadau: "
 
-#: ../rpmdrake:558
+#: ../rpmdrake:563
 #, c-format
 msgid "No description"
 msgstr "Dim disgrifiad"
 
-#: ../rpmdrake:573
-#, c-format
-msgid "Rpmdrake %s"
-msgstr "Rpmdrake %s"
-
-#: ../rpmdrake:590 ../rpmdrake:712 ../rpmdrake:714 ../rpmdrake:1637
+#: ../rpmdrake:592 ../rpmdrake:714 ../rpmdrake:716 ../rpmdrake:1638
 #, c-format
 msgid "More information on package..."
 msgstr "Rhagor o wybodaeth ar becyn..."
 
-#: ../rpmdrake:591
+#: ../rpmdrake:593
 #, c-format
 msgid "Please choose"
 msgstr "Dewiswch"
 
-#: ../rpmdrake:591
+#: ../rpmdrake:593
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../rpmdrake:612
+#: ../rpmdrake:614
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Arhoswch, rhestri pecynnau..."
 
-#: ../rpmdrake:629
+#: ../rpmdrake:631
 #, c-format
 msgid "No update"
 msgstr "Dim diweddariad"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:632
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1254,28 +1322,28 @@ msgstr ""
 "nad oes diweddariad ar gyfer y pecynnau ar eich cyfrifiadur,\n"
 "neu rydych wedi eu gosod i gyd yn barod."
 
-#: ../rpmdrake:653
+#: ../rpmdrake:655
 #, c-format
 msgid "All"
 msgstr "Popeth"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:699 ../rpmdrake:704
+#: ../rpmdrake:701 ../rpmdrake:706
 #, c-format
 msgid "More info"
 msgstr "Rhagor"
 
-#: ../rpmdrake:707 ../rpmdrake:1626
+#: ../rpmdrake:709 ../rpmdrake:1627
 #, c-format
 msgid "Information on packages"
 msgstr "Gwybodaeth am becynnau"
 
-#: ../rpmdrake:729
+#: ../rpmdrake:731
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 
-#: ../rpmdrake:730
+#: ../rpmdrake:732
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1286,12 +1354,12 @@ msgstr ""
 "hefyd: \n"
 "\n"
 
-#: ../rpmdrake:736 ../rpmdrake:745
+#: ../rpmdrake:738 ../rpmdrake:747
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Nid oes modd tynnu rhai pecynnau"
 
-#: ../rpmdrake:737
+#: ../rpmdrake:739
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1300,7 +1368,7 @@ msgstr ""
 "Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
 "\n"
 
-#: ../rpmdrake:746 ../rpmdrake:808
+#: ../rpmdrake:748 ../rpmdrake:810
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1310,12 +1378,12 @@ msgstr ""
 "Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
 "eu dad-ddewis nawr:\n"
 
-#: ../rpmdrake:775
+#: ../rpmdrake:777
 #, c-format
 msgid "Additional packages needed"
 msgstr "Pecynnau ychwanegol angenrheidiol"
 
-#: ../rpmdrake:776
+#: ../rpmdrake:778
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1326,17 +1394,17 @@ msgstr ""
 "hefyd:\n"
 "\n"
 
-#: ../rpmdrake:791
+#: ../rpmdrake:793
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (perthyn i'r rhestr hepgor)"
 
-#: ../rpmdrake:793
+#: ../rpmdrake:795
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Nid oes modd gosod rhai pecynnau"
 
-#: ../rpmdrake:794
+#: ../rpmdrake:796
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1347,122 +1415,122 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:807 ../rpmdrake:1073
+#: ../rpmdrake:809 ../rpmdrake:1075
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Rhaid tynnu rhai pecynnau"
 
-#: ../rpmdrake:832
+#: ../rpmdrake:834
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
 
-#: ../rpmdrake:833
+#: ../rpmdrake:835
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Maint dewiswyd: %d MB"
 
-#: ../rpmdrake:839
+#: ../rpmdrake:841
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Dim disgrifiad ar gael i'r pecyn hwn\n"
 
-#: ../rpmdrake:906
+#: ../rpmdrake:908
 #, c-format
 msgid "Security updates"
 msgstr "Diweddariadau diogelwch"
 
-#: ../rpmdrake:906
+#: ../rpmdrake:908
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Diweddariad cywiro gwallau"
 
-#: ../rpmdrake:906
+#: ../rpmdrake:908
 #, c-format
 msgid "Normal updates"
 msgstr "Diweddariadau arferol"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:928
 #, c-format
 msgid "%s choices"
 msgstr "%s dewis"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:928
 #, c-format
-msgid "Mandrakelinux choices"
-msgstr "Dewisiadau Mandrakelinux"
+msgid "Mandriva Linux choices"
+msgstr "Dewisiadau Mandriva Linux"
 
-#: ../rpmdrake:929
+#: ../rpmdrake:931
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Pob pecyn, trefn yr wyddor"
 
-#: ../rpmdrake:937
+#: ../rpmdrake:939
 #, c-format
 msgid "All packages, by group"
 msgstr "Pob pecyn, yn ôl grŵp"
 
-#: ../rpmdrake:938
+#: ../rpmdrake:940
 #, c-format
 msgid "All packages, by size"
 msgstr "Pob pecyn, yn ôl maint"
 
-#: ../rpmdrake:939
+#: ../rpmdrake:941
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Pob pecyn, yn ôl dyddiad dewis"
 
-#: ../rpmdrake:943
+#: ../rpmdrake:945
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Pob pecyn, yn ôl yn ôl ffynhonnell eu storfa"
 
-#: ../rpmdrake:944
+#: ../rpmdrake:946
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Pob pecyn, yn ôl diweddariad"
 
-#: ../rpmdrake:948
+#: ../rpmdrake:950
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Gadael, yn ôl dyddiad gosod"
 
-#: ../rpmdrake:1022
+#: ../rpmdrake:1024
 #, c-format
 msgid "in names"
 msgstr "enwau"
 
-#: ../rpmdrake:1024
+#: ../rpmdrake:1026
 #, c-format
 msgid "in descriptions"
 msgstr "disgrifiadau"
 
-#: ../rpmdrake:1026
+#: ../rpmdrake:1028
 #, c-format
 msgid "in file names"
 msgstr "mewn enwau ffeil"
 
-#: ../rpmdrake:1035
+#: ../rpmdrake:1037
 #, c-format
 msgid "Normal information"
 msgstr "Gwybodaeth arferol"
 
-#: ../rpmdrake:1035
+#: ../rpmdrake:1037
 #, c-format
 msgid "Maximum information"
 msgstr "Gwybodaeth lawn"
 
-#: ../rpmdrake:1055
+#: ../rpmdrake:1057
 #, c-format
 msgid "You need to select some packages first."
 msgstr "Rhaid dewis rhai pecynnau'n gyntaf."
 
-#: ../rpmdrake:1060
+#: ../rpmdrake:1062
 #, c-format
 msgid "Too many packages are selected"
 msgstr "Mae gormod o becynnau wedi eu dewis"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1063
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -1473,7 +1541,7 @@ msgid ""
 "Do you really want to install all the selected packages?"
 msgstr "Rhybudd:"
 
-#: ../rpmdrake:1074
+#: ../rpmdrake:1076
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1488,93 +1556,98 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake:1107
+#: ../rpmdrake:1109
 #, c-format
 msgid "Software Packages Removal"
 msgstr "Tynnu Pecynnau Meddalwedd"
 
-#: ../rpmdrake:1108
+#: ../rpmdrake:1110
 #, c-format
 msgid "Software Packages Update"
 msgstr "Diweddaru Pecynnau Meddalwedd"
 
-#: ../rpmdrake:1109
+#: ../rpmdrake:1111
 #, c-format
 msgid "Software Packages Installation"
 msgstr "Gosod Pecynnau Meddalwedd"
 
-#: ../rpmdrake:1115 ../rpmdrake:1118 ../rpmdrake:1127 ../rpmdrake:1138
-#: ../rpmdrake:1143
+#: ../rpmdrake:1117 ../rpmdrake:1120 ../rpmdrake:1129 ../rpmdrake:1140
+#: ../rpmdrake:1145
 #, c-format
 msgid "/_File"
 msgstr "/_Ffeil"
 
-#: ../rpmdrake:1118
+#: ../rpmdrake:1120
 #, c-format
 msgid "/_Update media"
 msgstr "/_Diweddaru'r cyfrwng"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1129
 #, c-format
 msgid "/_Reset the selection"
 msgstr "/_Ailosod y dewis"
 
-#: ../rpmdrake:1138
+#: ../rpmdrake:1140
 #, c-format
 msgid "/Reload the _packages list"
 msgstr "/_Ail-lwytho'r rhestr pecynnau"
 
-#: ../rpmdrake:1143
+#: ../rpmdrake:1145
 #, c-format
 msgid "/_Quit"
 msgstr "/_Gadael"
 
-#: ../rpmdrake:1146 ../rpmdrake:1147 ../rpmdrake:1154
+#: ../rpmdrake:1145
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../rpmdrake:1148 ../rpmdrake:1149 ../rpmdrake:1156
 #, c-format
 msgid "/_Options"
 msgstr "/_Dewisiadau"
 
-#: ../rpmdrake:1147 ../rpmdrake:1154
+#: ../rpmdrake:1149 ../rpmdrake:1156
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Dangoswch y pecynnau dewis awtomatig"
 
-#: ../rpmdrake:1151 ../rpmdrake:1152
+#: ../rpmdrake:1153 ../rpmdrake:1154
 #, c-format
 msgid "/_Help"
 msgstr "/_Cymorth"
 
-#: ../rpmdrake:1168
+#: ../rpmdrake:1170
 #, c-format
 msgid "Find:"
 msgstr "Canfod:"
 
-#: ../rpmdrake:1173
+#: ../rpmdrake:1175
 #, c-format
 msgid "Search"
 msgstr "Chwilio"
 
-#: ../rpmdrake:1179
+#: ../rpmdrake:1181
 #, c-format
 msgid "Install"
 msgstr "Gosod"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1186
 #, c-format
 msgid "Quit"
 msgstr "Gadael"
 
-#: ../rpmdrake:1225
+#: ../rpmdrake:1227
 #, c-format
 msgid "Fatal error"
 msgstr "Gwall terfynol"
 
-#: ../rpmdrake:1226
+#: ../rpmdrake:1228
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Digwyddodd gwall terfynol:%s."
 
-#: ../rpmdrake:1234
+#: ../rpmdrake:1236
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1587,12 +1660,12 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake:1243
+#: ../rpmdrake:1245
 #, c-format
 msgid "Already existing update media"
 msgstr "Cyfrwng diweddaru sy'n bod eisoes"
 
-#: ../rpmdrake:1244
+#: ../rpmdrake:1246
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1609,12 +1682,12 @@ msgstr ""
 "\n"
 "Yna ailgychwyn %s."
 
-#: ../rpmdrake:1254
+#: ../rpmdrake:1256
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "Sut i ddewis drych gyda llaw."
 
-#: ../rpmdrake:1255
+#: ../rpmdrake:1257
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1629,62 +1702,62 @@ msgstr ""
 "\n"
 "Yna ailgychwynnwch %s."
 
-#: ../rpmdrake:1288
+#: ../rpmdrake:1290
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../rpmdrake:1366
+#: ../rpmdrake:1368
 #, c-format
 msgid "Inspecting %s"
 msgstr "Archwilio %s"
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1391
 #, c-format
 msgid "changes:"
 msgstr "newidiadau:"
 
-#: ../rpmdrake:1397
+#: ../rpmdrake:1399
 #, c-format
 msgid "Remove .%s"
 msgstr "Tynnu .%s"
 
-#: ../rpmdrake:1401
+#: ../rpmdrake:1403
 #, c-format
 msgid "Use .%s as main file"
 msgstr "Defnyddio .%s fel y brif ffeil"
 
-#: ../rpmdrake:1405
+#: ../rpmdrake:1407
 #, c-format
 msgid "Do nothing"
 msgstr "Gwneud dim"
 
-#: ../rpmdrake:1421
+#: ../rpmdrake:1423
 #, c-format
 msgid "Installation finished"
 msgstr "Gorffennodd y gosodiad"
 
-#: ../rpmdrake:1436
+#: ../rpmdrake:1438
 #, c-format
 msgid "Inspect..."
 msgstr "Archwilio..."
 
-#: ../rpmdrake:1465 ../rpmdrake:1622
+#: ../rpmdrake:1468 ../rpmdrake:1623
 #, c-format
 msgid "Everything installed successfully"
 msgstr "Gosodwyd popeth yn llwyddiannus"
 
-#: ../rpmdrake:1466 ../rpmdrake:1623
+#: ../rpmdrake:1469 ../rpmdrake:1624
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
-#: ../rpmdrake:1468 ../rpmdrake:1607
+#: ../rpmdrake:1471 ../rpmdrake:1608
 #, c-format
 msgid "Problem during installation"
 msgstr "Anhawster wrth osod"
 
-#: ../rpmdrake:1469 ../rpmdrake:1608 ../rpmdrake:1663
+#: ../rpmdrake:1472 ../rpmdrake:1609 ../rpmdrake:1664
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1695,17 +1768,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1482
+#: ../rpmdrake:1485
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../rpmdrake:1483
+#: ../rpmdrake:1486
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Methu estyn pecynnau ffynhonnell, %s"
 
-#: ../rpmdrake:1484 ../rpmdrake:1555
+#: ../rpmdrake:1487 ../rpmdrake:1558
 #, c-format
 msgid ""
 "\n"
@@ -1718,37 +1791,37 @@ msgstr ""
 "Gwall(au) wedi eu hadrodd:\n"
 "%s"
 
-#: ../rpmdrake:1491
+#: ../rpmdrake:1494
 #, c-format
 msgid "Package installation..."
 msgstr "Gosod pecynnau..."
 
-#: ../rpmdrake:1491
+#: ../rpmdrake:1494
 #, c-format
 msgid "Initializing..."
 msgstr "Ymgychwyn..."
 
-#: ../rpmdrake:1500
+#: ../rpmdrake:1503
 #, c-format
 msgid "Change medium"
 msgstr "Newid cyfrwng"
 
-#: ../rpmdrake:1501
+#: ../rpmdrake:1504
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" i mewn i ddyfais [%s]"
 
-#: ../rpmdrake:1508
+#: ../rpmdrake:1511
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
 
-#: ../rpmdrake:1531
+#: ../rpmdrake:1534
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "Gwirio llofnodion pecynnau ..."
 
-#: ../rpmdrake:1544
+#: ../rpmdrake:1547
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1763,12 +1836,12 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau gyda'r gosod?"
 
-#: ../rpmdrake:1552 ../rpmdrake:1662
+#: ../rpmdrake:1555 ../rpmdrake:1663
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosodiad"
 
-#: ../rpmdrake:1553
+#: ../rpmdrake:1556
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1781,22 +1854,22 @@ msgstr ""
 "\n"
 "Efallai'r hoffech ddiweddaru eich cronfa ddata o gyfryngau."
 
-#: ../rpmdrake:1566
+#: ../rpmdrake:1569
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Paratoi pecynnau i'w gosod..."
 
-#: ../rpmdrake:1569
+#: ../rpmdrake:1572
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../rpmdrake:1585
+#: ../rpmdrake:1588
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad  ffeil rpm (%s)"
 
-#: ../rpmdrake:1620
+#: ../rpmdrake:1621
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -1809,47 +1882,47 @@ msgstr ""
 "Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
 "mae modd eu harchwilio i weithredu arnynt:"
 
-#: ../rpmdrake:1620
+#: ../rpmdrake:1621
 #, c-format
 msgid "everything was installed correctly"
 msgstr "gosodwyd popeth yn llwyddiannus"
 
-#: ../rpmdrake:1628
+#: ../rpmdrake:1629
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "Mae gan y pecynnau wybodaeth uwchraddio"
 
-#: ../rpmdrake:1640
+#: ../rpmdrake:1641
 #, c-format
 msgid "More information on package... [%s]"
 msgstr "Rhagor o wybodaeth ar becyn... [%s]"
 
-#: ../rpmdrake:1653
+#: ../rpmdrake:1654
 #, c-format
 msgid "No package found for installation."
 msgstr "Heb ganfod pecyn i'w osod"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1655
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Gwall anadferadwy: dim pecyn wedi ei ganfod ar gyfer y gosod."
 
-#: ../rpmdrake:1676
+#: ../rpmdrake:1677
 #, c-format
 msgid "Please wait, reading packages database..."
 msgstr "Arhoswch, darllen cronfa ddata'r pecynnau..."
 
-#: ../rpmdrake:1723
+#: ../rpmdrake:1724
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Arhoswch, tynnu'r pecynnau..."
 
-#: ../rpmdrake:1728
+#: ../rpmdrake:1729
 #, c-format
 msgid "Problem during removal"
 msgstr "Problem wrth dynnu"
 
-#: ../rpmdrake:1729
+#: ../rpmdrake:1730
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -1860,7 +1933,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1762
+#: ../rpmdrake:1763
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1873,7 +1946,7 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo o ddewis pa feddalwedd rydych\n"
 "am ei dynnu oddi ar eich cyfrifiadur."
 
-#: ../rpmdrake:1767
+#: ../rpmdrake:1768
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1885,203 +1958,213 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
 "ar eich cyfrifiadur."
 
-#: ../rpmdrake:1772
+#: ../rpmdrake:1773
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Croeso i'r offeryn gosod meddalwedd!"
 
-#: ../rpmdrake:1773
+#: ../rpmdrake:1774
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
-"Your Mandrakelinux system comes with several thousands of software\n"
+"Your Mandriva Linux system comes with several thousands of software\n"
 "packages on CDROM or DVD. This tool will help you choose which software\n"
 "you want to install on your computer."
 msgstr ""
 "Croeso i'r offeryn gosod meddalwedd!\n"
 "\n"
-"Mae eich system Mandrakelinux yn dod gyda rhai miloedd o becynnau\n"
+"Mae eich system Mandriva Linux yn dod gyda rhai miloedd o becynnau\n"
 "meddalwedd ar CDROM neu DVD.  Bydd yr offeryn hwn yn eich cynorthwyo\n"
 "i ddewis pa feddalwedd rydych am ei osod ar eich cyfrifiadur."
 
-#: ../rpmdrake.pm:94
+#: ../rpmdrake.pm:95
 #, c-format
 msgid "Software Update"
 msgstr "Diweddaru Meddalwedd"
 
-#: ../rpmdrake.pm:94
+#: ../rpmdrake.pm:95
 #, c-format
-msgid "Mandrakelinux Update"
-msgstr "Diweddaru Mandrakelinux"
+msgid "Mandriva Linux Update"
+msgstr "Diweddaru Mandriva Linux"
+
+#: ../rpmdrake.pm:122
+#, fuzzy, c-format
+msgid "Please enter your credentials for accessing proxy\n"
+msgstr "Rhowch eich cyfeiriad e-bost islaw"
+
+#: ../rpmdrake.pm:123
+#, fuzzy, c-format
+msgid "User name:"
+msgstr "Enw Defnyddiwr:"
 
-#: ../rpmdrake.pm:183
+#: ../rpmdrake.pm:215
 #, c-format
 msgid "No"
 msgstr "Na"
 
-#: ../rpmdrake.pm:187
+#: ../rpmdrake.pm:219
 #, c-format
 msgid "Yes"
 msgstr "Iawn"
 
-#: ../rpmdrake.pm:235
+#: ../rpmdrake.pm:267
 #, c-format
 msgid "Info..."
 msgstr "Gwybodaeth..."
 
-#: ../rpmdrake.pm:311
+#: ../rpmdrake.pm:343
 #, c-format
 msgid "Austria"
 msgstr "Awstria"
 
-#: ../rpmdrake.pm:312
+#: ../rpmdrake.pm:344
 #, c-format
 msgid "Australia"
 msgstr "Awstralia"
 
-#: ../rpmdrake.pm:313
+#: ../rpmdrake.pm:345
 #, c-format
 msgid "Belgium"
 msgstr "Gwlad Belg"
 
-#: ../rpmdrake.pm:314
+#: ../rpmdrake.pm:346
 #, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:315
+#: ../rpmdrake.pm:347
 #, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:316
+#: ../rpmdrake.pm:348
 #, c-format
 msgid "Switzerland"
 msgstr "Y Swistir"
 
-#: ../rpmdrake.pm:317
+#: ../rpmdrake.pm:349
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:318
+#: ../rpmdrake.pm:350
 #, c-format
 msgid "Czech Republic"
 msgstr "Gweriniaeth Tsiec"
 
-#: ../rpmdrake.pm:319
+#: ../rpmdrake.pm:351
 #, c-format
 msgid "Germany"
 msgstr "Yr Almaen"
 
-#: ../rpmdrake.pm:320
+#: ../rpmdrake.pm:352
 #, c-format
 msgid "Danmark"
 msgstr "Denmarc"
 
-#: ../rpmdrake.pm:321 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:353 ../rpmdrake.pm:357
 #, c-format
 msgid "Greece"
 msgstr "Groeg"
 
-#: ../rpmdrake.pm:322
+#: ../rpmdrake.pm:354
 #, c-format
 msgid "Spain"
 msgstr "Sbaen"
 
-#: ../rpmdrake.pm:323
+#: ../rpmdrake.pm:355
 #, c-format
 msgid "Finland"
 msgstr "Ffindir"
 
-#: ../rpmdrake.pm:324
+#: ../rpmdrake.pm:356
 #, c-format
 msgid "France"
 msgstr "Ffrainc"
 
-#: ../rpmdrake.pm:326
+#: ../rpmdrake.pm:358
 #, c-format
 msgid "Hungary"
 msgstr "Hwngari"
 
-#: ../rpmdrake.pm:327
+#: ../rpmdrake.pm:359
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:328
+#: ../rpmdrake.pm:360
 #, c-format
 msgid "Italy"
 msgstr "Yr Eidal"
 
-#: ../rpmdrake.pm:329
+#: ../rpmdrake.pm:361
 #, c-format
 msgid "Japan"
 msgstr "Siapan"
 
-#: ../rpmdrake.pm:330
+#: ../rpmdrake.pm:362
 #, c-format
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:331
+#: ../rpmdrake.pm:363
 #, c-format
 msgid "Netherlands"
 msgstr "Yr Iseldiroedd"
 
-#: ../rpmdrake.pm:332
+#: ../rpmdrake.pm:364
 #, c-format
 msgid "Norway"
 msgstr "Norwy"
 
-#: ../rpmdrake.pm:333
+#: ../rpmdrake.pm:365
 #, c-format
 msgid "Poland"
 msgstr "Gwlad Pwyl"
 
-#: ../rpmdrake.pm:334
+#: ../rpmdrake.pm:366
 #, c-format
 msgid "Portugal"
 msgstr "Portiwgal"
 
-#: ../rpmdrake.pm:335
+#: ../rpmdrake.pm:367
 #, c-format
 msgid "Russia"
 msgstr "Rwsia"
 
-#: ../rpmdrake.pm:336
+#: ../rpmdrake.pm:368
 #, c-format
 msgid "Sweden"
 msgstr "Sweden"
 
-#: ../rpmdrake.pm:337
+#: ../rpmdrake.pm:369
 #, c-format
 msgid "Slovakia"
 msgstr "Slofacia"
 
-#: ../rpmdrake.pm:338
+#: ../rpmdrake.pm:370
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:339
+#: ../rpmdrake.pm:371
 #, c-format
 msgid "United Kingdom"
 msgstr "Y Deyrnas Unedig"
 
-#: ../rpmdrake.pm:340
+#: ../rpmdrake.pm:372
 #, c-format
 msgid "China"
 msgstr "Tsiena"
 
-#: ../rpmdrake.pm:341 ../rpmdrake.pm:342 ../rpmdrake.pm:343 ../rpmdrake.pm:344
-#: ../rpmdrake.pm:421
+#: ../rpmdrake.pm:373 ../rpmdrake.pm:374 ../rpmdrake.pm:375 ../rpmdrake.pm:376
+#: ../rpmdrake.pm:453
 #, c-format
 msgid "United States"
 msgstr "Yr Unol Daleithiau"
 
-#: ../rpmdrake.pm:433
+#: ../rpmdrake.pm:468
 #, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2094,36 +2177,35 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake.pm:437
+#: ../rpmdrake.pm:472
 #, c-format
 msgid ""
-"I need to contact the Mandrakesoft website to get the mirror list.\n"
+"I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Mae angen i mi gysylltu â safle gwe Mandrakesoft i gael y rhestr\n"
+"Mae angen i mi gysylltu â safle gwe Mandriva i gael y rhestr\n"
 "drychau. Gwiriwch fod eich rhwydwaith yn rhedeg.\n"
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake.pm:443
+#: ../rpmdrake.pm:478
 #, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau."
 
-#: ../rpmdrake.pm:444
+#: ../rpmdrake.pm:479
 #, c-format
-msgid ""
-"Please wait, downloading mirror addresses from the Mandrakesoft website."
-msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau o safle gwe Mandrakesoft."
+msgid "Please wait, downloading mirror addresses from the Mandriva website."
+msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau o safle gwe Mandriva."
 
-#: ../rpmdrake.pm:450
+#: ../rpmdrake.pm:485
 #, c-format
 msgid "Error during download"
 msgstr "Gwall wrth lwytho i lawr"
 
-#: ../rpmdrake.pm:452
+#: ../rpmdrake.pm:487
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2138,103 +2220,103 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu'r safle, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:457
+#: ../rpmdrake.pm:492
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
 "%s\n"
-"The network, or the Mandrakesoft website, may be unavailable.\n"
+"The network, or the Mandriva website, may be unavailable.\n"
 "Please try again later."
 msgstr ""
 "Cafwyd gwall wrth lwytho'r rhestr drych i lawr:\n"
 "\n"
 "%s\n"
-"Nid yw'r rhwydwaith, neu safle Mandrakesoft, ar gael.\n"
+"Nid yw'r rhwydwaith, neu safle Mandriva, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:466
+#: ../rpmdrake.pm:501
 #, c-format
 msgid "No mirror"
 msgstr "Dim drych"
 
-#: ../rpmdrake.pm:468
+#: ../rpmdrake.pm:503
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Methu canfod drych addas."
 
-#: ../rpmdrake.pm:469
+#: ../rpmdrake.pm:504
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
 "There can be many reasons for this problem; the most frequent is\n"
 "the case when the architecture of your processor is not supported\n"
-"by Mandrakelinux Official Updates."
+"by Mandriva Linux Official Updates."
 msgstr ""
 "Methu canfod drych addas.\n"
 "\n"
 "Gall fod amryw o resymau; y mwyaf tebygol yw'r achos pan nad\n"
 "yw pensaernïaeth eich prosesydd yn cael ei gynnal gan Diweddariadau\n"
-"Swyddogol Mandrakelinux."
+"Swyddogol Mandriva Linux."
 
-#: ../rpmdrake.pm:488
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Dewiswch ddrych"
 
-#: ../rpmdrake.pm:547
+#: ../rpmdrake.pm:581
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copïo ffeil fel ar gyfer cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:550
+#: ../rpmdrake.pm:584
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Archwilio ffeil cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:553
+#: ../rpmdrake.pm:587
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Archwilio ffeil bell y cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:557
+#: ../rpmdrake.pm:591
 #, c-format
 msgid " done."
 msgstr " gorffen.."
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:595
 #, c-format
 msgid " failed!"
 msgstr " methwyd!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:565
+#: ../rpmdrake.pm:599
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s o gyfrwng %s"
 
-#: ../rpmdrake.pm:569
+#: ../rpmdrake.pm:603
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Cychwyn llwytho %s i lawr..."
 
-#: ../rpmdrake.pm:573
+#: ../rpmdrake.pm:607
 #, 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:576
+#: ../rpmdrake.pm:610
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
 
-#: ../rpmdrake.pm:613
+#: ../rpmdrake.pm:647
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Gwall estyn pecynnau"
 
-#: ../rpmdrake.pm:614
+#: ../rpmdrake.pm:648
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2251,27 +2333,27 @@ msgstr ""
 "neu nid oes modd ei gyrraedd ar hyn o bryd a dylech geisio eto \n"
 "rhywbryd."
 
-#: ../rpmdrake.pm:645
+#: ../rpmdrake.pm:679
 #, c-format
 msgid "Update media"
 msgstr "Diweddaru'r cyfrwng"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Dewiswch y cyfrwng i'w diweddaru:"
 
-#: ../rpmdrake.pm:667
+#: ../rpmdrake.pm:701
 #, c-format
 msgid "Select all"
 msgstr "Dewis popeth"
 
-#: ../rpmdrake.pm:671
+#: ../rpmdrake.pm:705
 #, c-format
 msgid "Update"
 msgstr "Diweddaru"
 
-#: ../rpmdrake.pm:693
+#: ../rpmdrake.pm:727
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2284,7 +2366,7 @@ msgstr ""
 "Gwallau:\n"
 "%s"
 
-#: ../rpmdrake.pm:717 ../rpmdrake.pm:726
+#: ../rpmdrake.pm:751 ../rpmdrake.pm:760
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2295,17 +2377,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:772
 #, c-format
 msgid "Unable to create medium."
 msgstr "Methu creu cyfrwng."
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:777
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Methu ychwanegu cyfrwng"
 
-#: ../rpmdrake.pm:744
+#: ../rpmdrake.pm:778
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2316,7 +2398,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:757
+#: ../rpmdrake.pm:791
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2327,23 +2409,23 @@ msgstr ""
 "s rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
-#: ../rpmdrake.pm:760
+#: ../rpmdrake.pm:794
 #, c-format
 msgid ""
-"Your medium `%s', used for updates, does not match the version of "
-"Mandrakelinux 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 "
-"Mandrakelinux rydych yn ei redeg (%s).\n"
+"Mandriva Linux rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
-#: ../rpmdrake.pm:776
+#: ../rpmdrake.pm:810
 #, c-format
 msgid "Help launched in background"
 msgstr "Cymorth wedi ei gychwyn yn y cefndir"
 
-#: ../rpmdrake.pm:777
+#: ../rpmdrake.pm:811
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
@@ -2621,6 +2703,12 @@ msgstr "Tynnu Meddalwedd"
 msgid "Software Media Manager"
 msgstr "Rheolwr Cyfrwng Meddalwedd"
 
+#~ msgid "Keys"
+#~ msgstr "Allweddi"
+
+#~ msgid "Rpmdrake %s"
+#~ msgstr "Rpmdrake %s"
+
 #~ msgid "/_View"
 #~ msgstr "/_Golwg"