re-sync after the big svn loss

1 files changed, 174 insertions, 171 deletions

diff --git a/po/cy.po b/po/cy.po
index 8ff304ab..667b52c9 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: 2007-02-23 19:44+0100\n"
+"POT-Creation-Date: 2007-03-27 16:38+0200\n"
 "PO-Revision-Date: 2007-03-02 20:33-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg\n"
@@ -106,12 +106,12 @@ msgstr "_Dileu"
 msgid "Choose location to save file"
 msgstr "Dewiswch leoliad i gadw'r ffeil"
 
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
 #, c-format
 msgid "Unknown option %s"
 msgstr "Dewis anhysbys %s"
 
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
 #, c-format
 msgid "No packages specified"
 msgstr "Heb enwi pecyn"
@@ -142,7 +142,7 @@ msgstr ""
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
@@ -235,7 +235,7 @@ msgstr ""
 "\n"
 "Hoffech chi barhau gyda'r gosod?"
 
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -246,7 +246,7 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../gurpmi2:292 ../urpme:141 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
@@ -266,10 +266,10 @@ msgstr "Gosod pecyn `%s' (%s/%s)..."
 msgid "_Done"
 msgstr "_Gorffen"
 
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
 #, c-format
-msgid "Installation failed"
-msgstr "Methodd y gosod"
+msgid "Installation failed:"
+msgstr "Methodd y gosod:"
 
 #: ../gurpmi2:344
 #, c-format
@@ -325,63 +325,63 @@ msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
 msgid "Running urpmi in restricted mode..."
 msgstr "Rhedeg urpmi mewn modd cyfyngedig..."
 
-#: ../urpm.pm:92
+#: ../urpm.pm:91
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "methu agor rpmdb"
 
-#: ../urpm.pm:111
+#: ../urpm.pm:110
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr "wedi canfod %d pennawd rpm yn yr ystorfa, tynnu %d hen bennawd"
 
-#: ../urpm.pm:127
+#: ../urpm.pm:126
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "enw ffeil rpm annilys [%s]"
 
-#: ../urpm.pm:133
+#: ../urpm.pm:132
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
 #, c-format
 msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... methodd ail-lwytho: %s"
 
-#: ../urpm.pm:143
+#: ../urpm.pm:142
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad  ffeil rpm (%s)"
 
-#: ../urpm.pm:148
+#: ../urpm.pm:147
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "methu didoli ffeil spec %s [%s]"
 
-#: ../urpm.pm:158
+#: ../urpm.pm:157
 #, c-format
 msgid "unable to register rpm file"
 msgstr "methu cofrestr ffeil rpm"
 
-#: ../urpm.pm:160
+#: ../urpm.pm:159
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Saernïaeth anghydnaws ar gyfer rpm [%s]"
 
-#: ../urpm.pm:164
+#: ../urpm.pm:163
 #, c-format
 msgid "error registering local packages"
 msgstr "gwall cofrestru pecynnau lleol"
 
-#: ../urpm.pm:260
+#: ../urpm.pm:259
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
@@ -421,7 +421,7 @@ msgstr "Methu defnyddio %s gyda %s"
 msgid "Too many arguments\n"
 msgstr "Gormod o ymresymiadau\n"
 
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
@@ -446,7 +446,7 @@ msgstr "Methu creu ffeil config (%s)"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "mae cyfrwng '%s' wedi ei ddiffinio ddwy waith, cau"
 
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
@@ -576,7 +576,7 @@ msgstr "mae yna becynnau niferus gyda'r un enw ffeil rpm \"%s\""
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
 
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
@@ -712,7 +712,7 @@ msgstr "rhybudd: nid yw md5sum ar gyfer %s ar gael yn ffeil MD5SUM"
 msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
 msgstr "cyfrifo md5sum ffynhonnell presennol hdlist (neu synthesis) [%s]"
 
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -721,105 +721,105 @@ msgstr ""
 "dylai cyfrwng rhithiol \"%s\" fod a rhestr ffeiliau hdlist, anwybyddwyd y "
 "cyfrwng"
 
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
 #, 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:183
+#: ../urpm/media.pm:184
 #, c-format
 msgid "invalid hdlist name"
 msgstr "enw hdlist annilys"
 
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
 #, c-format
 msgid "\"synthesis\" should not be set (medium \"%s\")"
 msgstr "nid ddylai \"synthesis\" gael ei osod (canolig \"%s\")"
 
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
 #, c-format
 msgid "\"synthesis\" should be set (medium \"%s\")"
 msgstr "\"synthesis\" i'w osod (canolig \"%s\")"
 
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "methu cael mynediad i  ffeil hdlist\"%s\", anwybyddu'r cyfrwng"
 
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
 #, c-format
 msgid "unable to access list file of \"%s\""
 msgstr "methu cael mynediad  ffeil rhestr \"%s\""
 
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng"
 
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng"
 
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", hepgor"
 
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "gormod o bwyntiau gosod ar gyfer cyfrwng symudol \"%s\""
 
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "cymryd dyfais symudol fel \"%s\""
 
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
 #, c-format
 msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
 msgstr ""
 "Delwedd ISO yw cyfrwng \"%s\" , a fydd yn cael ei osod wrth ei ddefnyddio."
 
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "defnyddio dyfais symudol gwahanol (%s) ar gyfer \"%s\""
 
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "methu adfer enw llwybr ar gyfer cyfrwng symudadwy \"%s\""
 
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
 #, c-format
 msgid "wrote %s"
 msgstr "ysgrifennodd %s"
 
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "ysgrifennu ffeil ffurfweddu (%s)"
 
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
 #, 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:504
+#: ../urpm/media.pm:505
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s"
 
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -828,145 +828,145 @@ msgstr ""
 "--nid oes modd defnyddio synthesis gyda --media, --excludemedia, --"
 "sortmedia, --diweddaru, --use-distrib or --parallel"
 
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
 #, c-format
 msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
 msgstr ""
 "Sylw: dim hdlist ar gyfer cyfrwng \"%s\", methu dychwelyd canlyniadau ar ei "
 "gyfer"
 
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Cychwyn chwilio: %s diwedd: %s"
 
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
 
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
 #, c-format
 msgid "skipping package %s"
 msgstr "hepgor pecyn %s"
 
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "gosod yn lle uwchraddio pecyn %s"
 
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "cyfrwng \"%s\" yn bodoli eisoes"
 
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
 #, c-format
 msgid "virtual medium needs to be local"
 msgstr "rhaid i'r rhith gyfrwng fod yn lleol"
 
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
 #, c-format
 msgid "(ignored by default)"
 msgstr "(anwybyddwyd drwy ragosodiad)"
 
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "ychwanegu cyfrwng \"%s\", cyn cyfrwng pell \"%s\""
 
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "ychwanegu cyfrwng \"%s\""
 
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
 #, c-format
 msgid "unable to mount the distribution medium"
 msgstr "methu mowntio cyfrwng y dosbarthiad"
 
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
 #, 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:739
+#: ../urpm/media.pm:740
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "estyn ffeil media.cfg..."
 
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "methu didoli media.cfg"
 
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
 #, 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:826
+#: ../urpm/media.pm:827
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
 
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "dewis aml-gyfrwng: %s"
 
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "dewis cyfrwng \"%s\":"
 
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "ail-ffurfweddu urpmi ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...methodd ail-ffurfweddu"
 
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
 #, c-format
 msgid "reconfiguration done"
 msgstr "cwblhau ail-ffurfweddu"
 
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Gwall wrth gynhyrchu ffeil enwau: heb ganfod dibyniaeth %d"
 
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
 #, c-format
 msgid "Error generating names file: Can't write to file (%s)"
 msgstr "Gwall wrth gynhyrchu ffeil enwau: Methu ysgrifennu ffeil (%s)"
 
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
 
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "archwilio ffeil hdlist [%s]"
 
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "archwilio ffeil synthesis [%s]"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "adeiladu hdlist [%s]"
 
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
 #, c-format
 msgid ""
 "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -975,77 +975,77 @@ msgstr ""
 "Methu adeiladu ffeil synthesis ar gyfer cyfrwng \"%s\". Efallai bod eich "
 "ffeil hdlist yn llygredig."
 
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
 #, c-format
 msgid "...copying failed"
 msgstr "...methodd y copïo"
 
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copïo ffeil disgrifiad o \"%s\""
 
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
 #, c-format
 msgid "...copying done"
 msgstr "...cwblhau'r copïo"
 
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "copïo [%s] ar gyfer cyfrwng \"%s\"..."
 
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
 #, 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:1271
+#: ../urpm/media.pm:1272
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
 
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "methodd copïo (%s) (md5sum gwallus)"
 
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)"
 
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
 #, c-format
 msgid "...retrieving failed: md5sum mismatch"
 msgstr "... methodd ail-lwytho: anghysondeb md5sum"
 
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "heb ganfod ffeiliau rpm o [%s]"
 
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "darllen ffeiliau rpm o [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "methu darllen ffeiliau rpm o (%s): %s"
 
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
 #, c-format
 msgid "no rpms read"
 msgstr "heb ddarllen rpmau"
 
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -1055,67 +1055,67 @@ msgstr ""
 "maethu cael mynediad i gyfrwng \"%s\",\n"
 "gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur wrth greu'r cyfrwng."
 
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ffeil hdlist annilys %s ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
 
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "archwilio ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "methu mewnforio ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "ysgrifennu rhestr ffeil  ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
 
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "methu didoli ffeil hdlist \"%s\""
 
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "darllen pennawd o'r cyfrwng \"%s\""
 
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
 #, c-format
 msgid "Nn"
 msgstr "Nn"
@@ -1124,13 +1124,14 @@ msgstr "Nn"
 #  you can put here the letters for 'yes' for your language, so people
 #  can hit those keys in their keyboard to reply.
 #  please keep the 'Yy' for compatibility reasons
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#. -PO: Add here the keys which might be pressed in the "Yes"-case.
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:549 ../urpmi:600 ../urpmi:677
+#: ../urpmi:755 ../urpmi.addmedia:130
 #, c-format
 msgid "Yy"
 msgstr "Yy"
 
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Dewis gwael, ceisiwch eto\n"
@@ -1185,47 +1186,47 @@ msgstr "cyfrwng annealladwy \"%s\" wedi ei nodi'n symudadwy ond nid yw"
 msgid "unable to access medium \"%s\""
 msgstr "methu cael mynediad at gyfrwng. \"%s\""
 
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
 #, c-format
 msgid "No package named %s"
 msgstr "Dim pecyn o'r enw %s"
 
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
 
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
 #, c-format
 msgid "due to missing %s"
 msgstr "oherwydd %s coll"
 
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s heb ei foddloni"
 
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
 #, c-format
 msgid "trying to promote %s"
 msgstr "ceisio hybu %s"
 
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
 #, c-format
 msgid "in order to keep %s"
 msgstr "fel modd i gadw %s"
 
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
 #, c-format
 msgid "in order to install %s"
 msgstr "er mwyn gosod %s"
 
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "oherwydd gwrthdaro gyda %s"
 
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
 #, c-format
 msgid "unrequested"
 msgstr "diofyn"
@@ -1393,7 +1394,7 @@ msgid_plural "Remove %d packages?"
 msgstr[0] "Tynnu pecynnau %d?"
 msgstr[1] "Tynnu pecynnau %d?"
 
-#: ../urpme:137 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
@@ -1658,7 +1659,7 @@ msgstr "  --vendor       - gwerthwr\n"
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - y cyfrwng lle cafwyd y pecyn\n"
 
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
@@ -1668,12 +1669,12 @@ msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig"
 
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "ddefnyddio amgylchedd penodol ar %s\n"
 
-#: ../urpmf:226
+#: ../urpmf:223
 #, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1682,7 +1683,7 @@ msgstr ""
 "Sylw: gan nad oedd unrhyw gyfrwng chwiliwyd yn defnyddio hdlists, methodd "
 "urpmf â chynnig canlyniad\n"
 
-#: ../urpmf:227
+#: ../urpmf:224
 #, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "Efallai yr hoffech ddefnyddio --name i chwilio am enwau pecynnau.\n"
@@ -1981,7 +1982,7 @@ 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:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
@@ -2213,99 +2214,101 @@ msgstr[1] "Parhau gyda gosod %d pecyn?"
 msgid "Press Enter when ready..."
 msgstr "Pwyso Enter pan yn barod..."
 
-#: ../urpmi:629
+#: ../urpmi:628
 #, c-format
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../urpmi:672
+#: ../urpmi:671
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Mae gan y pecyn canlynol lofnod gwallus"
 
-#: ../urpmi:673
+#: ../urpmi:672
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
 
-#: ../urpmi:674
+#: ../urpmi:673
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ydych chi am barhau gosod?"
 
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Methodd y gosod"
+
+#: ../urpmi:711
 #, c-format
 msgid "distributing %s"
 msgstr "dosbarthu %s"
 
-#: ../urpmi:735
+#: ../urpmi:725
 #, c-format
 msgid "installing %s from %s"
 msgstr "gosod %s o %s"
 
-#: ../urpmi:737
+#: ../urpmi:727
 #, c-format
 msgid "installing %s"
 msgstr "gosod %s"
 
-#: ../urpmi:762
-#, c-format
-msgid "Installation failed:"
-msgstr "Methodd y gosod:"
-
-#: ../urpmi:769
+#: ../urpmi:759
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
 
-#: ../urpmi:786
+#: ../urpmi:776
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Mwy o orfodaeth gyda'r gosod?  (--force)? (y/N)"
 
-#: ../urpmi:825
+#: ../urpmi:815
 #, c-format
 msgid "%d installation transaction failed"
 msgid_plural "%d installation transactions failed"
 msgstr[0] "methodd trosglwyddiad gosod %d"
 msgstr[1] "methodd trosglwyddiad gosod %d"
 
-#: ../urpmi:835
+#: ../urpmi:825
 #, c-format
 msgid "Installation is possible"
 msgstr "Gosod yn bosibl"
 
-#: ../urpmi:840
+#: ../urpmi:830
 #, c-format
 msgid "Packages are up to date"
 msgstr "Mae'r pecynnau'n rhai diweddaraf"
 
-#: ../urpmi:848
+#: ../urpmi:838
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pecyn %s wedi ei osod eisoes"
 
-#: ../urpmi:849
+#: ../urpmi:839
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Pecynnau %s wedi eu gosod eisoes"
 
-#: ../urpmi:852
+#: ../urpmi:842
 #, c-format
 msgid "Package %s can not be installed"
 msgstr "Methu gosod pecyn %s"
 
-#: ../urpmi:853
+#: ../urpmi:843
 #, c-format
 msgid "Packages %s can not be installed"
 msgstr "Methu gosod pecynnau %s"
 
-#: ../urpmi:872
+#: ../urpmi:862
 #, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
 
-#: ../urpmi.addmedia:36
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: neither the ``with''.  Only what is between <brackets> can be translated.
+#: ../urpmi.addmedia:35
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
@@ -2855,55 +2858,57 @@ msgstr ""
 "  --whatrequires-recursive\n"
 "                  - chwilio nôl  estyndig (yn cynnwys rhith becynnau) \n"
 
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+"  --whatprovides, -p\n"
+"                   - search in provides to find package.\n"
+msgstr "  -p             - caniatáu i chwilio canfod pecyn.\n"
+
+#: ../urpmq:93
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - allbwn cyfan a phecyn i'w dynnu\n"
 
-#: ../urpmq:92
+#: ../urpmq:94
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - ymestyn ymholiad i ddibyniaethau pecynnau.\n"
 
-#: ../urpmq:94
+#: ../urpmq:96
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g            - argraffu grwpiau gydag enw hefyd.\n"
 
-#: ../urpmq:95
+#: ../urpmq:97
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
 "i bobl.\n"
 
-#: ../urpmq:96
+#: ../urpmq:98
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
 
-#: ../urpmq:97
+#: ../urpmq:99
 #, c-format
 msgid "  -m             - equivalent to -du\n"
 msgstr "  -m             - yn cyfateb i -du.\n"
 
-#: ../urpmq:98
-#, c-format
-msgid "  -p             - search in provides to find package.\n"
-msgstr "  -p             - caniatáu i chwilio canfod pecyn.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
 #, 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:101
 #, 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:102
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2912,52 +2917,52 @@ msgstr ""
 "  -u             - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei "
 "osod.\n"
 
-#: ../urpmq:102
+#: ../urpmq:103
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - gosod chwilio fuzzy (fel --fuzzy).\n"
 
-#: ../urpmq:103
+#: ../urpmq:104
 #, 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:105
 #, 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:179
+#: ../urpmq:180
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
 
-#: ../urpmq:360
+#: ../urpmq:361
 #, c-format
 msgid "no hdlist for medium \"%s\", only partial result for package %s"
 msgstr ""
 "dim hdlist ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer pecyn "
 "%s"
 
-#: ../urpmq:361
+#: ../urpmq:362
 #, c-format
 msgid "no hdlist for medium \"%s\", only partial result for packages %s"
 msgstr ""
 "dim hdlist ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer "
 "pecynnau %s"
 
-#: ../urpmq:364
+#: ../urpmq:365
 #, c-format
 msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 "dim hdlist ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
 "pecyn %s"
 
-#: ../urpmq:365
+#: ../urpmq:366
 #, c-format
 msgid ""
 "no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2965,16 +2970,14 @@ msgstr ""
 "dim hdlist ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
 "pecynnau %s"
 
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "Heb ganfod filelist\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
 #, c-format
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"
 
+#~ msgid "No filelist found\n"
+#~ msgstr "Heb ganfod filelist\n"
+
 #~ msgid ""
 #~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 #~ msgstr ""