sync with code

1 files changed, 355 insertions, 383 deletions

diff --git a/po/cy.po b/po/cy.po
index 07b211f4..9ba4e16a 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mandriva Linux\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-28 15:12+0100\n"
+"POT-Creation-Date: 2009-03-30 16:09+0200\n"
 "PO-Revision-Date: 2008-10-07 18:50-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg\n"
@@ -30,7 +30,7 @@ msgstr "Gosod RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Gwall: methu canfod ffeil %s, diddymu'r weithred"
 
-#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
+#: ../gurpmi:47 ../gurpmi2:187 ../gurpmi2:212
 #, c-format
 msgid "_Ok"
 msgstr "_Iawn"
@@ -96,7 +96,7 @@ msgstr "_Gosod"
 msgid "_Save"
 msgstr "_Cadw"
 
-#: ../gurpmi:101 ../gurpmi2:186
+#: ../gurpmi:101 ../gurpmi2:187
 #, c-format
 msgid "_Cancel"
 msgstr "_Dileu"
@@ -128,7 +128,7 @@ msgid "Options:"
 msgstr "Dewisiadau:"
 
 #: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - argraffu neges cymorth.\n"
@@ -246,37 +246,37 @@ msgstr ""
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../gurpmi2:146 ../urpmi:612
+#: ../gurpmi2:146 ../urpmi:626
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../gurpmi2:182
+#: ../gurpmi2:183
 #, c-format
 msgid " (to upgrade)"
 msgstr "(uwchraddio)"
 
-#: ../gurpmi2:183
+#: ../gurpmi2:184
 #, c-format
 msgid " (to install)"
 msgstr "(gosod)"
 
-#: ../gurpmi2:186
+#: ../gurpmi2:187
 #, c-format
 msgid "Package choice"
 msgstr "Dewis pecyn"
 
-#: ../gurpmi2:187
+#: ../gurpmi2:188
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../gurpmi2:211
+#: ../gurpmi2:213
 #, c-format
 msgid "_Abort"
 msgstr "_Atal"
 
-#: ../gurpmi2:234
+#: ../gurpmi2:248
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -287,63 +287,63 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:253 ../urpmi:579
+#: ../gurpmi2:267 ../urpmi:593
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
 
-#: ../gurpmi2:254 ../urpmi:580
+#: ../gurpmi2:268 ../urpmi:594
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
 
-#: ../gurpmi2:256
+#: ../gurpmi2:270
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pecyn, %d MB)"
 msgstr[1] "(%d pecyn, %d MB)"
 
-#: ../gurpmi2:264 ../urpm/main_loop.pm:49
+#: ../gurpmi2:278 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "methu estyn pecynnau ffynhonnell, atal"
 
-#: ../gurpmi2:296 ../urpm/install.pm:80
+#: ../gurpmi2:310 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
 
-#: ../gurpmi2:302
+#: ../gurpmi2:316
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../gurpmi2:319 ../urpmi:607
+#: ../gurpmi2:333 ../urpmi:621
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Rhowch gyfrwng \"%s\" yn y ddyfais"
 
-#: ../gurpmi2:333
+#: ../gurpmi2:347
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Llwytho pecynnau i lawr ' %s'..."
 
-#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
-#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
-#: ../urpm/media.pm:1442
+#: ../gurpmi2:359 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:236 ../urpm/media.pm:810 ../urpm/media.pm:1271
+#: ../urpm/media.pm:1422
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... methodd ail-lwytho: %s"
 
-#: ../gurpmi2:361
+#: ../gurpmi2:375
 #, c-format
 msgid "_Done"
 msgstr "_Gorffen"
 
-#: ../gurpmi2:369 ../urpm/main_loop.pm:120
+#: ../gurpmi2:391
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -354,27 +354,27 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
+#: ../gurpmi2:397 ../urpm/main_loop.pm:250 ../urpm/main_loop.pm:290
 #, c-format
 msgid "Installation failed:"
 msgstr "Methodd y gosod:"
 
-#: ../gurpmi2:380
+#: ../gurpmi2:402
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Popeth wedi eu gosod eisoes"
 
-#: ../gurpmi2:382
+#: ../gurpmi2:404
 #, c-format
 msgid "Installation finished"
 msgstr "Cwblhawyd y gosod"
 
-#: ../gurpmi2:383 ../urpme:169
+#: ../gurpmi2:405 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
 
-#: ../gurpmi2:391 ../urpmi:674
+#: ../gurpmi2:413 ../urpmi:688
 #, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
@@ -463,7 +463,7 @@ msgstr "enw ffeil rpm annilys [%s]"
 msgid "retrieving rpm file [%s] ..."
 msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:234
 #, c-format
 msgid "...retrieving done"
 msgstr ".cwblhau adfer"
@@ -493,7 +493,7 @@ msgstr "Saernïaeth anghydnaws ar gyfer rpm [%s]"
 msgid "error registering local packages"
 msgstr "gwall cofrestru pecynnau lleol"
 
-#: ../urpm.pm:438
+#: ../urpm.pm:439
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
@@ -508,59 +508,59 @@ msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:371
 #, c-format
 msgid "unexpected expression %s"
 msgstr "mynegiadau annisgwyl %s"
 
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:372
 #, c-format
 msgid "missing expression before %s"
 msgstr "mynegiad coll cyn %s"
 
-#: ../urpm/args.pm:390
+#: ../urpm/args.pm:378
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "mynegiad annisgwyl %s (awgrym: defnyddio -a neu-0 ?)"
 
-#: ../urpm/args.pm:394
+#: ../urpm/args.pm:382
 #, c-format
 msgid "no expression to close"
 msgstr "dim mynegiad i'w gau"
 
-#: ../urpm/args.pm:403
+#: ../urpm/args.pm:391
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "drwy ragosodiad mae urmpf yn disgwyl regexp, dylech ddefnyddio dewis  \"--"
 "literal\""
 
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:460
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Nid yw cyfeiriadur chroot yn bodoli"
 
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:483
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Methu defnyddio %s heb %s"
 
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
+#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Methu defnyddio %s gyda %s"
 
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:497
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Gormod o ymresymiadau\n"
 
-#: ../urpm/bug_report.pm:54 ../urpmi:259
+#: ../urpm/bug_report.pm:55 ../urpmi:259
 #, c-format
 msgid "Copying failed"
 msgstr "Methodd y copïo"
 
-#: ../urpm/cdrom.pm:66
+#: ../urpm/cdrom.pm:67
 #, c-format
 msgid ""
 "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
@@ -569,17 +569,17 @@ msgstr ""
 "Rhaid i chi arosod y CD-ROM eich hun (neu osod perl-Hal-Cdroms i'w wneud yn "
 "awtomatig)"
 
-#: ../urpm/cdrom.pm:68
+#: ../urpm/cdrom.pm:69
 #, c-format
 msgid "HAL daemon (hald) is not running or not ready"
 msgstr "Nid yw'r HAL daemon (hald) yn rhedeg neu nid yw'n barod"
 
-#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:162 ../urpm/cdrom.pm:167
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr "nid yw cyfrwng \"%s\" ar gael"
 
-#: ../urpm/cdrom.pm:205
+#: ../urpm/cdrom.pm:206
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
@@ -599,7 +599,7 @@ msgstr "Methu creu ffeil config (%s)"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "mae cyfrwng '%s' wedi ei ddiffinio ddwy waith, cau"
 
-#: ../urpm/cfg.pm:251 ../urpm/media.pm:497 ../urpm/media.pm:503
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:477
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
@@ -729,94 +729,94 @@ msgstr "heb ganfod webfetch, yn cael eu cynnal gan webfetch: %s\n"
 msgid "unable to handle protocol: %s"
 msgstr "methu trin protocol: %s"
 
-#: ../urpm/get_pkgs.pm:15
+#: ../urpm/get_pkgs.pm:16
 #, c-format
 msgid "cleaning %s and %s"
 msgstr "glanhau %s ac %s"
 
-#: ../urpm/get_pkgs.pm:127
+#: ../urpm/get_pkgs.pm:128
 #, c-format
 msgid "package %s is not found."
 msgstr "heb ganfod pecyn %s"
 
-#: ../urpm/get_pkgs.pm:213
+#: ../urpm/get_pkgs.pm:227
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
 
-#: ../urpm/install.pm:86
+#: ../urpm/install.pm:87
 #, c-format
 msgid "[repackaging]"
 msgstr "[ailbecynnu]"
 
-#: ../urpm/install.pm:167
+#: ../urpm/install.pm:168
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "crëwyd trosglwyddiad ar gyfer gosod ar %s (tynnu=%d, gosod=%d, uwchraddio=%d)"
 
-#: ../urpm/install.pm:170
+#: ../urpm/install.pm:171
 #, c-format
 msgid "unable to create transaction"
 msgstr "methu creu trosglwyddiad."
 
-#: ../urpm/install.pm:193
+#: ../urpm/install.pm:196
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "methu tynnu rpm o becyn delta-rpm %s"
 
-#: ../urpm/install.pm:206
+#: ../urpm/install.pm:209
 #, c-format
 msgid "unable to install package %s"
 msgstr "methu gosod pecyn %s"
 
-#: ../urpm/install.pm:209
+#: ../urpm/install.pm:212
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "tynnu rpm gwallus (%s) o %s"
 
-#: ../urpm/install.pm:210 ../urpm/install.pm:267
+#: ../urpm/install.pm:213 ../urpm/install.pm:277
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "tynnu %s methodd: %s"
 
-#: ../urpm/install.pm:248
+#: ../urpm/install.pm:258
 #, c-format
 msgid "Removing package %s"
 msgstr "Tynnu pecyn %s."
 
-#: ../urpm/install.pm:249
+#: ../urpm/install.pm:259
 #, c-format
 msgid "removing package %s"
 msgstr "tynnu pecyn %s."
 
-#: ../urpm/install.pm:265
+#: ../urpm/install.pm:275
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "tynnu rpm wedi eu gosod (%s) o %s"
 
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:283
 #, c-format
 msgid "More information on package %s"
 msgstr "Rhagor o wybodaeth ar becyn %s"
 
-#: ../urpm/ldap.pm:71
+#: ../urpm/ldap.pm:70
 #, c-format
 msgid "Cannot create ldap cache directory"
 msgstr "Methu creu cyfeiriadur storfa Idap"
 
-#: ../urpm/ldap.pm:73
+#: ../urpm/ldap.pm:72
 #, c-format
 msgid "Cannot write cache file for ldap\n"
 msgstr "Methu ysgrifennu ffeil storfa ar gyfer Idap\n"
 
-#: ../urpm/ldap.pm:162
+#: ../urpm/ldap.pm:161
 #, c-format
 msgid "No server defined, missing uri or host"
 msgstr "Heb ddiffinio gweinydd, uri neu westeiwr coll"
 
-#: ../urpm/ldap.pm:163
+#: ../urpm/ldap.pm:162
 #, c-format
 msgid "No base defined"
 msgstr "Sail heb ei ddiffinio"
@@ -826,17 +826,17 @@ msgstr "Sail heb ei ddiffinio"
 msgid "Cannot connect to ldap uri:"
 msgstr "Methu cysylltu  æg uri ldap:"
 
-#: ../urpm/lock.pm:62
+#: ../urpm/lock.pm:63
 #, c-format
 msgid "%s database is locked. Waiting..."
 msgstr "Cronfa ddata %s wedi cloi, aros..."
 
-#: ../urpm/lock.pm:63
+#: ../urpm/lock.pm:64
 #, c-format
 msgid "aborting"
 msgstr "atal"
 
-#: ../urpm/lock.pm:65
+#: ../urpm/lock.pm:66
 #, c-format
 msgid "%s database is locked (another program is already using it)"
 msgstr "Mae cronfa ddata %s wedi ei chloi (mae rhaglen arall yn ei defnyddio)"
@@ -846,18 +846,24 @@ msgstr "Mae cronfa ddata %s wedi ei chloi (mae rhaglen arall yn ei defnyddio)"
 msgid "Retry?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
-#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
-#, c-format
-msgid "Installation failed"
-msgstr "Methodd y gosod"
+#: ../urpm/main_loop.pm:119
+#, fuzzy, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s"
+msgstr ""
+"Methodd y gosod, rpm gwallus:\n"
+"%s"
 
-#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#: ../urpm/main_loop.pm:121
 #, fuzzy, c-format
-msgid "Try to go on anyway?"
-msgstr "Ceisio mynd ymlaen beth bynnag? (i/N)"
+msgid "You may want to update your urpmi database."
+msgstr ""
+"Methodd y gosod, mae rhai ffeiliau ar goll:\n"
+"%s\n"
+"Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../urpm/main_loop.pm:130
+#: ../urpm/main_loop.pm:124
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -866,107 +872,118 @@ msgstr ""
 "Methodd y gosod, rpm gwallus:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:148
+#: ../urpm/main_loop.pm:132 ../urpm/main_loop.pm:171 ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:259
+#, c-format
+msgid "Installation failed"
+msgstr "Methodd y gosod"
+
+#: ../urpm/main_loop.pm:133
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
+msgstr "Ceisio mynd ymlaen beth bynnag? (i/N)"
+
+#: ../urpm/main_loop.pm:156
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Mae gan y pecyn canlynol lofnod gwallus"
 
-#: ../urpm/main_loop.pm:149
+#: ../urpm/main_loop.pm:157
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
 
-#: ../urpm/main_loop.pm:150
+#: ../urpm/main_loop.pm:158
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ydych chi am barhau gosod?"
 
-#: ../urpm/main_loop.pm:167
+#: ../urpm/main_loop.pm:175
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "tynnu rpm wedi eu gosod (%s)"
 
-#: ../urpm/main_loop.pm:187
+#: ../urpm/main_loop.pm:195
 #, c-format
 msgid "distributing %s"
 msgstr "dosbarthu %s"
 
-#: ../urpm/main_loop.pm:202
+#: ../urpm/main_loop.pm:210
 #, c-format
 msgid "installing %s from %s"
 msgstr "gosod %s o %s"
 
-#: ../urpm/main_loop.pm:204
+#: ../urpm/main_loop.pm:212
 #, c-format
 msgid "installing %s"
 msgstr "gosod %s"
 
-#: ../urpm/main_loop.pm:242
+#: ../urpm/main_loop.pm:253
 #, fuzzy, c-format
 msgid "Try installation without checking dependencies?"
 msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
 
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:260
 #, fuzzy, c-format
 msgid "Try harder to install (--force)?"
 msgstr "Mwy o orfodaeth gyda'r gosod?  (--force)? (y/N)"
 
-#: ../urpm/main_loop.pm:288
+#: ../urpm/main_loop.pm:300
 #, c-format
 msgid "Packages are up to date"
 msgstr "Mae'r pecynnau'n rhai diweddaraf"
 
-#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:311 ../urpm/parallel.pm:299
 #, c-format
 msgid "Installation is possible"
 msgstr "Gosod yn bosibl"
 
-#: ../urpm/md5sum.pm:26
+#: ../urpm/md5sum.pm:27
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "rhybudd: nid yw md5sum ar gyfer %s ar gael yn ffeil MD5SUM"
 
-#: ../urpm/media.pm:204
+#: ../urpm/media.pm:194
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "dylai cyfrwng rhithiol  \"%s\" gael url clir, anwybyddu'r cyfrwng"
 
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:196
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
 
-#: ../urpm/media.pm:213
+#: ../urpm/media.pm:199
 #, c-format
 msgid "unable to access synthesis file of \"%s\", medium ignored"
 msgstr "methu cael mynediad i  ffeil \"%s\", anwybyddu'r cyfrwng"
 
-#: ../urpm/media.pm:240
+#: ../urpm/media.pm:225
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", hepgor"
 
-#: ../urpm/media.pm:456
+#: ../urpm/media.pm:441
 #, c-format
 msgid "failed to migrate removable device, ignoring media"
 msgstr "methu symud y ddyfais symudol, anwybyddu'r cyfrwng"
 
-#: ../urpm/media.pm:499 ../urpm/media.pm:505
+#: ../urpm/media.pm:479
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "ysgrifennu ffeil ffurfweddu (%s)"
 
-#: ../urpm/media.pm:548
+#: ../urpm/media.pm:521
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Methu defnyddio'r modd paralel gyda'r modd use-distrib"
 
-#: ../urpm/media.pm:556
+#: ../urpm/media.pm:529
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s"
 
-#: ../urpm/media.pm:572
+#: ../urpm/media.pm:545
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -975,218 +992,213 @@ msgstr ""
 "--nid oes modd defnyddio synthesis gyda --media, --excludemedia, --"
 "sortmedia, --diweddaru, --use-distrib or --parallel"
 
-#: ../urpm/media.pm:666
-#, c-format
-msgid "Search start: %s end: %s"
-msgstr "Cychwyn chwilio: %s diwedd: %s"
-
-#: ../urpm/media.pm:683
+#: ../urpm/media.pm:663
 #, c-format
 msgid "skipping package %s"
 msgstr "hepgor pecyn %s"
 
-#: ../urpm/media.pm:699
+#: ../urpm/media.pm:679
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "gosod yn lle uwchraddio pecyn %s"
 
-#: ../urpm/media.pm:724
+#: ../urpm/media.pm:704
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "cyfrwng \"%s\" yn bodoli eisoes"
 
-#: ../urpm/media.pm:763
+#: ../urpm/media.pm:743
 #, c-format
 msgid "(ignored by default)"
 msgstr "(anwybyddwyd drwy ragosodiad)"
 
-#: ../urpm/media.pm:769
+#: ../urpm/media.pm:749
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "ychwanegu cyfrwng \"%s\", cyn cyfrwng pell \"%s\""
 
-#: ../urpm/media.pm:775
+#: ../urpm/media.pm:755
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "ychwanegu cyfrwng \"%s\""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:784
 #, c-format
 msgid "directory %s does not exist"
 msgstr "nid yw cyfeiriadur %s yn bodoli"
 
-#: ../urpm/media.pm:812
+#: ../urpm/media.pm:792
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "nid yw'r lleoliad i weld yn cynnwys unrhyw ddosbarthiad"
 
-#: ../urpm/media.pm:828
+#: ../urpm/media.pm:808
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "methu didoli media.cfg"
 
-#: ../urpm/media.pm:831
+#: ../urpm/media.pm:811
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "methu cael mynediad at gyfrwng y dosbarthiad (heb ganfod ffeil media.cfg)"
 
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:829
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "hepgor cyfrwng anghymarus '%s' (ar gyfer %s)"
 
-#: ../urpm/media.pm:900
+#: ../urpm/media.pm:880
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "estyn ffeil media.cfg..."
 
-#: ../urpm/media.pm:941
+#: ../urpm/media.pm:921
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
 
-#: ../urpm/media.pm:944
+#: ../urpm/media.pm:924
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "dewis aml-gyfrwng: %s"
 
-#: ../urpm/media.pm:964
+#: ../urpm/media.pm:944
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "dewis cyfrwng \"%s\":"
 
-#: ../urpm/media.pm:1047
+#: ../urpm/media.pm:1027
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "ail-ffurfweddu urpmi ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1081
+#: ../urpm/media.pm:1061
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...methodd ail-ffurfweddu"
 
-#: ../urpm/media.pm:1087
+#: ../urpm/media.pm:1067
 #, c-format
 msgid "reconfiguration done"
 msgstr "cwblhau ail-ffurfweddu"
 
-#: ../urpm/media.pm:1103
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Gwall wrth gynhyrchu ffeil enwau: heb ganfod dibyniaeth %d"
 
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1104
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
 
-#: ../urpm/media.pm:1135
+#: ../urpm/media.pm:1115
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "archwilio ffeil synthesis [%s]"
 
-#: ../urpm/media.pm:1155
+#: ../urpm/media.pm:1135
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1148 ../urpm/media.pm:1243
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "copïo [%s] ar gyfer cyfrwng \"%s\"..."
 
-#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
+#: ../urpm/media.pm:1150 ../urpm/media.pm:1220 ../urpm/media.pm:1473
 #, c-format
 msgid "...copying failed"
 msgstr "...methodd y copïo"
 
-#: ../urpm/media.pm:1236
+#: ../urpm/media.pm:1216
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copïo ffeil disgrifiad o \"%s\""
 
-#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1247
 #, c-format
 msgid "...copying done"
 msgstr "...cwblhau'r copïo"
 
-#: ../urpm/media.pm:1269
+#: ../urpm/media.pm:1249
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
 
-#: ../urpm/media.pm:1317
+#: ../urpm/media.pm:1297
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "cyfrifo md5sum o ffynhonnell synthesis adferwyd (neu synthesis)"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
+#: ../urpm/media.pm:1299 ../urpm/media.pm:1736
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "methodd estyn (%s) (md5sum gwallus)"
 
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1314
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "methodd genhdlist2 ar %s"
 
-#: ../urpm/media.pm:1344
+#: ../urpm/media.pm:1324
 #, c-format
 msgid "comparing %s and %s"
 msgstr "cymharu %s ac %s"
 
-#: ../urpm/media.pm:1374
+#: ../urpm/media.pm:1354
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ffeil hdlist annilys %s ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1400
+#: ../urpm/media.pm:1380
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "copïo ffeil MD5SUM o \"%s\""
 
-#: ../urpm/media.pm:1440
+#: ../urpm/media.pm:1420
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "ffeil MD5SUM annilys (llwytho i lawr o %s)"
 
-#: ../urpm/media.pm:1443
+#: ../urpm/media.pm:1423
 #, c-format
 msgid "no metadata found for medium \"%s\""
 msgstr "dim metadata ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1475
+#: ../urpm/media.pm:1455
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "adfer ffynhonnell synthesis \"%s\"..."
 
-#: ../urpm/media.pm:1541
+#: ../urpm/media.pm:1521
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "archwilio ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1533
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1557
+#: ../urpm/media.pm:1537
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "methu mewnforio ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1598
+#: ../urpm/media.pm:1578
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "dim ffeil synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1631
+#: ../urpm/media.pm:1611
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
 
-#: ../urpm/media.pm:1752
+#: ../urpm/media.pm:1730
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "methodd estyn [%s]"
@@ -1211,7 +1223,7 @@ msgstr "wedi canfod geolleoleiddio %s %.2f %.2f  o gylchfa amser %s"
 msgid "getting mirror list from %s"
 msgstr "estyn rhestr drychai o %s"
 
-#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
+#: ../urpm/msg.pm:76 ../urpmi:494 ../urpmi:509 ../urpmi:613
 #, c-format
 msgid "Nn"
 msgstr "Nn"
@@ -1221,13 +1233,13 @@ msgstr "Nn"
 #  can hit those keys in their keyboard to reply.
 #  please keep the 'Yy' for compatibility reasons
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
-#: ../urpmi.addmedia:141
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:545 ../urpmi:649 ../urpmi:655
+#: ../urpmi.addmedia:132
 #, c-format
 msgid "Yy"
 msgstr "Yy"
 
-#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:135
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
@@ -1297,14 +1309,19 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:311
+#: ../urpm/orphans.pm:51
 #, c-format
+msgid "Marking %s as manually installed, it won't be auto-orphaned"
+msgstr ""
+
+#: ../urpm/orphans.pm:362
+#, fuzzy, c-format
 msgid ""
-"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
-"it."
+"The following package is now orphan, if you wish to remove it, you can use "
+"\"urpme --auto-orphans\"."
 msgid_plural ""
-"The following packages are now orphans, use \"urpme --auto-orphans\" to "
-"remove them."
+"The following packages are now orphans, if you wish to remove them, you can "
+"use \"urpme --auto-orphans\"."
 msgstr[0] ""
 "Mae'r pecyn canlynol yn amddifad, defnyddiwch \"urpme --auto-orphans\" i'w "
 "thynnu."
@@ -1312,32 +1329,32 @@ msgstr[1] ""
 "Mae'r pecynnau canlynol yn amddifad, defnyddiwch \"urpme --auto-orphans\" "
 "i'w tynnu."
 
-#: ../urpm/parallel.pm:14
+#: ../urpm/parallel.pm:15
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "methu didoli ffeil hdlist \"%s\" yn ffeil (%s)"
 
-#: ../urpm/parallel.pm:23
+#: ../urpm/parallel.pm:24
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "archwilio trinydd paralel mewn ffeil [%s]"
 
-#: ../urpm/parallel.pm:34
+#: ../urpm/parallel.pm:35
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "canfod trinydd paralel ar gyfer nodau: %s"
 
-#: ../urpm/parallel.pm:38
+#: ../urpm/parallel.pm:39
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "methu defnyddio dewis paralel \"%s\""
 
-#: ../urpm/parallel.pm:93
+#: ../urpm/parallel.pm:94
 #, c-format
 msgid "on node %s"
 msgstr "ar nod %s"
 
-#: ../urpm/parallel.pm:293
+#: ../urpm/parallel.pm:294
 #, c-format
 msgid "Installation failed on node %s"
 msgstr "Methodd y gosod ar nod %s"
@@ -1371,89 +1388,89 @@ msgstr ""
 "methodd %s ar westai %s (efallai nad oes ganddo fersiwn da o urpmi?) (cod "
 "gadael: %d)"
 
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:33
 #, c-format
 msgid "unable to access medium \"%s\"."
 msgstr "methu cael mynediad at gyfrwng. \"%s\""
 
-#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
+#: ../urpm/removable.pm:73 ../urpm/removable.pm:91
 #, c-format
 msgid "mounting %s"
 msgstr "gosod %s"
 
-#: ../urpm/removable.pm:103
+#: ../urpm/removable.pm:104
 #, c-format
 msgid "unmounting %s"
 msgstr "dadosod %s"
 
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:31
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
 msgstr "ail gychwynnwyd urpmi, ac nid yw'r rhestr prif pecynnau wedi newid"
 
-#: ../urpm/select.pm:32
+#: ../urpm/select.pm:33
 #, c-format
 msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 "ail gychwynnwyd urpmi, ac mae'r rhestr prif pecynnau wedi newid: %s vs %s"
 
-#: ../urpm/select.pm:170
+#: ../urpm/select.pm:176
 #, c-format
 msgid "No package named %s"
 msgstr "Dim pecyn o'r enw %s"
 
-#: ../urpm/select.pm:172 ../urpme:117
+#: ../urpm/select.pm:178 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
 
-#: ../urpm/select.pm:174
+#: ../urpm/select.pm:180
 #, c-format
 msgid "You should use \"-a\" to use all of them"
 msgstr "Dylech ddefnyddio \"-a\" i'w defnyddio i gyd"
 
-#: ../urpm/select.pm:294
+#: ../urpm/select.pm:298
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "wedi canfod pecyn(nau) %s yn urpmi db, ond heb eu gosod"
 
-#: ../urpm/select.pm:537
+#: ../urpm/select.pm:545
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pecyn %s wedi ei osod eisoes"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:546
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Pecynnau %s wedi eu gosod eisoes"
 
-#: ../urpm/select.pm:556 ../urpm/select.pm:640
+#: ../urpm/select.pm:564 ../urpm/select.pm:648
 #, c-format
 msgid "due to missing %s"
 msgstr "oherwydd %s coll"
 
-#: ../urpm/select.pm:557
+#: ../urpm/select.pm:565
 #, c-format
 msgid "due to already installed %s"
 msgstr "oherwydd %s wedi ei osod eisoes"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:638
+#: ../urpm/select.pm:566 ../urpm/select.pm:646
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s heb ei foddloni"
 
-#: ../urpm/select.pm:564
+#: ../urpm/select.pm:572
 #, c-format
 msgid "trying to promote %s"
 msgstr "ceisio hybu %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:573
 #, c-format
 msgid "in order to keep %s"
 msgstr "fel modd i gadw %s"
 
-#: ../urpm/select.pm:606
+#: ../urpm/select.pm:614
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1462,7 +1479,7 @@ msgstr ""
 "Rhaid i'r pecyn canlynol gael ei dynnu i eraill gael eu diweddaru.\n"
 "%s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:615
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1471,27 +1488,27 @@ msgstr ""
 "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s"
 
-#: ../urpm/select.pm:634
+#: ../urpm/select.pm:642
 #, c-format
 msgid "in order to install %s"
 msgstr "er mwyn gosod %s"
 
-#: ../urpm/select.pm:644
+#: ../urpm/select.pm:652
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "oherwydd gwrthdaro gyda %s"
 
-#: ../urpm/signature.pm:32
+#: ../urpm/signature.pm:33
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Llofnod annilys (%s)"
 
-#: ../urpm/signature.pm:63
+#: ../urpm/signature.pm:64
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Enw Allwedd Annilys (%s)"
 
-#: ../urpm/signature.pm:65
+#: ../urpm/signature.pm:66
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Llofnod coll (%s)"
@@ -1569,7 +1586,7 @@ msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - defnyddio root arall ar gyfer tynnu rpm.\n"
 
 #: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr ""
@@ -2322,42 +2339,42 @@ msgstr ""
 "Defnydd --allow-force gorfodaeth i orfodi gweithred."
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:423
+#: ../urpmi:428
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (uwchraddio)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:425
+#: ../urpmi:430
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (uwchraddio)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:429
+#: ../urpmi:434
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (gosod)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:431
+#: ../urpmi:436
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (gosod)"
 
-#: ../urpmi:437
+#: ../urpmi:442
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "I fodloni '%s' dibyniaeth, bydd angen un o'r pecynnau canlynol:"
 
-#: ../urpmi:440
+#: ../urpmi:445
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Beth yw eich dewis? (1-%d)"
 
-#: ../urpmi:482
+#: ../urpmi:487
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2368,7 +2385,7 @@ msgstr ""
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:484
+#: ../urpmi:489
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2379,7 +2396,7 @@ msgstr ""
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:490 ../urpmi:505
+#: ../urpmi:495 ../urpmi:510
 #, c-format
 msgid ""
 "\n"
@@ -2388,12 +2405,12 @@ msgstr ""
 "\n"
 "Parhau i osod beth bynnag?"
 
-#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
+#: ../urpmi:496 ../urpmi:511 ../urpmi:614 ../urpmi.addmedia:135
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: ../urpmi:499
+#: ../urpmi:504
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2402,7 +2419,7 @@ msgstr ""
 "Nid oes modd gosod pecyn gofynnwyd amdani:\n"
 "%s"
 
-#: ../urpmi:500
+#: ../urpmi:505
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2411,12 +2428,12 @@ msgstr ""
 "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
 "%s"
 
-#: ../urpmi:517
+#: ../urpmi:522
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "bydd tynnu pecynnau %s yn torri'r system"
 
-#: ../urpmi:525
+#: ../urpmi:530
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2427,7 +2444,7 @@ msgstr ""
 "gael ei dynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:527
+#: ../urpmi:532
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2438,12 +2455,12 @@ msgstr ""
 "gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:535
+#: ../urpmi:540
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
 
-#: ../urpmi:555
+#: ../urpmi:560
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2454,46 +2471,46 @@ msgstr ""
 "canlynol:\n"
 "%s\n"
 
-#: ../urpmi:566
+#: ../urpmi:571
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Bydd y pecyn amddifad canlynol yn cael ei dynnu"
 msgstr[1] "Bydd y pecynnau amddifad canlynol yn cael eu tynnu"
 
-#: ../urpmi:582
+#: ../urpmi:596
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei osod)"
 
-#: ../urpmi:588
+#: ../urpmi:602
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Bydd %s o le ychwanegol ar ddisg yn cael ei ddefnyddio."
 
-#: ../urpmi:589
+#: ../urpmi:603
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Bydd %s o le ar ddisg ar gael."
 
-#: ../urpmi:590
+#: ../urpmi:604
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "bydd %s o becynnau yn cael eu hadfer."
 
-#: ../urpmi:591
+#: ../urpmi:605
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Parhau gyda gosod %d pecyn?"
 msgstr[1] "Parhau gyda gosod %d pecyn?"
 
-#: ../urpmi:612
+#: ../urpmi:626
 #, c-format
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../urpmi:620
+#: ../urpmi:634
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Pwyso Enter pan wedi ei arosod..."
@@ -2620,82 +2637,72 @@ msgstr "  --all-media   - gyda --distrib, rhestri'r holl gyfrwng ar gael.\n"
 
 #: ../urpmi.addmedia:77
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --from         - defnyddio url pennwyd ar gyfer rhestr drychau, y "
-"rhagosodedig yw\n"
-"                   %s\n"
-
-#: ../urpmi.addmedia:79
-#, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - creu cyfrwng rhithiol sydd wedi ei ddiweddaru,\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:44
+#: ../urpmi.addmedia:78 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - analluogi gwirio ffeil  MD5SUM.\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - peidio mewnforio pubkey y cyfrwng ychwanegwyd\n"
 
-#: ../urpmi.addmedia:82
+#: ../urpmi.addmedia:80
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - ychwanegu cyfrwng yn config, ond nid yn ei ddiweddaru.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:81 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modd distaw.\n"
 
-#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpmi.addmedia:104
+#: ../urpmi.addmedia:95
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "polisiau hysbys known xml-info yw %s"
 
-#: ../urpmi.addmedia:115
+#: ../urpmi.addmedia:106
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "dim angen ymresymiad ar gyfer --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:120
+#: ../urpmi.addmedia:111
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 "gwallus <url> (ar gyfer cyfeiriadur lleol, rhaid i'r llwybr fod yn absoliwt)"
 
-#: ../urpmi.addmedia:124
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael ychwanegu cyfrwng"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:118
 #, c-format
 msgid "creating config file [%s]"
 msgstr "yn creu ffeil config (%s)"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:119
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Methu creu ffeil Config (%s)"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "dim angen rhoi <llwybr perthynnol synthesis> gyda --distrib"
 
-#: ../urpmi.addmedia:144
+#: ../urpmi.addmedia:135
 #, c-format
 msgid ""
 "\n"
@@ -2704,159 +2711,20 @@ msgstr ""
 "\n"
 "Hoffech chi ychwanegu cyfrwng '%s'?"
 
-#: ../urpmi.addmedia:170
-#, c-format
-msgid "<relative path of synthesis> missing\n"
-msgstr "<llwybr perthynnol synthesis> ar goll\n"
-
-#: ../urpmi.addmedia:173
-#, c-format
-msgid "Can't use %s with remote medium"
-msgstr "Methu defnyddio %s gyda chyfrwng pell"
-
-#: ../urpmi.addmedia:185
+#: ../urpmi.addmedia:153 ../urpmi.addmedia:176
 #, c-format
 msgid "unable to add medium"
 msgstr "methu ychwanegu cyfrwng"
 
-#: ../urpmi.recover:28
-#, c-format
-msgid ""
-"urpmi.recover version %s\n"
-"Copyright (C) 2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi.recover fersiwn %s\n"
-"Hawlfraint (C) 2006 Mandriva.\n"
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU.\n"
-"\n"
-"defnydd:\n"
-
-#: ../urpmi.recover:34
-#, c-format
-msgid "  --checkpoint   - set repackaging start now\n"
-msgstr "  --checkpoint   - gosod cychwyn ailbacio nawr\n"
-
-#: ../urpmi.recover:35
-#, c-format
-msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
-msgstr "  --noclean      - peidio glanhau rpm ar checkpoint\n"
-
-#: ../urpmi.recover:37
-#, c-format
-msgid ""
-"  --list         - list transactions since provided date/duration argument\n"
-msgstr ""
-"  --list         - rhestri trafodion ers darparu ymresymiad dyddiad hyd\n"
-
-#: ../urpmi.recover:38
-#, c-format
-msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-msgstr "  --list-all     - rhestri'r holl drafodion yn rpmdb (hir)\n"
-
-#: ../urpmi.recover:39
-#, c-format
-msgid "  --list-safe    - list transactions since checkpoint\n"
-msgstr "  --list-safe     - rhestri'r holl drafodion ers y pwynt gwirio\n"
-
-#: ../urpmi.recover:40
-#, c-format
-msgid ""
-"  --rollback     - rollback until specified date,\n"
-"                   or rollback the specified number of transactions\n"
-msgstr ""
-"  --rollback     - mynd yn ôl i'r dyddiad penodol,\n"
-"                   neu nôl y nifer o drafodion penodwyd\n"
-
-#: ../urpmi.recover:42
-#, c-format
-msgid "  --disable      - turn off repackaging\n"
-msgstr "  --disable      - diffodd ailbecynnu\n"
-
-#: ../urpmi.recover:57
-#, c-format
-msgid "Invalid date or duration [%s]\n"
-msgstr "Dyddiad neu hyd annilys [%s]\n"
-
-#: ../urpmi.recover:65
-#, c-format
-msgid "Repackage directory not defined\n"
-msgstr "Heb ddiffinio cyfeiriadur ailbecynnu\n"
-
-#: ../urpmi.recover:68
-#, c-format
-msgid "Can't write to repackage directory [%s]\n"
-msgstr "Methu ysgrifennu i gyfeiriadur ailbacio [%s]\n"
-
-#: ../urpmi.recover:70
-#, c-format
-msgid "Cleaning up repackage directory [%s]...\n"
-msgstr "Glanhau cyfeiriadur ailbacio [%s]...\n"
-
-#: ../urpmi.recover:72
-#, c-format
-msgid "%d file removed\n"
-msgid_plural "%d files removed\n"
-msgstr[0] "Tynnwyd %d pecyn\n"
-msgstr[1] "Tynnwyd %d pecyn\n"
-
-#: ../urpmi.recover:82
-#, c-format
-msgid "Spurious command-line arguments [%s]\n"
-msgstr "Ymresymiadau llinell orchymyn annilys [%s]\n"
-
-#: ../urpmi.recover:84
-#, c-format
-msgid "You can't specify --checkpoint and --rollback at the same time\n"
-msgstr "Methu pennu --checkpoint a --rollback ar yr un pryd\n"
-
-#: ../urpmi.recover:86
-#, c-format
-msgid "You can't specify --checkpoint and --list at the same time\n"
-msgstr "Methu pennu --checkpoint a --list ar yr un pryd\n"
-
-#: ../urpmi.recover:88
-#, c-format
-msgid "You can't specify --rollback and --list at the same time\n"
-msgstr "Methu pennu --rollback a --list ar yr un pryd\n"
-
-#: ../urpmi.recover:90
-#, c-format
-msgid "You can't specify --disable along with another option"
-msgstr "Methu pennu --disable gyda dewis arall"
-
-#: ../urpmi.recover:115
-#, c-format
-msgid "No transaction found since %s\n"
-msgstr "Dim trafodion ers %s\n"
-
-#: ../urpmi.recover:130
-#, c-format
-msgid "You must be superuser to do this"
-msgstr "Rhaid bod yn uwch-ddefnyddiwr i wneud hyn"
-
-#: ../urpmi.recover:143 ../urpmi.recover:209
-#, c-format
-msgid "Writing rpm macros file [%s]...\n"
-msgstr "Ysgrifennu ffeil macros rpm [%s]...\n"
-
-#: ../urpmi.recover:185
-#, c-format
-msgid "No rollback date found\n"
-msgstr "Heb ganfod dyddiad rholio nôl\n"
-
-#: ../urpmi.recover:188
+#: ../urpmi.addmedia:161
 #, c-format
-msgid "Rollback until %s...\n"
-msgstr "Rholio nôl hyd %s...\n"
+msgid "<relative path of synthesis> missing\n"
+msgstr "<llwybr perthynnol synthesis> ar goll\n"
 
-#: ../urpmi.recover:195
+#: ../urpmi.addmedia:164
 #, c-format
-msgid "Disabling repackaging\n"
-msgstr "Anablu ailbecynnu\n"
+msgid "Can't use %s with remote medium"
+msgstr "Methu defnyddio %s gyda chyfrwng pell"
 
 #: ../urpmi.removemedia:38
 #, c-format
@@ -2953,12 +2821,12 @@ msgstr "  -f             - gorfodi diweddaru ffeiliau synthesis/\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael diweddaru cyfrwng"
 
-#: ../urpmi.update:82
+#: ../urpmi.update:86
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "dim i'w ddiweddaru (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n"
 
-#: ../urpmi.update:91
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2967,17 +2835,17 @@ msgstr ""
 "mae'r cofnod i ddiweddaru ar goll\n"
 "(un o %s)\n"
 
-#: ../urpmi.update:106
+#: ../urpmi.update:98
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:107
+#: ../urpmi.update:99
 #, c-format
 msgid "ignoring media %s"
 msgstr "anwybyddu cyfrwng %s"
 
-#: ../urpmi.update:107
+#: ../urpmi.update:99
 #, c-format
 msgid "enabling media %s"
 msgstr "galluogi cyfrwng %s"
@@ -3263,11 +3131,115 @@ msgstr ""
 "dim  xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
 "pecynnau %s"
 
-#: ../urpmq:473
+#: ../urpmq:476
 #, c-format
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"
 
+#~ msgid "Search start: %s end: %s"
+#~ msgstr "Cychwyn chwilio: %s diwedd: %s"
+
+#~ msgid ""
+#~ "  --from         - use specified url for list of mirrors, the default is\n"
+#~ "                   %s\n"
+#~ msgstr ""
+#~ "  --from         - defnyddio url pennwyd ar gyfer rhestr drychau, y "
+#~ "rhagosodedig yw\n"
+#~ "                   %s\n"
+
+#~ msgid ""
+#~ "urpmi.recover version %s\n"
+#~ "Copyright (C) 2006 Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "urpmi.recover fersiwn %s\n"
+#~ "Hawlfraint (C) 2006 Mandriva.\n"
+#~ "Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL "
+#~ "GNU.\n"
+#~ "\n"
+#~ "defnydd:\n"
+
+#~ msgid "  --checkpoint   - set repackaging start now\n"
+#~ msgstr "  --checkpoint   - gosod cychwyn ailbacio nawr\n"
+
+#~ msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
+#~ msgstr "  --noclean      - peidio glanhau rpm ar checkpoint\n"
+
+#~ msgid ""
+#~ "  --list         - list transactions since provided date/duration "
+#~ "argument\n"
+#~ msgstr ""
+#~ "  --list         - rhestri trafodion ers darparu ymresymiad dyddiad hyd\n"
+
+#~ msgid "  --list-all     - list all transactions in rpmdb (long)\n"
+#~ msgstr "  --list-all     - rhestri'r holl drafodion yn rpmdb (hir)\n"
+
+#~ msgid "  --list-safe    - list transactions since checkpoint\n"
+#~ msgstr "  --list-safe     - rhestri'r holl drafodion ers y pwynt gwirio\n"
+
+#~ msgid ""
+#~ "  --rollback     - rollback until specified date,\n"
+#~ "                   or rollback the specified number of transactions\n"
+#~ msgstr ""
+#~ "  --rollback     - mynd yn ôl i'r dyddiad penodol,\n"
+#~ "                   neu nôl y nifer o drafodion penodwyd\n"
+
+#~ msgid "  --disable      - turn off repackaging\n"
+#~ msgstr "  --disable      - diffodd ailbecynnu\n"
+
+#~ msgid "Invalid date or duration [%s]\n"
+#~ msgstr "Dyddiad neu hyd annilys [%s]\n"
+
+#~ msgid "Repackage directory not defined\n"
+#~ msgstr "Heb ddiffinio cyfeiriadur ailbecynnu\n"
+
+#~ msgid "Can't write to repackage directory [%s]\n"
+#~ msgstr "Methu ysgrifennu i gyfeiriadur ailbacio [%s]\n"
+
+#~ msgid "Cleaning up repackage directory [%s]...\n"
+#~ msgstr "Glanhau cyfeiriadur ailbacio [%s]...\n"
+
+#~ msgid "%d file removed\n"
+#~ msgid_plural "%d files removed\n"
+#~ msgstr[0] "Tynnwyd %d pecyn\n"
+#~ msgstr[1] "Tynnwyd %d pecyn\n"
+
+#~ msgid "Spurious command-line arguments [%s]\n"
+#~ msgstr "Ymresymiadau llinell orchymyn annilys [%s]\n"
+
+#~ msgid "You can't specify --checkpoint and --rollback at the same time\n"
+#~ msgstr "Methu pennu --checkpoint a --rollback ar yr un pryd\n"
+
+#~ msgid "You can't specify --checkpoint and --list at the same time\n"
+#~ msgstr "Methu pennu --checkpoint a --list ar yr un pryd\n"
+
+#~ msgid "You can't specify --rollback and --list at the same time\n"
+#~ msgstr "Methu pennu --rollback a --list ar yr un pryd\n"
+
+#~ msgid "You can't specify --disable along with another option"
+#~ msgstr "Methu pennu --disable gyda dewis arall"
+
+#~ msgid "No transaction found since %s\n"
+#~ msgstr "Dim trafodion ers %s\n"
+
+#~ msgid "You must be superuser to do this"
+#~ msgstr "Rhaid bod yn uwch-ddefnyddiwr i wneud hyn"
+
+#~ msgid "Writing rpm macros file [%s]...\n"
+#~ msgstr "Ysgrifennu ffeil macros rpm [%s]...\n"
+
+#~ msgid "No rollback date found\n"
+#~ msgstr "Heb ganfod dyddiad rholio nôl\n"
+
+#~ msgid "Rollback until %s...\n"
+#~ msgstr "Rholio nôl hyd %s...\n"
+
+#~ msgid "Disabling repackaging\n"
+#~ msgstr "Anablu ailbecynnu\n"
+
 #~ msgid "Updating media...\n"
 #~ msgstr "Diweddaru cyfrwng...\n"