updated pot file

1 files changed, 434 insertions, 444 deletions

diff --git a/po/cy.po b/po/cy.po
index d88735a5..2e5c22b6 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-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-12 08:42-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -49,22 +49,22 @@ msgstr ""
 "Gosodiad pecynnau awtomatig...\n"
 "Roeddech wedi gofyn i gael gosod pecyn %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Mae'r model yn gywir"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -74,7 +74,7 @@ msgstr " (Y/n) "
 msgid "%s: command not found\n"
 msgstr "%s: heb ganfod gorchymyn\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -83,115 +83,54 @@ msgstr ""
 "usage: %s [dewisiadau]\n"
 "lle mae [dewisiadau] o\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help     - argraffu neges cymorth.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - cyfyngu canlyniadau i'r grwp.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                   rhagosodedig yw %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Webfetch `%s' anhysbys!!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocol anhysbys ar gyfer %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "heb ganfod webfetch, yn cael eu cynnal gan webfetch: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "methu trin protocol: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "methodd y copïo: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget ar goll\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "methodd wget: gadael gyda%d neu signal %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl ar goll\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "methodd curl: gadael gyda %d neu signal %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rysnc ar goll\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "methodd rsync:gadael gyda %d neu signal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh ar goll\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% o %s wedi cwblhau, Cyrraedd = %s, cyflymder = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% wedi cwblhau, cyflymder = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "... methodd ail-lwytho: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "gwall cystrawen yn ffeil ffurfweddiad yn llinell %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, 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:544
+#: ../urpm.pm:181
 #, 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:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -200,41 +139,41 @@ msgstr ""
 "methu cymryd gofal o gyfrwng \"%s\" gan fod y rhestr ffeil yn cael ei "
 "ddefnyddio gan gyfrwng arall"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 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"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 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"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "methu enw cyfrwng y ffeil hdlist hon (%s)"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, 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:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", osgoi"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -243,92 +182,92 @@ msgstr ""
 "dylai cyfrwng rhithiol \"%s\" fod a rhestr ffeiliau hdlist, anwybyddwyd y "
 "cyfrwng"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, 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:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "rhestr ffeil annealladwy \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "methu archwilio rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "gormod o bwyntiau gosod ar gyfer cyfrwng symudol \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "cymryd dyfais symudol fel \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "defnyddio dyfais symudol wahanol (%s) ar gyfer \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "methu adfer enw llwybr ar gyfer cyfrwng symudadwy \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "ysgrifennu ffeil ffurfweddu (%s)"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, 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:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "methu didoli ffeil hdlist \"%s\" yn ffeil (%s)"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "archwilio trinydd paralel mewn ffeil [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "canfod trinydd paralel ar gyfer nodau: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "methu defnyddio dewis paralel \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -337,90 +276,90 @@ msgstr ""
 "-nid oes modd defnyddio synthesis gyda --media, --excludemedia, --sortmedia, "
 "--update neu --paralel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "archwilio ffeil synthesis [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "archwilio ffeil hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, 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:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "hepgor pecyn  %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "gosod yn lle uwchraddio pecyn %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "methu agor rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "cyfrwng \"%s\" yn bodoli eisoes"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "rhaid i'r rhith gyfrwng fod yn lleol"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "ychwanegwyd cyfrwng %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "methu cael mynediad i gyfrwng gosod cyntaf"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "copïo ffeil hdlists..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...methodd y copïo"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...cwblhau'r copïo"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -429,43 +368,49 @@ msgstr ""
 "methu cael mynediad i'r cyfrwng gosod cyntaf (heb ganfod ffeil Mandrake/base/"
 "hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "adfer ffeil hdlists..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "... methodd ail-lwytho: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "disgrifiad hdlist annilys \"%s\" yn rhestr ffeilio hdlists"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "dewis aml-gyfrwng: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "dewis cyfrwng \"%s\":"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -475,7 +420,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:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -484,222 +429,222 @@ msgstr ""
 "dylai'r rhith gyfrwng \"%s\" gael hdlist ffynhonnell ddilys neu synthesis, "
 "anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copïo ffeil disgrifiad o \"%s\""
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum ffynhonnell hdlist presennol (neu synthesis)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "archwilio ffeil MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copïo ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "methodd copïo (%s) (md5sum gwallus)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "darllen ffeiliau rpm o [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "methu darllen ffeiliau rpm o (%s): %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "heb ganfod ffeiliau rpm o [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "anghysondeb md5sum"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "methodd adfer ffynhonnell hdlist (neu synthesis)"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, 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:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "methu didoli ffeil hdlist \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "methu ysgrifennu i ffeil rhestr \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "ysgrifennu rhestr ffeil  ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "dim wedi ei ysgrifennu yn ffei rhestr ar gyfer \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "archwilio ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "methu mewnforio ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "darllen pennawd o'r cyfrwng \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "adeiladu hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "canfod %d pennawd mewn storfa"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "tynnu hen benawdau %d yn y storfa"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "gosod %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "dadosod %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "ailganfod cofnodion %s yn depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "dim cofnodion wedi eu symud i depslip"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "enw ffeil rpm annilys [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad  ffeil rpm (%s)"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "methu cofrestr ffeil rpm"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "gwall cofrestru pecynnau lleol"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "heb enwi pecyn %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, 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:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -708,144 +653,159 @@ msgstr ""
 "cyfrwng \"%s\" yndefnyddio rhestr ffeiliau annilys:\n"
 "  nid yw'r drych yn un diweddar, ceisiwch ddull arall"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, 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:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "heb ganfod pecyn %s"
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "cronfa ddata urmi wedi cloi"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "heb ddewis cyfrwng \"%s\""
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, 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:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "methu cael mynediad at gyfrwng. \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "allbwn gwallus: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "defnyddio proses %d ar gyfer gweithredu trosglwyddiad"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, 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:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "methu creu trosglwyddiad."
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "tynnu pecyn %s."
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "methu tynnu pecyn %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, 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:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "methu gosod pecyn %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "oherwydd %s coll"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s heb ei foddloni"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "ceisio hybu %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "fel modd i gadw %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "er mwyn gosod %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "oherwydd gwrthdaro gyda %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "diofyn"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Llofnod annilys (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Enw Allwedd Annilys (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Llofnod coll (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Dewis gwael, ceisiwch eto\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -861,24 +821,24 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - argraffu neges cymorth.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../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:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -886,18 +846,18 @@ msgstr ""
 "  --force        - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
 "bodoli.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --paralel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../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"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -906,73 +866,63 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth (ddad)osod chroot gyda dewis o  --root.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - select all packages matching expression.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: dewis anhysbys \"-%s\", gwirio defnydd gyda --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "pecynnau anhysbys"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "pecyn anhysbys"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "bydd tynnu pecynnau %s yn torri'r system"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Dim i'w dynnu"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Ticio i ddileu'r pecynnau canlynol"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 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:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Methodd y tynnu"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Dewis gwael, ceisiwch eto\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -988,23 +938,23 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, 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:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, 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:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1012,17 +962,17 @@ msgstr ""
 "   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
 "choma.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1034,89 +984,89 @@ msgstr ""
 "                    cael ei roi ar y linell orchymyn gyda modd "
 "rhyngweithiol).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - peidio argraffu llinellau yr un fath.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - argraffu pob tag.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - argraffu grwp tag: grwp.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - argraffu maint tag: maint.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - argraffu cyfnod tag: cyfnod.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - argraffu crynodeb tag: crynodeb.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --summary      - argraffu disgrifiad tag: disgrifiad.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - argraffu ourcerpm tag: ffynhonnell rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager      - argraffu pencynydd tag: pencynydd.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - argraffu buildhost tag: build host.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - argraffu tag url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - tag argraffu'n darparu: pob darpariaeth. \n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - argraffu tagiau angenrheidiol: pob anghenraid\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - argraffu fagiau ffeiliau: pob ffeil\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts    - tag argraffu'n gwrthdaro: pob gwrthdaro\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 "  --obsoletes     - argraffu hen dagiau: yr holl hen rai (llinellau "
 "niferus).\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1125,23 +1075,23 @@ msgstr ""
 "  --env          - defnyddio amgynlchedd benodol (adroddiad gwall \n"
 "                   fel rheol.\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 "  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - cynnwys perl cod yn union fel perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1149,7 +1099,7 @@ msgstr ""
 "  -a             - gweithredwr deuaidd AND, gwir os yw'r ddau ymadrodd yn "
 "gywir.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1157,22 +1107,22 @@ msgstr ""
 "  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
 "gywir.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unaidd NOT, true os yw'r mynegiad yn false.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - parenthesis chwith i agor mynegiad grwp.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - parenthesis de i gau mynegiad grwp.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1181,12 +1131,12 @@ msgstr ""
 "galw nôl yw: \n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "ddefnyddio amgylchedd penodol ar %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1202,25 +1152,25 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpmi:83
+#: ../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:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, 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:86
+#: ../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:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1229,7 +1179,7 @@ msgstr ""
 "  --keep         - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
 "                   pecynnau sy'n arwain at dynnu.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1241,39 +1191,39 @@ msgstr ""
 "                   eu gosod neu eu uwchraddio\n"
 "                   rhagosodiad yw %d.\n"
 
-#: ../urpmi:92
+#: ../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:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - mynnu chwiliad fuzzy (fel -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, 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:95
+#: ../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:96
+#: ../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:97
+#: ../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:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1282,7 +1232,7 @@ msgstr ""
 "  --allow-nodeps - caniatáu gofyn i ddefnyddiw osod pecynnau heb\n"
 "                   wirio dibyniaethau.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1291,7 +1241,7 @@ msgstr ""
 "  --allow-force  - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
 "                   wirio dibyniaethau na'u cyfanrwydd.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1300,22 +1250,22 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth gosod chroot gyda dewis o  --root.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - defnyddio curl i estyn ffeiliau pell.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../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:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1324,7 +1274,7 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1333,7 +1283,7 @@ msgstr ""
 "  --proxy        - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
 "                   rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1342,7 +1292,7 @@ msgstr ""
 "  --proxy-user   - enwi defnyddiwr a chyfrinair i'w ddefnyddio fel y\n"
 "                   dilysiad dirprw(fformat yw <user:password>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1351,12 +1301,12 @@ msgstr ""
 "  --bug          - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
 "                   yr arg. nesaf\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - defnyddio rhyngwyneb  X.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1365,7 +1315,7 @@ msgstr ""
 "  --best-output  - dewiswch y rhyngwyneb gorau yn ôl yr amgylchedd:\n"
 "                   X fodd testun.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1374,77 +1324,66 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - eithrio llwybr wedi ei wahanu a chollnod.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - eithrio ffeiliau docs.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - caniatáu i chwilio ganfod pecyn.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - peidio chwilio yn provides i ganfod pecyn.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - gosod chwilio fuzzy (fel --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, 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:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modd distaw.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, 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:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Dewis lleoliad i gadw'r ffeil"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: dewis anhysbys \"-%s\", gwirio defnydd gyda --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, 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:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1465,22 +1404,22 @@ msgstr ""
 "\n"
 "Beth hoffech chi ei wneud?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Gwneud dim"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Iawn, yn barod i'w osod"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Cadw ffeil"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1495,12 +1434,12 @@ msgstr ""
 "\n"
 "Efallai byddai'n well gennych eu cadw. Beth yw eich dewis?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Ei osod"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1509,42 +1448,42 @@ msgstr ""
 "Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
 "adroddiad gwall neu ei ddileu."
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Mae angen un o'r pecynnau canlynol i osod %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Beth yw eich dewis? (1-%d)"
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Gosod pecynnau..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Cychwyn..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1553,12 +1492,12 @@ msgstr ""
 "Nid oes modd gosod rhai pecynnau gofynwyd amdanynt:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "cytuno?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1569,7 +1508,7 @@ msgstr ""
 "gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1578,15 +1517,15 @@ msgstr ""
 "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu tynnu (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1595,37 +1534,47 @@ msgstr ""
 "Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "methu estyn pecynnau ffynhonnell, atal"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Pwyso Enter pan yn barod..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Llwytho pecyn '%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% o %s wedi cwblhau, Cyrraedd = %s, cyflymder = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% wedi cwblhau, cyflymder = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ydych chi am barhau gosod?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1636,57 +1585,57 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "dosbarthu %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "gosod %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Gwneud y gosod gyda mwy o orfodaeth (--force)? (i/N)"
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "methodd trosglwyddiad gosod %d"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Gosod yn bosibl"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Popeth wedi eu gosod eisoes"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1711,22 +1660,22 @@ msgstr ""
 "\n"
 "and [options] are from\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update        - defnyddio cyfrwng diweddaru.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - ceisio canfod a defnyddio ffeil synthesis.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - ceisio canfod a defnyddio ffeil hdlist.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1735,7 +1684,7 @@ msgstr ""
 "  --no-probe     - peidio ceisio canfod unrhyw synthesis neu\n"
 "                   ffeil hdlist.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1744,7 +1693,7 @@ msgstr ""
 "  --distrib      - creu yn awtomatig yr holl gyfrwng o gyfrwng\n"
 "                   gosod\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1756,7 +1705,7 @@ msgstr ""
 "neu\n"
 "                   unrhywwbeth arall sydd wedi ei ffurfweddu ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1766,7 +1715,7 @@ msgstr ""
 "rhagosodedig yw\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1779,7 +1728,7 @@ msgstr ""
 "pecynnau\n"
 "                   ryddhawyd gan Mandrake.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1789,7 +1738,7 @@ msgstr ""
 "o\n"
 "                   osod pecynnau Mandrake.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1798,73 +1747,52 @@ msgstr ""
 "  --virtual      - creu cyfrwng rhithil sydd wedi ei ddiweddaru,\n"
 "                   dom ond protocol ffeil:// sy'n cael ei ganiatau.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../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:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - glanhau penawdau yng nghyfeiriadur y storfa.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - gorfodi cynhyrchu ffeiliau hdlist\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"dewisiadau anhysbys '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "methu ychwanegu diweddariadau o ddosbarthiad cookies\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "adfer drychau yn %s..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "methu diweddaru cyfrwng \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<llwybr perthynnol hdlist> ar goll\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<llwybr perthynnol hdlist> ar goll\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with' ar goll ar gyfer cyfrwng rhwydwaith\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' ar goll ar gyfer cyfrwng rhwydwaith\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "methu creu cyfrwng \"%s\"\n"
@@ -1883,6 +1811,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - dewis pob cyfrwng.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"dewisiadau anhysbys '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1897,7 +1834,7 @@ msgstr ""
 "mae'r cofnod i'w dynnu ar goll\n"
 "(un o %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1906,27 +1843,27 @@ msgstr ""
 "usage: urpmi.update [options] <name> ...\n"
 "lle mai <name> yw'r ewn cyfrwng i'w dynnu.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - gorfodi diweddaru allwedd gpg.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - dewis pob cyfrwng ansymudadwy.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "dim i'w ddiweddaru (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1935,7 +1872,7 @@ msgstr ""
 "mae'r cofnod i ddiweddaru ar goll\n"
 "(un o %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1951,22 +1888,22 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list        - rhestri'r holl gyfrwng ar gael.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - rhestri'r holl gyfrwng ar gael.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - rhestru'r holl gyfrwng ar gael.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
@@ -1974,18 +1911,18 @@ msgstr ""
 "  --dump-config  - dympio'r ffurfweddiad mewn ffurf ymresymiad urpmi."
 "addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - rhestri'r nodau sydd ar gael wrth ddefnyddio --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - rhestr ar gael ar gyfer enwau paralel.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1994,14 +1931,14 @@ msgstr ""
 "  --headers      - tynnu penawdau o bechyn yn urpmii db i\n"
 "                   stdout (gwraidd yn unig).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - give all source packages before downloading (root only).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2010,17 +1947,17 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib.\n"
 "                   Mae hyn yn caniatáu ymholi mewn dosbarthiad.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - cofnod argraffu.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - ymestyn ymholiad i ddibyniaethau pecynnau.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2029,56 +1966,109 @@ msgstr ""
 "  -u             - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei "
 "osod.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - allbwn cyfan a phecyn i'w dynnu\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - chwilio nôl  i'r hyn sydd angen ar becyn.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
 "i bobl.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g            - argraffu grwpiau gydag enw hefyd.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - argraffu fersiwn a rhyddhad gydag enw hefyd.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
 "eu holi.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: dewis anhysbys \"-%s\", gwirio defnydd gyda --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Webfetch `%s' anhysbys!!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "methodd y copïo: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget ar goll\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "methodd wget: gadael gyda%d neu signal %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl ar goll\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "methodd curl: gadael gyda %d neu signal %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rysnc ar goll\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "methodd rsync:gadael gyda %d neu signal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh ar goll\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: dewis anhysbys \"-%s\", gwirio defnydd gyda --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: dewis anhysbys \"-%s\", gwirio defnydd gyda --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu tynnu (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<llwybr perthynnol hdlist> ar goll\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with' ar goll ar gyfer cyfrwng rhwydwaith\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: dewis anhysbys \"-%s\", gwirio defnydd gyda --help\n"