usync with code

1 files changed, 463 insertions, 451 deletions

diff --git a/po/cy.po b/po/cy.po
index 36944100..26c00528 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-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-08-18 19:57-0000\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:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, 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:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Iawn"
@@ -96,7 +96,7 @@ msgstr "_Gosod"
 msgid "_Save"
 msgstr "_Cadw"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Dileu"
@@ -127,8 +127,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Dewisiadau:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../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"
@@ -165,7 +166,7 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../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"
@@ -215,7 +216,7 @@ msgstr "Arhoswch..."
 msgid "Must be root"
 msgstr "Rhaid bod yn root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -226,42 +227,42 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr "(uwchraddio)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr "(gosod)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Dewis pecyn"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Atal"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -272,61 +273,61 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, 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:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, 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:235
+#: ../gurpmi2:240
 #, 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:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Gosod y pecyn..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "methu estyn pecynnau ffynhonnell, atal"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Rhowch gyfrwng \"%s\" yn y ddyfais"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Llwytho pecynnau i lawr ' %s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Gorffen"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -337,28 +338,28 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Methodd y gosod:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Popeth wedi eu gosod eisoes"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Cwblhawyd y gosod"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
@@ -438,8 +439,8 @@ msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... methodd ail-lwytho: %s"
@@ -479,54 +480,54 @@ msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
 msgid "bad proxy declaration on command line\n"
 msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr "mynegiadau annisgwyl %s"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr "mynegiad coll cyn %s"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "mynegiad annisgwyl %s (awgrym: defnyddio -a neu-0 ?)"
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr "dim mynegiad i'w gau"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, 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:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Nid yw cyfeiriadur chroot yn bodoli"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Methu defnyddio %s heb %s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Methu defnyddio %s gyda %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Gormod o ymresymiadau\n"
@@ -956,218 +957,218 @@ msgstr ""
 "--nid oes modd defnyddio synthesis gyda --media, --excludemedia, --"
 "sortmedia, --diweddaru, --use-distrib or --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Cychwyn chwilio: %s diwedd: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "hepgor pecyn %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "gosod yn lle uwchraddio pecyn %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "cyfrwng \"%s\" yn bodoli eisoes"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(anwybyddwyd drwy ragosodiad)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "ychwanegu cyfrwng \"%s\", cyn cyfrwng pell \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "ychwanegu cyfrwng \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "nid yw cyfeiriadur %s yn bodoli"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, 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:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "methu didoli media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, 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:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "hepgor cyfrwng anghymarus '%s' (ar gyfer %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "estyn ffeil media.cfg..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "dewis aml-gyfrwng: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "dewis cyfrwng \"%s\":"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "ail-ffurfweddu urpmi ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...methodd ail-ffurfweddu"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "cwblhau ail-ffurfweddu"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Gwall wrth gynhyrchu ffeil enwau: heb ganfod dibyniaeth %d"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "archwilio ffeil synthesis [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "copïo [%s] ar gyfer cyfrwng \"%s\"..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...methodd y copïo"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copïo ffeil disgrifiad o \"%s\""
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...cwblhau'r copïo"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, 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:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "cyfrifo md5sum o ffynhonnell synthesis adferwyd (neu synthesis)"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "methodd estyn (%s) (md5sum gwallus)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "methodd genhdlist2 ar %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "cymharu %s ac %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ffeil hdlist annilys %s ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "copïo ffeil MD5SUM o \"%s\""
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "ffeil MD5SUM annilys (llwytho i lawr o %s)"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "adfer ffynhonnell synthesis \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "canfod synthesis holwyd fel %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "dim ffeil synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "archwilio ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "methu mewnforio ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "methodd estyn [%s]"
@@ -1203,7 +1204,7 @@ msgstr "Nn"
 #  please keep the 'Yy' for compatibility reasons
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy"
@@ -1273,7 +1274,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1362,272 +1363,7 @@ msgstr "gosod %s"
 msgid "unmounting %s"
 msgstr "dadosod %s"
 
-#: ../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:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
-
-#: ../urpm/select.pm:296
-#, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "wedi canfod pecyn(nau) %s yn urpmi db, ond heb eu gosod"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Pecyn %s wedi ei osod eisoes"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Pecynnau %s wedi eu gosod eisoes"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "oherwydd %s coll"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "oherwydd %s wedi ei osod eisoes"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "%s heb ei foddloni"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "ceisio hybu %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "fel modd i gadw %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "er mwyn gosod %s"
-
-#: ../urpm/select.pm:613
-#, 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 "system"
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr "Dylech ailddechrau %s ar gyfer %s"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "Methu ysgrifennu'r ffeil"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "Methu agor y ffeil"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "Methu symud ffeil %s i %s"
-
-#: ../urpme:41
-#, 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:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - dewis pecyn yn awtomatig o fewn dewisiadau.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr "  --auto-orphans - tynnu amddifad\n"
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test          - gwirio os oes modd tynnu'n iawn.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - defnyddio root arall ar gyfer tynnu rpm.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, 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:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - peidio gweithredu sgriptledi'r pecyn(au).\n"
-
-#: ../urpme:56
-#, 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:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - modd llafar.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - select all packages matching expression.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "pecynnau anhysbys"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "pecyn anhysbys"
-
-#: ../urpme:119
-#, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "Bydd tynnu pecyn canlynol yn torri eich system:"
-msgstr[1] "Bydd tynnu pecynnau canlynol yn torri eich system:"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Dim i'w dynnu"
-
-#: ../urpme:141
-#, c-format
-msgid "No orphans to remove"
-msgstr "Dim amddifad i'w tynnu"
-
-#: ../urpme:147
-#, 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:152
-#, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "pecyn amddifad"
-msgstr[1] "pecynnau amddifad"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Tynnu pecynnau %d?"
-msgstr[1] "Tynnu pecynnau %d?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:164
-#, c-format
-msgid "testing removal of %s"
-msgstr "profi tynnu %s"
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Methodd y tynnu"
-
-#: ../urpme:180
-#, c-format
-msgid "Removal is possible"
-msgstr "Mae tynnu yn bosibl"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1643,25 +1379,25 @@ msgstr ""
 "\n"
 "defnydd: urpmf [dewisiadau] pattern-expression\n"
 
-#: ../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"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - defnyddio amgylchedd penodol (adroddiad gwall fel "
 "rheol).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
@@ -1669,7 +1405,16 @@ msgstr ""
 "  --literal, -l  - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn "
 "llythrennedd.\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, 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:77 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1677,257 +1422,524 @@ msgstr ""
 "   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
 "choma.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 "  --use-distrib  - defnyddio'r llwybr yma i gael mynediad ar y cyfrwng.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - peidio argraffu llinellau'r un fath.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i             - cadw gwahaniaeth maint llythrennau ym mhob patrwm "
 "(rhagosodiad).\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - newid ymwahanydd maes (arferol i ':').\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Mynegiadau patrymau:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - unrhyw destun wedi ei ddidoli fel regexp, onibai fod -l "
 "yn cael ei ddefnyddio.\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - cynnwys perl cod yn union fel perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - gweithredwr deuaidd AND.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - gweithredwr deuaidd OR.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unaidd NOT.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )              - parenthesis de a chwith.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Rhestr tagiau:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - pennu allbwn fformat printf-aidd\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   esiampl: '%%enw:%%ffeil'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - saernïaeth\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - gwestai'r adeiladedd\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - amser adeiladu\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - ffeiliau ffurfweddiad\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - tagiau gwrthdaro\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - disgrifiad pecyn\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - dosbarthiad\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - cyfnod\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - enw ffeil y pecyn\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - rhestr ffeiliau o fewn y pecyn\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - grŵp\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license          - trwydded\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name          - enw'r pecyn\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - tagiau'r hen\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager      - pecynydd\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - tag darparu\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - tagiau angenrhaid\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - maint wedi gosod\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - enw rpm ffynhonnell\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - cynnig tagiau\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - crynodeb\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - gwerthwr\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - y cyfrwng lle cafwyd y pecyn\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr "Mynegiadauheb ei derfynnu (%s)"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../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"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "ddefnyddio amgylchedd penodol ar %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "dim ffeil hdlist ar gyfer cyfrwng \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "adeiladu ffeil synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "dim xml-info ar gyfer cyfrwng \"%s\""
 
+#: ../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:168
+#, c-format
+msgid "No package named %s"
+msgstr "Dim pecyn o'r enw %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "wedi canfod pecyn(nau) %s yn urpmi db, ond heb eu gosod"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Pecyn %s wedi ei osod eisoes"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Pecynnau %s wedi eu gosod eisoes"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "oherwydd %s coll"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "oherwydd %s wedi ei osod eisoes"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "%s heb ei foddloni"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "ceisio hybu %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "fel modd i gadw %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "er mwyn gosod %s"
+
+#: ../urpm/select.pm:617
+#, 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 "system"
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr "Dylech ailddechrau %s ar gyfer %s"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "Methu ysgrifennu'r ffeil"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "Methu agor y ffeil"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "Methu symud ffeil %s i %s"
+
+#: ../urpme:41
+#, 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:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - dewis pecyn yn awtomatig o fewn dewisiadau.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr "  --auto-orphans - tynnu amddifad\n"
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test          - gwirio os oes modd tynnu'n iawn.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+"  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - defnyddio root arall ar gyfer tynnu rpm.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --justdb       - diweddaru'n unig db yr rpm, nid y system ffeilio.\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - peidio gweithredu sgriptledi'r pecyn(au).\n"
+
+#: ../urpme:57
+#, 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:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - modd llafar.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - select all packages matching expression.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "pecynnau anhysbys"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "pecyn anhysbys"
+
+#: ../urpme:121
+#, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "Bydd tynnu pecyn canlynol yn torri eich system:"
+msgstr[1] "Bydd tynnu pecynnau canlynol yn torri eich system:"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Dim i'w dynnu"
+
+#: ../urpme:143
+#, c-format
+msgid "No orphans to remove"
+msgstr "Dim amddifad i'w tynnu"
+
+#: ../urpme:149
+#, 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:154
+#, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "pecyn amddifad"
+msgstr[1] "pecynnau amddifad"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Tynnu pecynnau %d?"
+msgstr[1] "Tynnu pecynnau %d?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpme:166
+#, c-format
+msgid "testing removal of %s"
+msgstr "profi tynnu %s"
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Methodd y tynnu"
+
+#: ../urpme:183
+#, c-format
+msgid "Removal is possible"
+msgstr "Mae tynnu yn bosibl"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr "Mynegiadauheb ei derfynnu (%s)"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2018,11 +2030,6 @@ msgstr "  --clean        - tynnu rpm o'r storfa cyn unrhyw beth arall.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - peidio glanhau rpm o'r storfa.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - diweddaru'n unig db yr rpm, nid y system ffeilio.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2356,7 +2363,7 @@ msgstr ""
 "\n"
 "Parhau i osod beth bynnag?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -2549,10 +2556,12 @@ msgstr "  --aria2        - - defnyddio aria2 i estyn ffeiliau pell.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update        - defnyddio cyfrwng diweddaru.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2564,22 +2573,22 @@ msgstr ""
 "                   un o: byth, ar alw, diweddaru'n unig, bob tro. cf urpmi."
 "cfg(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - defnyddio ffeil synthesis.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   -defnyddio ffeiliau rpm (yn lle synthesis).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - peidio ceisio canfod unrhyw ffeil synthesis.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2588,18 +2597,18 @@ msgstr ""
 "  --distrib      - creu yn awtomatig yr holl gyfrwng o gyfrwng\n"
 "                   gosod\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --rhyngweithiol  - gyda --distrib, gofyn cadarnhad gyda phob cyfrwng\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media   - gyda --distrib, rhestri'r holl gyfrwng ar gael.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2609,74 +2618,74 @@ msgstr ""
 "rhagosodedig yw\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - creu cyfrwng rhithiol sydd wedi ei ddiweddaru,\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - analluogi gwirio ffeil  MD5SUM.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - peidio mewnforio pubkey y cyfrwng ychwanegwyd\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - ychwanegu cyfrwng yn config, ond nid yn ei ddiweddaru.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modd distaw.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "polisiau hysbys known xml-info yw %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "dim angen ymresymiad ar gyfer --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, 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:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael ychwanegu cyfrwng"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "yn creu ffeil config (%s)"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Methu creu ffeil Config (%s)"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "dim angen rhoi <llwybr perthynnol synthesis> gyda --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
@@ -2685,17 +2694,17 @@ msgstr ""
 "\n"
 "Hoffech chi ychwanegu cyfrwng '%s'?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<llwybr perthynnol synthesis> ar goll\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Methu defnyddio %s gyda chyfrwng pell"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "methu ychwanegu cyfrwng"
@@ -2934,12 +2943,12 @@ msgstr "  -f             - gorfodi diweddaru ffeiliau synthesis/\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael diweddaru cyfrwng"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, 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:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2948,17 +2957,17 @@ msgstr ""
 "mae'r cofnod i ddiweddaru ar goll\n"
 "(un o %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "anwybyddu cyfrwng %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "galluogi cyfrwng %s"
@@ -3249,6 +3258,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update        - defnyddio cyfrwng diweddaru.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "URL gwallus: [%s]"