updated pot file

1 files changed, 425 insertions, 465 deletions

diff --git a/po/cy.po b/po/cy.po
index 90b0c3d7..75ed6962 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -1,4 +1,3 @@
-#
 # Latest versions of po files are at http://www.mandrakelinux.com/l10n/cy.php3
 #
 # SOME DESCRIPTIVE TITLE.
@@ -9,13 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-26 11:39+0100\n"
-"PO-Revision-Date: 2004-06-11 21:12-0000\n"
-"Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
-"Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
+"POT-Creation-Date: 2005-01-03 13:52+0100\n"
+"PO-Revision-Date: 2004-12-27 15:57-0000\n"
+"Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
+"Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Welsh\n"
+"X-Poedit-Country: UK\n"
 
 #  This is a list of chars acceptable as a 'yes' answer to a Yes/No question;
 #  you can put here the letters for 'yes' for your language, so people
@@ -53,22 +54,22 @@ msgstr ""
 "Gosodiad pecynnau awtomatig...\n"
 "Roeddech wedi gofyn i gael gosod pecyn %s\n"
 
-#: ../_irpm:33 ../urpme:29 ../urpmi:554
+#: ../_irpm:33 ../urpme:29 ../urpmi:471
 #, c-format
 msgid "Is this OK?"
 msgstr "Mae'r model yn gywir"
 
-#: ../_irpm:35 ../urpm/msg.pm:41
+#: ../_irpm:35
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../_irpm:36 ../urpm/msg.pm:42
+#: ../_irpm:36
 #, c-format
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../_irpm:44 ../urpmi:459 ../urpmi:482 ../urpmi:562
+#: ../_irpm:44 ../urpmi:386 ../urpmi:404 ../urpmi:475
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -93,14 +94,14 @@ msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help     - argraffu neges cymorth.\n"
 
 #: ../rpm-find-leaves:15
-#, fuzzy, c-format
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
-msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
+msgstr "  --root <path>   - defnyddio'r root hwn yn lle /\n"
 
 #: ../rpm-find-leaves:16
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - cyfyngu canlyniadau i'r grwp.\n"
+msgstr "   -g [group]     - cyfyngu canlyniadau i'r grŵp.\n"
 
 #: ../rpm-find-leaves:17
 #, c-format
@@ -122,34 +123,34 @@ msgstr "heb ganfod webfetch, yn cael eu cynnal gan webfetch: %s\n"
 msgid "unable to handle protocol: %s"
 msgstr "methu trin protocol: %s"
 
-#: ../urpm.pm:195
+#: ../urpm.pm:200
 #, 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.pm:196
+#: ../urpm.pm:201
 #, 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.pm:209 ../urpm.pm:1201 ../urpm.pm:1211
+#: ../urpm.pm:214 ../urpm.pm:1222 ../urpm.pm:1232
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "methu cael mynediad i  ffeil hdlist\"%s\", anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:212 ../urpm.pm:2346
+#: ../urpm.pm:217 ../urpm.pm:2370
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:240
+#: ../urpm.pm:245
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", osgoi"
 
-#: ../urpm.pm:248
+#: ../urpm.pm:253
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -158,97 +159,97 @@ msgstr ""
 "dylai cyfrwng rhithiol \"%s\" fod a rhestr ffeiliau hdlist, anwybyddwyd y "
 "cyfrwng"
 
-#: ../urpm.pm:253
+#: ../urpm.pm:258
 #, 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.pm:262
+#: ../urpm.pm:267
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm.pm:269
+#: ../urpm.pm:274
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm.pm:291
+#: ../urpm.pm:296
 #, c-format
 msgid "inconsistent list file for \"%s\", medium ignored"
 msgstr "rhestr ffeil annealladwy \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm.pm:299
+#: ../urpm.pm:304
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "methu archwilio rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm.pm:332
+#: ../urpm.pm:337
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "gormod o bwyntiau gosod ar gyfer cyfrwng symudol \"%s\""
 
-#: ../urpm.pm:333
+#: ../urpm.pm:338
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "cymryd dyfais symudol fel \"%s\""
 
-#: ../urpm.pm:337
+#: ../urpm.pm:342
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
-msgstr "defnyddio dyfais symudol wahanol (%s) ar gyfer \"%s\""
+msgstr "defnyddio dyfais symudol gwahanol (%s) ar gyfer \"%s\""
 
-#: ../urpm.pm:342 ../urpm.pm:345
+#: ../urpm.pm:347 ../urpm.pm:350
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "methu adfer enw llwybr ar gyfer cyfrwng symudadwy \"%s\""
 
-#: ../urpm.pm:370
+#: ../urpm.pm:375
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
 
-#: ../urpm.pm:374
-#, fuzzy, c-format
+#: ../urpm.pm:379
+#, c-format
 msgid "unable to write file [%s]"
-msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
+msgstr "methu ysgrifennu ffeil (%s)"
 
-#: ../urpm.pm:381
+#: ../urpm.pm:386
 #, c-format
 msgid "write config file [%s]"
 msgstr "ysgrifennu ffeil ffurfweddu (%s)"
 
-#: ../urpm.pm:393
+#: ../urpm.pm:398
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Methu defnyddio'r modd paralel gyda'r modd use-distrib"
 
-#: ../urpm.pm:402
+#: ../urpm.pm:407
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "methu didoli ffeil hdlist \"%s\" yn ffeil (%s)"
 
-#: ../urpm.pm:412
+#: ../urpm.pm:417
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "archwilio trinydd paralel mewn ffeil [%s]"
 
-#: ../urpm.pm:422
+#: ../urpm.pm:427
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "canfod trinydd paralel ar gyfer nodau: %s"
 
-#: ../urpm.pm:426
+#: ../urpm.pm:431
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s"
 
-#: ../urpm.pm:430
+#: ../urpm.pm:435
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "methu defnyddio dewis paralel \"%s\""
 
-#: ../urpm.pm:441
+#: ../urpm.pm:446
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -257,159 +258,159 @@ msgstr ""
 "-nid oes modd defnyddio synthesis gyda --media, --excludemedia, --sortmedia, "
 "--update neu --paralel"
 
-#: ../urpm.pm:502 ../urpm.pm:528 ../urpm.pm:960 ../urpm.pm:971 ../urpm.pm:1040
-#: ../urpm.pm:1057 ../urpm.pm:1125 ../urpm.pm:1184 ../urpm.pm:1393
-#: ../urpm.pm:1514 ../urpm.pm:1629 ../urpm.pm:1635 ../urpm.pm:1735
-#: ../urpm.pm:1820 ../urpm.pm:1824
+#: ../urpm.pm:507 ../urpm.pm:533 ../urpm.pm:979 ../urpm.pm:990 ../urpm.pm:1059
+#: ../urpm.pm:1076 ../urpm.pm:1146 ../urpm.pm:1205 ../urpm.pm:1417
+#: ../urpm.pm:1538 ../urpm.pm:1653 ../urpm.pm:1659 ../urpm.pm:1759
+#: ../urpm.pm:1844 ../urpm.pm:1848
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "archwilio ffeil synthesis [%s]"
 
-#: ../urpm.pm:506 ../urpm.pm:521 ../urpm.pm:534 ../urpm.pm:963 ../urpm.pm:974
-#: ../urpm.pm:1046 ../urpm.pm:1052 ../urpm.pm:1130 ../urpm.pm:1188
-#: ../urpm.pm:1397 ../urpm.pm:1518 ../urpm.pm:1623 ../urpm.pm:1641
-#: ../urpm.pm:1830
+#: ../urpm.pm:511 ../urpm.pm:526 ../urpm.pm:539 ../urpm.pm:982 ../urpm.pm:993
+#: ../urpm.pm:1065 ../urpm.pm:1071 ../urpm.pm:1151 ../urpm.pm:1209
+#: ../urpm.pm:1421 ../urpm.pm:1542 ../urpm.pm:1647 ../urpm.pm:1665
+#: ../urpm.pm:1854
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "archwilio ffeil hdlist [%s]"
 
-#: ../urpm.pm:516 ../urpm.pm:967
+#: ../urpm.pm:521 ../urpm.pm:986
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "nid yw'r rhith gyfrwng \"%s\" yn lleol, anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:546
+#: ../urpm.pm:551
 #, c-format
 msgid "Search start: %s end: %s"
-msgstr ""
+msgstr "Cychwyn chwilio: %s diwedd: %s"
 
-#: ../urpm.pm:551 ../urpm.pm:981 ../urpm.pm:1065 ../urpm.pm:1134
-#: ../urpm.pm:1522
+#: ../urpm.pm:556 ../urpm.pm:1000 ../urpm.pm:1084 ../urpm.pm:1155
+#: ../urpm.pm:1546
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
 
-#: ../urpm.pm:557 ../urpm.pm:1773
+#: ../urpm.pm:562 ../urpm.pm:1797
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
 
-#: ../urpm.pm:572
+#: ../urpm.pm:577
 #, c-format
 msgid "skipping package %s"
 msgstr "hepgor pecyn  %s"
 
-#: ../urpm.pm:585
+#: ../urpm.pm:590
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "gosod yn lle uwchraddio pecyn %s"
 
-#: ../urpm.pm:596 ../urpm.pm:2159 ../urpm.pm:2223 ../urpm.pm:2787
-#: ../urpm.pm:2904
+#: ../urpm.pm:601 ../urpm.pm:2183 ../urpm.pm:2247 ../urpm.pm:2816
+#: ../urpm.pm:2930
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "methu agor rpmdb"
 
-#: ../urpm.pm:633
+#: ../urpm.pm:640
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "cyfrwng \"%s\" yn bodoli eisoes"
 
-#: ../urpm.pm:640
+#: ../urpm.pm:647
 #, c-format
 msgid "virtual medium needs to be local"
 msgstr "rhaid i'r rhith gyfrwng fod yn lleol"
 
-#: ../urpm.pm:666
+#: ../urpm.pm:673
 #, c-format
 msgid "added medium %s"
 msgstr "ychwanegwyd cyfrwng %s"
 
-#: ../urpm.pm:686
+#: ../urpm.pm:695
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "methu cael mynediad i gyfrwng gosod cyntaf"
 
-#: ../urpm.pm:690
+#: ../urpm.pm:699
 #, c-format
 msgid "copying hdlists file..."
 msgstr "copïo ffeil hdlists..."
 
-#: ../urpm.pm:692 ../urpm.pm:1079 ../urpm.pm:1154
+#: ../urpm.pm:701 ../urpm.pm:1100 ../urpm.pm:1175
 #, c-format
 msgid "...copying done"
 msgstr "...cwblhau'r copïo"
 
-#: ../urpm.pm:693 ../urpm.pm:1080 ../urpm.pm:1229 ../urpm.pm:1285
-#: ../urpm.pm:1461 ../urpm.pm:1468
+#: ../urpm.pm:702 ../urpm.pm:1101 ../urpm.pm:1250 ../urpm.pm:1309
+#: ../urpm.pm:1485 ../urpm.pm:1492
 #, c-format
 msgid "...copying failed"
 msgstr "...methodd y copïo"
 
-#: ../urpm.pm:696 ../urpm.pm:719 ../urpm.pm:750
+#: ../urpm.pm:705 ../urpm.pm:729 ../urpm.pm:763
 #, c-format
 msgid "unable to access first installation medium (no hdlists file found)"
 msgstr ""
 "methu cael mynediad i'r cyfrwng gosod cyntaf (heb ganfod ffeil hdlists)"
 
-#: ../urpm.pm:702
+#: ../urpm.pm:712
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "adfer ffeil hdlists..."
 
-#: ../urpm.pm:713 ../urpm.pm:1504 ../urpm.pm:1968 ../urpm.pm:2660
+#: ../urpm.pm:723 ../urpm.pm:1528 ../urpm.pm:1992 ../urpm.pm:2684
 #: ../urpmi.addmedia:167
 #, c-format
 msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
-#: ../urpm.pm:715 ../urpm.pm:1488 ../urpm.pm:1497 ../urpm.pm:1971
-#: ../urpm.pm:2662 ../urpmi.addmedia:169
+#: ../urpm.pm:725 ../urpm.pm:1512 ../urpm.pm:1521 ../urpm.pm:1995
+#: ../urpm.pm:2686 ../urpmi.addmedia:169
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... methodd ail-lwytho: %s"
 
-#: ../urpm.pm:735
+#: ../urpm.pm:747
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "disgrifiad hdlist annilys \"%s\" yn rhestr ffeilio hdlists"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:800
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
 
-#: ../urpm.pm:788
+#: ../urpm.pm:802
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "dewis aml-gyfrwng: %s"
 
-#: ../urpm.pm:788
+#: ../urpm.pm:802 ../urpmi.update:94
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:804
+#: ../urpm.pm:818
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "dewis cyfrwng \"%s\":"
 
-#: ../urpm.pm:855
-#, fuzzy, c-format
+#: ../urpm.pm:869
+#, c-format
 msgid "reconfiguring urpmi for media \"%s\""
-msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
+msgstr "ail-ffurfweddu urpmi ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:884
-#, fuzzy, c-format
+#: ../urpm.pm:898
+#, c-format
 msgid "...reconfiguration failed"
-msgstr "...methodd y copïo"
+msgstr "...methodd ail-ffurfweddu"
 
-#: ../urpm.pm:891
+#: ../urpm.pm:905
 #, c-format
 msgid "reconfiguration done"
-msgstr ""
+msgstr "cwblhau ail-ffurfweddu"
 
-#: ../urpm.pm:1018
+#: ../urpm.pm:1037
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -417,9 +418,9 @@ msgid ""
 "medium."
 msgstr ""
 "maethu cael mynediad i gyfrwng \"%s\",\n"
-"gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur gyda wrth greu'r cyfrwng."
+"gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur wrth greu'r cyfrwng."
 
-#: ../urpm.pm:1069
+#: ../urpm.pm:1088
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -428,401 +429,403 @@ msgstr ""
 "dylai'r rhith gyfrwng \"%s\" gael hdlist ffynhonnell ddilys neu synthesis, "
 "anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:1077
+#: ../urpm.pm:1098
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copïo ffeil disgrifiad o \"%s\""
 
-#: ../urpm.pm:1101 ../urpm.pm:1369
+#: ../urpm.pm:1122 ../urpm.pm:1393
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum ffynhonnell hdlist presennol (neu synthesis)"
 
-#: ../urpm.pm:1150
+#: ../urpm.pm:1171
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copïo ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpm.pm:1164
+#: ../urpm.pm:1185
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
 
-#: ../urpm.pm:1169
+#: ../urpm.pm:1190
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
 
-#: ../urpm.pm:1171
+#: ../urpm.pm:1192
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "methodd copïo (%s) (md5sum gwallus)"
 
-#: ../urpm.pm:1192 ../urpm.pm:1401 ../urpm.pm:1738
+#: ../urpm.pm:1213 ../urpm.pm:1425 ../urpm.pm:1762
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
 
-#: ../urpm.pm:1242
+#: ../urpm.pm:1267
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "darllen ffeiliau rpm o [%s]"
 
-#: ../urpm.pm:1257
+#: ../urpm.pm:1282
 #, c-format
 msgid "no rpms read"
-msgstr ""
+msgstr "heb ddarllen rpmau"
 
-#: ../urpm.pm:1267
+#: ../urpm.pm:1292
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "methu darllen ffeiliau rpm o (%s): %s"
 
-#: ../urpm.pm:1272
+#: ../urpm.pm:1297
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "heb ganfod ffeiliau rpm o [%s]"
 
-#: ../urpm.pm:1419
+#: ../urpm.pm:1443
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpm.pm:1446
+#: ../urpm.pm:1470
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
 
-#: ../urpm.pm:1495
+#: ../urpm.pm:1519
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)"
 
-#: ../urpm.pm:1497
+#: ../urpm.pm:1521
 #, c-format
 msgid "md5sum mismatch"
 msgstr "anghysondeb md5sum"
 
-#: ../urpm.pm:1593
+#: ../urpm.pm:1617
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "methodd adfer ffynhonnell hdlist (neu synthesis)"
 
-#: ../urpm.pm:1600
+#: ../urpm.pm:1624
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1611 ../urpm.pm:1665
+#: ../urpm.pm:1635 ../urpm.pm:1689
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "file [%s] yn cael ei ddefnyddio eisoes yn yr un cyfrwng \"%s\""
 
-#: ../urpm.pm:1651
+#: ../urpm.pm:1675
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "methu didoli ffeil hdlist \"%s\""
 
-#: ../urpm.pm:1688
+#: ../urpm.pm:1712
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "methu ysgrifennu i ffeil rhestr \"%s\""
 
-#: ../urpm.pm:1695
+#: ../urpm.pm:1719
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "ysgrifennu rhestr ffeil  ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1697
+#: ../urpm.pm:1721
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "dim wedi ei ysgrifennu yn ffei rhestr ar gyfer \"%s\""
 
-#: ../urpm.pm:1712
+#: ../urpm.pm:1736
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "archwilio ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1719
+#: ../urpm.pm:1743
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1746
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "methu mewnforio ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1787
+#: ../urpm.pm:1811
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "darllen pennawd o'r cyfrwng \"%s\""
 
-#: ../urpm.pm:1792
+#: ../urpm.pm:1816
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "adeiladu hdlist [%s]"
 
-#: ../urpm.pm:1807 ../urpm.pm:1842
+#: ../urpm.pm:1831 ../urpm.pm:1866
 #, c-format
 msgid ""
 "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
 "corrupted."
 msgstr ""
+"Methu adeiladu ffeil synthesis ar gyfer cyfrwng \"%s\". Efallai bod eich "
+"ffeil hdlist yn llygredig."
 
-#: ../urpm.pm:1810 ../urpm.pm:1845 ../urpmi:360
+#: ../urpm.pm:1834 ../urpm.pm:1869 ../urpmi:307
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1866
+#: ../urpm.pm:1890
 #, c-format
 msgid "found %d headers in cache"
 msgstr "canfod %d pennawd mewn storfa"
 
-#: ../urpm.pm:1870
+#: ../urpm.pm:1894
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "tynnu hen benawdau %d yn y storfa"
 
-#: ../urpm.pm:1920
+#: ../urpm.pm:1944
 #, c-format
 msgid "mounting %s"
 msgstr "gosod %s"
 
-#: ../urpm.pm:1936
+#: ../urpm.pm:1960
 #, c-format
 msgid "unmounting %s"
 msgstr "dadosod %s"
 
-#: ../urpm.pm:1960
+#: ../urpm.pm:1984
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "enw ffeil rpm annilys [%s]"
 
-#: ../urpm.pm:1966
+#: ../urpm.pm:1990
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpm.pm:1973 ../urpm.pm:2829
+#: ../urpm.pm:1997 ../urpm.pm:2858
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad  ffeil rpm (%s)"
 
-#: ../urpm.pm:1978
+#: ../urpm.pm:2002
 #, c-format
 msgid "unable to register rpm file"
 msgstr "methu cofrestr ffeil rpm"
 
-#: ../urpm.pm:1981
+#: ../urpm.pm:2005
 #, c-format
 msgid "error registering local packages"
 msgstr "gwall cofrestru pecynnau lleol"
 
-#: ../urpm.pm:2005
+#: ../urpm.pm:2029
 #, c-format
 msgid "Search"
-msgstr ""
+msgstr "Chwilio"
 
-#: ../urpm.pm:2096
+#: ../urpm.pm:2120
 #, c-format
 msgid "no package named %s"
 msgstr "heb enwi pecyn %s"
 
-#: ../urpm.pm:2099 ../urpme:88
+#: ../urpm.pm:2123 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
 
-#: ../urpm.pm:2283 ../urpm.pm:2327 ../urpm.pm:2353
+#: ../urpm.pm:2307 ../urpm.pm:2351 ../urpm.pm:2377
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "mae yna becynnau niferus gyda'r un enw ffeil rpm \"%s\""
 
-#: ../urpm.pm:2338
+#: ../urpm.pm:2362
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
 
-#: ../urpm.pm:2365
+#: ../urpm.pm:2389
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"cyfrwng \"%s\" yndefnyddio rhestr ffeiliau annilys:\n"
+"cyfrwng \"%s\" yn defnyddio rhestr ffeiliau annilys:\n"
 "  nid yw'r drych yn un diweddar, ceisiwch ddull arall"
 
-#: ../urpm.pm:2369
+#: ../urpm.pm:2393
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "nid yw cyfrwng \"%s\" yn diffinio unrhyw leoliad ar gyfer ffeiliau rpm"
 
-#: ../urpm.pm:2381
+#: ../urpm.pm:2405
 #, c-format
 msgid "package %s is not found."
 msgstr "heb ganfod pecyn %s"
 
-#: ../urpm.pm:2421 ../urpm.pm:2436 ../urpm.pm:2460 ../urpm.pm:2475
+#: ../urpm.pm:2445 ../urpm.pm:2460 ../urpm.pm:2484 ../urpm.pm:2499
 #, c-format
 msgid "urpmi database locked"
-msgstr "cronfa ddata urmi wedi cloi"
+msgstr "cronfa ddata urpmi wedi cloi"
 
-#: ../urpm.pm:2527 ../urpm.pm:2530 ../urpm.pm:2560
+#: ../urpm.pm:2551 ../urpm.pm:2554 ../urpm.pm:2584
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "heb ddewis cyfrwng \"%s\""
 
-#: ../urpm.pm:2556
+#: ../urpm.pm:2580
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
 
-#: ../urpm.pm:2564
+#: ../urpm.pm:2588
 #, c-format
 msgid "inconsistent medium \"%s\" marked removable but not really"
 msgstr "cyfrwng annealladwy \"%s\" wedi ei nodi'n symudadwy ond nid yw"
 
-#: ../urpm.pm:2576
+#: ../urpm.pm:2600
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "methu cael mynediad at gyfrwng. \"%s\""
 
-#: ../urpm.pm:2638
+#: ../urpm.pm:2662
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "allbwn gwallus: [%s]"
 
-#: ../urpm.pm:2645
+#: ../urpm.pm:2669
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
 
-#: ../urpm.pm:2726 ../urpmi:714
+#: ../urpm.pm:2751
 #, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
 
-#: ../urpm.pm:2760
+#: ../urpm.pm:2789
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "defnyddio proses %d ar gyfer gweithredu trosglwyddiad"
 
-#: ../urpm.pm:2791
+#: ../urpm.pm:2820
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "crëwyd trosglwyddiad ar gyfer gosod ar %s (tynnu=%d, gosod=%d, uwchraddio=%d)"
 
-#: ../urpm.pm:2794
+#: ../urpm.pm:2823
 #, c-format
 msgid "unable to create transaction"
 msgstr "methu creu trosglwyddiad."
 
-#: ../urpm.pm:2801
+#: ../urpm.pm:2830
 #, c-format
 msgid "removing package %s"
 msgstr "tynnu pecyn %s."
 
-#: ../urpm.pm:2803
+#: ../urpm.pm:2832
 #, c-format
 msgid "unable to remove package %s"
 msgstr "methu tynnu pecyn %s"
 
-#: ../urpm.pm:2813
+#: ../urpm.pm:2842
 #, 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.pm:2816
+#: ../urpm.pm:2845
 #, c-format
 msgid "unable to install package %s"
 msgstr "methu gosod pecyn %s"
 
-#: ../urpm.pm:2878
-#, fuzzy, c-format
+#: ../urpm.pm:2905
+#, c-format
 msgid "More information on package %s"
-msgstr "tynnu pecyn %s."
+msgstr "Rhagor o wybodaeth ar becyn %s"
 
-#: ../urpm.pm:3036 ../urpm.pm:3069
+#: ../urpm.pm:3062 ../urpm.pm:3095
 #, c-format
 msgid "due to missing %s"
 msgstr "oherwydd %s coll"
 
-#: ../urpm.pm:3037 ../urpm.pm:3067
+#: ../urpm.pm:3063 ../urpm.pm:3093
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s heb ei foddloni"
 
-#: ../urpm.pm:3038
+#: ../urpm.pm:3064
 #, c-format
 msgid "trying to promote %s"
 msgstr "ceisio hybu %s"
 
-#: ../urpm.pm:3039
+#: ../urpm.pm:3065
 #, c-format
 msgid "in order to keep %s"
 msgstr "fel modd i gadw %s"
 
-#: ../urpm.pm:3062
+#: ../urpm.pm:3088
 #, c-format
 msgid "in order to install %s"
 msgstr "er mwyn gosod %s"
 
-#: ../urpm.pm:3074
+#: ../urpm.pm:3100
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "oherwydd gwrthdaro gyda %s"
 
-#: ../urpm.pm:3076
+#: ../urpm.pm:3102
 #, c-format
 msgid "unrequested"
 msgstr "diofyn"
 
-#: ../urpm.pm:3092
+#: ../urpm.pm:3118
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Llofnod annilys (%s)"
 
-#: ../urpm.pm:3124
+#: ../urpm.pm:3150
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Enw Allwedd Annilys (%s)"
 
-#: ../urpm.pm:3126
+#: ../urpm.pm:3152
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Llofnod coll (%s)"
 
-#: ../urpm.pm:3175
+#: ../urpm.pm:3201
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "archwilio ffeil MD5SUM"
 
-#: ../urpm.pm:3184
+#: ../urpm.pm:3210
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
-msgstr ""
+msgstr "rhybudd: nid yw md5sum ar gyfer %s ar gael yn ffeil MD5SUM"
 
-#: ../urpm/args.pm:89 ../urpm/args.pm:96
+#: ../urpm/args.pm:92 ../urpm/args.pm:99
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
 
-#: ../urpm/args.pm:231
+#: ../urpm/args.pm:230
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
 
-#: ../urpm/msg.pm:83
+#: ../urpm/msg.pm:63
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Dewis gwael, ceisiwch eto\n"
 
 #: ../urpme:36
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "urpme version %s\n"
 "Copyright (C) 1999-2004 Mandrakesoft.\n"
@@ -832,29 +835,29 @@ msgid ""
 "usage:\n"
 msgstr ""
 "urpmf fersiwn %s\n"
-"Hawlfraint (C) 2002 - 2004 Mandrakesoft.\n"
+"Hawlfraint (C) 1999 - 2004 Mandrakesoft.\n"
 "Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
 "\n"
 "defnydd:\n"
 
-#: ../urpme:41 ../urpmf:32 ../urpmi:75 ../urpmi.addmedia:47
+#: ../urpme:41 ../urpmf:32 ../urpmi:76 ../urpmi.addmedia:47
 #: ../urpmi.removemedia:44 ../urpmi.update:30 ../urpmq:43
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - argraffu neges cymorth.\n"
 
-#: ../urpme:42 ../urpmi:82
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - dewis pecyn ynn awtomatig o fewn dewisiadau.\n"
 
-#: ../urpme:43 ../urpmi:123
+#: ../urpme:43 ../urpmi:121
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
 
-#: ../urpme:44 ../urpmi:96 ../urpmq:64
+#: ../urpme:44 ../urpmi:97 ../urpmq:64
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -862,13 +865,13 @@ msgstr ""
 "  --force        - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
 "bodoli.\n"
 
-#: ../urpme:45 ../urpmi:101 ../urpmq:65
+#: ../urpme:45 ../urpmi:102 ../urpmq:65
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --paralel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
 
-#: ../urpme:46 ../urpmi:102
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - defnyddio root arall ar gyfer gosod rpm.\n"
@@ -882,8 +885,8 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth (ddad)osod chroot gyda dewis o  --root.\n"
 
-#: ../urpme:49 ../urpmi:137 ../urpmi.addmedia:79 ../urpmi.removemedia:49
-#: ../urpmi.update:46 ../urpmq:90
+#: ../urpme:49 ../urpmi:135 ../urpmi.addmedia:79 ../urpmi.removemedia:49
+#: ../urpmi.update:48 ../urpmq:90
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
@@ -919,17 +922,18 @@ msgid "Checking to remove the following packages"
 msgstr "Ticio i ddileu'r pecynnau canlynol"
 
 #: ../urpme:106
-#, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu tynnu (%d MB)"
 
-#: ../urpme:108 ../urpmi:512 ../urpmi:660
+#: ../urpme:108 ../urpmi:429 ../urpmi:549
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
 
-#: ../urpme:111 ../urpmi:703
+#: ../urpme:111 ../urpmi:597
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
@@ -955,23 +959,23 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpmf:33 ../urpmi:76 ../urpmq:44
+#: ../urpmf:33 ../urpmi:77 ../urpmq:44
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpmf:34 ../urpmi:77 ../urpmq:45
+#: ../urpmf:34 ../urpmi:78 ../urpmq:45
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media          - defnyddio'r cyfrwng, wedi ei ran gan coma.\n"
+msgstr "  --media          - defnyddio'r cyfrwng, wedi ei ran gan gollnod.\n"
 
-#: ../urpmf:35 ../urpmi:79 ../urpmq:47
+#: ../urpmf:35 ../urpmi:80 ../urpmq:47
 #, 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:36 ../urpmi:80 ../urpmq:48
+#: ../urpmf:36 ../urpmi:81 ../urpmq:48
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -998,13 +1002,13 @@ msgid ""
 msgstr ""
 "  --quiet         - peidiwch argraffu enw tag (rhagosodedig os nad oes tag "
 "yn\n"
-"                    cael ei roi ar y linell orchymyn gyda modd "
+"                    cael ei roi ar y llinell orchymyn gyda modd "
 "rhyngweithiol).\n"
 
 #: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - peidio argraffu llinellau yr un fath.\n"
+msgstr "  --uniq         - peidio argraffu llinellau'r un fath.\n"
 
 #: ../urpmf:42
 #, c-format
@@ -1012,14 +1016,14 @@ msgid "  --all          - print all tags.\n"
 msgstr "  --all          - argraffu pob tag.\n"
 
 #: ../urpmf:43
-#, fuzzy, c-format
+#, c-format
 msgid "  --name         - print only package names.\n"
-msgstr "  --all          - argraffu pob tag.\n"
+msgstr "  --name          - argraffu enwau pecyn yn unig \n"
 
 #: ../urpmf:44
 #, c-format
 msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - argraffu grwp tag: grwp.\n"
+msgstr "  --group        - argraffu grŵp tag: grŵp.\n"
 
 #: ../urpmf:45
 #, c-format
@@ -1074,7 +1078,7 @@ msgstr "  --requires     - argraffu tagiau angenrheidiol: pob anghenraid\n"
 #: ../urpmf:55
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - argraffu fagiau ffeiliau: pob ffeil\n"
+msgstr "  --files        - argraffu tagiau ffeiliau: pob ffeil\n"
 
 #: ../urpmf:56
 #, c-format
@@ -1088,13 +1092,13 @@ msgstr ""
 "  --obsoletes     - argraffu hen dagiau: yr holl hen rai (llinellau "
 "niferus).\n"
 
-#: ../urpmf:58 ../urpmi:116 ../urpmq:74
+#: ../urpmf:58 ../urpmi:117 ../urpmq:74
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
-"  --env          - defnyddio amgynlchedd benodol (adroddiad gwall \n"
+"  --env          - defnyddio amgylchedd penodol (adroddiad gwall \n"
 "                   fel rheol.\n"
 
 #: ../urpmf:60
@@ -1137,12 +1141,12 @@ msgstr "  !              - unaidd NOT, true os yw'r mynegiad yn false.\n"
 #: ../urpmf:66
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - parenthesis chwith i agor mynegiad grwp.\n"
+msgstr "  (              - parenthesis chwith i agor mynegiad grŵp.\n"
 
 #: ../urpmf:67
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - parenthesis de i gau mynegiad grwp.\n"
+msgstr "  )              - parenthesis de i gau mynegiad grŵp.\n"
 
 #: ../urpmf:119
 #, c-format
@@ -1153,7 +1157,7 @@ msgstr ""
 "galw nôl yw: \n"
 "%s\n"
 
-#: ../urpmf:124 ../urpmi:253 ../urpmq:114
+#: ../urpmf:124 ../urpmi:200 ../urpmq:114
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "ddefnyddio amgylchedd penodol ar %s\n"
@@ -1165,15 +1169,15 @@ msgid ""
 "result\n"
 msgstr ""
 "Sylw: gan nad oedd unrhyw gyfrwng chwiliwyd yn defnyddio hdlists, methodd "
-"urpmf aâ chynnig canlyniad\n"
+"urpmf â chynnig canlyniad\n"
 
 #: ../urpmf:157
 #, c-format
 msgid "You may want to use --name to search for package names.\n"
-msgstr ""
+msgstr "Efallai yr hoffech ddefnyddio --name i chwilio am enwau pecynnau.\n"
 
-#: ../urpmi:70
-#, fuzzy, c-format
+#: ../urpmi:71
+#, c-format
 msgid ""
 "urpmi version %s\n"
 "Copyright (C) 1999-2004 Mandrakesoft.\n"
@@ -1183,37 +1187,39 @@ msgid ""
 "usage:\n"
 msgstr ""
 "urpmf fersiwn %s\n"
-"Hawlfraint (C) 2002 - 2004 Mandrakesoft.\n"
+"Hawlfraint (C) 1999 - 2004 Mandrakesoft.\n"
 "Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
 "\n"
 "defnydd:\n"
 
-#: ../urpmi:78 ../urpmq:46
-#, fuzzy, c-format
+#: ../urpmi:79 ../urpmq:46
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
-msgstr "  --media          - defnyddio'r cyfrwng, wedi ei ran gan coma.\n"
+msgstr ""
+"  --searchmedia  - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
+"gofynnwyd (neu diweddarwyd).\n"
 
-#: ../urpmi:81
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
-#: ../urpmi:83 ../urpmq:50
+#: ../urpmi:84 ../urpmq:50
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - dewis pecynnau'n awtomatig i uwchraddio'r system.\n"
 
-#: ../urpmi:84
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - peidio gofyn i ddadosod pecyn, atal gosod.\n"
 
-#: ../urpmi:85 ../urpmq:52
+#: ../urpmi:86 ../urpmq:52
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1222,7 +1228,7 @@ msgstr ""
 "  --keep         - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
 "                   pecynnau sy'n arwain at dynnu.\n"
 
-#: ../urpmi:87
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1234,48 +1240,48 @@ msgstr ""
 "                   eu gosod neu eu uwchraddio\n"
 "                   rhagosodiad yw %d.\n"
 
-#: ../urpmi:90
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - hyd drosglwyddiad byr, rhagosodiad yw %d.\n"
 
-#: ../urpmi:91 ../urpmq:51
+#: ../urpmi:92 ../urpmq:51
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - mynnu chwiliad fuzzy (fel -y).\n"
 
-#: ../urpmi:92 ../urpmq:60
+#: ../urpmi:93 ../urpmq:60
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - pecyn nesaf yn becyn ffynhonnell (yr un peth â -s).\n"
 
-#: ../urpmi:93
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
 
-#: ../urpmi:94
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - tynnu rpm o'r storfa cyn unrhyw beth arall.\n"
 
-#: ../urpmi:95
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - cadw'r rpm sydd heb ei ddefnyddio yn y storfa.\n"
 
-#: ../urpmi:97
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
-"  --allow-nodeps - caniatáu gofyn i ddefnyddiw osod pecynnau heb\n"
+"  --allow-nodeps - caniatáu gofyn i ddefnyddiwr i osod pecynnau heb\n"
 "                   wirio dibyniaethau.\n"
 
-#: ../urpmi:99
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1284,31 +1290,31 @@ msgstr ""
 "  --allow-force  - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
 "                   wirio dibyniaethau na'u cyfanrwydd.\n"
 
-#: ../urpmi:103
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
-"                   wrth gosod chroot gyda dewis o  --root.\n"
+"                   wrth osod chroot gyda dewis o  --root.\n"
 
-#: ../urpmi:105 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:68
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:68
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
 
-#: ../urpmi:106 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:69
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:69
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - defnyddio curl i estyn ffeiliau pell.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:50 ../urpmi.update:33
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - cyfyngu cyflymder y llwytho i lawr.\n"
 
-#: ../urpmi:108
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1317,7 +1323,7 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmi:110 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:70
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:70
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1326,16 +1332,16 @@ msgstr ""
 "  --proxy        - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
 "                   rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:72
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:72
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 "  --proxy-user   - enwi defnyddiwr a chyfrinair i'w ddefnyddio fel y\n"
-"                   dilysiad dirprw(fformat yw <user:password>).\n"
+"                   dilysiad dirprwy (fformat yw <user:password>).\n"
 
-#: ../urpmi:114
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1344,168 +1350,99 @@ msgstr ""
 "  --bug          - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
 "                   yr arg. nesaf\n"
 
-#: ../urpmi:118
-#, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - defnyddio rhyngwyneb  X.\n"
-
 #: ../urpmi:119
 #, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - dewiswch y rhyngwyneb gorau yn ôl yr amgylchedd:\n"
-"                   X fodd testun.\n"
-
-#: ../urpmi:121
-#, c-format
-msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmi:124
+#: ../urpmi:122
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - eithrio llwybr wedi ei wahanu a chollnod.\n"
 
-#: ../urpmi:125
+#: ../urpmi:123
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - eithrio ffeiliau docs.\n"
 
-#: ../urpmi:126
-#, fuzzy, c-format
+#: ../urpmi:124
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
-msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
+msgstr "  --skip          - pecynnau dylid osgoi eu gosod.\n"
 
-#: ../urpmi:127
+#: ../urpmi:125
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
+"  --more-choices - pan fydd nifer o becynnau wedi eu canfod, cynnig mwy o "
+"ddewis\n"
+"                   na'r rhagosodiad.\n"
 
-#: ../urpmi:129 ../urpmi.addmedia:75 ../urpmi.update:41
-#, fuzzy, c-format
+#: ../urpmi:127 ../urpmi.addmedia:75 ../urpmi.update:41
+#, c-format
 msgid "  --norebuild    - don't try to rebuild hdlist if not readable.\n"
-msgstr "  --buildhost    - argraffu buildhost tag: build host.\n"
+msgstr ""
+"  --norebuild    - peidiwch ceisio adeiladu buildhost os nad yw'n "
+"ddarllenadwy.\n"
 
-#: ../urpmi:130
+#: ../urpmi:128
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
+"  --strict-arch  - uwchraddio dim ond pecynnau gyda'r un bensaernïaeth.\n"
 
-#: ../urpmi:131 ../urpmq:77
+#: ../urpmi:129 ../urpmq:77
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
 
-#: ../urpmi:132
+#: ../urpmi:130
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - caniatáu i chwilio ganfod pecyn.\n"
+msgstr "  -p             - caniatáu i chwilio canfod pecyn.\n"
 
-#: ../urpmi:133
+#: ../urpmi:131
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - peidio chwilio yn provides i ganfod pecyn.\n"
 
-#: ../urpmi:134 ../urpmq:91
+#: ../urpmi:132 ../urpmq:91
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - gosod chwilio fuzzy (fel --fuzzy).\n"
 
-#: ../urpmi:135 ../urpmq:88
+#: ../urpmi:133 ../urpmq:88
 #, 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"
 
-#: ../urpmi:136 ../urpmi.addmedia:78 ../urpmi.removemedia:48
-#: ../urpmi.update:45
+#: ../urpmi:134 ../urpmi.addmedia:78 ../urpmi.removemedia:48
+#: ../urpmi.update:47
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modd distaw.\n"
 
-#: ../urpmi:138
+#: ../urpmi:136
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
 "eu gosod.\n"
 
-#: ../urpmi:145
-#, c-format
-msgid "Choose location to save file"
-msgstr "Dewis lleoliad i gadw'r ffeil"
-
-#: ../urpmi:201
+#: ../urpmi:181
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "Beth mae modd gwneud gyda ffeiliau deuaidd wrth ddefnyddio --install-src"
 
-#: ../urpmi:208
-#, c-format
-msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
-msgstr ""
-"Rydych wedi dewis pecyn ffynhonnell:\n"
-"\n"
-"%s\n"
-"\n"
-"Mwy na thebyg doeddech ddim am ei osod ar eich cyfrifiadur(bydd\n"
-"ei osod yn caniatáu i chi wneud newidiadau i'w cod ffynhonell a'i grynhoi).\n"
-"\n"
-"Beth hoffech chi ei wneud?"
-
-#: ../urpmi:216
-#, c-format
-msgid "Do nothing"
-msgstr "Gwneud dim"
-
-#: ../urpmi:217
-#, c-format
-msgid "Yes, really install it"
-msgstr "Iawn, yn barod i'w osod"
-
-#: ../urpmi:218 ../urpmi:235
-#, c-format
-msgid "Save file"
-msgstr "Cadw ffeil"
-
-#: ../urpmi:229
-#, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"Rydych ar fin gosod y pecynnau meddalwedd canlynol ar eich cyfrifiadur:\n"
-"\n"
-"%s\n"
-"\n"
-"Efallai byddai'n well gennych eu cadw. Beth yw eich dewis?"
-
-#: ../urpmi:234
-#, c-format
-msgid "Install it"
-msgstr "Ei osod"
-
-#: ../urpmi:243
+#: ../urpmi:190
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1514,82 +1451,79 @@ msgstr ""
 "Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
 "adroddiad gwall neu ei ddileu."
 
-#: ../urpmi:244
+#: ../urpmi:191
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
 
-#: ../urpmi:247 ../urpmi:370
+#: ../urpmi:194 ../urpmi:317
 #, c-format
 msgid "Copying failed"
 msgstr "Methodd y copïo"
 
-#: ../urpmi:264
+#: ../urpmi:211
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
 
-#: ../urpmi:403
+#: ../urpmi:220
+#, c-format
+msgid ""
+"Error: %s appears to be mounted read-only.\n"
+"Use --allow-force to force operation."
+msgstr ""
+
+#: ../urpmi:350
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../urpmi:416
+#: ../urpmi:353
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Beth yw eich dewis? (1-%d)"
 
-#: ../urpmi:424 ../urpmi:575
-#, c-format
-msgid "Package installation..."
-msgstr "Gosod pecynnau..."
-
-#: ../urpmi:424 ../urpmi:575
-#, c-format
-msgid "Initializing..."
-msgstr "Cychwyn..."
-
-#: ../urpmi:447
+#: ../urpmi:378
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
 msgstr ""
+"Nid oes modd gosod y pecynnau canlynol am eu bod yn dibynnu ar becynnau\n"
+"sy'n hyn na'r rhai sydd wedi eu gosod:\n"
+"%s"
 
-#: ../urpmi:453 ../urpmi:476 ../urpmi:507
-#, c-format
-msgid "do you agree ?"
-msgstr "cytuno?"
-
-#: ../urpmi:459 ../urpmi:482
+#: ../urpmi:386 ../urpmi:404
 #, c-format
 msgid ""
 "\n"
 "Continue?"
 msgstr ""
+"\n"
+"Parhau?"
 
-#: ../urpmi:471
+#: ../urpmi:397
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
 "%s"
 msgstr ""
-"Nid oes modd gosod rhai pecynnau gofynwyd amdanynt:\n"
+"Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
 "%s"
 
-#: ../urpmi:496
+#: ../urpmi:417
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
 msgstr ""
-"Nid oes modd i'r gosod parhau gan bo rhaid i'r pecynnau canlynol\n"
+"Nid oes modd i'r gosod parhau gan fo rhaid i'r pecynnau canlynol\n"
 "gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:502
+#: ../urpmi:423
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1598,7 +1532,7 @@ msgstr ""
 "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s"
 
-#: ../urpmi:541 ../urpmi:552
+#: ../urpmi:458 ../urpmi:469
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be installed "
@@ -1606,15 +1540,15 @@ msgid ""
 msgstr ""
 "I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod (%d MB)"
 
-#: ../urpmi:542 ../urpmi:553
-#, fuzzy, c-format
+#: ../urpmi:459 ../urpmi:470
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed (%d "
 "MB)"
 msgstr ""
-"I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod (%d MB)"
+"I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod (%d MB)"
 
-#: ../urpmi:548
+#: ../urpmi:465
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1623,37 +1557,32 @@ msgstr ""
 "Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
 "%s\n"
 
-#: ../urpmi:571 ../urpmq:302
+#: ../urpmi:483 ../urpmq:302
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "methu estyn pecynnau ffynhonnell, atal"
 
-#: ../urpmi:585
+#: ../urpmi:494
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
-#: ../urpmi:586
+#: ../urpmi:495
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Pwyso Enter pan yn barod..."
 
-#: ../urpmi:630
-#, c-format
-msgid "Downloading package `%s'..."
-msgstr "Llwytho pecyn '%s'..."
-
-#: ../urpmi:647
+#: ../urpmi:540
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
 
-#: ../urpmi:648
+#: ../urpmi:541
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ydych chi am barhau gosod?"
 
-#: ../urpmi:668 ../urpmi:795
+#: ../urpmi:556 ../urpmi:672
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1664,52 +1593,52 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../urpmi:678 ../urpmi:733 ../urpmi:754 ../urpmi:774
+#: ../urpmi:566 ../urpmi:610 ../urpmi:631 ../urpmi:651
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
-#: ../urpmi:693
+#: ../urpmi:581
 #, c-format
 msgid "distributing %s"
 msgstr "dosbarthu %s"
 
-#: ../urpmi:701
-#, c-format
-msgid "installing %s"
+#: ../urpmi:592
+#, fuzzy, c-format
+msgid "installing %s from %s"
 msgstr "gosod %s"
 
-#: ../urpmi:716
+#: ../urpmi:594
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Gosod pecyn `%s' (%s/%s)..."
+msgid "installing %s"
+msgstr "gosod %s"
 
-#: ../urpmi:740
+#: ../urpmi:617
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
 
-#: ../urpmi:759
+#: ../urpmi:636
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Gwneud y gosod gyda mwy o orfodaeth (--force)? (i/N)"
 
-#: ../urpmi:800
+#: ../urpmi:677
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "methodd trosglwyddiad gosod %d"
 
-#: ../urpmi:808
+#: ../urpmi:685
 #, c-format
 msgid "Installation is possible"
 msgstr "Gosod yn bosibl"
 
-#: ../urpmi:811
+#: ../urpmi:688
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Popeth wedi eu gosod eisoes"
 
-#: ../urpmi:825
+#: ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
@@ -1782,7 +1711,7 @@ msgstr ""
 "  --distrib-XXX  - creu cyfrwng yn awtomatig ar gyfer rhan  XXX o'r\n"
 "                   dosbarthiad, gall  XXX fod yn main, contrib, diweddariad "
 "neu\n"
-"                   unrhywwbeth arall sydd wedi ei ffurfweddu ;-)\n"
+"                   unrhyw beth arall sydd wedi ei ffurfweddu ;-)\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
@@ -1803,7 +1732,7 @@ msgid ""
 msgstr ""
 "  --version      - defnyddiwch fersiwn penodol i'r dosbarthiad, mae'r "
 "rhagosodiad\n"
-"                   yn cael ei gymryd ofersiwn dosbarthiad hysbyswyd gan "
+"                   yn cael ei gymryd o fersiwn dosbarthiad hysbyswyd gan "
 "pecynnau\n"
 "                   ryddhawyd gan Mandrakelinux.\n"
 
@@ -1813,8 +1742,7 @@ msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrakelinux-release package installed.\n"
 msgstr ""
-"  --arch         - defnyddio pensaerhiaeth ppenodol, y rhagosodiad yw arch "
-"o\n"
+"  --arch         - defnyddio pensaernïaeth benodol, y rhagosodiad yw arch o\n"
 "                   osod pecynnau Mandrakelinux.\n"
 
 #: ../urpmi.addmedia:72
@@ -1823,43 +1751,43 @@ msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
-"  --virtual      - creu cyfrwng rhithil sydd wedi ei ddiweddaru,\n"
-"                   dom ond protocol file:// sy'n cael ei ganiatau.\n"
+"  --virtual      - creu cyfrwng rhithiol sydd wedi ei ddiweddaru,\n"
+"                   dom ond protocol file:// sy'n cael ei ganiatáu.\n"
 
 #: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - analluogi gwirio ffeil  MD5SUM.\n"
 
-#: ../urpmi.addmedia:76 ../urpmi.removemedia:46 ../urpmi.update:43
+#: ../urpmi.addmedia:76 ../urpmi.removemedia:46 ../urpmi.update:45
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - glanhau penawdau yng nghyfeiriadur y storfa.\n"
 
-#: ../urpmi.addmedia:77 ../urpmi.update:44
+#: ../urpmi.addmedia:77 ../urpmi.update:46
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - gorfodi cynhyrchu ffeiliau hdlist\n"
 
 #: ../urpmi.addmedia:116
-#, fuzzy, c-format
+#, c-format
 msgid "Only superuser is allowed to add media"
-msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
+msgstr "Dim ond uwch ddefnyddiwr sy'n cael ychwanegu cyfrwng"
 
 #: ../urpmi.addmedia:119
-#, fuzzy, c-format
+#, c-format
 msgid "Will create config file [%s]"
-msgstr "ysgrifennu ffeil ffurfweddu (%s)"
+msgstr "Yn creu ffeil config (%s)"
 
 #: ../urpmi.addmedia:120
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create config file [%s]"
-msgstr "ysgrifennu ffeil ffurfweddu (%s)"
+msgstr "Methu creu ffeil Config (%s)"
 
 #: ../urpmi.addmedia:149
 #, c-format
 msgid "found version %s and arch %d ..."
-msgstr ""
+msgstr "wedi canfod fersiwn %s ac arch %d ..."
 
 #: ../urpmi.addmedia:153
 #, c-format
@@ -1903,7 +1831,7 @@ msgid ""
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
-"lle mai <name> yw'r ewn cyfrwng i'w dynnu.\n"
+"lle mai <name> yw'r enw cyfrwng i'w dynnu.\n"
 
 #: ../urpmi.removemedia:45
 #, c-format
@@ -1911,9 +1839,9 @@ msgid "  -a             - select all media.\n"
 msgstr "  -a             - dewis pob cyfrwng.\n"
 
 #: ../urpmi.removemedia:47
-#, fuzzy, c-format
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
-msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
+msgstr "  -y             - cydweddiad bras enwau cyfryngau\n"
 
 #: ../urpmi.removemedia:50
 #, c-format
@@ -1925,9 +1853,9 @@ msgstr ""
 "dewisiadau anhysbys '%s'\n"
 
 #: ../urpmi.removemedia:57
-#, fuzzy, c-format
+#, c-format
 msgid "Only superuser is allowed to remove media"
-msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
+msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu cyfrwng"
 
 #: ../urpmi.removemedia:67
 #, c-format
@@ -1950,7 +1878,7 @@ msgid ""
 "where <name> is a medium name to update.\n"
 msgstr ""
 "usage: urpmi.update [options] <name> ...\n"
-"lle mai <name> yw'r ewn cyfrwng i'w dynnu.\n"
+"lle mai <name> yw'r enw cyfrwng i'w dynnu.\n"
 
 #: ../urpmi.update:38
 #, c-format
@@ -1963,21 +1891,33 @@ msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - gorfodi diweddaru allwedd gpg.\n"
 
 #: ../urpmi.update:42
+#, fuzzy, c-format
+msgid "  --ignore       - don't update, mark the media as ignored.\n"
+msgstr ""
+"  --norebuild    - peidiwch ceisio adeiladu buildhost os nad yw'n "
+"ddarllenadwy.\n"
+
+#: ../urpmi.update:43
+#, c-format
+msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
+msgstr ""
+
+#: ../urpmi.update:44
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - dewis pob cyfrwng ansymudadwy.\n"
 
-#: ../urpmi.update:63
-#, fuzzy, c-format
+#: ../urpmi.update:64
+#, c-format
 msgid "Only superuser is allowed to update media"
-msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
+msgstr "Dim ond uwch ddefnyddiwr sy'n cael diweddaru cyfrwng"
 
-#: ../urpmi.update:71
+#: ../urpmi.update:72
 #, 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:83
+#: ../urpmi.update:90
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1986,6 +1926,16 @@ msgstr ""
 "mae'r cofnod i ddiweddaru ar goll\n"
 "(un o %s)\n"
 
+#: ../urpmi.update:95
+#, fuzzy, c-format
+msgid "ignoring media %s"
+msgstr "dewis cyfrwng \"%s\":"
+
+#: ../urpmi.update:95
+#, fuzzy, c-format
+msgid "enabling media %s"
+msgstr "dewis cyfrwng \"%s\":"
+
 #: ../urpmq:38
 #, c-format
 msgid ""
@@ -2042,7 +1992,7 @@ msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
-"  --headers      - tynnu penawdau o bechyn yn urpmii db i\n"
+"  --headers      - tynnu penawdau o becyn yn urpmi db i\n"
 "                   stdout (gwraidd yn unig).\n"
 
 #: ../urpmq:63
@@ -2104,7 +2054,7 @@ msgstr ""
 #: ../urpmq:85
 #, c-format
 msgid "  -p             - search in provides to find package.\n"
-msgstr "  -p             - caniatáu i chwilio ganfod pecyn.\n"
+msgstr "  -p             - caniatáu i chwilio canfod pecyn.\n"
 
 #: ../urpmq:86
 #, c-format
@@ -2126,9 +2076,11 @@ msgstr ""
 "osod.\n"
 
 #: ../urpmq:92
-#, fuzzy, c-format
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
-msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
+msgstr ""
+"  -Y             - fel -y, ond yn gorfodi cydweddu diffyg cydweddiad maint "
+"llythrennau.\n"
 
 #: ../urpmq:93
 #, c-format
@@ -2157,69 +2109,77 @@ msgstr "Heb ganfod filelist\n"
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"
 
-#~ msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-#~ msgstr "        %s%% o %s wedi cwblhau, Cyrraedd = %s, cyflymder = %s"
-
-#~ msgid "        %s%% completed, speed = %s"
-#~ msgstr "        %s%% wedi cwblhau, cyflymder = %s"
+#~ msgid "  --X            - use X interface.\n"
+#~ msgstr "  --X            - defnyddio rhyngwyneb  X.\n"
 
-#~ msgid "relocated %s entries in depslist"
-#~ msgstr "ailganfod cofnodion %s yn depslist"
+#~ msgid ""
+#~ "  --best-output  - choose best interface according to the environment:\n"
+#~ "                   X or text mode.\n"
+#~ msgstr ""
+#~ "  --best-output  - dewiswch y rhyngwyneb gorau yn ôl yr amgylchedd:\n"
+#~ "                   X fodd testun.\n"
 
-#~ msgid "no entries relocated in depslist"
-#~ msgstr "dim cofnodion wedi eu symud i depslip"
+#~ msgid "Choose location to save file"
+#~ msgstr "Dewis lleoliad i gadw'r ffeil"
 
 #~ msgid ""
-#~ "urpme version %s\n"
-#~ "Copyright (C) 1999, 2000, 2001, 2002 Mandrakesoft.\n"
-#~ "This is free software and may be redistributed under the terms of the GNU "
-#~ "GPL.\n"
+#~ "You have selected a source package:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "You probably didn't want to install it on your computer (installing it\n"
+#~ "would allow you to make modifications to its sourcecode then compile "
+#~ "it).\n"
 #~ "\n"
-#~ "usage:\n"
+#~ "What would you like to do?"
 #~ msgstr ""
-#~ "urpme fersiwn %s\n"
-#~ "Hawlfraint (C) 1999, 2000, 2001, 2002 Mandrakesoft.\n"
-#~ "Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL "
-#~ "GNU..\n"
+#~ "Rydych wedi dewis pecyn ffynhonnell:\n"
 #~ "\n"
-#~ "defnydd:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Mwy na thebyg doeddech ddim am ei osod ar eich cyfrifiadur (bydd\n"
+#~ "ei osod yn caniatáu i chi wneud newidiadau i'w cod ffynhonnell a'i "
+#~ "grynhoi).\n"
+#~ "\n"
+#~ "Beth hoffech chi ei wneud?"
+
+#~ msgid "Do nothing"
+#~ msgstr "Gwneud dim"
+
+#~ msgid "Yes, really install it"
+#~ msgstr "Iawn, yn barod i'w osod"
+
+#~ msgid "Save file"
+#~ msgstr "Cadw ffeil"
 
 #~ msgid ""
-#~ "urpmi version %s\n"
-#~ "Copyright (C) 1999, 2000, 2001, 2002 Mandrakesoft.\n"
-#~ "This is free software and may be redistributed under the terms of the GNU "
-#~ "GPL.\n"
+#~ "You are about to install the following software package on your "
+#~ "computer:\n"
+#~ "\n"
+#~ "%s\n"
 #~ "\n"
-#~ "usage:\n"
+#~ "You may prefer to just save it. What is your choice?"
 #~ msgstr ""
-#~ "urpmi fersiwn %s\n"
-#~ "Hawlfraint © 1999, 2000, 2001, 2002 Mandrakesoft.\n"
-#~ "Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL "
-#~ "GNU..\n"
+#~ "Rydych ar fin gosod y pecynnau meddalwedd canlynol ar eich cyfrifiadur:\n"
 #~ "\n"
-#~ "defnydd:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Efallai byddai'n well gennych eu cadw. Beth yw eich dewis?"
 
-#~ msgid "syntax error in config file at line %s"
-#~ msgstr "gwall cystrawen yn ffeil ffurfweddiad yn llinell %s"
+#~ msgid "Install it"
+#~ msgstr "Ei osod"
 
-#~ msgid ""
-#~ "unable to take care of medium \"%s\" as list file is already used by "
-#~ "another medium"
-#~ msgstr ""
-#~ "methu cymryd gofal o gyfrwng \"%s\" gan fod y rhestr ffeil yn cael ei "
-#~ "ddefnyddio gan gyfrwng arall"
+#~ msgid "Package installation..."
+#~ msgstr "Gosod pecynnau..."
 
-#~ msgid ""
-#~ "unable to use name \"%s\" for unnamed medium because it is already used"
-#~ msgstr ""
-#~ "methu defnyddio enw \"%s\" ar gyfer cyfrwng dienw am ei fod mewn defnydd "
-#~ "eisoes"
+#~ msgid "Initializing..."
+#~ msgstr "Cychwyn..."
 
-#~ msgid ""
-#~ "unable to take medium \"%s\" into account as no list file [%s] exists"
-#~ msgstr ""
-#~ "methu cymryd cyfrwng \"%s\" i ystyriaeth am nad oes rhestr ffeil [%s] yn "
-#~ "bodoli"
+#~ msgid "do you agree ?"
+#~ msgstr "cytuno?"
+
+#~ msgid "Downloading package `%s'..."
+#~ msgstr "Llwytho pecyn '%s'..."
 
-#~ msgid "unable to determine medium of this hdlist file [%s]"
-#~ msgstr "methu enw cyfrwng y ffeil hdlist hon (%s)"
+#~ msgid "Installing package `%s' (%s/%s)..."
+#~ msgstr "Gosod pecyn `%s' (%s/%s)..."