really sync with code

1 files changed, 601 insertions, 553 deletions

diff --git a/po/cy.po b/po/cy.po
index 26c8f727..9b40471a 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-17 17:46+0100\n"
+"POT-Creation-Date: 2008-04-22 20:19+0200\n"
 "PO-Revision-Date: 2008-03-17 19:40+0100\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg\n"
@@ -20,7 +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:72
 #, c-format
 msgid "RPM installation"
 msgstr "Gosod RPM"
@@ -30,7 +30,7 @@ msgstr "Gosod RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Gwall: methu canfod ffeil %s, diddymu'r weithred"
 
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:166 ../gurpmi2:190
 #, c-format
 msgid "_Ok"
 msgstr "_Iawn"
@@ -96,7 +96,7 @@ msgstr "_Gosod"
 msgid "_Save"
 msgstr "_Cadw"
 
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:166
 #, c-format
 msgid "_Cancel"
 msgstr "_Dileu"
@@ -127,14 +127,13 @@ msgstr ""
 msgid "Options:"
 msgstr "Dewisiadau:"
 
-#: ../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
+#: ../gurpmi.pm:46 ../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
+#: ../gurpmi.pm:47 ../urpmi:81
 #, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
@@ -157,7 +156,7 @@ msgstr ""
 "  --force        - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
 "bodoli.\n"
 
-#: ../gurpmi.pm:50 ../urpmi:132
+#: ../gurpmi.pm:50 ../urpmi:133
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -166,34 +165,34 @@ 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
+#: ../gurpmi.pm:52 ../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:148
+#: ../gurpmi.pm:53 ../urpmi:149
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - caniatáu i chwilio canfod pecyn.\n"
 
-#: ../gurpmi.pm:54 ../urpmi:149
+#: ../gurpmi.pm:54 ../urpmi:150
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - peidio chwilio yn provides i ganfod pecyn.\n"
 
-#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:68
+#: ../gurpmi.pm:55 ../urpmi:111 ../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
+#: ../gurpmi.pm:56 ../urpmi:135
 #, 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
+#: ../gurpmi.pm:57 ../urpmi:78
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
@@ -201,22 +200,22 @@ msgstr ""
 "  --searchmedia  - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
 "gofynnwyd.\n"
 
-#: ../gurpmi.pm:98
+#: ../gurpmi.pm:100
 #, c-format
 msgid "No packages specified"
 msgstr "Heb enwi pecyn"
 
-#: ../gurpmi2:45
+#: ../gurpmi2:52
 #, c-format
 msgid "Please wait..."
 msgstr "Arhoswch..."
 
-#: ../gurpmi2:54
+#: ../gurpmi2:61
 #, c-format
 msgid "Must be root"
 msgstr "Rhaid bod yn root"
 
-#: ../gurpmi2:89
+#: ../gurpmi2:102
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -227,42 +226,42 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:114
+#: ../gurpmi2:126
 #, c-format
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../gurpmi2:114 ../urpmi:626
+#: ../gurpmi2:126 ../urpmi:638
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../gurpmi2:148
+#: ../gurpmi2:162
 #, c-format
 msgid " (to upgrade)"
 msgstr "(uwchraddio)"
 
-#: ../gurpmi2:149
+#: ../gurpmi2:163
 #, c-format
 msgid " (to install)"
 msgstr "(gosod)"
 
-#: ../gurpmi2:152
+#: ../gurpmi2:166
 #, c-format
 msgid "Package choice"
 msgstr "Dewis pecyn"
 
-#: ../gurpmi2:153
+#: ../gurpmi2:167
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../gurpmi2:176
+#: ../gurpmi2:191
 #, c-format
 msgid "_Abort"
 msgstr "_Atal"
 
-#: ../gurpmi2:196
+#: ../gurpmi2:213
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -273,61 +272,61 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:215 ../urpmi:592
+#: ../gurpmi2:232 ../urpmi:604
 #, 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:593
+#: ../gurpmi2:233 ../urpmi:605
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
 
-#: ../gurpmi2:218
+#: ../gurpmi2:235
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pecyn, %d MB)"
 msgstr[1] "(%d pecyn, %d MB)"
 
-#: ../gurpmi2:224
+#: ../gurpmi2:241
 #, c-format
 msgid "Package installation..."
 msgstr "Gosod y pecyn..."
 
-#: ../gurpmi2:226 ../urpm/main_loop.pm:48
+#: ../gurpmi2:243 ../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:257 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
 
-#: ../gurpmi2:244
+#: ../gurpmi2:261
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../gurpmi2:264 ../urpmi:622
+#: ../gurpmi2:278 ../urpmi:633
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Rhowch gyfrwng \"%s\" yn y ddyfais"
 
-#: ../gurpmi2:275
+#: ../gurpmi2:289
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Llwytho pecynnau i lawr ' %s'..."
 
-#: ../gurpmi2:289
+#: ../gurpmi2:308
 #, c-format
 msgid "_Done"
 msgstr "_Gorffen"
 
-#: ../gurpmi2:296 ../urpm/main_loop.pm:258
+#: ../gurpmi2:316 ../urpm/main_loop.pm:261
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -338,28 +337,28 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../gurpmi2:302 ../urpm/main_loop.pm:196 ../urpm/main_loop.pm:214
-#: ../urpm/main_loop.pm:232
+#: ../gurpmi2:322 ../urpm/main_loop.pm:199 ../urpm/main_loop.pm:217
+#: ../urpm/main_loop.pm:235
 #, c-format
 msgid "Installation failed:"
 msgstr "Methodd y gosod:"
 
-#: ../gurpmi2:307
+#: ../gurpmi2:327
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Popeth wedi eu gosod eisoes"
 
-#: ../gurpmi2:309
+#: ../gurpmi2:329
 #, c-format
 msgid "Installation finished"
 msgstr "Cwblhawyd y gosod"
 
-#: ../gurpmi2:310 ../urpme:132
+#: ../gurpmi2:330 ../urpme:132
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
 
-#: ../gurpmi2:334 ../urpmi:677
+#: ../gurpmi2:338 ../urpmi:692
 #, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
@@ -398,7 +397,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:281
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
@@ -418,100 +417,120 @@ msgstr "methu creu cyfeiriadur %s"
 msgid "invalid owner for directory %s"
 msgstr "perchennog annilys cyfeiriadur %s"
 
-#: ../urpm.pm:210
+#: ../urpm.pm:233
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "methu agor rpmdb"
 
-#: ../urpm.pm:224
+#: ../urpm.pm:247
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "enw ffeil rpm annilys [%s]"
 
-#: ../urpm.pm:230
+#: ../urpm.pm:253
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpm.pm:232 ../urpm/get_pkgs.pm:160
+#: ../urpm.pm:255 ../urpm/get_pkgs.pm:171
 #, 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:258 ../urpm/download.pm:714 ../urpm/get_pkgs.pm:173
+#: ../urpm/media.pm:793 ../urpm/media.pm:1237 ../urpm/media.pm:1405
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... methodd ail-lwytho: %s"
 
-#: ../urpm.pm:240
+#: ../urpm.pm:263
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad  ffeil rpm (%s)"
 
-#: ../urpm.pm:245
+#: ../urpm.pm:268
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "methu didoli ffeil spec %s [%s]"
 
-#: ../urpm.pm:253
+#: ../urpm.pm:276
 #, c-format
 msgid "unable to register rpm file"
 msgstr "methu cofrestr ffeil rpm"
 
-#: ../urpm.pm:255
+#: ../urpm.pm:278
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Saernïaeth anghydnaws ar gyfer rpm [%s]"
 
-#: ../urpm.pm:259
+#: ../urpm.pm:282
 #, c-format
 msgid "error registering local packages"
 msgstr "gwall cofrestru pecynnau lleol"
 
-#: ../urpm.pm:357
+#: ../urpm.pm:367
 #, c-format
 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:142 ../urpm/args.pm:151
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
 
-#: ../urpm/args.pm:280
+#: ../urpm/args.pm:300
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
 
-#: ../urpm/args.pm:353
+#: ../urpm/args.pm:377
+#, fuzzy, c-format
+msgid "unexpected expression %s"
+msgstr "Mynegiadau patrymau:\n"
+
+#: ../urpm/args.pm:378
+#, fuzzy, c-format
+msgid "missing expression before %s"
+msgstr "Llofnod coll (%s)"
+
+#: ../urpm/args.pm:384
+#, c-format
+msgid "unexpected expression %s (suggestion: use -a or -o ?)"
+msgstr ""
+
+#: ../urpm/args.pm:388
+#, fuzzy, c-format
+msgid "no expression to close"
+msgstr "Mynegiadau patrymau:\n"
+
+#: ../urpm/args.pm:397
 #, 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:419
+#: ../urpm/args.pm:469
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Nid yw cyfeiriadur chroot yn bodoli"
 
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:488
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Methu defnyddio %s heb %s"
 
-#: ../urpm/args.pm:441 ../urpm/args.pm:444
+#: ../urpm/args.pm:491 ../urpm/args.pm:494
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Methu defnyddio %s gyda %s"
 
-#: ../urpm/args.pm:452
+#: ../urpm/args.pm:502
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Gormod o ymresymiadau\n"
 
-#: ../urpm/bug_report.pm:48 ../urpmi:247
+#: ../urpm/bug_report.pm:48 ../urpmi:258
 #, c-format
 msgid "Copying failed"
 msgstr "Methodd y copïo"
@@ -525,12 +544,17 @@ msgstr ""
 "Rhaid i chi arosod y CD-ROM eich hun (neu osod perl-Hal-Cdroms i'w wneud yn "
 "awtomatig)"
 
+#: ../urpm/cdrom.pm:68
+#, c-format
+msgid "HAL daemon (hald) is not running or not ready"
+msgstr ""
+
 #: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr "nid yw cyfrwng \"%s\" ar gael"
 
-#: ../urpm/cdrom.pm:206
+#: ../urpm/cdrom.pm:207
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
@@ -550,122 +574,127 @@ 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:456 ../urpm/media.pm:462
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
 
-#: ../urpm/download.pm:111
+#: ../urpm/download.pm:100
+#, c-format
+msgid "can not read proxy settings (not enough rights to read %s)"
+msgstr ""
+
+#: ../urpm/download.pm:125
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Rhowch eich hawliau ar gyfer cael mynediad i ddirprwy\n"
 
-#: ../urpm/download.pm:112
+#: ../urpm/download.pm:126
 #, c-format
 msgid "User name:"
 msgstr "Enw Defnyddiwr"
 
-#: ../urpm/download.pm:112
+#: ../urpm/download.pm:126
 #, c-format
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../urpm/download.pm:195
+#: ../urpm/download.pm:210
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
 msgstr "Webfetch anhysbys '%s' !!!\n"
 
-#: ../urpm/download.pm:204
+#: ../urpm/download.pm:219
 #, c-format
 msgid "%s failed: exited with signal %d"
 msgstr "Methodd '%s': gadael gydag arwydd %d"
 
-#: ../urpm/download.pm:205
+#: ../urpm/download.pm:220
 #, c-format
 msgid "%s failed: exited with %d"
 msgstr "Methodd '%s': gadael gyda %d"
 
-#: ../urpm/download.pm:234
+#: ../urpm/download.pm:249
 #, c-format
 msgid "copy failed"
 msgstr "methodd y copïo"
 
-#: ../urpm/download.pm:240
+#: ../urpm/download.pm:255
 #, c-format
 msgid "wget is missing\n"
 msgstr "mae wget ar goll\n"
 
-#: ../urpm/download.pm:305
+#: ../urpm/download.pm:322
 #, c-format
 msgid "curl is missing\n"
 msgstr "mae curl ar goll\n"
 
-#: ../urpm/download.pm:430
+#: ../urpm/download.pm:447
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "methodd curl: diddymwyd y llwytho i lawr\n"
 
-#: ../urpm/download.pm:469
+#: ../urpm/download.pm:486
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync ar goll\n"
 
-#: ../urpm/download.pm:535
+#: ../urpm/download.pm:552
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh ar goll\n"
 
-#: ../urpm/download.pm:554
+#: ../urpm/download.pm:571
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla ar goll\n"
 
-#: ../urpm/download.pm:570
+#: ../urpm/download.pm:587
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Methu gweithredu prozilla\n"
 
-#: ../urpm/download.pm:578
+#: ../urpm/download.pm:595
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 ar goll\n"
 
-#: ../urpm/download.pm:681
+#: ../urpm/download.pm:698
 #, 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:683
+#: ../urpm/download.pm:700
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% wedi ei gwblhau, cyflymder = %s"
 
-#: ../urpm/download.pm:740
+#: ../urpm/download.pm:763
 #, c-format
 msgid "retrieving %s"
 msgstr "estyn %s"
 
-#: ../urpm/download.pm:744
+#: ../urpm/download.pm:767
 #, c-format
 msgid "retrieved %s"
 msgstr "estynwyd: %s"
 
-#: ../urpm/download.pm:772
+#: ../urpm/download.pm:795
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocol anhysbys ar gyfer %s"
 
-#: ../urpm/download.pm:792
+#: ../urpm/download.pm:815
 #, 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:796
+#: ../urpm/download.pm:819
 #, 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:817
+#: ../urpm/download.pm:840
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "methu trin protocol: %s"
@@ -680,19 +709,19 @@ msgstr "glanhau %s ac %s"
 msgid "package %s is not found."
 msgstr "heb ganfod pecyn %s"
 
-#: ../urpm/get_pkgs.pm:136
+#: ../urpm/get_pkgs.pm:149
 #, c-format
 msgid "malformed URL: [%s]"
 msgstr "URL gwallus: [%s]"
 
-#: ../urpm/get_pkgs.pm:149
+#: ../urpm/get_pkgs.pm:160
 #, 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:156
+#: ../urpm/get_pkgs.pm:167
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
@@ -799,47 +828,47 @@ msgstr "Mae cronfa ddata %s wedi ei chloi (mae rhaglen arall yn ei defnyddio)"
 msgid "The following package has bad signature"
 msgstr "Mae gan y pecyn canlynol lofnod gwallus"
 
-#: ../urpm/main_loop.pm:111
+#: ../urpm/main_loop.pm:114
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
 
-#: ../urpm/main_loop.pm:112
+#: ../urpm/main_loop.pm:115
 #, c-format
 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:128 ../urpm/main_loop.pm:206 ../urpm/main_loop.pm:224
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
-#: ../urpm/main_loop.pm:129
+#: ../urpm/main_loop.pm:132
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "tynnu rpm wedi eu gosod (%s)"
 
-#: ../urpm/main_loop.pm:149
+#: ../urpm/main_loop.pm:152
 #, c-format
 msgid "distributing %s"
 msgstr "dosbarthu %s"
 
-#: ../urpm/main_loop.pm:164
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "installing %s from %s"
 msgstr "gosod %s o %s"
 
-#: ../urpm/main_loop.pm:166
+#: ../urpm/main_loop.pm:169
 #, c-format
 msgid "installing %s"
 msgstr "gosod %s"
 
-#: ../urpm/main_loop.pm:204
+#: ../urpm/main_loop.pm:207
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
 
-#: ../urpm/main_loop.pm:222
+#: ../urpm/main_loop.pm:225
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Mwy o orfodaeth gyda'r gosod?  (--force)? (y/N)"
@@ -858,7 +887,7 @@ msgstr ""
 "Methodd y gosod, rpm gwallus:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:270
+#: ../urpm/main_loop.pm:273
 #, c-format
 msgid "%d installation transaction failed"
 msgid_plural "%d installation transactions failed"
@@ -905,47 +934,47 @@ 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:187
+#: ../urpm/media.pm:194
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "dylai cyfrwng rhithiol  \"%s\" gael url clir, anwybyddu'r cyfrwng"
 
-#: ../urpm/media.pm:189
+#: ../urpm/media.pm:196
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
 
-#: ../urpm/media.pm:196
+#: ../urpm/media.pm:203
 #, 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:223
+#: ../urpm/media.pm:230
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", hepgor"
 
-#: ../urpm/media.pm:409
+#: ../urpm/media.pm:415
 #, c-format
 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:458 ../urpm/media.pm:464
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "ysgrifennu ffeil ffurfweddu (%s)"
 
-#: ../urpm/media.pm:501
+#: ../urpm/media.pm:507
 #, 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:509
+#: ../urpm/media.pm:515
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s"
 
-#: ../urpm/media.pm:525
+#: ../urpm/media.pm:531
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -954,213 +983,213 @@ msgstr ""
 "--nid oes modd defnyddio synthesis gyda --media, --excludemedia, --"
 "sortmedia, --diweddaru, --use-distrib or --parallel"
 
-#: ../urpm/media.pm:612
+#: ../urpm/media.pm:624
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Cychwyn chwilio: %s diwedd: %s"
 
-#: ../urpm/media.pm:627
+#: ../urpm/media.pm:641
 #, c-format
 msgid "skipping package %s"
 msgstr "hepgor pecyn %s"
 
-#: ../urpm/media.pm:643
+#: ../urpm/media.pm:657
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "gosod yn lle uwchraddio pecyn %s"
 
-#: ../urpm/media.pm:668
+#: ../urpm/media.pm:682
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "cyfrwng \"%s\" yn bodoli eisoes"
 
-#: ../urpm/media.pm:710
+#: ../urpm/media.pm:724
 #, c-format
 msgid "(ignored by default)"
 msgstr "(anwybyddwyd drwy ragosodiad)"
 
-#: ../urpm/media.pm:716
+#: ../urpm/media.pm:730
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "ychwanegu cyfrwng \"%s\", cyn cyfrwng pell \"%s\""
 
-#: ../urpm/media.pm:722
+#: ../urpm/media.pm:736
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "ychwanegu cyfrwng \"%s\""
 
-#: ../urpm/media.pm:759
+#: ../urpm/media.pm:765
 #, c-format
 msgid "directory %s does not exist"
 msgstr "nid yw cyfeiriadur %s yn bodoli"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:773
 #, 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:769
+#: ../urpm/media.pm:791
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "methu didoli media.cfg"
 
-#: ../urpm/media.pm:772
+#: ../urpm/media.pm:794
 #, 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:790
+#: ../urpm/media.pm:812
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "hepgor cyfrwng anghymarus '%s' (ar gyfer %s)"
 
-#: ../urpm/media.pm:839
+#: ../urpm/media.pm:861
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "estyn ffeil media.cfg..."
 
-#: ../urpm/media.pm:880
+#: ../urpm/media.pm:902
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
 
-#: ../urpm/media.pm:883
+#: ../urpm/media.pm:905
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "dewis aml-gyfrwng: %s"
 
-#: ../urpm/media.pm:903
+#: ../urpm/media.pm:925
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "dewis cyfrwng \"%s\":"
 
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:1001
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "ail-ffurfweddu urpmi ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1017
+#: ../urpm/media.pm:1039
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...methodd ail-ffurfweddu"
 
-#: ../urpm/media.pm:1023
+#: ../urpm/media.pm:1045
 #, c-format
 msgid "reconfiguration done"
 msgstr "cwblhau ail-ffurfweddu"
 
-#: ../urpm/media.pm:1053
+#: ../urpm/media.pm:1061
 #, 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
+#: ../urpm/media.pm:1082
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
 
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1093
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "archwilio ffeil synthesis [%s]"
 
-#: ../urpm/media.pm:1075
+#: ../urpm/media.pm:1113
 #, c-format
 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:1126 ../urpm/media.pm:1209
 #, 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:1128 ../urpm/media.pm:1183 ../urpm/media.pm:1421
 #, c-format
 msgid "...copying failed"
 msgstr "...methodd y copïo"
 
-#: ../urpm/media.pm:1141
+#: ../urpm/media.pm:1179
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copïo ffeil disgrifiad o \"%s\""
 
-#: ../urpm/media.pm:1143 ../urpm/media.pm:1175
+#: ../urpm/media.pm:1181 ../urpm/media.pm:1213
 #, c-format
 msgid "...copying done"
 msgstr "...cwblhau'r copïo"
 
-#: ../urpm/media.pm:1177
+#: ../urpm/media.pm:1215
 #, 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:1210
+#: ../urpm/media.pm:1248
 #, c-format
 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:1250 ../urpm/media.pm:1671
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "methodd estyn (%s) (md5sum gwallus)"
 
-#: ../urpm/media.pm:1227
+#: ../urpm/media.pm:1265
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "methodd genhdlist2 ar %s"
 
-#: ../urpm/media.pm:1237
+#: ../urpm/media.pm:1275
 #, c-format
 msgid "comparing %s and %s"
 msgstr "cymharu %s ac %s"
 
-#: ../urpm/media.pm:1268
+#: ../urpm/media.pm:1300
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ffeil hdlist annilys %s ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1296
+#: ../urpm/media.pm:1326
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "copïo ffeil MD5SUM o \"%s\""
 
-#: ../urpm/media.pm:1350
+#: ../urpm/media.pm:1380
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "adfer ffynhonnell synthesis \"%s\"..."
 
-#: ../urpm/media.pm:1367
+#: ../urpm/media.pm:1397
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "canfod synthesis holwyd fel %s"
 
-#: ../urpm/media.pm:1374 ../urpm/media.pm:1482
+#: ../urpm/media.pm:1404 ../urpm/media.pm:1512
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "dim ffeil synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1425
+#: ../urpm/media.pm:1455
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "archwilio ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1437
+#: ../urpm/media.pm:1467
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1441
+#: ../urpm/media.pm:1471
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "methu mewnforio ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1512
+#: ../urpm/media.pm:1545
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
 
-#: ../urpm/media.pm:1623
+#: ../urpm/media.pm:1665
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "methodd estyn [%s]"
@@ -1170,22 +1199,22 @@ msgstr "methodd estyn [%s]"
 msgid "trying again with mirror %s"
 msgstr "ceisio eto gyda drych %s"
 
-#: ../urpm/mirrors.pm:60
+#: ../urpm/mirrors.pm:55
 #, c-format
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Methu canfod drych o restr drychau %s"
 
-#: ../urpm/mirrors.pm:133
+#: ../urpm/mirrors.pm:181
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "wedi canfod geolleoleiddio %s %.2f %.2f  o gylchfa amser %s"
 
-#: ../urpm/mirrors.pm:178
+#: ../urpm/mirrors.pm:226
 #, c-format
 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:63 ../urpmi:518 ../urpmi:534 ../urpmi:624
 #, c-format
 msgid "Nn"
 msgstr "Nn"
@@ -1195,73 +1224,73 @@ 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:64 ../urpme:37 ../urpmi:519 ../urpmi:535 ../urpmi:574
+#: ../urpmi:625 ../urpmi:661 ../urpmi:667 ../urpmi.addmedia:138
 #, c-format
 msgid "Yy"
 msgstr "Yy"
 
-#: ../urpm/msg.pm:120
+#: ../urpm/msg.pm:121
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Dewis gwael, ceisiwch eto\n"
 
-#: ../urpm/msg.pm:151
+#: ../urpm/msg.pm:152
 #, c-format
 msgid "Package"
 msgstr "Pecyn"
 
-#: ../urpm/msg.pm:151
+#: ../urpm/msg.pm:152
 #, c-format
 msgid "Version"
 msgstr "Fersiwn"
 
-#: ../urpm/msg.pm:151
+#: ../urpm/msg.pm:152
 #, c-format
 msgid "Release"
 msgstr "Ryddhad"
 
-#: ../urpm/msg.pm:151
+#: ../urpm/msg.pm:152
 #, c-format
 msgid "Arch"
 msgstr "Arch"
 
-#: ../urpm/msg.pm:160
+#: ../urpm/msg.pm:161
 #, c-format
 msgid "(suggested)"
 msgstr "(awgrym)"
 
-#: ../urpm/msg.pm:175
+#: ../urpm/msg.pm:176
 #, c-format
 msgid "medium \"%s\""
 msgstr "cyfrwng \"%s\""
 
-#: ../urpm/msg.pm:175
+#: ../urpm/msg.pm:176
 #, c-format
 msgid "command line"
 msgstr "llinell orchymyn"
 
-#: ../urpm/msg.pm:189
+#: ../urpm/msg.pm:190
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:189
+#: ../urpm/msg.pm:190
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:189
+#: ../urpm/msg.pm:190
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:189
+#: ../urpm/msg.pm:190
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:189 ../urpm/msg.pm:198
+#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
 #, c-format
 msgid "TB"
 msgstr "TB"
@@ -1301,7 +1330,233 @@ msgstr "gosod %s"
 msgid "unmounting %s"
 msgstr "dadosod %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
+#: ../urpm/select.pm:28
+#, 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:30
+#, 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:191
+#, c-format
+msgid "No package named %s"
+msgstr "Dim pecyn o'r enw %s"
+
+#: ../urpm/select.pm:193 ../urpme:107
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
+
+#: ../urpm/select.pm:516 ../urpm/select.pm:559
+#, c-format
+msgid "due to missing %s"
+msgstr "oherwydd %s coll"
+
+#: ../urpm/select.pm:517
+#, c-format
+msgid "due to already installed %s"
+msgstr "oherwydd %s wedi ei osod eisoes"
+
+#: ../urpm/select.pm:518 ../urpm/select.pm:557
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "%s heb ei foddloni"
+
+#: ../urpm/select.pm:524
+#, c-format
+msgid "trying to promote %s"
+msgstr "ceisio hybu %s"
+
+#: ../urpm/select.pm:525
+#, c-format
+msgid "in order to keep %s"
+msgstr "fel modd i gadw %s"
+
+#: ../urpm/select.pm:553
+#, c-format
+msgid "in order to install %s"
+msgstr "er mwyn gosod %s"
+
+#: ../urpm/select.pm:563
+#, 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:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:271
+#, c-format
+msgid "Can't write file"
+msgstr "Methu ysgrifennu'r ffeil"
+
+#: ../urpm/sys.pm:271
+#, c-format
+msgid "Can't open file"
+msgstr "Methu agor y ffeil"
+
+#: ../urpm/sys.pm:284
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "Methu symud ffeil %s i %s"
+
+#: ../urpme:40
+#, c-format
+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"
+"\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:49 ../urpmi:110 ../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:141
+#, 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:112 ../urpmi.addmedia:69
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../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:152 ../urpmq:86
+#, 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:548
+#, 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:575 ../urpmi:662 ../urpmi.addmedia:141
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpme:150
+#, c-format
+msgid "Removal failed"
+msgstr "Methodd y tynnu"
+
+#: ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1317,25 +1572,25 @@ msgstr ""
 "\n"
 "defnydd: urpmf [dewisiadau] pattern-expression\n"
 
-#: ../urpm/search.pm:36 ../urpmf: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
+#: ../urpmf:37 ../urpmi:132 ../urpmq:79
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - defnyddio amgylchedd penodol (adroddiad gwall fel "
 "rheol).\n"
 
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:76 ../urpmq:49
+#: ../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"
 
-#: ../urpm/search.pm:39 ../urpmf:39
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
@@ -1343,16 +1598,7 @@ 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
-#, 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:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
+#: ../urpmf:42 ../urpmi:79 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1360,460 +1606,257 @@ msgstr ""
 "   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
 "choma.\n"
 
-#: ../urpm/search.pm:43 ../urpmf: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"
 
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:80 ../urpmq:51
+#: ../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
+#: ../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
+#: ../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
+#: ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpm/search.pm:48 ../urpmf:48
+#: ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
 
-#: ../urpm/search.pm:49 ../urpmf: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"
 
-#: ../urpm/search.pm:50 ../urpmf: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
+#: ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Mynegiadau patrymau:\n"
 
-#: ../urpm/search.pm:52 ../urpmf: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"
 
-#: ../urpm/search.pm:53 ../urpmf: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
+#: ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - gweithredwr deuaidd AND.\n"
 
-#: ../urpm/search.pm:55 ../urpmf:55
+#: ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - gweithredwr deuaidd OR.\n"
 
-#: ../urpm/search.pm:56 ../urpmf:56
+#: ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unaidd NOT.\n"
 
-#: ../urpm/search.pm:57 ../urpmf:57
+#: ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )              - parenthesis de a chwith.\n"
 
-#: ../urpm/search.pm:58 ../urpmf:58
+#: ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Rhestr tagiau:\n"
 
-#: ../urpm/search.pm:59 ../urpmf: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
+#: ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   esiampl: '%%enw:%%ffeil'\n"
 
-#: ../urpm/search.pm:61 ../urpmf:61
+#: ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - saernïaeth\n"
 
-#: ../urpm/search.pm:62 ../urpmf:62
+#: ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - gwestai'r adeiladedd\n"
 
-#: ../urpm/search.pm:63 ../urpmf:63
+#: ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - amser adeiladu\n"
 
-#: ../urpm/search.pm:64 ../urpmf:64
+#: ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - ffeiliau ffurfweddiad\n"
 
-#: ../urpm/search.pm:65 ../urpmf:65
+#: ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - tagiau gwrthdaro\n"
 
-#: ../urpm/search.pm:66 ../urpmf:66
+#: ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - disgrifiad pecyn\n"
 
-#: ../urpm/search.pm:67 ../urpmf:67
+#: ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - dosbarthiad\n"
 
-#: ../urpm/search.pm:68 ../urpmf:68
+#: ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - cyfnod\n"
 
-#: ../urpm/search.pm:69 ../urpmf: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
+#: ../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
+#: ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - grŵp\n"
 
-#: ../urpm/search.pm:72 ../urpmf:72
+#: ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license          - trwydded\n"
 
-#: ../urpm/search.pm:73 ../urpmf:73
+#: ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name          - enw'r pecyn\n"
 
-#: ../urpm/search.pm:74 ../urpmf:74
+#: ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - tagiau'r hen\n"
 
-#: ../urpm/search.pm:75 ../urpmf:75
+#: ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager      - pecynydd\n"
 
-#: ../urpm/search.pm:76 ../urpmf:76
+#: ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - tag darparu\n"
 
-#: ../urpm/search.pm:77 ../urpmf:77
+#: ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - tagiau angenrhaid\n"
 
-#: ../urpm/search.pm:78 ../urpmf:78
+#: ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - maint wedi gosod\n"
 
-#: ../urpm/search.pm:79 ../urpmf:79
+#: ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - enw rpm ffynhonnell\n"
 
-#: ../urpm/search.pm:80 ../urpmf:80
+#: ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - cynnig tagiau\n"
 
-#: ../urpm/search.pm:81 ../urpmf:81
+#: ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - crynodeb\n"
 
-#: ../urpm/search.pm:82 ../urpmf:82
+#: ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpm/search.pm:83 ../urpmf:83
+#: ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - gwerthwr\n"
 
-#: ../urpm/search.pm:84 ../urpmf: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
+#: ../urpmf:85 ../urpmq:96
 #, 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
+#: ../urpmf:153
+#, fuzzy, c-format
+msgid "unterminated expression (%s)"
+msgstr "Mynegiadau patrymau:\n"
+
+#: ../urpmf:198
 #, 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
+#: ../urpmf:248 ../urpmi:265 ../urpmq:141
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "ddefnyddio amgylchedd penodol ar %s\n"
 
-#: ../urpm/search.pm:290 ../urpmf:290
+#: ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "dim ffeil hdlist ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/search.pm:297 ../urpmf:297
+#: ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "adeiladu ffeil synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/search.pm:304 ../urpmf:306
+#: ../urpmf:307
 #, 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
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "Methu symud ffeil %s i %s"
-
-#: ../urpme:40
-#, c-format
-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"
-"\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: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:83
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1928,7 +1971,12 @@ msgstr ""
 "  --allow-force  - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
 "                   wirio dibyniaethau na'u cyfanrwydd.\n"
 
-#: ../urpmi:112
+#: ../urpmi:109
+#, fuzzy, c-format
+msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
+msgstr "  --no-suggests  - peidio awto ddewis pecynnau \"suggested\" .\n"
+
+#: ../urpmi:113
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1937,7 +1985,7 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth osod chroot gyda dewis o  --root.\n"
 
-#: ../urpmi:114
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --downloader   - program to use to retrieve distant files. \n"
@@ -1946,37 +1994,37 @@ msgstr ""
 "  --downloader   - rhaglen i'w defnyddio ar gyfer estyn ffeiliau pell. \n"
 "                   rhaglenni hysbys: %s\n"
 
-#: ../urpmi:117
+#: ../urpmi:118
 #, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - dewis ychwanegol wrth ddefnyddio curl\n"
 
-#: ../urpmi:118
+#: ../urpmi:119
 #, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- dewis ychwanegol wrth ddefnyddio rsync\n"
 
-#: ../urpmi:119
+#: ../urpmi:120
 #, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - dewis ychwanegol wrth ddefnyddio wget\n"
 
-#: ../urpmi:120
+#: ../urpmi:121
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --cprozilla-options - dewis ychwanegol wrth ddefnyddio prozilla\n"
 
-#: ../urpmi:121
+#: ../urpmi:122
 #, c-format
 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:123 ../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"
 
-#: ../urpmi:123
+#: ../urpmi:124
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1985,7 +2033,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:126 ../urpmi.addmedia:59 ../urpmi.update:37 ../urpmq:75
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1994,7 +2042,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:128 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:77
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2003,7 +2051,7 @@ msgstr ""
 "  --proxy-user   - enwi defnyddiwr a chyfrinair i'w ddefnyddio fel y\n"
 "                   dilysiad dirprwy (fformat yw <user:password>).\n"
 
-#: ../urpmi:129
+#: ../urpmi:130
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -2012,42 +2060,42 @@ msgstr ""
 "  --bug          - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
 "                   yr arg. nesaf\n"
 
-#: ../urpmi:135
+#: ../urpmi:136
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - eithrio llwybr wedi ei wahanu a chollnod.\n"
 
-#: ../urpmi:136
+#: ../urpmi:137
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - eithrio ffeiliau docs.\n"
 
-#: ../urpmi:137
+#: ../urpmi:138
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - peidio gwirio maint ar ddisg cyn gosod.\n"
 
-#: ../urpmi:138
+#: ../urpmi:139
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - caniatáu gosod rpm ar gyfer saernïaeth annhebyg.\n"
 
-#: ../urpmi:139
+#: ../urpmi:140
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - peidio gweithredu sgripledi pecyn(au)\n"
 
-#: ../urpmi:141
+#: ../urpmi:142
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip          - pecynnau dylid osgoi eu gosod.\n"
 
-#: ../urpmi:142
+#: ../urpmi:143
 #, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr "  --prefer       - pecynnau angenrheidiol\n"
 
-#: ../urpmi:143
+#: ../urpmi:144
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -2057,45 +2105,45 @@ msgstr ""
 "ddewis\n"
 "                   na'r rhagosodiad.\n"
 
-#: ../urpmi:145
+#: ../urpmi:146
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - peidio cloi db rpm.\n"
 
-#: ../urpmi:146
+#: ../urpmi:147
 #, 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"
 
-#: ../urpmi:147 ../urpmq:92
+#: ../urpmi:148 ../urpmq:94
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
 
-#: ../urpmi:150
+#: ../urpmi:151
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - modd distaw.\n"
 
-#: ../urpmi:152
+#: ../urpmi:153
 #, c-format
 msgid "  --debug        - very verbose mode.\n"
 msgstr "  -  --debug       - modd llafar iawn.\n"
 
-#: ../urpmi:153
+#: ../urpmi:154
 #, 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:181
+#: ../urpmi:182
 #, 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:188
+#: ../urpmi:189
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2105,29 +2153,29 @@ msgstr ""
 "arferol\n"
 "ynghyd a --bug.\n"
 
-#: ../urpmi:215
+#: ../urpmi:219
 #, 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:219
+#: ../urpmi:220
 #, c-format
 msgid "You can't install spec files"
 msgstr "Nid oes modd gosod ffeiliau spec"
 
-#: ../urpmi:226
+#: ../urpmi:227
 #, c-format
 msgid "defaulting to --buildrequires"
 msgstr "rhagosod --buildrequires"
 
-#: ../urpmi:231
+#: ../urpmi:232
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 "defnyddiwch --buildrequires neu --install-src, yn rhagosod i --buildrequires"
 
-#: ../urpmi:241
+#: ../urpmi:252
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -2136,17 +2184,17 @@ msgstr ""
 "Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
 "adroddiad gwall neu ei ddileu."
 
-#: ../urpmi:242
+#: ../urpmi:253
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
 
-#: ../urpmi:253
+#: ../urpmi:264
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "Nid yw cyfeiriadur amgylchedd %s yn bodoli"
 
-#: ../urpmi:275
+#: ../urpmi:287
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2155,48 +2203,48 @@ msgstr ""
 "Gwall: %s i weld wedi ei osod fel darllen yn unig.\n"
 "Defnydd --allow-force gorfodaeth i orfodi gweithred."
 
-#: ../urpmi:362
+#: ../urpmi:374
 #, c-format
 msgid "Updating media...\n"
 msgstr "Diweddaru cyfrwng...\n"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:453
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (uwchraddio)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:443
+#: ../urpmi:455
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (uwchraddio)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:447
+#: ../urpmi:459
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (gosod)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:449
+#: ../urpmi:461
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (gosod)"
 
-#: ../urpmi:455
+#: ../urpmi:467
 #, 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:458
+#: ../urpmi:470
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Beth yw eich dewis? (1-%d)"
 
-#: ../urpmi:499
+#: ../urpmi:511
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2207,7 +2255,7 @@ msgstr ""
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:501
+#: ../urpmi:513
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2218,7 +2266,7 @@ msgstr ""
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:508 ../urpmi:524
+#: ../urpmi:520 ../urpmi:536
 #, c-format
 msgid ""
 "\n"
@@ -2227,12 +2275,12 @@ msgstr ""
 "\n"
 "Parhau i osod beth bynnag?"
 
-#: ../urpmi:509 ../urpmi:525 ../urpmi:613 ../urpmi.addmedia:142
+#: ../urpmi:521 ../urpmi:537 ../urpmi:626 ../urpmi.addmedia:141
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: ../urpmi:517
+#: ../urpmi:529
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2241,7 +2289,7 @@ msgstr ""
 "Nid oes modd gosod pecyn gofynnwyd amdani:\n"
 "%s"
 
-#: ../urpmi:518
+#: ../urpmi:530
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2250,7 +2298,7 @@ msgstr ""
 "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
 "%s"
 
-#: ../urpmi:545
+#: ../urpmi:557
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2261,7 +2309,7 @@ msgstr ""
 "gael ei dynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:547
+#: ../urpmi:559
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2272,7 +2320,7 @@ msgstr ""
 "gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:554
+#: ../urpmi:566
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -2281,7 +2329,7 @@ msgstr ""
 "Rhaid i'r pecyn canlynol gael ei dynnu i eraill gael eu diweddaru.\n"
 "%s"
 
-#: ../urpmi:555
+#: ../urpmi:567
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -2290,12 +2338,12 @@ msgstr ""
 "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s"
 
-#: ../urpmi:557
+#: ../urpmi:569
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
 
-#: ../urpmi:578
+#: ../urpmi:590
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2306,39 +2354,39 @@ msgstr ""
 "canlynol:\n"
 "%s\n"
 
-#: ../urpmi:595
+#: ../urpmi:607
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei osod)"
 
-#: ../urpmi:601
+#: ../urpmi:613
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Bydd %s o le ychwanegol ar ddisg yn cael ei ddefnyddio."
 
-#: ../urpmi:602
+#: ../urpmi:614
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Bydd %s o le ar ddisg ar gael."
 
-#: ../urpmi:604
+#: ../urpmi:615
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "bydd %s o becynnau yn cael eu hadfer."
 
-#: ../urpmi:605
+#: ../urpmi:616
 #, 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:627
+#: ../urpmi:638
 #, c-format
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../urpmi:635
+#: ../urpmi:646
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Pwyso Enter pan wedi ei arosod..."
@@ -2489,67 +2537,67 @@ msgstr ""
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modd distaw.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:45 ../urpmi.update:53
+#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpmi.addmedia:102
+#: ../urpmi.addmedia:101
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "polisiau hysbys known xml-info yw %s"
 
-#: ../urpmi.addmedia:113
+#: ../urpmi.addmedia:112
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "dim angen ymresymiad ar gyfer --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:117
 #, 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:122
+#: ../urpmi.addmedia:121
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael ychwanegu cyfrwng"
 
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "creating config file [%s]"
 msgstr "yn creu ffeil config (%s)"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:125
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Methu creu ffeil Config (%s)"
 
-#: ../urpmi.addmedia:134
+#: ../urpmi.addmedia:133
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "dim angen rhoi <llwybr perthynnol synthesis> gyda --distrib"
 
-#: ../urpmi.addmedia:142
-#, c-format
+#: ../urpmi.addmedia:141
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Do you want to add media '%s'"
+"Do you want to add media '%s'?"
 msgstr ""
 "\n"
 "Hoffech chi ychwanegu cyfrwng '%s'"
 
-#: ../urpmi.addmedia:168
+#: ../urpmi.addmedia:167
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<llwybr perthynnol synthesis> ar goll\n"
 
-#: ../urpmi.addmedia:171
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Methu defnyddio %s gyda chyfrwng pell"
 
-#: ../urpmi.addmedia:183
+#: ../urpmi.addmedia:182
 #, c-format
 msgid "unable to add medium"
 msgstr "methu ychwanegu cyfrwng"
@@ -2707,22 +2755,22 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - dewis pob cyfrwng.\n"
 
-#: ../urpmi.removemedia:43
+#: ../urpmi.removemedia:42
 #, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - cydweddiad bras enwau cyfryngau\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:59
 #, c-format
 msgid "Only superuser is allowed to remove media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu cyfrwng"
 
-#: ../urpmi.removemedia:73
+#: ../urpmi.removemedia:72
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "dim i'w dynnu (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n"
 
-#: ../urpmi.removemedia:79
+#: ../urpmi.removemedia:78
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -2773,27 +2821,27 @@ msgstr ""
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - dewis pob cyfrwng ansymudadwy.\n"
 
-#: ../urpmi.update:50
+#: ../urpmi.update:49
 #, c-format
 msgid "  -f             - force updating synthesis\n"
 msgstr "  -f             - gorfodi diweddaru ffeiliau synthesis\n"
 
-#: ../urpmi.update:51
+#: ../urpmi.update:50
 #, c-format
 msgid "  -ff            - really force updating synthesis\n"
 msgstr "  -f             - gorfodi diweddaru ffeiliau synthesis/\n"
 
-#: ../urpmi.update:68
+#: ../urpmi.update:67
 #, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael diweddaru cyfrwng"
 
-#: ../urpmi.update:76
+#: ../urpmi.update:75
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "dim i'w ddiweddaru (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n"
 
-#: ../urpmi.update:94
+#: ../urpmi.update:93
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2802,17 +2850,17 @@ msgstr ""
 "mae'r cofnod i ddiweddaru ar goll\n"
 "(un o %s)\n"
 
-#: ../urpmi.update:98
+#: ../urpmi.update:97
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:99
+#: ../urpmi.update:98
 #, c-format
 msgid "ignoring media %s"
 msgstr "anwybyddu cyfrwng %s"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:98
 #, c-format
 msgid "enabling media %s"
 msgstr "galluogi cyfrwng %s"
@@ -2949,12 +2997,12 @@ msgstr ""
 "                   - ymestyn ymholiad i ddibyniaethau pecynnau.\n"
 ".\n"
 
-#: ../urpmq:87
+#: ../urpmq:89
 #, c-format
 msgid "  --whatrequires - reverse search to what requires package.\n"
 msgstr "  --whatrequires - chwilio nôl  i'r hyn sydd angen ar becyn.\n"
 
-#: ../urpmq:88
+#: ../urpmq:90
 #, c-format
 msgid ""
 "  --whatrequires-recursive\n"
@@ -2963,7 +3011,7 @@ msgstr ""
 "  --whatrequires-recursive\n"
 "                  - chwilio nôl  estyndig (yn cynnwys rhith becynnau) \n"
 
-#: ../urpmq:90
+#: ../urpmq:92
 #, c-format
 msgid ""
 "  --whatprovides, -p\n"
@@ -2972,45 +3020,45 @@ msgstr ""
 "  --whatprovides, -p\n"
 "                   - chwilio yn provides i ganfod pecyn.\n"
 
-#: ../urpmq:93
+#: ../urpmq:95
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - allbwn cyfan a phecyn i'w dynnu\n"
 
-#: ../urpmq:95
+#: ../urpmq:97
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g            - argraffu grwpiau gydag enw hefyd.\n"
 
-#: ../urpmq:96
+#: ../urpmq:98
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
 "i bobl.\n"
 
-#: ../urpmq:97
+#: ../urpmq:99
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
 #, c-format
 msgid "  -m             - equivalent to -du\n"
 msgstr "  -m             - yn cyfateb i -du.\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - argraffu fersiwn a rhyddhad gydag enw hefyd.\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
 #, 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"
 
-#: ../urpmq:101
+#: ../urpmq:103
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -3019,50 +3067,50 @@ msgstr ""
 "  -u             - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei "
 "osod.\n"
 
-#: ../urpmq:102
+#: ../urpmq:104
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - gosod chwilio fuzzy (fel --fuzzy).\n"
 
-#: ../urpmq:103
+#: ../urpmq:105
 #, 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"
 
-#: ../urpmq:104
+#: ../urpmq:106
 #, 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"
 
-#: ../urpmq:180
+#: ../urpmq:185
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
 
-#: ../urpmq:206
+#: ../urpmq:209
 #, c-format
 msgid "use -l to list files"
 msgstr "defnyddiwch -l i restru'r ffeiliau"
 
-#: ../urpmq:363
+#: ../urpmq:382
 #, 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:361
+#: ../urpmq:383
 #, 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:364
+#: ../urpmq:386
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3070,7 +3118,7 @@ msgstr ""
 "dim  xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
 "pecyn %s"
 
-#: ../urpmq:365
+#: ../urpmq:387
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3078,7 +3126,7 @@ msgstr ""
 "dim  xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
 "pecynnau %s"
 
-#: ../urpmq:429
+#: ../urpmq:451
 #, c-format
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"