Updated POT file.

1 files changed, 122 insertions, 117 deletions

diff --git a/po/cy.po b/po/cy.po
index 667b52c9..46647843 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-03-27 16:38+0200\n"
+"POT-Creation-Date: 2007-05-05 17:12+0200\n"
 "PO-Revision-Date: 2007-03-02 20:33-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg\n"
@@ -162,7 +162,7 @@ msgstr "(gosod)"
 msgid "Package choice"
 msgstr "Dewis pecyn"
 
-#: ../gurpmi2:154 ../urpmi:447
+#: ../gurpmi2:154
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
@@ -246,7 +246,7 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
+#: ../gurpmi2:292 ../urpme:142 ../urpmi:731
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
@@ -351,7 +351,7 @@ msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
 #: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
+#: ../urpm/media.pm:747 ../urpm/media.pm:1261 ../urpm/media.pm:1483
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... methodd ail-lwytho: %s"
@@ -632,37 +632,32 @@ msgstr ""
 msgid "unable to create transaction"
 msgstr "methu creu trosglwyddiad."
 
-#: ../urpm/install.pm:121
-#, c-format
-msgid "removing package %s"
-msgstr "tynnu pecyn %s."
-
-#: ../urpm/install.pm:123
-#, c-format
-msgid "unable to remove package %s"
-msgstr "methu tynnu pecyn %s"
-
-#: ../urpm/install.pm:135
+#: ../urpm/install.pm:131
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "methu tynnu rpm o becyn delta-rpm %s"
 
-#: ../urpm/install.pm:141
+#: ../urpm/install.pm:137
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "ychwanegu pecyn %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm/install.pm:144
+#: ../urpm/install.pm:140
 #, c-format
 msgid "unable to install package %s"
 msgstr "methu gosod pecyn %s"
 
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:171
+#, c-format
+msgid "removing package %s"
+msgstr "tynnu pecyn %s."
+
+#: ../urpm/install.pm:185
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "tynnu rpm wedi eu gosod (%s) o %s"
 
-#: ../urpm/install.pm:186
+#: ../urpm/install.pm:191
 #, c-format
 msgid "More information on package %s"
 msgstr "Rhagor o wybodaeth ar becyn %s"
@@ -746,7 +741,7 @@ msgstr "nid ddylai \"synthesis\" gael ei osod (canolig \"%s\")"
 msgid "\"synthesis\" should be set (medium \"%s\")"
 msgstr "\"synthesis\" i'w osod (canolig \"%s\")"
 
-#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
+#: ../urpm/media.pm:210 ../urpm/media.pm:1421 ../urpm/media.pm:1509
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "methu cael mynediad i  ffeil hdlist\"%s\", anwybyddu'r cyfrwng"
@@ -840,7 +835,7 @@ msgstr ""
 msgid "Search start: %s end: %s"
 msgstr "Cychwyn chwilio: %s diwedd: %s"
 
-#: ../urpm/media.pm:606 ../urpm/media.pm:1803
+#: ../urpm/media.pm:606 ../urpm/media.pm:1806
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
@@ -980,72 +975,72 @@ msgstr ""
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
+#: ../urpm/media.pm:1169 ../urpm/media.pm:1234
+#, c-format
+msgid "copying [%s] for medium \"%s\"..."
+msgstr "copïo [%s] ar gyfer cyfrwng \"%s\"..."
+
+#: ../urpm/media.pm:1171 ../urpm/media.pm:1209 ../urpm/media.pm:1496
 #, c-format
 msgid "...copying failed"
 msgstr "...methodd y copïo"
 
-#: ../urpm/media.pm:1204
+#: ../urpm/media.pm:1205
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copïo ffeil disgrifiad o \"%s\""
 
-#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
+#: ../urpm/media.pm:1207 ../urpm/media.pm:1238
 #, c-format
 msgid "...copying done"
 msgstr "...cwblhau'r copïo"
 
-#: ../urpm/media.pm:1233
-#, c-format
-msgid "copying [%s] for medium \"%s\"..."
-msgstr "copïo [%s] ar gyfer cyfrwng \"%s\"..."
-
-#: ../urpm/media.pm:1239
+#: ../urpm/media.pm:1240
 #, 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:1272
+#: ../urpm/media.pm:1273
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
 
-#: ../urpm/media.pm:1274
+#: ../urpm/media.pm:1275
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "methodd copïo (%s) (md5sum gwallus)"
 
-#: ../urpm/media.pm:1286
+#: ../urpm/media.pm:1287
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)"
 
-#: ../urpm/media.pm:1288
+#: ../urpm/media.pm:1289
 #, c-format
 msgid "...retrieving failed: md5sum mismatch"
 msgstr "... methodd ail-lwytho: anghysondeb md5sum"
 
-#: ../urpm/media.pm:1303
+#: ../urpm/media.pm:1304
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "heb ganfod ffeiliau rpm o [%s]"
 
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1311
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "darllen ffeiliau rpm o [%s]"
 
-#: ../urpm/media.pm:1325
+#: ../urpm/media.pm:1326
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "methu darllen ffeiliau rpm o (%s): %s"
 
-#: ../urpm/media.pm:1335
+#: ../urpm/media.pm:1336
 #, c-format
 msgid "no rpms read"
 msgstr "heb ddarllen rpmau"
 
-#: ../urpm/media.pm:1365
+#: ../urpm/media.pm:1366
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -1055,62 +1050,62 @@ msgstr ""
 "maethu cael mynediad i gyfrwng \"%s\",\n"
 "gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur wrth greu'r cyfrwng."
 
-#: ../urpm/media.pm:1378
+#: ../urpm/media.pm:1379
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ffeil hdlist annilys %s ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1458
+#: ../urpm/media.pm:1459
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpm/media.pm:1474
+#: ../urpm/media.pm:1475
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
 
-#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
+#: ../urpm/media.pm:1482 ../urpm/media.pm:1616
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1533
+#: ../urpm/media.pm:1534
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "archwilio ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1545
+#: ../urpm/media.pm:1546
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1549
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "methu mewnforio ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1564
+#: ../urpm/media.pm:1567
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "ysgrifennu rhestr ffeil  ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
+#: ../urpm/media.pm:1625 ../urpm/media.pm:1655
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
 
-#: ../urpm/media.pm:1639
+#: ../urpm/media.pm:1642
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "methu didoli ffeil hdlist \"%s\""
 
-#: ../urpm/media.pm:1645
+#: ../urpm/media.pm:1648
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1710
+#: ../urpm/media.pm:1713
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "darllen pennawd o'r cyfrwng \"%s\""
@@ -1125,8 +1120,8 @@ msgstr "Nn"
 #  can hit those keys in their keyboard to reply.
 #  please keep the 'Yy' for compatibility reasons
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:549 ../urpmi:600 ../urpmi:677
-#: ../urpmi:755 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
 #, c-format
 msgid "Yy"
 msgstr "Yy"
@@ -1191,17 +1186,17 @@ msgstr "methu cael mynediad at gyfrwng. \"%s\""
 msgid "No package named %s"
 msgstr "Dim pecyn o'r enw %s"
 
-#: ../urpm/select.pm:115 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:113
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
 
-#: ../urpm/select.pm:394 ../urpm/select.pm:434
+#: ../urpm/select.pm:394 ../urpm/select.pm:436
 #, c-format
 msgid "due to missing %s"
 msgstr "oherwydd %s coll"
 
-#: ../urpm/select.pm:395 ../urpm/select.pm:432
+#: ../urpm/select.pm:395 ../urpm/select.pm:434
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s heb ei foddloni"
@@ -1216,17 +1211,17 @@ msgstr "ceisio hybu %s"
 msgid "in order to keep %s"
 msgstr "fel modd i gadw %s"
 
-#: ../urpm/select.pm:428
+#: ../urpm/select.pm:430
 #, c-format
 msgid "in order to install %s"
 msgstr "er mwyn gosod %s"
 
-#: ../urpm/select.pm:438
+#: ../urpm/select.pm:440
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "oherwydd gwrthdaro gyda %s"
 
-#: ../urpm/select.pm:440
+#: ../urpm/select.pm:442
 #, c-format
 msgid "unrequested"
 msgstr "diofyn"
@@ -1246,7 +1241,7 @@ msgstr "Enw Allwedd Annilys (%s)"
 msgid "Missing signature (%s)"
 msgstr "Llofnod coll (%s)"
 
-#: ../urpme:39
+#: ../urpme:40
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -1262,23 +1257,23 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
 #: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - argraffu neges cymorth.\n"
 
-#: ../urpme:45
+#: ../urpme:46
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - dewis pecyn yn awtomatig o fewn dewisiadau.\n"
 
-#: ../urpme:46
+#: ../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:47 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:109 ../urpmq:67
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -1286,23 +1281,23 @@ msgstr ""
 "  --force        - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
 "bodoli.\n"
 
-#: ../urpme:48 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:114 ../urpmq:69
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
 
-#: ../urpme:49 ../urpmi:146
+#: ../urpme:50 ../urpmi:146
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
 
-#: ../urpme:50
+#: ../urpme:51
 #, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - defnyddio root arall ar gyfer tynnu rpm.\n"
 
-#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
 #: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
@@ -1310,12 +1305,12 @@ msgstr ""
 "  --urpmi-root         - defnyddio root arall ar gyfer gosod urpmi db ac "
 "rpm.\n"
 
-#: ../urpme:52
+#: ../urpme:53
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - peidio gweithredu sgriptledi'r pecyn(au).\n"
 
-#: ../urpme:53
+#: ../urpme:54
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1324,57 +1319,57 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth (ddad)osod chroot gyda dewis  --root.\n"
 
-#: ../urpme:55 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:119 ../urpmq:74
 #, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - defnyddio ffeil synthesis.\n"
 
-#: ../urpme:56 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:120 ../urpmq:75
 #, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - defnyddio ffeil hdlist.\n"
 
-#: ../urpme:57 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:156 ../urpmq:86
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - modd llafar.\n"
 
-#: ../urpme:58
+#: ../urpme:59
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - select all packages matching expression.\n"
 
-#: ../urpme:75
+#: ../urpme:76
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau"
 
-#: ../urpme:106
+#: ../urpme:107
 #, c-format
 msgid "unknown packages"
 msgstr "pecynnau anhysbys"
 
-#: ../urpme:106
+#: ../urpme:107
 #, c-format
 msgid "unknown package"
 msgstr "pecyn anhysbys"
 
-#: ../urpme:118 ../urpmi:526
+#: ../urpme:119 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "bydd tynnu pecynnau %s yn torri'r system"
 
-#: ../urpme:120
+#: ../urpme:121
 #, c-format
 msgid "Nothing to remove"
 msgstr "Dim i'w dynnu"
 
-#: ../urpme:125
+#: ../urpme:126
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Ticio i ddileu'r pecynnau canlynol"
 
-#: ../urpme:133
+#: ../urpme:134
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1382,24 +1377,24 @@ msgid_plural ""
 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:135 ../urpmi:600
+#: ../urpme:136 ../urpmi:600
 #, c-format
 msgid " (%d MB)"
 msgstr " (%d MB)"
 
-#: ../urpme:137
+#: ../urpme:138
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Tynnu pecynnau %d?"
 msgstr[1] "Tynnu pecynnau %d?"
 
-#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
+#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
 
-#: ../urpme:159
+#: ../urpme:160
 #, c-format
 msgid "Removal failed"
 msgstr "Methodd y tynnu"
@@ -1839,17 +1834,17 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth osod chroot gyda dewis o  --root.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - defnyddio curl i estyn ffeiliau pell.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prozilla         - defnyddio prozilla i estyn ffeiliau pell.\n"
@@ -1874,7 +1869,7 @@ msgstr "  --wget-options - dewis ychwanegol wrth ddefnyddio wget\n"
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --cprozilla-options - dewis ychwanegol wrth ddefnyddio prozilla\n"
 
-#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - cyfyngu cyflymder y llwytho i lawr.\n"
@@ -1888,7 +1883,7 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1897,7 +1892,7 @@ msgstr ""
 "  --proxy        - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
 "                   rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2084,6 +2079,13 @@ msgstr "%s: %s (gosod)"
 msgid "%s (to install)"
 msgstr "%s (gosod)"
 
+#: ../urpmi:447
+#, fuzzy, c-format
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
+msgstr "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
+
 #: ../urpmi:450
 #, c-format
 msgid "What is your choice? (1-%d) "
@@ -2120,7 +2122,7 @@ msgstr ""
 "\n"
 "Parhau i osod beth bynnag?"
 
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -2331,33 +2333,33 @@ msgstr ""
 "\n"
 "a [options] o\n"
 
-#: ../urpmi.addmedia:54
+#: ../urpmi.addmedia:53
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update        - defnyddio cyfrwng diweddaru.\n"
 
-#: ../urpmi.addmedia:55
+#: ../urpmi.addmedia:54
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - defnyddio ffeil synthesis.\n"
 
-#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - defnyddio ffeil hdlist.\n"
 
-#: ../urpmi.addmedia:57
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
 msgstr "  --probe-rpms   - defnyddio ffeiliau rpm (yn lle synthesis/hdlist).\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
 msgstr ""
 "  --no-probe     - peidio ceisio canfod unrhyw ffeil synthesis neu hdlist\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:59
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2366,18 +2368,18 @@ msgstr ""
 "  --distrib      - creu yn awtomatig yr holl gyfrwng o gyfrwng\n"
 "                   gosod\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:61
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --rhyngweithiol  - gyda --distrib, gofyn cadarnhad gyda phob cyfrwng\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:62
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media   - gyda --distrib, rhestri'r holl gyfrwng ar gael.\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:63
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2387,7 +2389,7 @@ msgstr ""
 "rhagosodedig yw\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:67
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -2396,69 +2398,69 @@ msgstr ""
 "  --virtual      - creu cyfrwng rhithiol sydd wedi ei ddiweddaru,\n"
 "                   dom ond protocol file:// sy'n cael ei ganiatáu.\n"
 
-#: ../urpmi.addmedia:69 ../urpmi.update:42
+#: ../urpmi.addmedia:67 ../urpmi.update:42
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - analluogi gwirio ffeil  MD5SUM.\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:68
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - peidio mewnforio pubkey y cyfrwng ychwanegwyd\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - ychwanegu cyfrwng yn config, ond nid yn ei ddiweddaru.\n"
 
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
+#: ../urpmi.addmedia:70 ../urpmi.removemedia:42 ../urpmi.update:49
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - glanhau penawdau yng nghyfeiriadur y storfa.\n"
 
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
+#: ../urpmi.addmedia:71 ../urpmi.removemedia:44 ../urpmi.update:51
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modd distaw.\n"
 
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:45 ../urpmi.update:52
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpmi.addmedia:86
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "methu diweddaru cyfrwng \"%s\"\n"
 
-#: ../urpmi.addmedia:115
+#: ../urpmi.addmedia:111
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)\n"
 msgstr ""
 "<url> gwallus (rhaid i'r llwybr fod yn absoliwt ar gyfer cyfeiriadur lleol)\n"
 
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:114
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael ychwanegu cyfrwng"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:117
 #, c-format
 msgid "creating config file [%s]"
 msgstr "yn creu ffeil config (%s)"
 
-#: ../urpmi.addmedia:122
+#: ../urpmi.addmedia:118
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Methu creu ffeil Config (%s)"
 
-#: ../urpmi.addmedia:129
+#: ../urpmi.addmedia:125
 #, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib"
 
-#: ../urpmi.addmedia:137
+#: ../urpmi.addmedia:133
 #, c-format
 msgid ""
 "\n"
@@ -2467,12 +2469,12 @@ msgstr ""
 "\n"
 "Hoffech chi ychwanegu cyfrwng '%s'"
 
-#: ../urpmi.addmedia:166
+#: ../urpmi.addmedia:164
 #, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<llwybr perthynnol hdlist> ar goll\n"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:167
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Methu defnyddio %s gyda chyfrwng pell"
@@ -2975,6 +2977,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"
 
+#~ msgid "unable to remove package %s"
+#~ msgstr "methu tynnu pecyn %s"
+
 #~ msgid "No filelist found\n"
 #~ msgstr "Heb ganfod filelist\n"