sync with code

1 files changed, 542 insertions, 479 deletions

diff --git a/po/cy.po b/po/cy.po
index 6a568953..759e3cf4 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-02-14 13:05+0100\n"
+"POT-Creation-Date: 2008-02-25 11:14+0100\n"
 "PO-Revision-Date: 2008-02-14 21:11-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg\n"
@@ -142,7 +142,7 @@ msgstr ""
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../gurpmi2:114 ../urpmi:625
+#: ../gurpmi2:114 ../urpmi:626
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
@@ -183,13 +183,13 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:215 ../urpmi:591
+#: ../gurpmi2:215 ../urpmi:592
 #, 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:216 ../urpmi:592
+#: ../gurpmi2:216 ../urpmi:593
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -222,7 +222,7 @@ msgstr "Paratoi..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../gurpmi2:260 ../urpmi:619
+#: ../gurpmi2:260 ../urpmi:620
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
@@ -303,7 +303,7 @@ msgstr "                   rhagosodedig yw %s.\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -f            - allbynnu enw llawn rpm (NVRA)\n"
 
-#: ../rurpmi:11 ../urpmi:268
+#: ../rurpmi:11 ../urpmi:269
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
@@ -313,68 +313,68 @@ msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
 msgid "Running urpmi in restricted mode..."
 msgstr "Rhedeg urpmi mewn modd cyfyngedig..."
 
-#: ../urpm.pm:108
+#: ../urpm.pm:110
 #, c-format
 msgid "fail to create directory %s"
 msgstr "methu creu cyfeiriadur %s"
 
-#: ../urpm.pm:109
+#: ../urpm.pm:111
 #, c-format
 msgid "invalid owner for directory %s"
 msgstr "perchennog annilys cyfeiriadur %s"
 
-#: ../urpm.pm:208
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "methu agor rpmdb"
 
-#: ../urpm.pm:222
+#: ../urpm.pm:224
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "enw ffeil rpm annilys [%s]"
 
-#: ../urpm.pm:228
+#: ../urpm.pm:230
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpm.pm:230 ../urpm/get_pkgs.pm:158
+#: ../urpm.pm:232 ../urpm/get_pkgs.pm:160
 #, c-format
 msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
-#: ../urpm.pm:233 ../urpm/download.pm:686 ../urpm/get_pkgs.pm:160
-#: ../urpm/media.pm:742 ../urpm/media.pm:1144 ../urpm/media.pm:1320
+#: ../urpm.pm:235 ../urpm/download.pm:691 ../urpm/get_pkgs.pm:162
+#: ../urpm/media.pm:771 ../urpm/media.pm:1199 ../urpm/media.pm:1375
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... methodd ail-lwytho: %s"
 
-#: ../urpm.pm:238
+#: ../urpm.pm:240
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad  ffeil rpm (%s)"
 
-#: ../urpm.pm:243
+#: ../urpm.pm:245
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "methu didoli ffeil spec %s [%s]"
 
-#: ../urpm.pm:251
+#: ../urpm.pm:253
 #, c-format
 msgid "unable to register rpm file"
 msgstr "methu cofrestr ffeil rpm"
 
-#: ../urpm.pm:253
+#: ../urpm.pm:255
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Saernïaeth anghydnaws ar gyfer rpm [%s]"
 
-#: ../urpm.pm:257
+#: ../urpm.pm:259
 #, c-format
 msgid "error registering local packages"
 msgstr "gwall cofrestru pecynnau lleol"
 
-#: ../urpm.pm:355
+#: ../urpm.pm:357
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
@@ -389,34 +389,34 @@ 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:352
+#: ../urpm/args.pm:353
 #, 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:418
+#: ../urpm/args.pm:419
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Nid yw cyfeiriadur chroot yn bodoli"
 
-#: ../urpm/args.pm:437
+#: ../urpm/args.pm:438
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Methu defnyddio %s heb %s"
 
-#: ../urpm/args.pm:440 ../urpm/args.pm:443
+#: ../urpm/args.pm:441 ../urpm/args.pm:444
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Methu defnyddio %s gyda %s"
 
-#: ../urpm/args.pm:451
+#: ../urpm/args.pm:452
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Gormod o ymresymiadau\n"
 
-#: ../urpm/bug_report.pm:48 ../urpmi:246
+#: ../urpm/bug_report.pm:48 ../urpmi:247
 #, c-format
 msgid "Copying failed"
 msgstr "Methodd y copïo"
@@ -436,7 +436,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:248 ../urpm/media.pm:443 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:250 ../urpm/media.pm:450 ../urpm/media.pm:456
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
@@ -471,87 +471,87 @@ msgstr "Methodd '%s': gadael gydag arwydd %d"
 msgid "%s failed: exited with %d"
 msgstr "Methodd '%s': gadael gyda %d"
 
-#: ../urpm/download.pm:229
+#: ../urpm/download.pm:234
 #, c-format
 msgid "copy failed"
 msgstr "methodd y copïo"
 
-#: ../urpm/download.pm:235
+#: ../urpm/download.pm:240
 #, c-format
 msgid "wget is missing\n"
 msgstr "mae wget ar goll\n"
 
-#: ../urpm/download.pm:300
+#: ../urpm/download.pm:305
 #, c-format
 msgid "curl is missing\n"
 msgstr "mae curl ar goll\n"
 
-#: ../urpm/download.pm:425
+#: ../urpm/download.pm:430
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "methodd curl: diddymwyd y llwytho i lawr\n"
 
-#: ../urpm/download.pm:464
+#: ../urpm/download.pm:469
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync ar goll\n"
 
-#: ../urpm/download.pm:530
+#: ../urpm/download.pm:535
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh ar goll\n"
 
-#: ../urpm/download.pm:549
+#: ../urpm/download.pm:554
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla ar goll\n"
 
-#: ../urpm/download.pm:565
+#: ../urpm/download.pm:570
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Methu gweithredu prozilla\n"
 
-#: ../urpm/download.pm:573
+#: ../urpm/download.pm:578
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 ar goll\n"
 
-#: ../urpm/download.pm:676
+#: ../urpm/download.pm:681
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% o %s wedi ei gwblhau, Amser = %s, cyflymder = %s"
 
-#: ../urpm/download.pm:678
+#: ../urpm/download.pm:683
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% wedi ei gwblhau, cyflymder = %s"
 
-#: ../urpm/download.pm:735
+#: ../urpm/download.pm:740
 #, c-format
 msgid "retrieving %s"
 msgstr "estyn %s"
 
-#: ../urpm/download.pm:739
+#: ../urpm/download.pm:744
 #, c-format
 msgid "retrieved %s"
 msgstr "estynwyd: %s"
 
-#: ../urpm/download.pm:752
+#: ../urpm/download.pm:772
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocol anhysbys ar gyfer %s"
 
-#: ../urpm/download.pm:772
+#: ../urpm/download.pm:792
 #, c-format
 msgid "%s is not available, falling back on %s"
 msgstr "Nid yw %s ar gael, mynd yn ôl at %s"
 
-#: ../urpm/download.pm:776
+#: ../urpm/download.pm:796
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "heb ganfod webfetch, yn cael eu cynnal gan webfetch: %s\n"
 
-#: ../urpm/download.pm:797
+#: ../urpm/download.pm:817
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "methu trin protocol: %s"
@@ -566,19 +566,19 @@ msgstr "glanhau %s ac %s"
 msgid "package %s is not found."
 msgstr "heb ganfod pecyn %s"
 
-#: ../urpm/get_pkgs.pm:134
+#: ../urpm/get_pkgs.pm:136
 #, c-format
 msgid "malformed URL: [%s]"
 msgstr "URL gwallus: [%s]"
 
-#: ../urpm/get_pkgs.pm:147
+#: ../urpm/get_pkgs.pm:149
 #, c-format
 msgid "sorry, you can't use --install-src to install remote .src.rpm files"
 msgstr ""
 "nid oes modd ei ddefnyddio --install-src i osod y ffeiliau pell .src.rpm "
 "files"
 
-#: ../urpm/get_pkgs.pm:154
+#: ../urpm/get_pkgs.pm:156
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
@@ -600,32 +600,42 @@ msgstr ""
 msgid "unable to create transaction"
 msgstr "methu creu trosglwyddiad."
 
-#: ../urpm/install.pm:179
+#: ../urpm/install.pm:180
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "methu tynnu rpm o becyn delta-rpm %s"
 
-#: ../urpm/install.pm:190
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to install package %s"
 msgstr "methu gosod pecyn %s"
 
-#: ../urpm/install.pm:227
+#: ../urpm/install.pm:196
+#, fuzzy, c-format
+msgid "removing bad rpm (%s) from %s"
+msgstr "tynnu rpm wedi eu gosod (%s) o %s"
+
+#: ../urpm/install.pm:197 ../urpm/install.pm:254
+#, fuzzy, c-format
+msgid "removing %s failed: %s"
+msgstr "... methodd ail-lwytho: %s"
+
+#: ../urpm/install.pm:235
 #, c-format
 msgid "Removing package %s"
 msgstr "Tynnu pecyn %s."
 
-#: ../urpm/install.pm:228
+#: ../urpm/install.pm:236
 #, c-format
 msgid "removing package %s"
 msgstr "tynnu pecyn %s."
 
-#: ../urpm/install.pm:243
+#: ../urpm/install.pm:252
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "tynnu rpm wedi eu gosod (%s) o %s"
 
-#: ../urpm/install.pm:249
+#: ../urpm/install.pm:260
 #, c-format
 msgid "More information on package %s"
 msgstr "Rhagor o wybodaeth ar becyn %s"
@@ -721,38 +731,45 @@ msgid "Try harder to install (--force)? (y/N) "
 msgstr "Mwy o orfodaeth gyda'r gosod?  (--force)? (y/N)"
 
 #: ../urpm/main_loop.pm:264
+#, fuzzy, c-format
+msgid ""
+"Installation failed, bad rpms:\n"
+"%s"
+msgstr "Methodd y gosod:"
+
+#: ../urpm/main_loop.pm:270
 #, c-format
 msgid "%d installation transaction failed"
 msgid_plural "%d installation transactions failed"
 msgstr[0] "methodd trosglwyddiad gosod %d"
 msgstr[1] "methodd trosglwyddiad gosod %d"
 
-#: ../urpm/main_loop.pm:275
+#: ../urpm/main_loop.pm:281
 #, c-format
 msgid "Installation is possible"
 msgstr "Gosod yn bosibl"
 
-#: ../urpm/main_loop.pm:280
+#: ../urpm/main_loop.pm:286
 #, c-format
 msgid "Packages are up to date"
 msgstr "Mae'r pecynnau'n rhai diweddaraf"
 
-#: ../urpm/main_loop.pm:288
+#: ../urpm/main_loop.pm:294
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pecyn %s wedi ei osod eisoes"
 
-#: ../urpm/main_loop.pm:289
+#: ../urpm/main_loop.pm:295
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Pecynnau %s wedi eu gosod eisoes"
 
-#: ../urpm/main_loop.pm:292
+#: ../urpm/main_loop.pm:298
 #, c-format
 msgid "Package %s can not be installed"
 msgstr "Methu gosod pecyn %s"
 
-#: ../urpm/main_loop.pm:293
+#: ../urpm/main_loop.pm:299
 #, c-format
 msgid "Packages %s can not be installed"
 msgstr "Methu gosod pecynnau %s"
@@ -767,68 +784,68 @@ msgstr "archwilio %s ffeil"
 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:185
+#: ../urpm/media.pm:187
 #, 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:187
+#: ../urpm/media.pm:189
 #, 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:194
+#: ../urpm/media.pm:196
 #, 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:221
+#: ../urpm/media.pm:223
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", hepgor"
 
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:409
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "gormod o bwyntiau gosod ar gyfer cyfrwng symudol \"%s\""
 
-#: ../urpm/media.pm:403
+#: ../urpm/media.pm:410
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "cymryd dyfais symudol fel \"%s\""
 
-#: ../urpm/media.pm:406
+#: ../urpm/media.pm:413
 #, c-format
 msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
 msgstr ""
 "Delwedd ISO yw cyfrwng \"%s\" , a fydd yn cael ei osod wrth ei ddefnyddio."
 
-#: ../urpm/media.pm:409
+#: ../urpm/media.pm:416
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "defnyddio dyfais symudol gwahanol (%s) ar gyfer \"%s\""
 
-#: ../urpm/media.pm:414 ../urpm/media.pm:417
+#: ../urpm/media.pm:421 ../urpm/media.pm:424
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "methu adfer enw llwybr ar gyfer cyfrwng symudadwy \"%s\""
 
-#: ../urpm/media.pm:445 ../urpm/media.pm:451
+#: ../urpm/media.pm:452 ../urpm/media.pm:458
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "ysgrifennu ffeil ffurfweddu (%s)"
 
-#: ../urpm/media.pm:494
+#: ../urpm/media.pm:501
 #, 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:502
+#: ../urpm/media.pm:509
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s"
 
-#: ../urpm/media.pm:518
+#: ../urpm/media.pm:525
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -837,163 +854,163 @@ msgstr ""
 "--nid oes modd defnyddio synthesis gyda --media, --excludemedia, --"
 "sortmedia, --diweddaru, --use-distrib or --parallel"
 
-#: ../urpm/media.pm:602
+#: ../urpm/media.pm:612
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Cychwyn chwilio: %s diwedd: %s"
 
-#: ../urpm/media.pm:617
+#: ../urpm/media.pm:627
 #, c-format
 msgid "skipping package %s"
 msgstr "hepgor pecyn %s"
 
-#: ../urpm/media.pm:633
+#: ../urpm/media.pm:643
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "gosod yn lle uwchraddio pecyn %s"
 
-#: ../urpm/media.pm:658
+#: ../urpm/media.pm:668
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "cyfrwng \"%s\" yn bodoli eisoes"
 
-#: ../urpm/media.pm:686
+#: ../urpm/media.pm:710
 #, c-format
 msgid "(ignored by default)"
 msgstr "(anwybyddwyd drwy ragosodiad)"
 
-#: ../urpm/media.pm:692
+#: ../urpm/media.pm:716
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "ychwanegu cyfrwng \"%s\", cyn cyfrwng pell \"%s\""
 
-#: ../urpm/media.pm:698
+#: ../urpm/media.pm:722
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "ychwanegu cyfrwng \"%s\""
 
-#: ../urpm/media.pm:725
+#: ../urpm/media.pm:750
 #, c-format
 msgid "unable to mount the distribution medium"
 msgstr "methu mowntio cyfrwng y dosbarthiad"
 
-#: ../urpm/media.pm:728
+#: ../urpm/media.pm:753
 #, 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:735
-#, c-format
-msgid "retrieving media.cfg file..."
-msgstr "estyn ffeil media.cfg..."
-
-#: ../urpm/media.pm:740
+#: ../urpm/media.pm:769
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "methu didoli media.cfg"
 
-#: ../urpm/media.pm:743
+#: ../urpm/media.pm:772
 #, 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:761
+#: ../urpm/media.pm:790
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "hepgor cyfrwng anghymarus '%s' (ar gyfer %s)"
 
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:839
+#, c-format
+msgid "retrieving media.cfg file..."
+msgstr "estyn ffeil media.cfg..."
+
+#: ../urpm/media.pm:880
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
 
-#: ../urpm/media.pm:840
+#: ../urpm/media.pm:883
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "dewis aml-gyfrwng: %s"
 
-#: ../urpm/media.pm:860
+#: ../urpm/media.pm:903
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "dewis cyfrwng \"%s\":"
 
-#: ../urpm/media.pm:926
+#: ../urpm/media.pm:979
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "ail-ffurfweddu urpmi ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:964
+#: ../urpm/media.pm:1017
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...methodd ail-ffurfweddu"
 
-#: ../urpm/media.pm:970
+#: ../urpm/media.pm:1023
 #, c-format
 msgid "reconfiguration done"
 msgstr "cwblhau ail-ffurfweddu"
 
-#: ../urpm/media.pm:991
+#: ../urpm/media.pm:1044
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
 
-#: ../urpm/media.pm:1002
+#: ../urpm/media.pm:1055
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "archwilio ffeil synthesis [%s]"
 
-#: ../urpm/media.pm:1022
+#: ../urpm/media.pm:1075
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1035 ../urpm/media.pm:1117
+#: ../urpm/media.pm:1088 ../urpm/media.pm:1171
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "copïo [%s] ar gyfer cyfrwng \"%s\"..."
 
-#: ../urpm/media.pm:1037 ../urpm/media.pm:1092 ../urpm/media.pm:1336
+#: ../urpm/media.pm:1090 ../urpm/media.pm:1145 ../urpm/media.pm:1391
 #, c-format
 msgid "...copying failed"
 msgstr "...methodd y copïo"
 
-#: ../urpm/media.pm:1088
+#: ../urpm/media.pm:1141
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copïo ffeil disgrifiad o \"%s\""
 
-#: ../urpm/media.pm:1090 ../urpm/media.pm:1121
+#: ../urpm/media.pm:1143 ../urpm/media.pm:1175
 #, c-format
 msgid "...copying done"
 msgstr "...cwblhau'r copïo"
 
-#: ../urpm/media.pm:1123
+#: ../urpm/media.pm:1177
 #, 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:1155
+#: ../urpm/media.pm:1210
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "cyfrifo md5sum o ffynhonnell synthesis adferwyd (neu synthesis)"
 
-#: ../urpm/media.pm:1157 ../urpm/media.pm:1572
+#: ../urpm/media.pm:1212 ../urpm/media.pm:1629
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "methodd estyn (%s) (md5sum gwallus)"
 
-#: ../urpm/media.pm:1172
+#: ../urpm/media.pm:1227
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "methodd genhdlist2 ar %s"
 
-#: ../urpm/media.pm:1182
+#: ../urpm/media.pm:1237
 #, c-format
 msgid "comparing %s and %s"
 msgstr "cymharu %s ac %s"
 
-#: ../urpm/media.pm:1202
+#: ../urpm/media.pm:1257
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -1003,57 +1020,77 @@ msgstr ""
 "maethu cael mynediad i gyfrwng \"%s\",\n"
 "gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur wrth greu'r cyfrwng."
 
-#: ../urpm/media.pm:1215
+#: ../urpm/media.pm:1270
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ffeil hdlist annilys %s ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1241
+#: ../urpm/media.pm:1296
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "copïo ffeil MD5SUM o \"%s\""
 
-#: ../urpm/media.pm:1295
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "adfer ffynhonnell synthesis \"%s\"..."
 
-#: ../urpm/media.pm:1312
+#: ../urpm/media.pm:1367
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "canfod synthesis holwyd fel %s"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1425
+#: ../urpm/media.pm:1374 ../urpm/media.pm:1482
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "dim ffeil synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1425
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "archwilio ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1382
+#: ../urpm/media.pm:1437
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1386
+#: ../urpm/media.pm:1441
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "methu mewnforio ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1455
+#: ../urpm/media.pm:1512
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
 
-#: ../urpm/media.pm:1566
+#: ../urpm/media.pm:1623
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "methodd estyn [%s]"
 
-#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:521 ../urpmi:610
+#: ../urpm/mirrors.pm:19
+#, c-format
+msgid "trying again with mirror %s"
+msgstr ""
+
+#: ../urpm/mirrors.pm:60
+#, c-format
+msgid "Could not find a mirror from mirrorlist %s"
+msgstr ""
+
+#: ../urpm/mirrors.pm:133
+#, c-format
+msgid "found geolocalisation %s %.2f %.2f from timezone %s"
+msgstr ""
+
+#: ../urpm/mirrors.pm:178
+#, fuzzy, c-format
+msgid "getting mirror list from %s"
+msgstr "darllen ffeiliau rpm o [%s]"
+
+#: ../urpm/msg.pm:62 ../urpmi:506 ../urpmi:522 ../urpmi:611
 #, c-format
 msgid "Nn"
 msgstr "Nn"
@@ -1063,8 +1100,8 @@ 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:63 ../urpme:37 ../urpmi:506 ../urpmi:522 ../urpmi:561
-#: ../urpmi:611 ../urpmi:641 ../urpmi:647 ../urpmi.addmedia:122
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:507 ../urpmi:523 ../urpmi:562
+#: ../urpmi:612 ../urpmi:642 ../urpmi:648 ../urpmi.addmedia:139
 #, c-format
 msgid "Yy"
 msgstr "Yy"
@@ -1184,232 +1221,7 @@ msgstr "cyfrwng annealladwy \"%s\" wedi ei nodi'n symudadwy ond nid yw"
 msgid "unable to access medium \"%s\""
 msgstr "methu cael mynediad at gyfrwng. \"%s\""
 
-#: ../urpm/select.pm:21
-#, 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:23
-#, 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:184
-#, c-format
-msgid "No package named %s"
-msgstr "Dim pecyn o'r enw %s"
-
-#: ../urpm/select.pm:186 ../urpme:107
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
-
-#: ../urpm/select.pm:495 ../urpm/select.pm:538
-#, c-format
-msgid "due to missing %s"
-msgstr "oherwydd %s coll"
-
-#: ../urpm/select.pm:496
-#, c-format
-msgid "due to already installed %s"
-msgstr "oherwydd %s wedi ei osod eisoes"
-
-#: ../urpm/select.pm:497 ../urpm/select.pm:536
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "%s heb ei foddloni"
-
-#: ../urpm/select.pm:503
-#, c-format
-msgid "trying to promote %s"
-msgstr "ceisio hybu %s"
-
-#: ../urpm/select.pm:504
-#, c-format
-msgid "in order to keep %s"
-msgstr "fel modd i gadw %s"
-
-#: ../urpm/select.pm:532
-#, c-format
-msgid "in order to install %s"
-msgstr "er mwyn gosod %s"
-
-#: ../urpm/select.pm:542
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "oherwydd gwrthdaro gyda %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Llofnod annilys (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Enw Allwedd Annilys (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Llofnod coll (%s)"
-
-#: ../urpm/sys.pm:221
-#, c-format
-msgid "Can't write file"
-msgstr "Methu ysgrifennu'r ffeil"
-
-#: ../urpm/sys.pm:221
-#, c-format
-msgid "Can't open file"
-msgstr "Methu agor y ffeil"
-
-#: ../urpme:40
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmf fersiwn %s\n"
-"Hawlfraint (C) 1999 - 2006 Mandriva.\n"
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU.\n"
-"\n"
-"defnydd:\n"
-
-#: ../urpme:45 ../urpmf:35 ../urpmi:74 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
-#, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - argraffu neges cymorth.\n"
-
-#: ../urpme:46
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - dewis pecyn yn awtomatig o fewn dewisiadau.\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test          - gwirio os oes modd tynnu'n iawn.\n"
-
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
-"bodoli.\n"
-
-#: ../urpme:49 ../urpmi:109 ../urpmq:67
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
-
-#: ../urpme:50 ../urpmi:140
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
-
-#: ../urpme:51
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - defnyddio root arall ar gyfer tynnu rpm.\n"
-
-#: ../urpme:52 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:60
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:69
-#, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root         - defnyddio root arall ar gyfer gosod urpmi db ac "
-"rpm.\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - peidio gweithredu sgriptledi'r pecyn(au).\n"
-
-#: ../urpme:54
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
-"                   wrth (ddad)osod chroot gyda dewis  --root.\n"
-
-#: ../urpme:56 ../urpmi:151 ../urpmq:84
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - modd llafar.\n"
-
-#: ../urpme:57
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - select all packages matching expression.\n"
-
-#: ../urpme:70
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau"
-
-#: ../urpme:100
-#, c-format
-msgid "unknown packages"
-msgstr "pecynnau anhysbys"
-
-#: ../urpme:100
-#, c-format
-msgid "unknown package"
-msgstr "pecyn anhysbys"
-
-#: ../urpme:113 ../urpmi:535
-#, c-format
-msgid "removing package %s will break your system"
-msgstr "bydd tynnu pecynnau %s yn torri'r system"
-
-#: ../urpme:115
-#, c-format
-msgid "Nothing to remove"
-msgstr "Dim i'w dynnu"
-
-#: ../urpme:120
-#, c-format
-msgid "Checking to remove the following packages"
-msgstr "Ticio i ddileu'r pecynnau canlynol"
-
-#: ../urpme:124
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
-msgstr[1] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
-
-#: ../urpme:128
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Tynnu pecynnau %d?"
-msgstr[1] "Tynnu pecynnau %d?"
-
-#: ../urpme:128 ../urpmi:562 ../urpmi:642 ../urpmi.addmedia:125
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:150
-#, c-format
-msgid "Removal failed"
-msgstr "Methodd y tynnu"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1425,25 +1237,32 @@ msgstr ""
 "\n"
 "defnydd: urpmf [dewisiadau] pattern-expression\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:35 ../urpme:45 ../urpmf:35 ../urpmi:74
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - argraffu neges cymorth.\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - argraffu rhif fersiwn yr offeryn.\n"
 
-#: ../urpmf:37 ../urpmi:131 ../urpmq:79
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:131 ../urpmq:79
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - defnyddio amgylchedd penodol (adroddiad gwall fel "
 "rheol).\n"
 
-#: ../urpmf:38 ../urpmi:76 ../urpmq:49
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:76 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
@@ -1451,12 +1270,21 @@ msgstr ""
 "  --literal, -l  - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn "
 "llythrennedd.\n"
 
-#: ../urpmf:41 ../urpmi:75 ../urpmq:47
+#: ../urpm/search.pm:40 ../urpme:52 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:69 ../urpmi.recover:36 ../urpmi.removemedia:46
+#: ../urpmi.update:46 ../urpmq:69
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root         - defnyddio root arall ar gyfer gosod urpmi db ac "
+"rpm.\n"
+
+#: ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media          - defnyddio'r cyfrwng, wedi ei ran gan gollnod.\n"
 
-#: ../urpmf:42 ../urpmi:79 ../urpmq:50
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1464,252 +1292,468 @@ msgstr ""
 "   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
 "choma.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 "  --use-distrib  - defnyddio'r llwybr yma i gael mynediad ar y cyfrwng.\n"
 
-#: ../urpmf:44 ../urpmi:80 ../urpmq:51
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:80 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - peidio argraffu llinellau'r un fath.\n"
 
-#: ../urpmf:46 ../urpmi:77 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:77 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i             - cadw gwahaniaeth maint llythrennau ym mhob patrwm "
 "(rhagosodiad).\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - newid ymwahanydd maes (arferol i ':').\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Mynegiadau patrymau:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - unrhyw destun wedi ei ddidoli fel regexp, onibai fod -l "
 "yn cael ei ddefnyddio.\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - cynnwys perl cod yn union fel perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - gweithredwr deuaidd AND.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - gweithredwr deuaidd OR.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unaidd NOT.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )              - parenthesis de a chwith.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Rhestr tagiau:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - pennu allbwn fformat printf-aidd\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   esiampl: '%%enw:%%ffeil'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - saernïaeth\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - gwestai'r adeiladedd\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - amser adeiladu\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - ffeiliau ffurfweddiad\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - tagiau gwrthdaro\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - disgrifiad pecyn\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - dosbarthiad\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - cyfnod\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - enw ffeil y pecyn\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - rhestr ffeiliau o fewn y pecyn\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - grŵp\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license          - trwydded\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name          - enw'r pecyn\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - tagiau'r hen\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager      - pecynydd\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - tag darparu\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - tagiau angenrhaid\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - maint wedi gosod\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - enw rpm ffynhonnell\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - cynnig tagiau\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - crynodeb\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - gwerthwr\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - y cyfrwng lle cafwyd y pecyn\n"
 
-#: ../urpmf:85 ../urpmq:94
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:94
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
 
-#: ../urpmf:197
+#: ../urpm/search.pm:197 ../urpmf:197
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig"
 
-#: ../urpmf:247 ../urpmi:253 ../urpmq:136
+#: ../urpm/search.pm:247 ../urpmf:247 ../urpmi:254 ../urpmq:136
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "ddefnyddio amgylchedd penodol ar %s\n"
 
-#: ../urpmf:290
+#: ../urpm/search.pm:290 ../urpmf:290
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "dim ffeil hdlist ar gyfer cyfrwng \"%s\""
 
-#: ../urpmf:297
+#: ../urpm/search.pm:297 ../urpmf:297
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "adeiladu ffeil synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpmf:304
+#: ../urpm/search.pm:304 ../urpmf:306
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "dim xml-info ar gyfer cyfrwng \"%s\""
 
+#: ../urpm/select.pm:21
+#, 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:23
+#, 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:184
+#, c-format
+msgid "No package named %s"
+msgstr "Dim pecyn o'r enw %s"
+
+#: ../urpm/select.pm:186 ../urpme:107
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
+
+#: ../urpm/select.pm:495 ../urpm/select.pm:538
+#, c-format
+msgid "due to missing %s"
+msgstr "oherwydd %s coll"
+
+#: ../urpm/select.pm:496
+#, c-format
+msgid "due to already installed %s"
+msgstr "oherwydd %s wedi ei osod eisoes"
+
+#: ../urpm/select.pm:497 ../urpm/select.pm:536
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "%s heb ei foddloni"
+
+#: ../urpm/select.pm:503
+#, c-format
+msgid "trying to promote %s"
+msgstr "ceisio hybu %s"
+
+#: ../urpm/select.pm:504
+#, c-format
+msgid "in order to keep %s"
+msgstr "fel modd i gadw %s"
+
+#: ../urpm/select.pm:532
+#, c-format
+msgid "in order to install %s"
+msgstr "er mwyn gosod %s"
+
+#: ../urpm/select.pm:542
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "oherwydd gwrthdaro gyda %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Llofnod annilys (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Enw Allwedd Annilys (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Llofnod coll (%s)"
+
+#: ../urpm/sys.pm:221
+#, c-format
+msgid "Can't write file"
+msgstr "Methu ysgrifennu'r ffeil"
+
+#: ../urpm/sys.pm:221
+#, c-format
+msgid "Can't open file"
+msgstr "Methu agor y ffeil"
+
+#: ../urpm/sys.pm:234
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Methu defnyddio %s gyda %s"
+
+#: ../urpme:40
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2006 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf fersiwn %s\n"
+"Hawlfraint (C) 1999 - 2006 Mandriva.\n"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU.\n"
+"\n"
+"defnydd:\n"
+
+#: ../urpme:46
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - dewis pecyn yn awtomatig o fewn dewisiadau.\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test          - gwirio os oes modd tynnu'n iawn.\n"
+
+#: ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
+"bodoli.\n"
+
+#: ../urpme:49 ../urpmi:109 ../urpmq:67
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+"  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
+
+#: ../urpme:50 ../urpmi:140
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
+
+#: ../urpme:51
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - defnyddio root arall ar gyfer tynnu rpm.\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - peidio gweithredu sgriptledi'r pecyn(au).\n"
+
+#: ../urpme:54
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
+"                   wrth (ddad)osod chroot gyda dewis  --root.\n"
+
+#: ../urpme:56 ../urpmi:151 ../urpmq:84
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - modd llafar.\n"
+
+#: ../urpme:57
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - select all packages matching expression.\n"
+
+#: ../urpme:70
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau"
+
+#: ../urpme:100
+#, c-format
+msgid "unknown packages"
+msgstr "pecynnau anhysbys"
+
+#: ../urpme:100
+#, c-format
+msgid "unknown package"
+msgstr "pecyn anhysbys"
+
+#: ../urpme:113 ../urpmi:536
+#, c-format
+msgid "removing package %s will break your system"
+msgstr "bydd tynnu pecynnau %s yn torri'r system"
+
+#: ../urpme:115
+#, c-format
+msgid "Nothing to remove"
+msgstr "Dim i'w dynnu"
+
+#: ../urpme:120
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Ticio i ddileu'r pecynnau canlynol"
+
+#: ../urpme:124
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
+msgstr[1] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
+
+#: ../urpme:128
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Tynnu pecynnau %d?"
+msgstr[1] "Tynnu pecynnau %d?"
+
+#: ../urpme:128 ../urpmi:563 ../urpmi:643 ../urpmi.addmedia:142
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpme:150
+#, c-format
+msgid "Removal failed"
+msgstr "Methodd y tynnu"
+
 #: ../urpmi:69
 #, c-format
 msgid ""
@@ -1911,7 +1955,7 @@ msgstr "  --cprozilla-options - dewis ychwanegol wrth ddefnyddio prozilla\n"
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr "  --aria2-options -dewis ychwanegol  i'w estyn i aria2\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:49 ../urpmi.update:36
+#: ../urpmi:122 ../urpmi.addmedia:58 ../urpmi.update:36
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - cyfyngu cyflymder y llwytho i lawr.\n"
@@ -1925,7 +1969,7 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmi:125 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:75
+#: ../urpmi:125 ../urpmi.addmedia:59 ../urpmi.update:37 ../urpmq:75
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1934,7 +1978,7 @@ msgstr ""
 "  --proxy        - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
 "                   rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
 
-#: ../urpmi:127 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:77
+#: ../urpmi:127 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:77
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2045,18 +2089,23 @@ msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - modd distaw.\n"
 
 #: ../urpmi:152
+#, fuzzy, c-format
+msgid "  --debug        - very verbose mode.\n"
+msgstr "  --verbose      - modd llafar.\n"
+
+#: ../urpmi:153
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
 "eu gosod.\n"
 
-#: ../urpmi:180
+#: ../urpmi:181
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "Gwall: methu defnyddio --auto-select ynghyd â'r rhestr pecynnau.\n"
 
-#: ../urpmi:187
+#: ../urpmi:188
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2066,19 +2115,19 @@ msgstr ""
 "arferol\n"
 "ynghyd a --bug.\n"
 
-#: ../urpmi:214
+#: ../urpmi:215
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Methu gosod ffeiliau deuaidd rpm wrth ddefnyddio --install-src"
 
-#: ../urpmi:220
+#: ../urpmi:221
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 "defnyddiwch --buildrequires neu --install-src, yn rhagosod i --buildrequires"
 
-#: ../urpmi:240
+#: ../urpmi:241
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -2087,17 +2136,17 @@ msgstr ""
 "Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
 "adroddiad gwall neu ei ddileu."
 
-#: ../urpmi:241
+#: ../urpmi:242
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
 
-#: ../urpmi:252
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "Nid yw cyfeiriadur amgylchedd %s yn bodoli"
 
-#: ../urpmi:274
+#: ../urpmi:275
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2106,48 +2155,48 @@ msgstr ""
 "Gwall: %s i weld wedi ei osod fel darllen yn unig.\n"
 "Defnydd --allow-force gorfodaeth i orfodi gweithred."
 
-#: ../urpmi:361
+#: ../urpmi:362
 #, c-format
 msgid "Updating media...\n"
 msgstr "Diweddaru cyfrwng...\n"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (uwchraddio)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (uwchraddio)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:446
+#: ../urpmi:447
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (gosod)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:448
+#: ../urpmi:449
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (gosod)"
 
-#: ../urpmi:454
+#: ../urpmi:455
 #, 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:457
+#: ../urpmi:458
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Beth yw eich dewis? (1-%d)"
 
-#: ../urpmi:498
+#: ../urpmi:499
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2158,7 +2207,7 @@ msgstr ""
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:500
+#: ../urpmi:501
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2169,7 +2218,7 @@ msgstr ""
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:507 ../urpmi:523
+#: ../urpmi:508 ../urpmi:524
 #, c-format
 msgid ""
 "\n"
@@ -2178,12 +2227,12 @@ msgstr ""
 "\n"
 "Parhau i osod beth bynnag?"
 
-#: ../urpmi:508 ../urpmi:524 ../urpmi:612 ../urpmi.addmedia:125
+#: ../urpmi:509 ../urpmi:525 ../urpmi:613 ../urpmi.addmedia:142
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: ../urpmi:516
+#: ../urpmi:517
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2192,7 +2241,7 @@ msgstr ""
 "Nid oes modd gosod pecyn gofynnwyd amdani:\n"
 "%s"
 
-#: ../urpmi:517
+#: ../urpmi:518
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2201,7 +2250,7 @@ msgstr ""
 "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
 "%s"
 
-#: ../urpmi:544
+#: ../urpmi:545
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2212,7 +2261,7 @@ msgstr ""
 "gael ei dynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:546
+#: ../urpmi:547
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2223,7 +2272,7 @@ msgstr ""
 "gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:553
+#: ../urpmi:554
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -2232,7 +2281,7 @@ msgstr ""
 "Rhaid i'r pecyn canlynol gael ei dynnu i eraill gael eu diweddaru.\n"
 "%s"
 
-#: ../urpmi:554
+#: ../urpmi:555
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -2241,12 +2290,12 @@ msgstr ""
 "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s"
 
-#: ../urpmi:556
+#: ../urpmi:557
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
 
-#: ../urpmi:577
+#: ../urpmi:578
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2257,39 +2306,39 @@ msgstr ""
 "canlynol:\n"
 "%s\n"
 
-#: ../urpmi:594
+#: ../urpmi:595
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei osod)"
 
-#: ../urpmi:600
+#: ../urpmi:601
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Bydd %s o le ychwanegol ar ddisg yn cael ei ddefnyddio."
 
-#: ../urpmi:601
+#: ../urpmi:602
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Bydd %s o le ar ddisg ar gael."
 
-#: ../urpmi:602
+#: ../urpmi:603
 #, 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:620
+#: ../urpmi:621
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Pwyso Enter pan yn barod..."
 
-#: ../urpmi:625
+#: ../urpmi:626
 #, c-format
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../urpmi:664
+#: ../urpmi:665
 #, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
@@ -2297,7 +2346,7 @@ msgstr "ailgychwyn urpmi"
 #. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
 #. -PO: neither the ``with''.  Only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -2307,6 +2356,15 @@ msgid ""
 "       http://<host>/<path>\n"
 "       removable://<path>\n"
 "\n"
+"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
+"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
+"\n"
+"examples:\n"
+"\n"
+"  urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\n"
+"  urpmi.addmedia --mirrorlist '$MIRRORLIST' backports media/main/backports\n"
+"\n"
+"\n"
 "and [options] are from\n"
 msgstr ""
 "defnydd: urpmi.addmedia [options] <name> <url>\n"
@@ -2319,27 +2377,27 @@ msgstr ""
 "\n"
 "a [options] o\n"
 
-#: ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:72
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:72
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
 
-#: ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:73
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:73
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - defnyddio curl i estyn ffeiliau pell.\n"
 
-#: ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:74
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:74
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prozilla         - defnyddio prozilla i estyn ffeiliau pell.\n"
 
-#: ../urpmi.addmedia:54
+#: ../urpmi.addmedia:63
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update        - defnyddio cyfrwng diweddaru.\n"
 
-#: ../urpmi.addmedia:55
+#: ../urpmi.addmedia:64
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2351,22 +2409,22 @@ msgstr ""
 "                   un o: byth, ar alw, diweddaru'n unig, bob tro. cf urpmi."
 "cfg(5)\n"
 
-#: ../urpmi.addmedia:57
+#: ../urpmi.addmedia:66
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - defnyddio ffeil synthesis.\n"
 
-#: ../urpmi.addmedia:58
+#: ../urpmi.addmedia:67
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   -defnyddio ffeiliau rpm (yn lle synthesis).\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:68
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - peidio ceisio canfod unrhyw ffeil synthesis.\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2375,18 +2433,18 @@ msgstr ""
 "  --distrib      - creu yn awtomatig yr holl gyfrwng o gyfrwng\n"
 "                   gosod\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:72
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --rhyngweithiol  - gyda --distrib, gofyn cadarnhad gyda phob cyfrwng\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:73
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media   - gyda --distrib, rhestri'r holl gyfrwng ar gael.\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:74
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2396,78 +2454,81 @@ msgstr ""
 "rhagosodedig yw\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:67
-#, c-format
-msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+#: ../urpmi.addmedia:76
+#, fuzzy, c-format
+msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - creu cyfrwng rhithiol sydd wedi ei ddiweddaru,\n"
 "                   dom ond protocol file:// sy'n cael ei ganiatáu.\n"
 
-#: ../urpmi.addmedia:69 ../urpmi.update:42
+#: ../urpmi.addmedia:77 ../urpmi.update:42
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - analluogi gwirio ffeil  MD5SUM.\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:78
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - peidio mewnforio pubkey y cyfrwng ychwanegwyd\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:79
 #, 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:72 ../urpmi.removemedia:42 ../urpmi.update:49
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - glanhau penawdau yng nghyfeiriadur y storfa.\n"
 
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modd distaw.\n"
 
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:53
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:45 ../urpmi.update:53
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpmi.addmedia:94
+#: ../urpmi.addmedia:102
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "polisiau hysbys known xml-info yw %s"
 
-#: ../urpmi.addmedia:102
+#: ../urpmi.addmedia:113
+#, c-format
+msgid "no argument needed for --distrib --mirrorlist <url>"
+msgstr ""
+
+#: ../urpmi.addmedia:118
 #, 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:105
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael ychwanegu cyfrwng"
 
-#: ../urpmi.addmedia:108
+#: ../urpmi.addmedia:125
 #, c-format
 msgid "creating config file [%s]"
 msgstr "yn creu ffeil config (%s)"
 
-#: ../urpmi.addmedia:109
+#: ../urpmi.addmedia:126
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Methu creu ffeil Config (%s)"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:134
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "dim angen rhoi <llwybr perthynnol synthesis> gyda --distrib"
 
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:142
 #, c-format
 msgid ""
 "\n"
@@ -2476,16 +2537,21 @@ msgstr ""
 "\n"
 "Hoffech chi ychwanegu cyfrwng '%s'"
 
-#: ../urpmi.addmedia:150
+#: ../urpmi.addmedia:168
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<llwybr perthynnol synthesis> ar goll\n"
 
-#: ../urpmi.addmedia:153
+#: ../urpmi.addmedia:171
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Methu defnyddio %s gyda chyfrwng pell"
 
+#: ../urpmi.addmedia:183
+#, fuzzy, c-format
+msgid "unable to add medium"
+msgstr "methu cael mynediad at gyfrwng. \"%s\""
+
 #: ../urpmi.recover:28
 #, c-format
 msgid ""
@@ -2965,21 +3031,21 @@ msgstr ""
 msgid "--list-nodes can only be used with --parallel"
 msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
 
-#: ../urpmq:358
+#: ../urpmq:360
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
 msgstr ""
 "dim xml info ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer "
 "pecyn %s"
 
-#: ../urpmq:359
+#: ../urpmq:361
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
 msgstr ""
 "dimxml info ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer "
 "pecynnau %s"
 
-#: ../urpmq:362
+#: ../urpmq:364
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for package %s"
@@ -2987,7 +3053,7 @@ msgstr ""
 "dim  xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
 "pecyn %s"
 
-#: ../urpmq:363
+#: ../urpmq:365
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -2995,7 +3061,7 @@ msgstr ""
 "dim  xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
 "pecynnau %s"
 
-#: ../urpmq:427
+#: ../urpmq:429
 #, c-format
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"
@@ -3085,9 +3151,6 @@ msgstr "Heb ganfod changelog\n"
 #~ msgid "no rpm files found from [%s]"
 #~ msgstr "heb ganfod ffeiliau rpm o [%s]"
 
-#~ msgid "reading rpm files from [%s]"
-#~ msgstr "darllen ffeiliau rpm o [%s]"
-
 #~ msgid "unable to read rpm files from [%s]: %s"
 #~ msgstr "methu darllen ffeiliau rpm o (%s): %s"