sync with code

1 files changed, 480 insertions, 447 deletions

diff --git a/po/cy.po b/po/cy.po
index 3d92e686..144509a4 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
 "PO-Revision-Date: 2008-03-11 17:54+0100\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg\n"
@@ -20,8 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../gurpmi:30
-#: ../gurpmi2:65
+#: ../gurpmi:30 ../gurpmi2:65
 #, c-format
 msgid "RPM installation"
 msgstr "Gosod RPM"
@@ -31,9 +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:45
-#: ../gurpmi2:152
-#: ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
 #, c-format
 msgid "_Ok"
 msgstr "_Iawn"
@@ -45,7 +42,8 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
 "What would you like to do?"
 msgstr ""
@@ -53,12 +51,12 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"Efallai nad oeddech wedi bwriadu ei osod ar eich cyfrifiadur (byddai ei osod yn caniatáu i chi i wneud newidiadau i'r cod ffynhonnell a'i grynhoi.).\n"
+"Efallai nad oeddech wedi bwriadu ei osod ar eich cyfrifiadur (byddai ei osod "
+"yn caniatáu i chi i wneud newidiadau i'r cod ffynhonnell a'i grynhoi.).\n"
 "\n"
 "Beth hoffech chi ei wneud?"
 
-#: ../gurpmi:73
-#: ../gurpmi:84
+#: ../gurpmi:73 ../gurpmi:84
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -98,8 +96,7 @@ msgstr "_Gosod"
 msgid "_Save"
 msgstr "_Cadw"
 
-#: ../gurpmi:99
-#: ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:152
 #, c-format
 msgid "_Cancel"
 msgstr "_Dileu"
@@ -109,7 +106,92 @@ msgstr "_Dileu"
 msgid "Choose location to save file"
 msgstr "Dewiswch leoliad i gadw'r ffeil"
 
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 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 © 1999 - 2006 Mandriva.\n"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU.\n"
+"\n"
+"defnydd:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+"  --auto         - non-interactive mode, assume default answers to "
+"questions.    --auto\n"
+msgstr ""
+"  --auto         - modd anrhyngweithiol, derbyn atebion rhagosodedig i "
+"gwestiynau.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - dewis pecynnau'n awtomatig i uwchraddio'r system.\n"
+
+#: ../gurpmi.pm:49 ../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"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+"  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
+"                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig).\n"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - defnyddio root arall ar gyfer gosod rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+"  --test         - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
+msgstr ""
+"  --searchmedia  - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
+"gofynnwyd.\n"
+
+#: ../gurpmi.pm:98
 #, c-format
 msgid "No packages specified"
 msgstr "Heb enwi pecyn"
@@ -140,8 +222,7 @@ msgstr ""
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../gurpmi2:114
-#: ../urpmi:626
+#: ../gurpmi2:114 ../urpmi:626
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
@@ -182,16 +263,16 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:215
-#: ../urpmi:592
+#: ../gurpmi2:215 ../urpmi:592
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+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:593
+#: ../gurpmi2:216 ../urpmi:593
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+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:218
@@ -206,14 +287,12 @@ msgstr[1] "(%d pecyn, %d MB)"
 msgid "Package installation..."
 msgstr "Gosod y pecyn..."
 
-#: ../gurpmi2:226
-#: ../urpm/main_loop.pm:48
+#: ../gurpmi2:226 ../urpm/main_loop.pm:48
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "methu estyn pecynnau ffynhonnell, atal"
 
-#: ../gurpmi2:240
-#: ../urpm/install.pm:81
+#: ../gurpmi2:240 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
@@ -223,8 +302,7 @@ msgstr "Paratoi..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../gurpmi2:264
-#: ../urpmi:622
+#: ../gurpmi2:264 ../urpmi:622
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Rhowch gyfrwng \"%s\" yn y ddyfais"
@@ -239,8 +317,7 @@ msgstr "Llwytho pecynnau i lawr ' %s'..."
 msgid "_Done"
 msgstr "_Gorffen"
 
-#: ../gurpmi2:296
-#: ../urpm/main_loop.pm:258
+#: ../gurpmi2:296 ../urpm/main_loop.pm:258
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -251,9 +328,7 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../gurpmi2:302
-#: ../urpm/main_loop.pm:196
-#: ../urpm/main_loop.pm:214
+#: ../gurpmi2:302 ../urpm/main_loop.pm:196 ../urpm/main_loop.pm:214
 #: ../urpm/main_loop.pm:232
 #, c-format
 msgid "Installation failed:"
@@ -269,12 +344,16 @@ msgstr "Popeth wedi eu gosod eisoes"
 msgid "Installation finished"
 msgstr "Cwblhawyd y gosod"
 
-#: ../gurpmi2:310
-#: ../urpme:132
+#: ../gurpmi2:310 ../urpme:132
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
 
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "ailgychwyn urpmi"
+
 #: ../rpm-find-leaves:14
 #, c-format
 msgid ""
@@ -309,8 +388,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:269
+#: ../rurpmi:11 ../urpmi:269
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
@@ -345,18 +423,13 @@ msgstr "enw ffeil rpm annilys [%s]"
 msgid "retrieving rpm file [%s] ..."
 msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpm.pm:232
-#: ../urpm/get_pkgs.pm:160
+#: ../urpm.pm:232 ../urpm/get_pkgs.pm:160
 #, c-format
 msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
-#: ../urpm.pm:235
-#: ../urpm/download.pm:691
-#: ../urpm/get_pkgs.pm:162
-#: ../urpm/media.pm:771
-#: ../urpm/media.pm:1199
-#: ../urpm/media.pm:1375
+#: ../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"
@@ -391,8 +464,7 @@ msgstr "gwall cofrestru pecynnau lleol"
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
 
-#: ../urpm/args.pm:130
-#: ../urpm/args.pm:139
+#: ../urpm/args.pm:130 ../urpm/args.pm:139
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
@@ -405,7 +477,9 @@ msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
 #: ../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\""
+msgstr ""
+"drwy ragosodiad mae urmpf yn disgwyl regexp, dylech ddefnyddio dewis  \"--"
+"literal\""
 
 #: ../urpm/args.pm:419
 #, c-format
@@ -417,8 +491,7 @@ msgstr "Nid yw cyfeiriadur chroot yn bodoli"
 msgid "Can't use %s without %s"
 msgstr "Methu defnyddio %s heb %s"
 
-#: ../urpm/args.pm:441
-#: ../urpm/args.pm:444
+#: ../urpm/args.pm:441 ../urpm/args.pm:444
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Methu defnyddio %s gyda %s"
@@ -428,14 +501,19 @@ msgstr "Methu defnyddio %s gyda %s"
 msgid "Too many arguments\n"
 msgstr "Gormod o ymresymiadau\n"
 
-#: ../urpm/bug_report.pm:48
-#: ../urpmi:247
+#: ../urpm/bug_report.pm:48 ../urpmi:247
 #, c-format
 msgid "Copying failed"
 msgstr "Methodd y copïo"
 
-#: ../urpm/cdrom.pm:160
-#: ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr "nid yw cyfrwng \"%s\" ar gael"
@@ -460,9 +538,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:250
-#: ../urpm/media.pm:450
-#: ../urpm/media.pm:456
+#: ../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)"
@@ -600,7 +676,9 @@ msgstr "URL gwallus: [%s]"
 #: ../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"
+msgstr ""
+"nid oes modd ei ddefnyddio --install-src i osod y ffeiliau pell .src.rpm "
+"files"
 
 #: ../urpm/get_pkgs.pm:156
 #, c-format
@@ -614,8 +692,10 @@ msgstr "[ailbecynnu]"
 
 #: ../urpm/install.pm:154
 #, 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)"
+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:157
 #, c-format
@@ -637,8 +717,7 @@ msgstr "methu gosod pecyn %s"
 msgid "removing bad rpm (%s) from %s"
 msgstr "tynnu rpm gwallus (%s) o %s"
 
-#: ../urpm/install.pm:197
-#: ../urpm/install.pm:254
+#: ../urpm/install.pm:197 ../urpm/install.pm:254
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "tynnu %s methodd: %s"
@@ -683,8 +762,7 @@ msgstr "Heb ddiffinio gweinydd, uri neu westeiwr coll"
 msgid "No base defined"
 msgstr "Sail heb ei ddiffinio"
 
-#: ../urpm/ldap.pm:172
-#: ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
 #, c-format
 msgid "Cannot connect to ldap uri:"
 msgstr "Methu cysylltu  æg uri ldap:"
@@ -719,9 +797,7 @@ msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
 msgid "Do you want to continue installation ?"
 msgstr "Ydych chi am barhau gosod?"
 
-#: ../urpm/main_loop.pm:125
-#: ../urpm/main_loop.pm:203
-#: ../urpm/main_loop.pm:221
+#: ../urpm/main_loop.pm:125 ../urpm/main_loop.pm:203 ../urpm/main_loop.pm:221
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosod"
@@ -756,8 +832,7 @@ msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Mwy o orfodaeth gyda'r gosod?  (--force)? (y/N)"
 
-#: ../urpm/main_loop.pm:259
-#: ../urpm/main_loop.pm:267
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
 #, c-format
 msgid "Error"
 msgstr "Gwall"
@@ -843,8 +918,7 @@ msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", hepgor"
 msgid "failed to migrate removable device, ignoring media"
 msgstr "methu symud y ddyfais symudol, anwybyddu'r cyfrwng"
 
-#: ../urpm/media.pm:452
-#: ../urpm/media.pm:458
+#: ../urpm/media.pm:452 ../urpm/media.pm:458
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "ysgrifennu ffeil ffurfweddu (%s)"
@@ -861,8 +935,12 @@ msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s"
 
 #: ../urpm/media.pm:525
 #, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "--nid oes modd defnyddio synthesis gyda --media, --excludemedia, --sortmedia, --diweddaru, --use-distrib or --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"--nid oes modd defnyddio synthesis gyda --media, --excludemedia, --"
+"sortmedia, --diweddaru, --use-distrib or --parallel"
 
 #: ../urpm/media.pm:612
 #, c-format
@@ -900,6 +978,11 @@ msgid "adding medium \"%s\""
 msgstr "ychwanegu cyfrwng \"%s\""
 
 #: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Nid yw cyfeiriadur amgylchedd %s yn bodoli"
+
+#: ../urpm/media.pm:767
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "nid yw'r lleoliad i weld yn cynnwys unrhyw ddosbarthiad"
@@ -912,7 +995,8 @@ msgstr "methu didoli media.cfg"
 #: ../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)"
+msgstr ""
+"methu cael mynediad at gyfrwng y dosbarthiad (heb ganfod ffeil media.cfg)"
 
 #: ../urpm/media.pm:790
 #, c-format
@@ -954,7 +1038,12 @@ msgstr "...methodd ail-ffurfweddu"
 msgid "reconfiguration done"
 msgstr "cwblhau ail-ffurfweddu"
 
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr "Gwall wrth gynhyrchu ffeil enwau: heb ganfod dibyniaeth %d"
+
+#: ../urpm/media.pm:1074
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
@@ -969,15 +1058,12 @@ msgstr "archwilio ffeil synthesis [%s]"
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1088
-#: ../urpm/media.pm:1171
+#: ../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:1090
-#: ../urpm/media.pm:1145
-#: ../urpm/media.pm:1391
+#: ../urpm/media.pm:1090 ../urpm/media.pm:1145 ../urpm/media.pm:1391
 #, c-format
 msgid "...copying failed"
 msgstr "...methodd y copïo"
@@ -987,8 +1073,7 @@ msgstr "...methodd y copïo"
 msgid "copying description file of \"%s\"..."
 msgstr "copïo ffeil disgrifiad o \"%s\""
 
-#: ../urpm/media.pm:1143
-#: ../urpm/media.pm:1175
+#: ../urpm/media.pm:1143 ../urpm/media.pm:1175
 #, c-format
 msgid "...copying done"
 msgstr "...cwblhau'r copïo"
@@ -1003,8 +1088,7 @@ msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "cyfrifo md5sum o ffynhonnell synthesis adferwyd (neu synthesis)"
 
-#: ../urpm/media.pm:1212
-#: ../urpm/media.pm:1629
+#: ../urpm/media.pm:1212 ../urpm/media.pm:1629
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "methodd estyn (%s) (md5sum gwallus)"
@@ -1039,8 +1123,7 @@ msgstr "adfer ffynhonnell synthesis \"%s\"..."
 msgid "found probed synthesis as %s"
 msgstr "canfod synthesis holwyd fel %s"
 
-#: ../urpm/media.pm:1374
-#: ../urpm/media.pm:1482
+#: ../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\""
@@ -1090,10 +1173,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:62
-#: ../urpmi:506
-#: ../urpmi:522
-#: ../urpmi:611
+#: ../urpm/msg.pm:62 ../urpmi:506 ../urpmi:522 ../urpmi:611
 #, c-format
 msgid "Nn"
 msgstr "Nn"
@@ -1103,15 +1183,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:507
-#: ../urpmi:523
-#: ../urpmi:562
-#: ../urpmi:612
-#: ../urpmi:642
-#: ../urpmi:648
-#: ../urpmi.addmedia:139
+#: ../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"
@@ -1176,8 +1249,7 @@ msgstr "MB"
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:189
-#: ../urpm/msg.pm:198
+#: ../urpm/msg.pm:189 ../urpm/msg.pm:198
 #, c-format
 msgid "TB"
 msgstr "TB"
@@ -1207,8 +1279,7 @@ msgstr "methu defnyddio dewis paralel \"%s\""
 msgid "unable to access medium \"%s\"."
 msgstr "methu cael mynediad at gyfrwng. \"%s\""
 
-#: ../urpm/removable.pm:66
-#: ../urpm/removable.pm:84
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
 #, c-format
 msgid "mounting %s"
 msgstr "gosod %s"
@@ -1218,13 +1289,13 @@ msgstr "gosod %s"
 msgid "unmounting %s"
 msgstr "dadosod %s"
 
-#: ../urpm/search.pm:29
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
 "Copyright (C) 2002-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage: urpmf [options] pattern-expression\n"
 msgstr ""
@@ -1234,367 +1305,291 @@ msgstr ""
 "\n"
 "defnydd: urpmf [dewisiadau] pattern-expression\n"
 
-#: ../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
+#: ../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"
 
-#: ../urpm/search.pm:37
-#: ../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"
+msgstr ""
+"  --env          - defnyddio amgylchedd penodol (adroddiad gwall fel "
+"rheol).\n"
 
-#: ../urpm/search.pm:38
-#: ../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"
+msgstr ""
+"  --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n"
 
-#: ../urpm/search.pm:39
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr "  --literal, -l  - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn llythrennedd.\n"
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+"  --literal, -l  - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn "
+"llythrennedd.\n"
 
-#: ../urpm/search.pm:40
-#: ../urpme:52
-#: ../urpmf:40
-#: ../urpmi:111
-#: ../urpmi.addmedia:69
-#: ../urpmi.recover:36
-#: ../urpmi.removemedia:46
-#: ../urpmi.update:46
-#: ../urpmq:69
+#: ../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"
+msgstr ""
+"  --urpmi-root         - defnyddio root arall ar gyfer gosod urpmi db ac "
+"rpm.\n"
 
-#: ../urpm/search.pm:42
-#: ../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"
-msgstr "   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda choma.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
+"choma.\n"
 
-#: ../urpm/search.pm:43
-#: ../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"
+msgstr ""
+"  --use-distrib  - defnyddio'r llwybr yma i gael mynediad ar y cyfrwng.\n"
 
-#: ../urpm/search.pm:44
-#: ../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"
 
-#: ../urpm/search.pm:45
-#: ../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"
 
-#: ../urpm/search.pm:46
-#: ../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"
 
-#: ../urpm/search.pm:47
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpm/search.pm:48
-#: ../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"
+msgstr ""
+"  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
 
-#: ../urpm/search.pm:49
-#: ../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"
+msgstr ""
+"  -i             - cadw gwahaniaeth maint llythrennau ym mhob patrwm "
+"(rhagosodiad).\n"
 
-#: ../urpm/search.pm:50
-#: ../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"
 
-#: ../urpm/search.pm:51
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Mynegiadau patrymau:\n"
 
-#: ../urpm/search.pm:52
-#: ../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"
+msgstr ""
+"  text           - unrhyw destun wedi ei ddidoli fel regexp, onibai fod -l "
+"yn cael ei ddefnyddio.\n"
 
-#: ../urpm/search.pm:53
-#: ../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"
 
-#: ../urpm/search.pm:54
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - gweithredwr deuaidd AND.\n"
 
-#: ../urpm/search.pm:55
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - gweithredwr deuaidd OR.\n"
 
-#: ../urpm/search.pm:56
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unaidd NOT.\n"
 
-#: ../urpm/search.pm:57
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )              - parenthesis de a chwith.\n"
 
-#: ../urpm/search.pm:58
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Rhestr tagiau:\n"
 
-#: ../urpm/search.pm:59
-#: ../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"
 
-#: ../urpm/search.pm:60
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   esiampl: '%%enw:%%ffeil'\n"
 
-#: ../urpm/search.pm:61
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - saernïaeth\n"
 
-#: ../urpm/search.pm:62
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - gwestai'r adeiladedd\n"
 
-#: ../urpm/search.pm:63
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - amser adeiladu\n"
 
-#: ../urpm/search.pm:64
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - ffeiliau ffurfweddiad\n"
 
-#: ../urpm/search.pm:65
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - tagiau gwrthdaro\n"
 
-#: ../urpm/search.pm:66
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - disgrifiad pecyn\n"
 
-#: ../urpm/search.pm:67
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - dosbarthiad\n"
 
-#: ../urpm/search.pm:68
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - cyfnod\n"
 
-#: ../urpm/search.pm:69
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - enw ffeil y pecyn\n"
 
-#: ../urpm/search.pm:70
-#: ../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"
 
-#: ../urpm/search.pm:71
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - grŵp\n"
 
-#: ../urpm/search.pm:72
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license          - trwydded\n"
 
-#: ../urpm/search.pm:73
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name          - enw'r pecyn\n"
 
-#: ../urpm/search.pm:74
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - tagiau'r hen\n"
 
-#: ../urpm/search.pm:75
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager      - pecynydd\n"
 
-#: ../urpm/search.pm:76
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - tag darparu\n"
 
-#: ../urpm/search.pm:77
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - tagiau angenrhaid\n"
 
-#: ../urpm/search.pm:78
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - maint wedi gosod\n"
 
-#: ../urpm/search.pm:79
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - enw rpm ffynhonnell\n"
 
-#: ../urpm/search.pm:80
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - cynnig tagiau\n"
 
-#: ../urpm/search.pm:81
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - crynodeb\n"
 
-#: ../urpm/search.pm:82
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpm/search.pm:83
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - gwerthwr\n"
 
-#: ../urpm/search.pm:84
-#: ../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"
 
-#: ../urpm/search.pm:85
-#: ../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"
 
-#: ../urpm/search.pm:197
-#: ../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"
 
-#: ../urpm/search.pm:247
-#: ../urpmf:247
-#: ../urpmi:254
-#: ../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"
 
-#: ../urpm/search.pm:290
-#: ../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\""
 
-#: ../urpm/search.pm:297
-#: ../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\""
 
-#: ../urpm/search.pm:304
-#: ../urpmf:306
+#: ../urpm/search.pm:304 ../urpmf:306
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "dim xml-info ar gyfer cyfrwng \"%s\""
@@ -1606,22 +1601,22 @@ 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"
+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
+#: ../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
+#: ../urpm/select.pm:495 ../urpm/select.pm:538
 #, c-format
 msgid "due to missing %s"
 msgstr "oherwydd %s coll"
@@ -1631,8 +1626,7 @@ msgstr "oherwydd %s coll"
 msgid "due to already installed %s"
 msgstr "oherwydd %s wedi ei osod eisoes"
 
-#: ../urpm/select.pm:497
-#: ../urpm/select.pm:536
+#: ../urpm/select.pm:497 ../urpm/select.pm:536
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s heb ei foddloni"
@@ -1692,7 +1686,8 @@ msgstr "Methu symud ffeil %s i %s"
 msgid ""
 "urpme version %s\n"
 "Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -1712,22 +1707,13 @@ msgstr "  --auto         - dewis pecyn yn awtomatig o fewn dewisiadau.\n"
 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
+#: ../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"
+msgstr ""
+"  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
 
-#: ../urpme:50
-#: ../urpmi:140
+#: ../urpme:50 ../urpmi:140
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
@@ -1751,9 +1737,7 @@ 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
+#: ../urpme:56 ../urpmi:151 ../urpmq:84
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - modd llafar.\n"
@@ -1778,8 +1762,7 @@ msgstr "pecynnau anhysbys"
 msgid "unknown package"
 msgstr "pecyn anhysbys"
 
-#: ../urpme:113
-#: ../urpmi:536
+#: ../urpme:113 ../urpmi:536
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "bydd tynnu pecynnau %s yn torri'r system"
@@ -1797,7 +1780,8 @@ 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"
+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"
 
@@ -1808,10 +1792,7 @@ msgid_plural "Remove %d packages?"
 msgstr[0] "Tynnu pecynnau %d?"
 msgstr[1] "Tynnu pecynnau %d?"
 
-#: ../urpme:128
-#: ../urpmi:563
-#: ../urpmi:643
-#: ../urpmi.addmedia:142
+#: ../urpme:128 ../urpmi:563 ../urpmi:643 ../urpmi.addmedia:142
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
@@ -1821,36 +1802,14 @@ msgstr " (y/N) "
 msgid "Removal failed"
 msgstr "Methodd y tynnu"
 
-#: ../urpmi:69
+#: ../urpmi:81
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
-"\n"
-"usage:\n"
+"  --auto         - non-interactive mode, assume default answers to "
+"questions.\n"
 msgstr ""
-"urpmf fersiwn %s\n"
-"Hawlfraint © 1999 - 2006 Mandriva.\n"
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU.\n"
-"\n"
-"defnydd:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
-msgstr "  --searchmedia  - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau gofynnwyd.\n"
-
-#: ../urpmi:81
-#, c-format
-msgid "  --auto         - non-interactive mode, assume default answers to questions.\n"
-msgstr "  --auto         - modd anrhyngweithiol, derbyn atebion rhagosodedig i gwestiynau.\n"
-
-#: ../urpmi:82
-#: ../urpmq:52
-#, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - dewis pecynnau'n awtomatig i uwchraddio'r system.\n"
+"  --auto         - modd anrhyngweithiol, derbyn atebion rhagosodedig i "
+"gwestiynau.\n"
 
 #: ../urpmi:83
 #, c-format
@@ -1867,24 +1826,25 @@ msgstr "  --no-md5sum    - analluogi gwirio ffeil  MD5SUM.\n"
 msgid "    --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - gorfodi diweddaru allwedd gpg.\n"
 
-#: ../urpmi:86
-#: ../urpmq:53
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
 msgstr "  --no-suggests  - peidio awto ddewis pecynnau \"suggested\" .\n"
 
 #: ../urpmi:87
 #, c-format
-msgid "  --no-uninstall - never ask to uninstall a package, abort the installation.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr "  --no-uninstall - peidio gofyn i ddadosod pecyn, atal gosod.\n"
 
 #: ../urpmi:88
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
-msgstr "  --no-install   - peidio gosod y pecynnau (dim ond eu llwytho i lawr)\n"
+msgstr ""
+"  --no-install   - peidio gosod y pecynnau (dim ond eu llwytho i lawr)\n"
 
-#: ../urpmi:89
-#: ../urpmq:55
+#: ../urpmi:89 ../urpmq:55
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1900,7 +1860,8 @@ msgid ""
 "                   are going to be installed or upgraded,\n"
 "                   default is %d.\n"
 msgstr ""
-"  --split-level  - hollti'n ddarnau llai os yw mwy na'r pecynnau hyn yn cael\n"
+"  --split-level  - hollti'n ddarnau llai os yw mwy na'r pecynnau hyn yn "
+"cael\n"
 "                   eu gosod neu eu uwchraddio\n"
 "                   rhagosodiad yw %d.\n"
 
@@ -1922,7 +1883,8 @@ msgstr "  --buildrequires - gosod buildrequires y pecynnau\n"
 #: ../urpmi:99
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
+msgstr ""
+"  --install-src  - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
 
 #: ../urpmi:100
 #, c-format
@@ -1941,7 +1903,8 @@ msgstr "  --justdb       - diweddaru'n unig db yr rpm, nid y system ffeilio.\n"
 
 #: ../urpmi:103
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr "  --replacepkgs  - gorfodi gosod pecynnau sydd wedi eu gosod eisoes.\n"
 
 #: ../urpmi:105
@@ -1962,12 +1925,6 @@ msgstr ""
 "  --allow-force  - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
 "                   wirio dibyniaethau na'u cyfanrwydd.\n"
 
-#: ../urpmi:110
-#: ../urpmq:68
-#, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - defnyddio root arall ar gyfer gosod rpm.\n"
-
 #: ../urpmi:112
 #, c-format
 msgid ""
@@ -2011,9 +1968,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:58
-#: ../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"
@@ -2027,10 +1982,7 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmi:125
-#: ../urpmi.addmedia:59
-#: ../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"
@@ -2039,10 +1991,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:61
-#: ../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"
@@ -2060,20 +2009,6 @@ msgstr ""
 "  --bug          - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
 "                   yr arg. nesaf\n"
 
-#: ../urpmi:132
-#, c-format
-msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-"  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
-"                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid "  --test         - only verify if the installation can be achieved correctly.\n"
-msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
-
 #: ../urpmi:135
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
@@ -2115,7 +2050,8 @@ msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
-"  --more-choices - pan fydd nifer o becynnau wedi eu canfod, cynnig mwy o ddewis\n"
+"  --more-choices - pan fydd nifer o becynnau wedi eu canfod, cynnig mwy o "
+"ddewis\n"
 "                   na'r rhagosodiad.\n"
 
 #: ../urpmi:145
@@ -2126,10 +2062,10 @@ msgstr "  --nolock       - peidio cloi db rpm.\n"
 #: ../urpmi:146
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
-msgstr "  --strict-arch  - uwchraddio dim ond pecynnau gyda'r un bensaernïaeth.\n"
+msgstr ""
+"  --strict-arch  - uwchraddio dim ond pecynnau gyda'r un bensaernïaeth.\n"
 
-#: ../urpmi:147
-#: ../urpmq:92
+#: ../urpmi:147 ../urpmq:92
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
@@ -2157,7 +2093,9 @@ msgstr "  -  --debug       - modd llafar iawn.\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"
+msgstr ""
+" bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
+"eu gosod.\n"
 
 #: ../urpmi:181
 #, c-format
@@ -2170,7 +2108,8 @@ msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
-"Gwall: I gynhyrchu adroddiad gwall, nodwch yr ymresymiad llinell orchymyn arferol\n"
+"Gwall: I gynhyrchu adroddiad gwall, nodwch yr ymresymiad llinell orchymyn "
+"arferol\n"
 "ynghyd a --bug.\n"
 
 #: ../urpmi:215
@@ -2180,13 +2119,19 @@ msgstr "Methu gosod ffeiliau deuaidd rpm wrth ddefnyddio --install-src"
 
 #: ../urpmi:221
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "defnyddiwch --buildrequires neu --install-src, yn rhagosod i --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"defnyddiwch --buildrequires neu --install-src, yn rhagosod i --buildrequires"
 
 #: ../urpmi:241
 #, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am adroddiad gwall neu ei ddileu."
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
+"adroddiad gwall neu ei ddileu."
 
 #: ../urpmi:242
 #, c-format
@@ -2238,7 +2183,9 @@ msgstr "%s (gosod)"
 
 #: ../urpmi:455
 #, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
+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:458
@@ -2268,8 +2215,7 @@ msgstr ""
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:508
-#: ../urpmi:524
+#: ../urpmi:508 ../urpmi:524
 #, c-format
 msgid ""
 "\n"
@@ -2278,10 +2224,7 @@ msgstr ""
 "\n"
 "Parhau i osod beth bynnag?"
 
-#: ../urpmi:509
-#: ../urpmi:525
-#: ../urpmi:613
-#: ../urpmi.addmedia:142
+#: ../urpmi:509 ../urpmi:525 ../urpmi:613 ../urpmi.addmedia:142
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -2352,10 +2295,12 @@ msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
 #: ../urpmi:578
 #, c-format
 msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
 "%s\n"
 msgstr ""
-"Rhaid galw urpmi yn gyntaf gyda --buildrequires er mwyn gosod y dibyniaethau canlynol:\n"
+"Rhaid galw urpmi yn gyntaf gyda --buildrequires er mwyn gosod y dibyniaethau "
+"canlynol:\n"
 "%s\n"
 
 #: ../urpmi:595
@@ -2390,12 +2335,12 @@ msgstr[1] "Parhau gyda gosod %d pecyn?"
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "ailgychwyn urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Pwyso Enter pan yn barod..."
 
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
 #. -PO: neither the ``with''.  Only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
 #, c-format
@@ -2438,23 +2383,17 @@ msgstr ""
 "\n"
 "a [options] o\n"
 
-#: ../urpmi.addmedia:55
-#: ../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:56
-#: ../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:57
-#: ../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"
@@ -2468,10 +2407,13 @@ msgstr "  --update        - defnyddio cyfrwng diweddaru.\n"
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
-"                   one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+"                   one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
 msgstr ""
-"  --xml-info     - defnyddio'r polisi penodol o lwytho ffeiliau gwybodaeth xml\n"
-"                   un o: byth, ar alw, diweddaru'n unig, bob tro. cf urpmi.cfg(5)\n"
+"  --xml-info     - defnyddio'r polisi penodol o lwytho ffeiliau gwybodaeth "
+"xml\n"
+"                   un o: byth, ar alw, diweddaru'n unig, bob tro. cf urpmi."
+"cfg(5)\n"
 
 #: ../urpmi.addmedia:66
 #, c-format
@@ -2500,7 +2442,8 @@ msgstr ""
 #: ../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"
+msgstr ""
+"  --rhyngweithiol  - gyda --distrib, gofyn cadarnhad gyda phob cyfrwng\n"
 
 #: ../urpmi.addmedia:73
 #, c-format
@@ -2513,7 +2456,8 @@ 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"
+"  --from         - defnyddio url pennwyd ar gyfer rhestr drychau, y "
+"rhagosodedig yw\n"
 "                   %s\n"
 
 #: ../urpmi.addmedia:76
@@ -2521,8 +2465,7 @@ msgstr ""
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - creu cyfrwng rhithiol sydd wedi ei ddiweddaru,\n"
 
-#: ../urpmi.addmedia:77
-#: ../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"
@@ -2535,18 +2478,15 @@ msgstr "  --nopubkey     - peidio mewnforio pubkey y cyfrwng ychwanegwyd\n"
 #: ../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"
+msgstr ""
+"  --raw          - ychwanegu cyfrwng yn config, ond nid yn ei ddiweddaru.\n"
 
-#: ../urpmi.addmedia:80
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:51
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modd distaw.\n"
 
-#: ../urpmi.addmedia:82
-#: ../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"
@@ -2564,7 +2504,8 @@ msgstr "dim angen ymresymiad ar gyfer --distrib --mirrorlist <url>"
 #: ../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)"
+msgstr ""
+"gwallus <url> (ar gyfer cyfeiriadur lleol, rhaid i'r llwybr fod yn absoliwt)"
 
 #: ../urpmi.addmedia:122
 #, c-format
@@ -2615,7 +2556,8 @@ msgstr "methu ychwanegu cyfrwng"
 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"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -2637,8 +2579,10 @@ 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"
+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
@@ -2726,8 +2670,7 @@ msgstr "Dim trafodion ers %s\n"
 msgid "You must be superuser to do this"
 msgstr "Rhaid bod yn uwch-ddefnyddiwr i wneud hyn"
 
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Ysgrifennu ffeil macros rpm [%s]...\n"
@@ -2807,17 +2750,20 @@ msgstr "  --force-key    - gorfodi diweddaru allwedd gpg.\n"
 #: ../urpmi.update:44
 #, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
-msgstr "  --norebuild    - peidio diweddaru, marcio'r cyfrwng wedi ei anwybyddu.\n"
+msgstr ""
+"  --norebuild    - peidio diweddaru, marcio'r cyfrwng wedi ei anwybyddu.\n"
 
 #: ../urpmi.update:45
 #, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
-msgstr "  --no-ignore    - peidiwch diweddaru, marciwch y cyfrwng wedi ei alluogi.\n"
+msgstr ""
+"  --no-ignore    - peidiwch diweddaru, marciwch y cyfrwng wedi ei alluogi.\n"
 
 #: ../urpmi.update:47
 #, c-format
 msgid "  --probe-rpms   - do not use synthesis, use rpm files directly\n"
-msgstr "  --probe-rpms     - peidio defnyddio synthesis, defnyddiwch ffeiliau rpm\n"
+msgstr ""
+"  --probe-rpms     - peidio defnyddio synthesis, defnyddiwch ffeiliau rpm\n"
 
 #: ../urpmi.update:48
 #, c-format
@@ -2873,7 +2819,8 @@ msgstr "galluogi cyfrwng %s"
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -2885,8 +2832,12 @@ msgstr ""
 
 #: ../urpmq:48
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested (or updated) packages.\n"
-msgstr "  --searchmedia  - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau gofynnwyd (neu diweddarwyd).\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested (or updated) "
+"packages.\n"
+msgstr ""
+"  --searchmedia  - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
+"gofynnwyd (neu diweddarwyd).\n"
 
 #: ../urpmq:54
 #, c-format
@@ -2911,7 +2862,8 @@ msgstr "  --list-url     - rhestri'r holl gyfrwng ar gael.\n"
 #: ../urpmq:60
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - rhestri'r nodau sydd ar gael wrth ddefnyddio --parallel.\n"
+msgstr ""
+"  --list-nodes   - rhestri'r nodau sydd ar gael wrth ddefnyddio --parallel.\n"
 
 #: ../urpmq:61
 #, c-format
@@ -2920,23 +2872,30 @@ msgstr "  --list-aliases - rhestr ar gael ar gyfer enwau paralel.\n"
 
 #: ../urpmq:62
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "  --dump-config  - dympio'r ffurfweddiad mewn ffurf ymresymiad urpmi.addmedia.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - dympio'r ffurfweddiad mewn ffurf ymresymiad urpmi."
+"addmedia.\n"
 
 #: ../urpmq:63
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - pecyn nesaf yn becyn ffynhonnell (yr un peth â -s).\n"
+msgstr ""
+"  --src          - pecyn nesaf yn becyn ffynhonnell (yr un peth â -s).\n"
 
 #: ../urpmq:64
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - give all source packages before downloading (root only).\n"
 
 #: ../urpmq:66
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
-msgstr "  --ignorearch   - caniatáu ymholi rpmau ar gyfer saernïaeth annhebyg.\n"
+msgstr ""
+"  --ignorearch   - caniatáu ymholi rpmau ar gyfer saernïaeth annhebyg.\n"
 
 #: ../urpmq:70
 #, c-format
@@ -3023,7 +2982,9 @@ msgstr "  -g            - argraffu grwpiau gydag enw hefyd.\n"
 #: ../urpmq:96
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy i bobl.\n"
+msgstr ""
+"  -i             - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
+"i bobl.\n"
 
 #: ../urpmq:97
 #, c-format
@@ -3043,12 +3004,17 @@ msgstr "  -r             - argraffu fersiwn a rhyddhad gydag enw hefyd.\n"
 #: ../urpmq:100
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  --s          - pecyn nesaf yn becyn ffynhonnell (yr un peth â --src).\n"
+msgstr ""
+"  --s          - pecyn nesaf yn becyn ffynhonnell (yr un peth â --src).\n"
 
 #: ../urpmq:101
 #, c-format
-msgid "  -u             - remove package if a more recent version is already installed.\n"
-msgstr "  -u             - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei osod.\n"
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u             - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei "
+"osod.\n"
 
 #: ../urpmq:102
 #, c-format
@@ -3058,12 +3024,16 @@ msgstr "  -y             - gosod chwilio fuzzy (fel --fuzzy).\n"
 #: ../urpmq:103
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
-msgstr "  -Y             - fel -y, ond yn gorfodi cydweddu diffyg cydweddiad maint llythrennau.\n"
+msgstr ""
+"  -Y             - fel -y, ond yn gorfodi cydweddu diffyg cydweddiad maint "
+"llythrennau.\n"
 
 #: ../urpmq:104
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
-msgstr " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael eu holi.\n"
+msgstr ""
+" bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
+"eu holi.\n"
 
 #: ../urpmq:180
 #, c-format
@@ -3078,22 +3048,32 @@ msgstr "defnyddiwch -l i restru'r ffeiliau"
 #: ../urpmq:363
 #, 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"
+msgstr ""
+"dim xml info ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer "
+"pecyn %s"
 
 #: ../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"
+msgstr ""
+"dimxml info ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer "
+"pecynnau %s"
 
 #: ../urpmq:364
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "dim  xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer pecyn %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"dim  xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
+"pecyn %s"
 
 #: ../urpmq:365
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "dim  xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer pecynnau %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"dim  xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
+"pecynnau %s"
 
 #: ../urpmq:429
 #, c-format
@@ -3102,19 +3082,26 @@ msgstr "Heb ganfod changelog\n"
 
 #~ msgid "Unknown option %s"
 #~ msgstr "Dewis anhysbys %s"
+
 #~ msgid "too many mount points for removable medium \"%s\""
 #~ msgstr "gormod o bwyntiau gosod ar gyfer cyfrwng symudol \"%s\""
+
 #~ msgid "taking removable device as \"%s\""
 #~ msgstr "cymryd dyfais symudol fel \"%s\""
+
 #~ 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."
+
 #~ msgid "using different removable device [%s] for \"%s\""
 #~ msgstr "defnyddio dyfais symudol gwahanol (%s) ar gyfer \"%s\""
+
 #~ msgid "unable to retrieve pathname for removable medium \"%s\""
 #~ msgstr "methu adfer enw llwybr ar gyfer cyfrwng symudadwy \"%s\""
+
 #~ msgid "unable to mount the distribution medium"
 #~ msgstr "methu mowntio cyfrwng y dosbarthiad"
+
 #~ msgid ""
 #~ "unable to access medium \"%s\",\n"
 #~ "this could happen if you mounted manually the directory when creating the "
@@ -3122,122 +3109,161 @@ msgstr "Heb ganfod changelog\n"
 #~ msgstr ""
 #~ "maethu cael mynediad i gyfrwng \"%s\",\n"
 #~ "gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur wrth greu'r cyfrwng."
+
 #~ msgid "inconsistent medium \"%s\" marked removable but not really"
 #~ msgstr "cyfrwng annealladwy \"%s\" wedi ei nodi'n symudadwy ond nid yw"
-#~ msgid "Press Enter when ready..."
-#~ msgstr "Pwyso Enter pan yn barod..."
+
 #~ msgid "  -c             - clean headers cache directory.\n"
 #~ msgstr "  -c             - glanhau penawdau yng nghyfeiriadur y storfa.\n"
+
 #~ msgid "virtual medium needs to be local"
 #~ msgstr "rhaid i'r rhith gyfrwng fod yn lleol"
-#~ msgid "Error generating names file: dependency %d not found"
-#~ msgstr "Gwall wrth gynhyrchu ffeil enwau: heb ganfod dibyniaeth %d"
+
 #~ msgid "Error generating names file: Can't write to file (%s)"
 #~ msgstr "Gwall wrth gynhyrchu ffeil enwau: Methu ysgrifennu ffeil (%s)"
 
 #, fuzzy
 #~ msgid "unable to parse synthesis file of \"%s\""
 #~ msgstr "methu didoli ffeil hdlist \"%s\""
+
 #~ msgid "found %d rpm headers in cache, removing %d obsolete headers"
 #~ msgstr "wedi canfod %d pennawd rpm yn yr ystorfa, tynnu %d hen bennawd"
+
 #~ msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
 #~ msgstr "cyfrifo md5sum ffynhonnell presennol hdlist (neu synthesis) [%s]"
+
 #~ msgid ""
 #~ "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 #~ "ignored"
 #~ msgstr ""
 #~ "dylai cyfrwng rhithiol \"%s\" fod a rhestr ffeiliau hdlist, anwybyddwyd y "
 #~ "cyfrwng"
+
 #~ msgid "invalid hdlist name"
 #~ msgstr "enw hdlist annilys"
+
 #~ msgid "unable to find list file for \"%s\", medium ignored"
 #~ msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
+
 #~ msgid "\"synthesis\" should not be set (medium \"%s\")"
 #~ msgstr "nid ddylai \"synthesis\" gael ei osod (canolig \"%s\")"
+
 #~ msgid "\"synthesis\" should be set (medium \"%s\")"
 #~ msgstr "\"synthesis\" i'w osod (canolig \"%s\")"
+
 #~ msgid "unable to access list file of \"%s\""
 #~ msgstr "methu cael mynediad  ffeil rhestr \"%s\""
+
 #~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 #~ msgstr ""
 #~ "cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r "
 #~ "cyfrwng"
+
 #~ msgid "medium \"%s\" trying to use an already used list, medium ignored"
 #~ msgstr ""
 #~ "cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r "
 #~ "cyfrwng"
+
 #~ msgid "wrote %s"
 #~ msgstr "ysgrifennodd %s"
+
 #~ msgid ""
 #~ "Note: no hdlist for medium \"%s\", unable to return any result for it"
 #~ msgstr ""
 #~ "Sylw: dim hdlist ar gyfer cyfrwng \"%s\", methu dychwelyd canlyniadau ar "
 #~ "ei gyfer"
+
 #~ msgid "performing second pass to compute dependencies\n"
 #~ msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
+
 #~ msgid "building hdlist [%s]"
 #~ msgstr "adeiladu hdlist [%s]"
+
 #~ msgid ""
 #~ "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
 #~ "corrupted."
 #~ msgstr ""
 #~ "Methu adeiladu ffeil synthesis ar gyfer cyfrwng \"%s\". Efallai bod eich "
 #~ "ffeil hdlist yn llygredig."
+
 #~ msgid "problem reading hdlist or synthesis file of medium \"%s\""
 #~ msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
+
 #~ msgid "computing md5sum of copied source hdlist (or synthesis)"
 #~ msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
+
 #~ msgid "...retrieving failed: md5sum mismatch"
 #~ msgstr "... methodd ail-lwytho: anghysondeb md5sum"
+
 #~ msgid "no rpm files found from [%s]"
 #~ msgstr "heb ganfod ffeiliau rpm o [%s]"
+
 #~ msgid "unable to read rpm files from [%s]: %s"
 #~ msgstr "methu darllen ffeiliau rpm o (%s): %s"
+
 #~ msgid "no rpms read"
 #~ msgstr "heb ddarllen rpmau"
+
 #~ msgid "reading headers from medium \"%s\""
 #~ msgstr "darllen pennawd o'r cyfrwng \"%s\""
+
 #~ msgid "    --probe-synthesis - use synthesis file.\n"
 #~ msgstr "  --probe-synthesis - defnyddio ffeil synthesis.\n"
+
 #~ msgid "    --probe-hdlist - use hdlist file.\n"
 #~ msgstr "  --probe-hdlist - defnyddio ffeil hdlist.\n"
+
 #~ msgid ""
 #~ "Note: since no media searched uses hdlists, urpmf was unable to return "
 #~ "any result\n"
 #~ msgstr ""
 #~ "Sylw: gan nad oedd unrhyw gyfrwng chwiliwyd yn defnyddio hdlists, methodd "
 #~ "urpmf â chynnig canlyniad\n"
+
 #~ msgid "You may want to use --name to search for package names.\n"
 #~ msgstr "Efallai yr hoffech ddefnyddio --name i chwilio am enwau pecynnau.\n"
+
 #~ msgid "  --src, -s      - next package is a source package.\n"
 #~ msgstr "  --src, -s      - pecyn nesaf yn becyn ffynhonnell.\n"
+
 #~ msgid "  --probe-hdlist - use hdlist file.\n"
 #~ msgstr "  --probe-hdlist - defnyddio ffeil hdlist.\n"
+
 #~ msgid "unable to update medium \"%s\"\n"
 #~ msgstr "methu diweddaru cyfrwng \"%s\"\n"
+
 #~ msgid "unable to create medium \"%s\"\n"
 #~ msgstr "methu creu cyfrwng \"%s\"\n"
+
 #~ msgid "there are multiple packages with the same rpm filename \"%s\""
 #~ msgstr "mae yna becynnau niferus gyda'r un enw ffeil rpm \"%s\""
+
 #~ msgid "unable to correctly parse [%s] on value \"%s\""
 #~ msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
+
 #~ msgid "(retry as root?)"
 #~ msgstr "(ceisio eto fel root)"
+
 #~ msgid ""
 #~ "medium \"%s\" uses an invalid list file:\n"
 #~ "  mirror is probably not up-to-date, trying to use alternate method"
 #~ msgstr ""
 #~ "cyfrwng \"%s\" yn defnyddio rhestr ffeiliau annilys:\n"
 #~ "  nid yw'r drych yn un diweddar, ceisiwch ddull arall"
+
 #~ msgid "medium \"%s\" does not define any location for rpm files"
 #~ msgstr ""
 #~ "nid yw cyfrwng \"%s\" yn diffinio unrhyw leoliad ar gyfer ffeiliau rpm"
+
 #~ msgid "unrequested"
 #~ msgstr "diofyn"
+
 #~ msgid " (%d MB)"
 #~ msgstr " (%d MB)"
+
 #~ msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 #~ msgstr "ychwanegu pecyn %s (id=%d, eid=%d, update=%d, file=%s)"
+
 #~ msgid ""
 #~ "The following packages have bad signatures:\n"
 #~ "%s\n"
@@ -3248,27 +3274,34 @@ msgstr "Heb ganfod changelog\n"
 #~ "%s\n"
 #~ "\n"
 #~ "Hoffech chi barhau gyda'r gosod?"
+
 #~ msgid "You need to be root to use --use-distrib"
 #~ msgstr "Rhaid i chi fod yn wraidd i ddefnyddio --use-distrib"
+
 #~ msgid "unable to remove package %s"
 #~ msgstr "methu tynnu pecyn %s"
+
 #~ msgid "No filelist found\n"
 #~ msgstr "Heb ganfod filelist\n"
+
 #~ msgid ""
 #~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 #~ msgstr ""
 #~ "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu (%d MB)"
+
 #~ msgid "Proceed with the installation of the %d package? (%d MB)"
 #~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
 #~ msgstr[0] "Parhau gyda gosod %d pecyn? (%d MB)"
 #~ msgstr[1] "Parhau gyda gosod %d pecyn? (%d MB)"
+
 #~ msgid "(%d packages, %d MB)"
 #~ msgstr "(%d pecyn, %d MB)"
+
 #~ msgid ""
 #~ "  -P             - do not search in provides to find package (default).\n"
 #~ msgstr ""
 #~ "  -P             - peidio chwilio yn provides i ganfod pecyn "
 #~ "(rhagosodedig).\n"
+
 #~ msgid "  -R             - reverse search to what requires package.\n"
 #~ msgstr "  -R             - chwilio nôl  i'r hyn sydd angen ar becyn.\n"
-