updated pot file

1 files changed, 257 insertions, 219 deletions

diff --git a/po/cy.po b/po/cy.po
index 7ad95485..c013d43a 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-30 09:14+0200\n"
+"POT-Creation-Date: 2004-07-17 12:34+0200\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"
@@ -53,7 +53,7 @@ msgstr ""
 "Gosodiad pecynnau awtomatig...\n"
 "Roeddech wedi gofyn i gael gosod pecyn %s\n"
 
-#: ../_irpm:33 ../urpme:29 ../urpmi:514
+#: ../_irpm:33 ../urpme:29 ../urpmi:516
 #, c-format
 msgid "Is this OK?"
 msgstr "Mae'r model yn gywir"
@@ -68,7 +68,7 @@ msgstr "Iawn"
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../_irpm:44 ../urpmi:446 ../urpmi:522
+#: ../_irpm:44 ../urpmi:444 ../urpmi:524
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -134,7 +134,7 @@ msgstr ""
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "methu cael mynediad i  ffeil hdlist\"%s\", anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:195 ../urpm.pm:2268
+#: ../urpm.pm:195 ../urpm.pm:2262
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
@@ -252,34 +252,34 @@ msgstr ""
 "-nid oes modd defnyddio synthesis gyda --media, --excludemedia, --sortmedia, "
 "--update neu --paralel"
 
-#: ../urpm.pm:478 ../urpm.pm:504 ../urpm.pm:882 ../urpm.pm:893 ../urpm.pm:954
-#: ../urpm.pm:971 ../urpm.pm:1054 ../urpm.pm:1111 ../urpm.pm:1304
-#: ../urpm.pm:1424 ../urpm.pm:1539 ../urpm.pm:1545 ../urpm.pm:1646
-#: ../urpm.pm:1725 ../urpm.pm:1729
+#: ../urpm.pm:478 ../urpm.pm:504 ../urpm.pm:889 ../urpm.pm:900 ../urpm.pm:961
+#: ../urpm.pm:978 ../urpm.pm:1061 ../urpm.pm:1118 ../urpm.pm:1311
+#: ../urpm.pm:1431 ../urpm.pm:1546 ../urpm.pm:1552 ../urpm.pm:1653
+#: ../urpm.pm:1732 ../urpm.pm:1736
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "archwilio ffeil synthesis [%s]"
 
-#: ../urpm.pm:482 ../urpm.pm:497 ../urpm.pm:510 ../urpm.pm:885 ../urpm.pm:896
-#: ../urpm.pm:960 ../urpm.pm:966 ../urpm.pm:1059 ../urpm.pm:1115
-#: ../urpm.pm:1308 ../urpm.pm:1428 ../urpm.pm:1533 ../urpm.pm:1551
-#: ../urpm.pm:1735
+#: ../urpm.pm:482 ../urpm.pm:497 ../urpm.pm:510 ../urpm.pm:892 ../urpm.pm:903
+#: ../urpm.pm:967 ../urpm.pm:973 ../urpm.pm:1066 ../urpm.pm:1122
+#: ../urpm.pm:1315 ../urpm.pm:1435 ../urpm.pm:1540 ../urpm.pm:1558
+#: ../urpm.pm:1742
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "archwilio ffeil hdlist [%s]"
 
-#: ../urpm.pm:492 ../urpm.pm:889
+#: ../urpm.pm:492 ../urpm.pm:896
 #, 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:520 ../urpm.pm:903 ../urpm.pm:979 ../urpm.pm:1063
-#: ../urpm.pm:1432
+#: ../urpm.pm:520 ../urpm.pm:910 ../urpm.pm:986 ../urpm.pm:1070
+#: ../urpm.pm:1439
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
 
-#: ../urpm.pm:526 ../urpm.pm:1685
+#: ../urpm.pm:526 ../urpm.pm:1692
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
@@ -294,8 +294,8 @@ msgstr "hepgor pecyn  %s"
 msgid "would install instead of upgrade package %s"
 msgstr "gosod yn lle uwchraddio pecyn %s"
 
-#: ../urpm.pm:566 ../urpm.pm:2068 ../urpm.pm:2131 ../urpm.pm:2710
-#: ../urpm.pm:2808
+#: ../urpm.pm:566 ../urpm.pm:2076 ../urpm.pm:2139 ../urpm.pm:2705
+#: ../urpm.pm:2822
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "methu agor rpmdb"
@@ -325,13 +325,13 @@ msgstr "methu cael mynediad i gyfrwng gosod cyntaf"
 msgid "copying hdlists file..."
 msgstr "copïo ffeil hdlists..."
 
-#: ../urpm.pm:666 ../urpm.pm:994 ../urpm.pm:1083 ../urpm.pm:1146
-#: ../urpm.pm:1203 ../urpm.pm:1374 ../urpm.pm:1380
+#: ../urpm.pm:666 ../urpm.pm:1001 ../urpm.pm:1090 ../urpm.pm:1153
+#: ../urpm.pm:1210 ../urpm.pm:1381 ../urpm.pm:1387
 #, c-format
 msgid "...copying failed"
 msgstr "...methodd y copïo"
 
-#: ../urpm.pm:666 ../urpm.pm:994 ../urpm.pm:1087
+#: ../urpm.pm:666 ../urpm.pm:1001 ../urpm.pm:1094
 #, c-format
 msgid "...copying done"
 msgstr "...cwblhau'r copïo"
@@ -350,14 +350,14 @@ msgstr ""
 msgid "retrieving hdlists file..."
 msgstr "adfer ffeil hdlists..."
 
-#: ../urpm.pm:685 ../urpm.pm:1414 ../urpm.pm:1879 ../urpm.pm:2583
-#: ../urpmi.addmedia:144
+#: ../urpm.pm:685 ../urpm.pm:1421 ../urpm.pm:1887 ../urpm.pm:2577
+#: ../urpmi.addmedia:151
 #, c-format
 msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
-#: ../urpm.pm:687 ../urpm.pm:1398 ../urpm.pm:1407 ../urpm.pm:1882
-#: ../urpm.pm:2585 ../urpmi:613 ../urpmi.addmedia:146
+#: ../urpm.pm:687 ../urpm.pm:1405 ../urpm.pm:1414 ../urpm.pm:1890
+#: ../urpm.pm:2579 ../urpmi:615 ../urpmi.addmedia:153
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... methodd ail-lwytho: %s"
@@ -367,27 +367,27 @@ msgstr "... methodd ail-lwytho: %s"
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "disgrifiad hdlist annilys \"%s\" yn rhestr ffeilio hdlists"
 
-#: ../urpm.pm:752
+#: ../urpm.pm:756
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
 
-#: ../urpm.pm:754
+#: ../urpm.pm:758
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "dewis aml-gyfrwng: %s"
 
-#: ../urpm.pm:754
+#: ../urpm.pm:758
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:770
+#: ../urpm.pm:774
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "dewis cyfrwng \"%s\":"
 
-#: ../urpm.pm:930
+#: ../urpm.pm:937
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -397,7 +397,7 @@ msgstr ""
 "maethu cael mynediad i gyfrwng \"%s\",\n"
 "gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur gyda wrth greu'r cyfrwng."
 
-#: ../urpm.pm:983
+#: ../urpm.pm:990
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -406,222 +406,222 @@ msgstr ""
 "dylai'r rhith gyfrwng \"%s\" gael hdlist ffynhonnell ddilys neu synthesis, "
 "anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:991
+#: ../urpm.pm:998
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copïo ffeil disgrifiad o \"%s\""
 
-#: ../urpm.pm:1014 ../urpm.pm:1264
+#: ../urpm.pm:1021 ../urpm.pm:1271
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum ffynhonnell hdlist presennol (neu synthesis)"
 
-#: ../urpm.pm:1025 ../urpm.pm:1275
+#: ../urpm.pm:1032 ../urpm.pm:1282
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "archwilio ffeil MD5SUM"
 
-#: ../urpm.pm:1079
+#: ../urpm.pm:1086
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copïo ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpm.pm:1092
+#: ../urpm.pm:1099
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
 
-#: ../urpm.pm:1096
+#: ../urpm.pm:1103
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
 
-#: ../urpm.pm:1098
+#: ../urpm.pm:1105
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "methodd copïo (%s) (md5sum gwallus)"
 
-#: ../urpm.pm:1119 ../urpm.pm:1312 ../urpm.pm:1649
+#: ../urpm.pm:1126 ../urpm.pm:1319 ../urpm.pm:1656
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
 
-#: ../urpm.pm:1161
+#: ../urpm.pm:1168
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "darllen ffeiliau rpm o [%s]"
 
-#: ../urpm.pm:1186
+#: ../urpm.pm:1193
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "methu darllen ffeiliau rpm o (%s): %s"
 
-#: ../urpm.pm:1191
+#: ../urpm.pm:1198
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "heb ganfod ffeiliau rpm o [%s]"
 
-#: ../urpm.pm:1330
+#: ../urpm.pm:1337
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpm.pm:1359
+#: ../urpm.pm:1366
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
 
-#: ../urpm.pm:1405
+#: ../urpm.pm:1412
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)"
 
-#: ../urpm.pm:1407
+#: ../urpm.pm:1414
 #, c-format
 msgid "md5sum mismatch"
 msgstr "anghysondeb md5sum"
 
-#: ../urpm.pm:1503
+#: ../urpm.pm:1510
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "methodd adfer ffynhonnell hdlist (neu synthesis)"
 
-#: ../urpm.pm:1510
+#: ../urpm.pm:1517
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1521 ../urpm.pm:1575
+#: ../urpm.pm:1528 ../urpm.pm:1582
 #, 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:1561
+#: ../urpm.pm:1568
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "methu didoli ffeil hdlist \"%s\""
 
-#: ../urpm.pm:1599
+#: ../urpm.pm:1606
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "methu ysgrifennu i ffeil rhestr \"%s\""
 
-#: ../urpm.pm:1606
+#: ../urpm.pm:1613
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "ysgrifennu rhestr ffeil  ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1608
+#: ../urpm.pm:1615
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "dim wedi ei ysgrifennu yn ffei rhestr ar gyfer \"%s\""
 
-#: ../urpm.pm:1623
+#: ../urpm.pm:1630
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "archwilio ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1630
+#: ../urpm.pm:1637
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1633
+#: ../urpm.pm:1640
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "methu mewnforio ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1699
+#: ../urpm.pm:1706
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "darllen pennawd o'r cyfrwng \"%s\""
 
-#: ../urpm.pm:1704
+#: ../urpm.pm:1711
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "adeiladu hdlist [%s]"
 
-#: ../urpm.pm:1716 ../urpm.pm:1745 ../urpmi:355
+#: ../urpm.pm:1723 ../urpm.pm:1752 ../urpmi:353
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1765
+#: ../urpm.pm:1772
 #, c-format
 msgid "found %d headers in cache"
 msgstr "canfod %d pennawd mewn storfa"
 
-#: ../urpm.pm:1769
+#: ../urpm.pm:1776
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "tynnu hen benawdau %d yn y storfa"
 
-#: ../urpm.pm:1819
+#: ../urpm.pm:1827
 #, c-format
 msgid "mounting %s"
 msgstr "gosod %s"
 
-#: ../urpm.pm:1835
+#: ../urpm.pm:1843
 #, c-format
 msgid "unmounting %s"
 msgstr "dadosod %s"
 
-#: ../urpm.pm:1857
+#: ../urpm.pm:1865
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "ailganfod cofnodion %s yn depslist"
 
-#: ../urpm.pm:1858
+#: ../urpm.pm:1866
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "dim cofnodion wedi eu symud i depslip"
 
-#: ../urpm.pm:1871
+#: ../urpm.pm:1879
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "enw ffeil rpm annilys [%s]"
 
-#: ../urpm.pm:1877
+#: ../urpm.pm:1885
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpm.pm:1884 ../urpm.pm:2752
+#: ../urpm.pm:1892 ../urpm.pm:2747
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad  ffeil rpm (%s)"
 
-#: ../urpm.pm:1889
+#: ../urpm.pm:1897
 #, c-format
 msgid "unable to register rpm file"
 msgstr "methu cofrestr ffeil rpm"
 
-#: ../urpm.pm:1892
+#: ../urpm.pm:1900
 #, c-format
 msgid "error registering local packages"
 msgstr "gwall cofrestru pecynnau lleol"
 
-#: ../urpm.pm:2005
+#: ../urpm.pm:2013
 #, c-format
 msgid "no package named %s"
 msgstr "heb enwi pecyn %s"
 
-#: ../urpm.pm:2008 ../urpme:88
+#: ../urpm.pm:2016 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
 
-#: ../urpm.pm:2205 ../urpm.pm:2249 ../urpm.pm:2275
+#: ../urpm.pm:2199 ../urpm.pm:2243 ../urpm.pm:2269
 #, 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:2260
+#: ../urpm.pm:2254
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
 
-#: ../urpm.pm:2287
+#: ../urpm.pm:2281
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -630,149 +630,154 @@ msgstr ""
 "cyfrwng \"%s\" yndefnyddio rhestr ffeiliau annilys:\n"
 "  nid yw'r drych yn un diweddar, ceisiwch ddull arall"
 
-#: ../urpm.pm:2291
+#: ../urpm.pm:2285
 #, 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:2303
+#: ../urpm.pm:2297
 #, c-format
 msgid "package %s is not found."
 msgstr "heb ganfod pecyn %s"
 
-#: ../urpm.pm:2343 ../urpm.pm:2358 ../urpm.pm:2382 ../urpm.pm:2397
+#: ../urpm.pm:2337 ../urpm.pm:2352 ../urpm.pm:2376 ../urpm.pm:2391
 #, c-format
 msgid "urpmi database locked"
 msgstr "cronfa ddata urmi wedi cloi"
 
-#: ../urpm.pm:2449 ../urpm.pm:2452 ../urpm.pm:2482
+#: ../urpm.pm:2443 ../urpm.pm:2446 ../urpm.pm:2476
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "heb ddewis cyfrwng \"%s\""
 
-#: ../urpm.pm:2478
+#: ../urpm.pm:2472
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
 
-#: ../urpm.pm:2486
+#: ../urpm.pm:2480
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "cyfrwng annealladwy \"%s\" wedi ei nodi'n symudadwy ond nid yw"
 
-#: ../urpm.pm:2499
+#: ../urpm.pm:2493
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "methu cael mynediad at gyfrwng. \"%s\""
 
-#: ../urpm.pm:2561
+#: ../urpm.pm:2555
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "allbwn gwallus: [%s]"
 
-#: ../urpm.pm:2568
+#: ../urpm.pm:2562
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
 
-#: ../urpm.pm:2650 ../urpmi:691
+#: ../urpm.pm:2644 ../urpmi:693
 #, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
 
-#: ../urpm.pm:2683
+#: ../urpm.pm:2678
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "defnyddio proses %d ar gyfer gweithredu trosglwyddiad"
 
-#: ../urpm.pm:2714
+#: ../urpm.pm:2709
 #, 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:2717
+#: ../urpm.pm:2712
 #, c-format
 msgid "unable to create transaction"
 msgstr "methu creu trosglwyddiad."
 
-#: ../urpm.pm:2725
+#: ../urpm.pm:2719
 #, c-format
 msgid "removing package %s"
 msgstr "tynnu pecyn %s."
 
-#: ../urpm.pm:2727
+#: ../urpm.pm:2721
 #, c-format
 msgid "unable to remove package %s"
 msgstr "methu tynnu pecyn %s"
 
-#: ../urpm.pm:2737
+#: ../urpm.pm:2731
 #, 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:2740
+#: ../urpm.pm:2734
 #, c-format
 msgid "unable to install package %s"
 msgstr "methu gosod pecyn %s"
 
-#: ../urpm.pm:2940 ../urpm.pm:2973
+#: ../urpm.pm:2796
+#, fuzzy, c-format
+msgid "More information on package %s"
+msgstr "tynnu pecyn %s."
+
+#: ../urpm.pm:2954 ../urpm.pm:2987
 #, c-format
 msgid "due to missing %s"
 msgstr "oherwydd %s coll"
 
-#: ../urpm.pm:2941 ../urpm.pm:2971
+#: ../urpm.pm:2955 ../urpm.pm:2985
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s heb ei foddloni"
 
-#: ../urpm.pm:2942
+#: ../urpm.pm:2956
 #, c-format
 msgid "trying to promote %s"
 msgstr "ceisio hybu %s"
 
-#: ../urpm.pm:2943
+#: ../urpm.pm:2957
 #, c-format
 msgid "in order to keep %s"
 msgstr "fel modd i gadw %s"
 
-#: ../urpm.pm:2966
+#: ../urpm.pm:2980
 #, c-format
 msgid "in order to install %s"
 msgstr "er mwyn gosod %s"
 
-#: ../urpm.pm:2978
+#: ../urpm.pm:2992
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "oherwydd gwrthdaro gyda %s"
 
-#: ../urpm.pm:2980
+#: ../urpm.pm:2994
 #, c-format
 msgid "unrequested"
 msgstr "diofyn"
 
-#: ../urpm.pm:2996
+#: ../urpm.pm:3010
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Llofnod annilys (%s)"
 
-#: ../urpm.pm:3028
+#: ../urpm.pm:3042
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Enw Allwedd Annilys (%s)"
 
-#: ../urpm.pm:3030
+#: ../urpm.pm:3044
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Llofnod coll (%s)"
 
-#: ../urpm/args.pm:87 ../urpm/args.pm:94
+#: ../urpm/args.pm:88 ../urpm/args.pm:95
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
 
-#: ../urpm/args.pm:223
+#: ../urpm/args.pm:224
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
@@ -793,29 +798,29 @@ msgid ""
 "usage:\n"
 msgstr ""
 "urpme fersiwn %s\n"
-"Hawlfraint (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Hawlfraint (C) 1999, 2000, 2001, 2002 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:77 ../urpmi.addmedia:47
-#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#: ../urpme:41 ../urpmf:32 ../urpmi:74 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:38 ../urpmi.update:30 ../urpmq:43
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - argraffu neges cymorth.\n"
 
-#: ../urpme:42 ../urpmi:83
+#: ../urpme:42 ../urpmi:80
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - dewis pecyn ynn awtomatig o fewn dewisiadau.\n"
 
-#: ../urpme:43 ../urpmi:124
+#: ../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:97 ../urpmq:63
+#: ../urpme:44 ../urpmi:94 ../urpmq:63
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -823,13 +828,13 @@ msgstr ""
 "  --force        - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
 "bodoli.\n"
 
-#: ../urpme:45 ../urpmi:102 ../urpmq:64
+#: ../urpme:45 ../urpmi:99 ../urpmq:64
 #, 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:103
+#: ../urpme:46 ../urpmi:100
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - defnyddio root arall ar gyfer gosod rpm.\n"
@@ -843,7 +848,7 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth (ddad)osod chroot gyda dewis o  --root.\n"
 
-#: ../urpme:49 ../urpmi:133 ../urpmq:76
+#: ../urpme:49 ../urpmi:131 ../urpmq:76
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
@@ -884,12 +889,12 @@ msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu tynnu (%d MB)"
 
-#: ../urpme:108 ../urpmi:476 ../urpmi:637
+#: ../urpme:108 ../urpmi:474 ../urpmi:639
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
 
-#: ../urpme:111 ../urpmi:680
+#: ../urpme:111 ../urpmi:682
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
@@ -910,28 +915,28 @@ msgid ""
 "usage:\n"
 msgstr ""
 "urpmf fersiwn %s\n"
-"Hawlfraint (C) 2002 - 2004 MandrakeSoft.\n"
+"Hawlfraint (C) 2002 - 2004 Mandrakesoft.\n"
 "Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
 "\n"
 "defnydd:\n"
 
-#: ../urpmf:33 ../urpmi:78 ../urpmq:44
+#: ../urpmf:33 ../urpmi:75 ../urpmq:44
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#: ../urpmf:34 ../urpmi:76 ../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"
 
-#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#: ../urpmf:35 ../urpmi:77 ../urpmq:46
 #, 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:81 ../urpmq:47
+#: ../urpmf:36 ../urpmi:78 ../urpmq:47
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1043,7 +1048,7 @@ msgstr ""
 "  --obsoletes     - argraffu hen dagiau: yr holl hen rai (llinellau "
 "niferus).\n"
 
-#: ../urpmf:57 ../urpmi:117 ../urpmq:73
+#: ../urpmf:57 ../urpmi:114 ../urpmq:73
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1108,7 +1113,7 @@ msgstr ""
 "galw nôl yw: \n"
 "%s\n"
 
-#: ../urpmf:119 ../urpmi:249 ../urpmq:112
+#: ../urpmf:119 ../urpmi:247 ../urpmq:112
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "ddefnyddio amgylchedd penodol ar %s\n"
@@ -1122,7 +1127,7 @@ msgstr ""
 "Sylw: gan nad oedd unrhyw gyfrwng chwiliwyd yn defnyddio hdlists, methodd "
 "urpmf aâ chynnig canlyniad\n"
 
-#: ../urpmi:72
+#: ../urpmi:69
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1133,30 +1138,30 @@ msgid ""
 "usage:\n"
 msgstr ""
 "urpmi fersiwn %s\n"
-"Hawlfraint © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Hawlfraint © 1999, 2000, 2001, 2002 Mandrakesoft.\n"
 "Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
 "\n"
 "defnydd:\n"
 
-#: ../urpmi:82
+#: ../urpmi:79
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
-#: ../urpmi:84 ../urpmq:49
+#: ../urpmi:81 ../urpmq:49
 #, 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:85
+#: ../urpmi:82
 #, 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:86 ../urpmq:51
+#: ../urpmi:83 ../urpmq:51
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1165,7 +1170,7 @@ msgstr ""
 "  --keep         - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
 "                   pecynnau sy'n arwain at dynnu.\n"
 
-#: ../urpmi:88
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1177,39 +1182,39 @@ msgstr ""
 "                   eu gosod neu eu uwchraddio\n"
 "                   rhagosodiad yw %d.\n"
 
-#: ../urpmi:91
+#: ../urpmi:88
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - hyd drosglwyddiad byr, rhagosodiad yw %d.\n"
 
-#: ../urpmi:92 ../urpmq:50
+#: ../urpmi:89 ../urpmq:50
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - mynnu chwiliad fuzzy (fel -y).\n"
 
-#: ../urpmi:93 ../urpmq:59
+#: ../urpmi:90 ../urpmq:59
 #, 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:94
+#: ../urpmi:91
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
 
-#: ../urpmi:95
+#: ../urpmi:92
 #, 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:96
+#: ../urpmi:93
 #, 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:98
+#: ../urpmi:95
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1218,7 +1223,7 @@ msgstr ""
 "  --allow-nodeps - caniatáu gofyn i ddefnyddiw osod pecynnau heb\n"
 "                   wirio dibyniaethau.\n"
 
-#: ../urpmi:100
+#: ../urpmi:97
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1227,7 +1232,7 @@ msgstr ""
 "  --allow-force  - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
 "                   wirio dibyniaethau na'u cyfanrwydd.\n"
 
-#: ../urpmi:104
+#: ../urpmi:101
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1236,22 +1241,22 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth gosod chroot gyda dewis o  --root.\n"
 
-#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
+#: ../urpmi:103 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
+#: ../urpmi:104 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - defnyddio curl i estyn ffeiliau pell.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
+#: ../urpmi:105 ../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:109
+#: ../urpmi:106
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1260,7 +1265,7 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
+#: ../urpmi:108 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1269,7 +1274,7 @@ msgstr ""
 "  --proxy        - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
 "                   rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
 
-#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
+#: ../urpmi:110 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1278,7 +1283,7 @@ msgstr ""
 "  --proxy-user   - enwi defnyddiwr a chyfrinair i'w ddefnyddio fel y\n"
 "                   dilysiad dirprw(fformat yw <user:password>).\n"
 
-#: ../urpmi:115
+#: ../urpmi:112
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1287,12 +1292,12 @@ msgstr ""
 "  --bug          - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
 "                   yr arg. nesaf\n"
 
-#: ../urpmi:119
+#: ../urpmi:116
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - defnyddio rhyngwyneb  X.\n"
 
-#: ../urpmi:120
+#: ../urpmi:117
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1301,7 +1306,7 @@ msgstr ""
 "  --best-output  - dewiswch y rhyngwyneb gorau yn ôl yr amgylchedd:\n"
 "                   X fodd testun.\n"
 
-#: ../urpmi:122
+#: ../urpmi:119
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1310,66 +1315,71 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmi:125
+#: ../urpmi:122
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - eithrio llwybr wedi ei wahanu a chollnod.\n"
 
-#: ../urpmi:126
+#: ../urpmi:123
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - eithrio ffeiliau docs.\n"
 
-#: ../urpmi:127 ../urpmq:79
+#: ../urpmi:124
+#, fuzzy, c-format
+msgid "  --skip         - packages which installation should be skipped\n"
+msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
+
+#: ../urpmi:125 ../urpmq:79
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
 
-#: ../urpmi:128
+#: ../urpmi:126
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - caniatáu i chwilio ganfod pecyn.\n"
 
-#: ../urpmi:129
+#: ../urpmi:127
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - peidio chwilio yn provides i ganfod pecyn.\n"
 
-#: ../urpmi:130 ../urpmq:84
+#: ../urpmi:128 ../urpmq:84
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - gosod chwilio fuzzy (fel --fuzzy).\n"
 
-#: ../urpmi:131 ../urpmq:85
+#: ../urpmi:129 ../urpmq:85
 #, 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:132
+#: ../urpmi:130
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modd distaw.\n"
 
-#: ../urpmi:134
+#: ../urpmi:132
 #, 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:141
+#: ../urpmi:139
 #, c-format
 msgid "Choose location to save file"
 msgstr "Dewis lleoliad i gadw'r ffeil"
 
-#: ../urpmi:197
+#: ../urpmi:195
 #, 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:204
+#: ../urpmi:202
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1390,22 +1400,22 @@ msgstr ""
 "\n"
 "Beth hoffech chi ei wneud?"
 
-#: ../urpmi:212
+#: ../urpmi:210
 #, c-format
 msgid "Do nothing"
 msgstr "Gwneud dim"
 
-#: ../urpmi:213
+#: ../urpmi:211
 #, c-format
 msgid "Yes, really install it"
 msgstr "Iawn, yn barod i'w osod"
 
-#: ../urpmi:214 ../urpmi:231
+#: ../urpmi:212 ../urpmi:229
 #, c-format
 msgid "Save file"
 msgstr "Cadw ffeil"
 
-#: ../urpmi:225
+#: ../urpmi:223
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1420,12 +1430,12 @@ msgstr ""
 "\n"
 "Efallai byddai'n well gennych eu cadw. Beth yw eich dewis?"
 
-#: ../urpmi:230
+#: ../urpmi:228
 #, c-format
 msgid "Install it"
 msgstr "Ei osod"
 
-#: ../urpmi:239
+#: ../urpmi:237
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1434,42 +1444,42 @@ msgstr ""
 "Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
 "adroddiad gwall neu ei ddileu."
 
-#: ../urpmi:240
+#: ../urpmi:238
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
 
-#: ../urpmi:243 ../urpmi:365
+#: ../urpmi:241 ../urpmi:363
 #, c-format
 msgid "Copying failed"
 msgstr "Methodd y copïo"
 
-#: ../urpmi:260
+#: ../urpmi:258
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
 
-#: ../urpmi:396
+#: ../urpmi:394
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../urpmi:403
+#: ../urpmi:401
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Beth yw eich dewis? (1-%d)"
 
-#: ../urpmi:412 ../urpmi:535
+#: ../urpmi:410 ../urpmi:537
 #, c-format
 msgid "Package installation..."
 msgstr "Gosod pecynnau..."
 
-#: ../urpmi:412 ../urpmi:535
+#: ../urpmi:410 ../urpmi:537
 #, c-format
 msgid "Initializing..."
 msgstr "Cychwyn..."
 
-#: ../urpmi:435
+#: ../urpmi:433
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1478,19 +1488,19 @@ msgstr ""
 "Nid oes modd gosod rhai pecynnau gofynwyd amdanynt:\n"
 "%s"
 
-#: ../urpmi:440 ../urpmi:471
+#: ../urpmi:438 ../urpmi:469
 #, c-format
 msgid "do you agree ?"
 msgstr "cytuno?"
 
-#: ../urpmi:446
+#: ../urpmi:444
 #, c-format
 msgid ""
 "\n"
 "Continue?"
 msgstr ""
 
-#: ../urpmi:460
+#: ../urpmi:458
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1501,7 +1511,7 @@ msgstr ""
 "gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:466
+#: ../urpmi:464
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1510,7 +1520,7 @@ msgstr ""
 "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s"
 
-#: ../urpmi:504 ../urpmi:513
+#: ../urpmi:503 ../urpmi:514
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be installed "
@@ -1518,6 +1528,14 @@ msgid ""
 msgstr ""
 "I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod (%d MB)"
 
+#: ../urpmi:504 ../urpmi:515
+#, fuzzy, 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)"
+
 #: ../urpmi:510
 #, c-format
 msgid ""
@@ -1527,47 +1545,47 @@ msgstr ""
 "Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
 "%s\n"
 
-#: ../urpmi:531 ../urpmq:297
+#: ../urpmi:533 ../urpmq:297
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "methu estyn pecynnau ffynhonnell, atal"
 
-#: ../urpmi:545
+#: ../urpmi:547
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
-#: ../urpmi:546
+#: ../urpmi:548
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Pwyso Enter pan yn barod..."
 
-#: ../urpmi:590
+#: ../urpmi:592
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Llwytho pecyn '%s'..."
 
-#: ../urpmi:602
+#: ../urpmi:604
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% o %s wedi cwblhau, Cyrraedd = %s, cyflymder = %s"
 
-#: ../urpmi:605
+#: ../urpmi:607
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% wedi cwblhau, cyflymder = %s"
 
-#: ../urpmi:624
+#: ../urpmi:626
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
 
-#: ../urpmi:625
+#: ../urpmi:627
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ydych chi am barhau gosod?"
 
-#: ../urpmi:645 ../urpmi:772
+#: ../urpmi:647 ../urpmi:774
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1578,52 +1596,52 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../urpmi:655 ../urpmi:710 ../urpmi:731 ../urpmi:751
+#: ../urpmi:657 ../urpmi:712 ../urpmi:733 ../urpmi:753
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
-#: ../urpmi:670
+#: ../urpmi:672
 #, c-format
 msgid "distributing %s"
 msgstr "dosbarthu %s"
 
-#: ../urpmi:678
+#: ../urpmi:680
 #, c-format
 msgid "installing %s"
 msgstr "gosod %s"
 
-#: ../urpmi:693
+#: ../urpmi:695
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../urpmi:717
+#: ../urpmi:719
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
 
-#: ../urpmi:736
+#: ../urpmi:738
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Gwneud y gosod gyda mwy o orfodaeth (--force)? (i/N)"
 
-#: ../urpmi:777
+#: ../urpmi:779
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "methodd trosglwyddiad gosod %d"
 
-#: ../urpmi:785
+#: ../urpmi:787
 #, c-format
 msgid "Installation is possible"
 msgstr "Gosod yn bosibl"
 
-#: ../urpmi:788
+#: ../urpmi:790
 #, c-format
 msgid "Everything already installed"
 msgstr "Popeth wedi eu gosod eisoes"
 
-#: ../urpmi:802
+#: ../urpmi:804
 #, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
@@ -1644,7 +1662,7 @@ msgid ""
 msgstr ""
 "defnydd: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
-"       file://<path>\n"
+"       file://<path> with <relative filename of hdlist>\n"
 "       ftp://<login>:<password>@<host>/<path> with <relative filename of "
 "hdlist>\n"
 "       ftp://<host>/<path> with <relative filename of hdlist>\n"
@@ -1713,23 +1731,23 @@ msgstr ""
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
 "                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+"                   installed mandrakelinux-release package.\n"
 msgstr ""
 "  --version      - defnyddiwch fersiwn penodol i'r dosbarthiad, mae'r "
 "rhagosodiad\n"
 "                   yn cael ei gymryd ofersiwn dosbarthiad hysbyswyd gan "
 "pecynnau\n"
-"                   ryddhawyd gan Mandrake.\n"
+"                   ryddhawyd gan Mandrakelinux.\n"
 
 #: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"                   mandrakelinux-release package installed.\n"
 msgstr ""
 "  --arch         - defnyddio pensaerhiaeth ppenodol, y rhagosodiad yw arch "
 "o\n"
-"                   osod pecynnau Mandrake.\n"
+"                   osod pecynnau Mandrakelinux.\n"
 
 #: ../urpmi.addmedia:72
 #, c-format
@@ -1738,14 +1756,14 @@ msgid ""
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 "  --virtual      - creu cyfrwng rhithil sydd wedi ei ddiweddaru,\n"
-"                   dom ond protocol ffeil:// sy'n cael ei ganiatau.\n"
+"                   dom ond protocol file:// sy'n cael ei ganiatau.\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:75 ../urpmi.removemedia:38 ../urpmi.update:42
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:40 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - glanhau penawdau yng nghyfeiriadur y storfa.\n"
@@ -1755,42 +1773,47 @@ msgstr "  -c             - glanhau penawdau yng nghyfeiriadur y storfa.\n"
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - gorfodi cynhyrchu ffeiliau hdlist\n"
 
-#: ../urpmi.addmedia:130
+#: ../urpmi.addmedia:109
+#, fuzzy, c-format
+msgid "Only superuser is allowed to add media"
+msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
+
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "methu ychwanegu diweddariadau o ddosbarthiad cookies\n"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:142
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "adfer drychau yn %s..."
 
-#: ../urpmi.addmedia:179
+#: ../urpmi.addmedia:186
 #, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib"
 
-#: ../urpmi.addmedia:186 ../urpmi.addmedia:209
+#: ../urpmi.addmedia:193 ../urpmi.addmedia:216
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "methu diweddaru cyfrwng \"%s\"\n"
 
-#: ../urpmi.addmedia:197
+#: ../urpmi.addmedia:204
 #, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<llwybr perthynnol hdlist> ar goll\n"
 
-#: ../urpmi.addmedia:199
+#: ../urpmi.addmedia:206
 #, c-format
 msgid "`with' missing for network media\n"
 msgstr "`with' ar goll ar gyfer cyfrwng rhwydwaith\n"
 
-#: ../urpmi.addmedia:207
+#: ../urpmi.addmedia:214
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "methu creu cyfrwng \"%s\"\n"
 
-#: ../urpmi.removemedia:34
+#: ../urpmi.removemedia:36
 #, c-format
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -1799,12 +1822,17 @@ msgstr ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "lle mai <name> yw'r ewn cyfrwng i'w dynnu.\n"
 
-#: ../urpmi.removemedia:37
+#: ../urpmi.removemedia:39
 #, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - dewis pob cyfrwng.\n"
 
-#: ../urpmi.removemedia:39
+#: ../urpmi.removemedia:41
+#, fuzzy, c-format
+msgid "  -y             - fuzzy match on media names.\n"
+msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
+
+#: ../urpmi.removemedia:42
 #, c-format
 msgid ""
 "\n"
@@ -1814,11 +1842,16 @@ msgstr ""
 "dewisiadau anhysbys '%s'\n"
 
 #: ../urpmi.removemedia:48
+#, fuzzy, c-format
+msgid "Only superuser is allowed to remove media"
+msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
+
+#: ../urpmi.removemedia:55
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "dim i'w dynnu (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n"
 
-#: ../urpmi.removemedia:50
+#: ../urpmi.removemedia:57
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1851,12 +1884,17 @@ msgstr "  --force-key    - gorfodi diweddaru allwedd gpg.\n"
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - dewis pob cyfrwng ansymudadwy.\n"
 
-#: ../urpmi.update:63
+#: ../urpmi.update:58
+#, fuzzy, c-format
+msgid "Only superuser is allowed to update media"
+msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
+
+#: ../urpmi.update:66
 #, 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:75
+#: ../urpmi.update:78
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1876,7 +1914,7 @@ msgid ""
 "usage:\n"
 msgstr ""
 "urpmf fersiwn %s\n"
-"Hawlfraint (C) 2002 - 2004 MandrakeSoft.\n"
+"Hawlfraint (C) 2002 - 2004 Mandrakesoft.\n"
 "Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
 "\n"
 "defnydd:\n"