updated pot file; added Furlan file

1 files changed, 1299 insertions, 1253 deletions

diff --git a/po/cy.po b/po/cy.po
index 518cdba9..b7dce57a 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-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-04-26 22:21-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -35,878 +35,778 @@ msgstr "Yy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "gosod %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - creu yn awtomatig yr holl gyfrwng o gyfrwng\n"
-"                   gosod\n"
+"Gosodiad pecynnau awtomatig...\n"
+"Roeddech wedi gofyn i gael gosod pecyn %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "methu agor rpmdb"
+msgid "Is this OK?"
+msgstr "Mae'r model yn gywir"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - argraffu neges cymorth.\n"
+msgid "Ok"
+msgstr "Iawn"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Mae angen un o'r pecynnau canlynol i osod %s:"
+msgid "Cancel"
+msgstr "Dileu"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "tynnu pecyn %s."
+msgid " (Y/n) "
+msgstr " (Y/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: heb ganfod gorchymyn\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Methu defnyddio'r modd paralel gyda'r modd use-distrib"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"usage: %s [dewisiadau]\n"
+"lle mae [dewisiadau] o\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Popeth wedi eu gosod eisoes"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help     - argraffu neges cymorth.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - glanhau penawdau yng nghyfeiriadur y storfa.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - cyfyngu canlyniadau i'r grwp.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "defnyddio proses %d ar gyfer gweithredu trosglwyddiad"
+msgid "                    defaults is %s.\n"
+msgstr "                   rhagosodedig yw %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - tag argraffu'n darparu: pob darpariaeth. \n"
+msgid "unknown protocol defined for %s"
+msgstr "protocol anhysbys ar gyfer %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Beth yw eich dewis? (1-%d)"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "heb ganfod webfetch, yn cael eu cynnal gan webfetch: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "canfod %d pennawd mewn storfa"
+msgid "unable to handle protocol: %s"
+msgstr "methu trin protocol: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, 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\""
+msgid "syntax error in config file at line %s"
+msgstr "gwall cystrawen yn ffeil ffurfweddiad yn llinell %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user   - enwi defnyddiwr a chyfrinair i'w ddefnyddio fel y\n"
-"                   dilysiad dirprw(fformat yw <user:password>).\n"
+"cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
+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:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "adfer ffeil rpm (%s)..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"methu cymryd gofal o gyfrwng \"%s\" gan fod y rhestr ffeil yn cael ei "
+"ddefnyddio gan gyfrwng arall"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - rhestr ar gael ar gyfer enwau paralel.\n"
+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:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "... methodd ail-lwytho: %s"
+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:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "methu archwilio rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "methu enw cyfrwng y ffeil hdlist hon (%s)"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
-"gywir.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "methu cael mynediad i  ffeil hdlist\"%s\", anwybyddu'r cyfrwng"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Gosod pecynnau..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "enw ffeil rpm annilys [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", osgoi"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"dylai cyfrwng rhithiol \"%s\" fod a rhestr ffeiliau hdlist, anwybyddwyd y "
+"cyfrwng"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "methodd trosglwyddiad gosod %d"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "dylai cyfrwng rhithiol  \"%s\" gael url clir, anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"methu cael mynediad i'r cyfrwng gosod cyntaf (heb ganfod ffeil Mandrake/base/"
-"hdlists)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Dewis gwael, ceisiwch eto\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Dewis lleoliad i gadw'r ffeil"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "rhestr ffeil annealladwy \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - argraffu crynodeb tag: crynodeb.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "methu archwilio rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "gormod o bwyntiau gosod ar gyfer cyfrwng symudol \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Ei osod"
+msgid "taking removable device as \"%s\""
+msgstr "cymryd dyfais symudol fel \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - defnyddio rhyngwyneb  X.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "defnyddio dyfais symudol wahanol (%s) ar gyfer \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Mae angen un o'r pecynnau canlynol:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "methu adfer enw llwybr ar gyfer cyfrwng symudadwy \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, 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)"
+msgid "unable to write config file [%s]"
+msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - dewiswch y rhyngwyneb gorau yn ôl yr amgylchedd:\n"
-"                   X fodd testun.\n"
+msgid "write config file [%s]"
+msgstr "ysgrifennu ffeil ffurfweddu (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Llwytho pecyn '%s'..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Methu defnyddio'r modd paralel gyda'r modd use-distrib"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, 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"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "methu didoli ffeil hdlist \"%s\" yn ffeil (%s)"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, 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"
+msgid "examining parallel handler in file [%s]"
+msgstr "archwilio trinydd paralel mewn ffeil [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "heb enwi pecyn %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "canfod trinydd paralel ar gyfer nodau: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Methodd y gosod, mae rhai ffeiliau ar goll:\n"
-"%s\n"
-"Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
+msgid "unable to use parallel option \"%s\""
+msgstr "methu defnyddio dewis paralel \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"lle mai <name> yw'r ewn cyfrwng i'w dynnu.\n"
+"-nid oes modd defnyddio synthesis gyda --media, --excludemedia, --sortmedia, "
+"--update neu --paralel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Nid oes modd i'r gosod parhau gan bo rhaid i'r pecynnau canlynol\n"
-"gael eu tynnu i eraill gael eu diweddaru.\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "archwilio ffeil synthesis [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' ar goll ar gyfer cyfrwng rhwydwaith\n"
+msgid "examining hdlist file [%s]"
+msgstr "archwilio ffeil hdlist [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "nid yw'r rhith gyfrwng \"%s\" yn lleol, anwybyddu'r cyfrwng"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "pecyn anhysbys"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Gosod yn bosibl"
+msgid "performing second pass to compute dependencies\n"
+msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
-"%s"
+msgid "skipping package %s"
+msgstr "hepgor pecyn  %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod (%d MB)"
+msgid "would install instead of upgrade package %s"
+msgstr "gosod yn lle uwchraddio pecyn %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, 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"
+msgid "unable to open rpmdb"
+msgstr "methu agor rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
+msgid "medium \"%s\" already exists"
+msgstr "cyfrwng \"%s\" yn bodoli eisoes"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "methu ychwanegu diweddariadau o ddosbarthiad cookies\n"
+msgid "virtual medium need to be local"
+msgstr "rhaid i'r rhith gyfrwng fod yn lleol"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  --verbose      - modd llafar.\n"
+msgid "added medium %s"
+msgstr "ychwanegwyd cyfrwng %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Cychwyn..."
+msgid "unable to access first installation medium"
+msgstr "methu cael mynediad i gyfrwng gosod cyntaf"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list        - rhestri'r holl gyfrwng ar gael.\n"
+msgid "copying hdlists file..."
+msgstr "copïo ffeil hdlists..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - argraffu pob tag.\n"
+msgid "...copying failed"
+msgstr "...methodd y copïo"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "cyfrwng annealladwy \"%s\" wedi ei nodi'n symudadwy ond nid yw"
+msgid "...copying done"
+msgstr "...cwblhau'r copïo"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"dylai cyfrwng rhithiol \"%s\" fod a rhestr ffeiliau hdlist, anwybyddwyd y "
-"cyfrwng"
+"methu cael mynediad i'r cyfrwng gosod cyntaf (heb ganfod ffeil Mandrake/base/"
+"hdlists)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
+msgid "retrieving hdlists file..."
+msgstr "adfer ffeil hdlists..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - eithrio llwybr wedi ei wahanu a chollnod.\n"
+msgid "...retrieving done"
+msgstr ".cwblhau adfer"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Pwyso Enter pan yn barod..."
+msgid "...retrieving failed: %s"
+msgstr "... methodd ail-lwytho: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"dewisiadau anhysbys '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "disgrifiad hdlist annilys \"%s\" yn rhestr ffeilio hdlists"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - hollti'n ddarnau llai os yw mwy na'r pecynnau hyn yn "
-"cael\n"
-"                   eu gosod neu eu uwchraddio\n"
-"                   rhagosodiad yw %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "dewis aml-gyfrwng: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - caniatáu i chwilio ganfod pecyn.\n"
+msgid "removing medium \"%s\""
+msgstr "dewis cyfrwng \"%s\":"
 
-#: ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --list-nodes   - rhestri'r nodau sydd ar gael wrth ddefnyddio --parallel.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "adeiladu hdlist [%s]"
+"maethu cael mynediad i gyfrwng \"%s\",\n"
+"gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur gyda wrth greu'r cyfrwng."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
-"                   pecynnau sy'n arwain at dynnu.\n"
+"dylai'r rhith gyfrwng \"%s\" gael hdlist ffynhonnell ddilys neu synthesis, "
+"anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "archwilio ffeil MD5SUM"
+msgid "copying description file of \"%s\"..."
+msgstr "copïo ffeil disgrifiad o \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: heb ganfod gorchymyn\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "cyfrifo md5sum ffynhonnell hdlist presennol (neu synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "methu cofrestr ffeil rpm"
+msgid "examining MD5SUM file"
+msgstr "archwilio ffeil MD5SUM"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - caniatáu gofyn i ddefnyddiw osod pecynnau heb\n"
-"                   wirio dibyniaethau.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "copïo ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "methu trin protocol: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "adfer ffeil hdlists..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Iawn, yn barod i'w osod"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "methodd copïo (%s) (md5sum gwallus)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "ychwanegwyd cyfrwng %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - cadw'r rpm sydd heb ei ddefnyddio yn y storfa.\n"
+msgid "reading rpm files from [%s]"
+msgstr "darllen ffeiliau rpm o [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, 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)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "methu darllen ffeiliau rpm o (%s): %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "anghysondeb md5sum"
+msgid "no rpm files found from [%s]"
+msgstr "heb ganfod ffeiliau rpm o [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "gwall cystrawen yn ffeil ffurfweddiad yn llinell %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, 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"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
-"                   rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "er mwyn gosod %s"
+msgid "md5sum mismatch"
+msgstr "anghysondeb md5sum"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "ailganfod cofnodion %s yn depslist"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "methodd adfer ffynhonnell hdlist (neu synthesis)"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
+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:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "gosod yn lle uwchraddio pecyn %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "methu didoli ffeil hdlist \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "adfer drychau yn %s..."
+msgid "unable to write list file of \"%s\""
+msgstr "methu ysgrifennu i ffeil rhestr \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - argraffu tag url: url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "ysgrifennu rhestr ffeil  ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protocol anhysbys ar gyfer %s"
+msgid "nothing written in list file for \"%s\""
+msgstr "dim wedi ei ysgrifennu yn ffei rhestr ar gyfer \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - argraffu fersiwn a rhyddhad gydag enw hefyd.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "archwilio ffeil pubkey \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
-"  --obsoletes     - argraffu hen dagiau: yr holl hen rai (llinellau "
-"niferus).\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "cyfrwng \"%s\" yn bodoli eisoes"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "methu mewnforio ffeil pubkey \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "gosod %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "darllen pennawd o'r cyfrwng \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"mae'r cofnod i ddiweddaru ar goll\n"
-"(un o %s)\n"
+msgid "building hdlist [%s]"
+msgstr "adeiladu hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "ceisio hybu %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "methu tynnu pecyn %s"
+msgid "found %d headers in cache"
+msgstr "canfod %d pennawd mewn storfa"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "tynnu hen benawdau %d yn y storfa"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"mae'r cofnod i'w dynnu ar goll\n"
-"(un o %s)\n"
+msgid "mounting %s"
+msgstr "gosod %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - dewis pob cyfrwng.\n"
+msgid "unmounting %s"
+msgstr "dadosod %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Llofnod coll (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "ailganfod cofnodion %s yn depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "methu darllen ffeiliau rpm o (%s): %s"
+msgid "no entries relocated in depslist"
+msgstr "dim cofnodion wedi eu symud i depslip"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --paralel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "enw ffeil rpm annilys [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "methu cael mynediad  ffeil rpm (%s)"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (Y/n) "
+msgid "unable to register rpm file"
+msgstr "methu cofrestr ffeil rpm"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - cyfyngu canlyniadau i'r grwp.\n"
+msgid "error registering local packages"
+msgstr "gwall cofrestru pecynnau lleol"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, 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"
+msgid "no package named %s"
+msgstr "heb enwi pecyn %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "allbwn gwallus: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "bydd tynnu pecynnau %s yn torri'r system"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "mae yna becynnau niferus gyda'r un enw ffeil rpm \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - rhestri'r holl gyfrwng ar gael.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Nid oes modd gosod rhai pecynnau gofynwyd amdanynt:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Gosod pecyn `%s' (%s/%s)..."
+"cyfrwng \"%s\" yndefnyddio rhestr ffeiliau annilys:\n"
+"  nid yw'r drych yn un diweddar, ceisiwch ddull arall"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "dim cofnodion wedi eu symud i depslip"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "nid yw cyfrwng \"%s\" yn diffinio unrhyw leoliad ar gyfer ffeiliau rpm"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
+msgid "package %s is not found."
+msgstr "heb ganfod pecyn %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - defnyddio curl i estyn ffeiliau pell.\n"
+msgid "urpmi database locked"
+msgstr "cronfa ddata urmi wedi cloi"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - cynnwys perl cod yn union fel perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "heb ddewis cyfrwng \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "cytuno?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "rhestr ffeil annealladwy \"%s\", cyfrwng wedi ei anwybyddu"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "cyfrwng annealladwy \"%s\" wedi ei nodi'n symudadwy ond nid yw"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr ".cwblhau adfer"
+msgid "unable to access medium \"%s\""
+msgstr "methu cael mynediad at gyfrwng. \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, 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)"
+msgid "malformed input: [%s]"
+msgstr "allbwn gwallus: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "hepgor pecyn  %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Llofnod annilys (%s)"
+msgid "Preparing..."
+msgstr "Paratoi..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, 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"
+msgid "using process %d for executing transaction"
+msgstr "defnyddio proses %d ar gyfer gweithredu trosglwyddiad"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi fersiwn %s\n"
-"Hawlfraint © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
-"\n"
-"defnydd:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"  --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "methu enw cyfrwng y ffeil hdlist hon (%s)"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "methu didoli ffeil hdlist \"%s\""
+"crëwyd trosglwyddiad ar gyfer gosod ar %s (tynnu=%d, gosod=%d, uwchraddio=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, 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"
+msgid "unable to create transaction"
+msgstr "methu creu trosglwyddiad."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "oherwydd gwrthdaro gyda %s"
+msgid "removing package %s"
+msgstr "tynnu pecyn %s."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "tynnu hen benawdau %d yn y storfa"
+msgid "unable to remove package %s"
+msgstr "methu tynnu pecyn %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "methu diweddaru cyfrwng \"%s\"\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "ychwanegu pecyn %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
+msgid "unable to install package %s"
+msgstr "methu gosod pecyn %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "nid yw'r rhith gyfrwng \"%s\" yn lleol, anwybyddu'r cyfrwng"
+msgid "due to missing %s"
+msgstr "oherwydd %s coll"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "Paratoi..."
+msgid "due to unsatisfied %s"
+msgstr "%s heb ei foddloni"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                   rhagosodedig yw %s.\n"
+msgid "trying to promote %s"
+msgstr "ceisio hybu %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "defnyddio dyfais symudol wahanol (%s) ar gyfer \"%s\""
+msgid "in order to keep %s"
+msgstr "fel modd i gadw %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - peidio ceisio canfod unrhyw synthesis neu\n"
-"                   ffeil hdlist.\n"
+msgid "in order to install %s"
+msgstr "er mwyn gosod %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - peidio chwilio yn provides i ganfod pecyn.\n"
+msgid "due to conflicts with %s"
+msgstr "oherwydd gwrthdaro gyda %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "methodd copïo (%s) (md5sum gwallus)"
+msgid "unrequested"
+msgstr "diofyn"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib.\n"
-"                   Mae hyn yn caniatáu ymholi mewn dosbarthiad.\n"
+msgid "Invalid signature (%s)"
+msgstr "Llofnod annilys (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"usage: %s [dewisiadau]\n"
-"lle mae [dewisiadau] o\n"
+msgid "Invalid Key ID (%s)"
+msgstr "Enw Allwedd Annilys (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - tynnu rpm o'r storfa cyn unrhyw beth arall.\n"
+msgid "Missing signature (%s)"
+msgstr "Llofnod coll (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, 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"
+msgid "bad proxy declaration on command line\n"
+msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - tag argraffu'n gwrthdaro: pob gwrthdaro\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"dylai'r rhith gyfrwng \"%s\" gael hdlist ffynhonnell ddilys neu synthesis, "
-"anwybyddu'r cyfrwng"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Dewis gwael, ceisiwch eto\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -922,662 +822,718 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - argraffu neges cymorth.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "copïo ffynhonnell hdlist (neu synthesis) \"%s\"..."
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - dewis pecyn ynn awtomatig o fewn dewisiadau.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "...copying done"
-msgstr "...cwblhau'r copïo"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "methu defnyddio dewis paralel \"%s\""
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
+"bodoli.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
-"cyfrwng \"%s\" yndefnyddio rhestr ffeiliau annilys:\n"
-"  nid yw'r drych yn un diweddar, ceisiwch ddull arall"
+"  --paralel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "methu cael mynediad i gyfrwng gosod cyntaf"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - defnyddio root arall ar gyfer gosod rpm.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "rhaid i'r rhith gyfrwng fod yn lleol"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
+"                   wrth (ddad)osod chroot gyda dewis o  --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "error registering local packages"
-msgstr "gwall cofrestru pecynnau lleol"
+msgid "  -v             - verbose mode.\n"
+msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:50
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - cyfyngu cyflymder y llwytho i lawr.\n"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - select all packages matching expression.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
+msgid "unknown packages"
+msgstr "pecynnau anhysbys"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "methodd adfer ffynhonnell hdlist (neu synthesis)"
+msgid "unknown package"
+msgstr "pecyn anhysbys"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "heb ganfod ffeiliau rpm o [%s]"
+msgid "removing package %s will break your system"
+msgstr "bydd tynnu pecynnau %s yn torri'r system"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "dim wedi ei ysgrifennu yn ffei rhestr ar gyfer \"%s\""
+msgid "Nothing to remove"
+msgstr "Dim i'w dynnu"
 
-#: ../urpmi:1
+#: ../urpme:99
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
+msgid "Checking to remove the following packages"
+msgstr "Ticio i ddileu'r pecynnau canlynol"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "cyfrifo md5sum ffynhonnell hdlist presennol (neu synthesis)"
+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)"
 
-#: ../urpmq:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - allbwn cyfan a phecyn i'w dynnu\n"
+msgid " (y/N) "
+msgstr " (y/N) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "unable to install package %s"
-msgstr "methu gosod pecyn %s"
+msgid "removing %s"
+msgstr "tynnu %s"
 
-#: ../urpmi:1
+#: ../urpme:115
 #, c-format
+msgid "Removing failed"
+msgstr "Methodd y tynnu"
+
+#: ../urpmf:27
+#, fuzzy, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --allow-force  - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
-"                   wirio dibyniaethau na'u cyfanrwydd.\n"
+"urpmf fersiwn %s\n"
+"Hawlfraint (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
+"\n"
+"defnydd:\n"
 
-#: ../urpmi:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "Save file"
-msgstr "Cadw ffeil"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media          - defnyddio'r cyfrwng, wedi ei ran gan coma.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n"
 
-#: ../urpme:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - select all packages matching expression.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
+"choma.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Enw Allwedd Annilys (%s)"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:38
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modd llafar.\n"
+
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --force        - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
-"bodoli.\n"
+"  --quiet         - peidiwch argraffu enw tag (rhagosodedig os nad oes tag "
+"yn\n"
+"                    cael ei roi ar y linell orchymyn gyda modd "
+"rhyngweithiol).\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "methu adfer enw llwybr ar gyfer cyfrwng symudadwy \"%s\""
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - peidio argraffu llinellau yr un fath.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:42
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - ceisio canfod a defnyddio ffeil synthesis.\n"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - argraffu pob tag.\n"
 
-#: ../urpmi:1
+#: ../urpmf:43
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - argraffu grwp tag: grwp.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:44
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - gorfodi diweddaru allwedd gpg.\n"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - argraffu maint tag: maint.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<llwybr perthynnol hdlist> ar goll\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - argraffu cyfnod tag: cyfnod.\n"
 
-#: ../urpme:1
+#: ../urpmf:46
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Ticio i ddileu'r pecynnau canlynol"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - argraffu crynodeb tag: crynodeb.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, c-format
-msgid "unrequested"
-msgstr "diofyn"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --summary      - argraffu disgrifiad tag: disgrifiad.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:48
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "methu cael mynediad  ffeil rpm (%s)"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - argraffu ourcerpm tag: ffynhonnell rpm.\n"
 
-#: ../urpmf:1
+#: ../urpmf:49
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - argraffu fagiau ffeiliau: pob ffeil\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager      - argraffu pencynydd tag: pencynydd.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "methu didoli ffeil hdlist \"%s\" yn ffeil (%s)"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - argraffu buildhost tag: build host.\n"
 
-#: ../urpmi:1
+#: ../urpmf:51
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Ydych chi am barhau gosod?"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - argraffu tag url: url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides      - tag argraffu'n darparu: pob darpariaeth. \n"
 
-#: ../urpmi:1
+#: ../urpmf:53
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
-"                   wrth gosod chroot gyda dewis o  --root.\n"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - argraffu tagiau angenrheidiol: pob anghenraid\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - argraffu fagiau ffeiliau: pob ffeil\n"
 
-#: ../urpmq:1
+#: ../urpmf:55
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts    - tag argraffu'n gwrthdaro: pob gwrthdaro\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
-"  -i             - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
-"i bobl.\n"
+"  --obsoletes     - argraffu hen dagiau: yr holl hen rai (llinellau "
+"niferus).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 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"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\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"
+"  --env          - defnyddio amgynlchedd benodol (adroddiad gwall \n"
+"                   fel rheol.\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
+"  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:60 ../urpmq:88
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
+
+#: ../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:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - defnyddio url pennwyd ar gyfer rhestr drychau, y "
-"rhagosodedig yw\n"
-"                   %s\n"
+"  -a             - gweithredwr deuaidd AND, gwir os yw'r ddau ymadrodd yn "
+"gywir.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
-"                   wrth (ddad)osod chroot gyda dewis o  --root.\n"
+"  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
+"gywir.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unaidd NOT, true os yw'r mynegiad yn false.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - parenthesis chwith i agor mynegiad grwp.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - parenthesis de i gau mynegiad grwp.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
-"adroddiad gwall neu ei ddileu."
+"galw nôl yw: \n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "dadosod %s"
+msgid "using specific environment on %s\n"
+msgstr "ddefnyddio amgylchedd penodol ar %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, 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"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% wedi cwblhau, cyflymder = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi fersiwn %s\n"
+"Hawlfraint © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
+"\n"
+"defnydd:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "ailgychwyn urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "archwilio ffeil synthesis [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - dewis pecynnau'n awtomatig i uwchraddio'r system.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Gwneud y gosod gyda mwy o orfodaeth (--force)? (i/N)"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr "  --no-uninstall - peidio gofyn i ddadosod pecyn, atal gosod.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...methodd y copïo"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
+"                   pecynnau sy'n arwain at dynnu.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "methu cael mynediad i  ffeil hdlist\"%s\", anwybyddu'r cyfrwng"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - hollti'n ddarnau llai os yw mwy na'r pecynnau hyn yn "
+"cael\n"
+"                   eu gosod neu eu uwchraddio\n"
+"                   rhagosodiad yw %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - modd distaw.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - hyd drosglwyddiad byr, rhagosodiad yw %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - modd llafar.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - mynnu chwiliad fuzzy (fel -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --src          - pecyn nesaf yn becyn ffynhonnell (yr un peth â -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"  --headers      - tynnu penawdau o bechyn yn urpmii db i\n"
-"                   stdout (gwraidd yn unig).\n"
+"  --install-src  - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "pecynnau anhysbys"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - tynnu rpm o'r storfa cyn unrhyw beth arall.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "dewis aml-gyfrwng: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - cadw'r rpm sydd heb ei ddefnyddio yn y storfa.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - caniatáu gofyn i ddefnyddiw osod pecynnau heb\n"
+"                   wirio dibyniaethau.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, 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\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
+"                   wirio dibyniaethau na'u cyfanrwydd.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, 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"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
+"                   wrth gosod chroot gyda dewis o  --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help     - argraffu neges cymorth.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - defnyddio curl i estyn ffeiliau pell.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "canfod trinydd paralel ar gyfer nodau: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - cyfyngu cyflymder y llwytho i lawr.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"galw nôl yw: \n"
-"%s\n"
+"  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
+"                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - chwilio nôl  i'r hyn sydd angen ar becyn.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
+"                   rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
 msgid ""
-"urpmf version %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf fersiwn %s\n"
-"Hawlfraint (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
-"\n"
-"defnydd:\n"
+"  --proxy-user   - enwi defnyddiwr a chyfrinair i'w ddefnyddio fel y\n"
+"                   dilysiad dirprw(fformat yw <user:password>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet         - peidiwch argraffu enw tag (rhagosodedig os nad oes tag "
-"yn\n"
-"                    cael ei roi ar y linell orchymyn gyda modd "
-"rhyngweithiol).\n"
+"  --bug          - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
+"                   yr arg. nesaf\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - peidio argraffu llinellau yr un fath.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - defnyddio rhyngwyneb  X.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"-nid oes modd defnyddio synthesis gyda --media, --excludemedia, --sortmedia, "
-"--update neu --paralel"
+"  --best-output  - dewiswch y rhyngwyneb gorau yn ôl yr amgylchedd:\n"
+"                   X fodd testun.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - defnyddio pensaerhiaeth ppenodol, y rhagosodiad yw arch "
-"o\n"
-"                   osod pecynnau Mandrake.\n"
+"  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
+"                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Mae'r model yn gywir"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - eithrio llwybr wedi ei wahanu a chollnod.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - eithrio ffeiliau docs.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "archwilio trinydd paralel mewn ffeil [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - caniatáu i chwilio ganfod pecyn.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Dim i'w dynnu"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - peidio chwilio yn provides i ganfod pecyn.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - gosod chwilio fuzzy (fel --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "darllen pennawd o'r cyfrwng \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  --s          - pecyn nesaf yn becyn ffynhonnell (yr un peth â -src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - ymestyn ymholiad i ddibyniaethau pecynnau.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modd distaw.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --bug          - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
-"                   yr arg. nesaf\n"
+" bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
+"eu gosod.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, 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"
+msgid "Choose location to save file"
+msgstr "Dewis lleoliad i gadw'r ffeil"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - argraffu ourcerpm tag: ffynhonnell rpm.\n"
+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"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "methu ysgrifennu i ffeil rhestr \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Rydych wedi dewis pecyn ffynhonnell:\n"
+"\n"
+"%s\n"
+"\n"
+"Mwy na thebyg doeddech ddim am ei osod ar eich cyfrifiadur(bydd\n"
+"ei osod yn caniatáu i chi wneud newidiadau i'w cod ffynhonell a'i grynhoi).\n"
+"\n"
+"Beth hoffech chi ei wneud?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - argraffu tagiau angenrheidiol: pob anghenraid\n"
+msgid "Do nothing"
+msgstr "Gwneud dim"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
+msgid "Yes, really install it"
+msgstr "Iawn, yn barod i'w osod"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --summary      - argraffu disgrifiad tag: disgrifiad.\n"
+msgid "Save file"
+msgstr "Cadw ffeil"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "Methodd y copïo"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Rydych ar fin gosod y pecynnau meddalwedd canlynol ar eich cyfrifiadur:\n"
+"\n"
+"%s\n"
+"\n"
+"Efallai byddai'n well gennych eu cadw. Beth yw eich dewis?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - gorfodi cynhyrchu ffeiliau hdlist\n"
+msgid "Install it"
+msgstr "Ei osod"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
+"adroddiad gwall neu ei ddileu."
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, 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"
+msgid "Copying failed"
+msgstr "Methodd y copïo"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "gosod %s"
+msgid "Only superuser is allowed to install packages"
+msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "darllen ffeiliau rpm o [%s]"
+msgid "One of the following packages is needed:"
+msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "copïo ffeil disgrifiad o \"%s\""
+msgid "What is your choice? (1-%d) "
+msgstr "Beth yw eich dewis? (1-%d)"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - dewis pecyn ynn awtomatig o fewn dewisiadau.\n"
+msgid "Package installation..."
+msgstr "Gosod pecynnau..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Methodd y tynnu"
+msgid "Initializing..."
+msgstr "Cychwyn..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual      - creu cyfrwng rhithil sydd wedi ei ddiweddaru,\n"
-"                   dom ond protocol ffeil:// sy'n cael ei ganiatau.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "package %s is not found."
-msgstr "heb ganfod pecyn %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "dewis cyfrwng \"%s\":"
-
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib"
-
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Dileu"
+"Nid oes modd gosod rhai pecynnau gofynwyd amdanynt:\n"
+"%s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:440 ../urpmi:466
 #, 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"
+msgid "do you agree ?"
+msgstr "cytuno?"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:455
 #, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"  --env          - defnyddio amgynlchedd benodol (adroddiad gwall \n"
-"                   fel rheol.\n"
+"Nid oes modd i'r gosod parhau gan bo rhaid i'r pecynnau canlynol\n"
+"gael eu tynnu i eraill gael eu diweddaru.\n"
+"%s\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:461
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
-"   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
-"choma.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "methu cael mynediad at gyfrwng. \"%s\""
-
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "methu creu cyfrwng \"%s\"\n"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager      - argraffu pencynydd tag: pencynydd.\n"
+"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
+"%s"
 
-#: ../urpmq:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
-"  --dump-config  - dympio'r ffurfweddiad mewn ffurf ymresymiad urpmi."
-"addmedia.\n"
+"I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod (%d MB)"
 
-#: ../urpmi:1
+#: ../urpmi:505
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1586,382 +1542,430 @@ msgstr ""
 "Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
 "%s\n"
 
-#: ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - cofnod argraffu.\n"
+msgid "unable to get source packages, aborting"
+msgstr "methu estyn pecynnau ffynhonnell, atal"
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - parenthesis de i gau mynegiad grwp.\n"
+msgid "Press Enter when ready..."
+msgstr "Pwyso Enter pan yn barod..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "heb ganfod webfetch, yn cael eu cynnal gan webfetch: %s\n"
+msgid "Downloading package `%s'..."
+msgstr "Llwytho pecyn '%s'..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "archwilio ffeil hdlist [%s]"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% o %s wedi cwblhau, Cyrraedd = %s, cyflymder = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:600
 #, c-format
-msgid "copying hdlists file..."
-msgstr "copïo ffeil hdlists..."
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% wedi cwblhau, cyflymder = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:619
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "ysgrifennu rhestr ffeil  ar gyfer cyfrwng \"%s\""
+msgid "The following packages have bad signatures"
+msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
 
-#: ../urpm.pm:1
+#: ../urpmi:620
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "dylai cyfrwng rhithiol  \"%s\" gael url clir, anwybyddu'r cyfrwng"
+msgid "Do you want to continue installation ?"
+msgstr "Ydych chi am barhau gosod?"
 
-#: ../urpmf:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - argraffu buildhost tag: build host.\n"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
+msgstr ""
+"Methodd y gosod, mae rhai ffeiliau ar goll:\n"
+"%s\n"
+"Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../urpmi:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "Do nothing"
-msgstr "Gwneud dim"
+msgid "Installation failed"
+msgstr "Methodd y gosod"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s"
+msgid "distributing %s"
+msgstr "dosbarthu %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "mounting %s"
+msgid "installing %s"
 msgstr "gosod %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"methu cymryd gofal o gyfrwng \"%s\" gan fod y rhestr ffeil yn cael ei "
-"ddefnyddio gan gyfrwng arall"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:712
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "methu estyn pecynnau ffynhonnell, atal"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:731
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - defnyddio root arall ar gyfer gosod rpm.\n"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Gwneud y gosod gyda mwy o orfodaeth (--force)? (i/N)"
 
-#: ../urpmi:1
+#: ../urpmi:772
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% o %s wedi cwblhau, Cyrraedd = %s, cyflymder = %s"
+msgid "%d installation transactions failed"
+msgstr "methodd trosglwyddiad gosod %d"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)"
+msgid "Installation is possible"
+msgstr "Gosod yn bosibl"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "methu mewnforio ffeil pubkey \"%s\""
+msgid "Everything already installed"
+msgstr "Popeth wedi eu gosod eisoes"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, 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"
+msgid "restarting urpmi"
+msgstr "ailgychwyn urpmi"
 
-#: ../urpmq:1
-#, c-format
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
 msgid ""
-"urpmq version %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\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"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
 "\n"
-"usage:\n"
+"and [options] are from\n"
 msgstr ""
-"urpmq fersiwn %s\n"
-"Hawlfraint (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
 "\n"
-"defnydd:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..."
+"and [options] are from\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g            - argraffu grwpiau gydag enw hefyd.\n"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update        - defnyddio cyfrwng diweddaru.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "heb ddewis cyfrwng \"%s\""
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - ceisio canfod a defnyddio ffeil synthesis.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - ceisio canfod a defnyddio ffeil hdlist.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "ddefnyddio amgylchedd penodol ar %s\n"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - peidio ceisio canfod unrhyw synthesis neu\n"
+"                   ffeil hdlist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - creu yn awtomatig yr holl gyfrwng o gyfrwng\n"
+"                   gosod\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - hyd drosglwyddiad byr, rhagosodiad yw %d.\n"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - creu cyfrwng yn awtomatig ar gyfer rhan  XXX o'r\n"
+"                   dosbarthiad, gall  XXX fod yn main, contrib, diweddariad "
+"neu\n"
+"                   unrhywwbeth arall sydd wedi ei ffurfweddu ;-)\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - parenthesis chwith i agor mynegiad grwp.\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - defnyddio url pennwyd ar gyfer rhestr drychau, y "
+"rhagosodedig yw\n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "gormod o bwyntiau gosod ar gyfer cyfrwng symudol \"%s\""
+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"
+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"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  -a             - gweithredwr deuaidd AND, gwir os yw'r ddau ymadrodd yn "
-"gywir.\n"
+"  --arch         - defnyddio pensaerhiaeth ppenodol, y rhagosodiad yw arch "
+"o\n"
+"                   osod pecynnau Mandrake.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"maethu cael mynediad i gyfrwng \"%s\",\n"
-"gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur gyda wrth greu'r cyfrwng."
+"  --virtual      - creu cyfrwng rhithil sydd wedi ei ddiweddaru,\n"
+"                   dom ond protocol ffeil:// sy'n cael ei ganiatau.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - argraffu grwp tag: grwp.\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - analluogi gwirio ffeil  MD5SUM.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media          - defnyddio'r cyfrwng, wedi ei ran gan coma.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - glanhau penawdau yng nghyfeiriadur y storfa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "unable to create transaction"
-msgstr "methu creu trosglwyddiad."
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - gorfodi cynhyrchu ffeiliau hdlist\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "methu ychwanegu diweddariadau o ddosbarthiad cookies\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
-msgstr ""
-"Rydych wedi dewis pecyn ffynhonnell:\n"
-"\n"
-"%s\n"
-"\n"
-"Mwy na thebyg doeddech ddim am ei osod ar eich cyfrifiadur(bydd\n"
-"ei osod yn caniatáu i chi wneud newidiadau i'w cod ffynhonell a'i grynhoi).\n"
-"\n"
-"Beth hoffech chi ei wneud?"
+msgid "retrieving mirrors at %s ..."
+msgstr "adfer drychau yn %s..."
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "distributing %s"
-msgstr "dosbarthu %s"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "Installation failed"
-msgstr "Methodd y gosod"
+msgid "unable to update medium \"%s\"\n"
+msgstr "methu diweddaru cyfrwng \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "write config file [%s]"
-msgstr "ysgrifennu ffeil ffurfweddu (%s)"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<llwybr perthynnol hdlist> ar goll\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - dewis pob cyfrwng ansymudadwy.\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' ar goll ar gyfer cyfrwng rhwydwaith\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - argraffu cyfnod tag: cyfnod.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "methu creu cyfrwng \"%s\"\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
-"                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"lle mai <name> yw'r ewn cyfrwng i'w dynnu.\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - dewis pob cyfrwng.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update        - defnyddio cyfrwng diweddaru.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"dewisiadau anhysbys '%s'\n"
 
-#: ../urpmq:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "  --list-url     - list available media and their url.\n"
-msgstr "  --list-url     - rhestru'r holl gyfrwng ar gael.\n"
+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:1 ../urpmq:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - gosod chwilio fuzzy (fel --fuzzy).\n"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"mae'r cofnod i'w dynnu ar goll\n"
+"(un o %s)\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi.update:28
 #, c-format
-msgid "Ok"
-msgstr "Iawn"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"usage: urpmi.update [options] <name> ...\n"
+"lle mai <name> yw'r ewn cyfrwng i'w dynnu.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:38
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "disgrifiad hdlist annilys \"%s\" yn rhestr ffeilio hdlists"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.update:40
 #, c-format
-msgid "removing %s"
-msgstr "tynnu %s"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - gorfodi diweddaru allwedd gpg.\n"
+
+#: ../urpmi.update:41
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - dewis pob cyfrwng ansymudadwy.\n"
+
+#: ../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.addmedia:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --distrib-XXX  - creu cyfrwng yn awtomatig ar gyfer rhan  XXX o'r\n"
-"                   dosbarthiad, gall  XXX fod yn main, contrib, diweddariad "
-"neu\n"
-"                   unrhywwbeth arall sydd wedi ei ffurfweddu ;-)\n"
+"mae'r cofnod i ddiweddaru ar goll\n"
+"(un o %s)\n"
 
-#: ../urpmf:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf fersiwn %s\n"
+"Hawlfraint (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
+"\n"
+"defnydd:\n"
+
+#: ../urpmq:53
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - argraffu maint tag: maint.\n"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list        - rhestri'r holl gyfrwng ar gael.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:54
 #, c-format
-msgid "in order to keep %s"
-msgstr "fel modd i gadw %s"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - rhestri'r holl gyfrwng ar gael.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:55
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "%s heb ei foddloni"
+msgid "  --list-url     - list available media and their url.\n"
+msgstr "  --list-url     - rhestru'r holl gyfrwng ar gael.\n"
 
-#: ../_irpm:1
+#: ../urpmq:56
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
-"Gosodiad pecynnau awtomatig...\n"
-"Roeddech wedi gofyn i gael gosod pecyn %s\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "cronfa ddata urmi wedi cloi"
+"  --dump-config  - dympio'r ffurfweddiad mewn ffurf ymresymiad urpmi."
+"addmedia.\n"
 
-#: ../urpmi:1
+#: ../urpmq:57
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
-"                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
+"  --list-nodes   - rhestri'r nodau sydd ar gael wrth ddefnyddio --parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "archwilio ffeil pubkey \"%s\""
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - rhestr ar gael ar gyfer enwau paralel.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:60
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - analluogi gwirio ffeil  MD5SUM.\n"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - tynnu penawdau o bechyn yn urpmii db i\n"
+"                   stdout (gwraidd yn unig).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "cymryd dyfais symudol fel \"%s\""
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - give all source packages before downloading (root only).\n"
 
-#: ../urpmi:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
-"Rydych ar fin gosod y pecynnau meddalwedd canlynol ar eich cyfrifiadur:\n"
-"\n"
-"%s\n"
-"\n"
-"Efallai byddai'n well gennych eu cadw. Beth yw eich dewis?"
+"  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib.\n"
+"                   Mae hyn yn caniatáu ymholi mewn dosbarthiad.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:75
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - mynnu chwiliad fuzzy (fel -y).\n"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - cofnod argraffu.\n"
+
+#: ../urpmq:77
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - ymestyn ymholiad i ddibyniaethau pecynnau.\n"
 
-#: ../urpmq:1
+#: ../urpmq:78
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -1970,37 +1974,79 @@ msgstr ""
 "  -u             - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei "
 "osod.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:80
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - ceisio canfod a defnyddio ffeil hdlist.\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - allbwn cyfan a phecyn i'w dynnu\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "due to missing %s"
-msgstr "oherwydd %s coll"
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - chwilio nôl  i'r hyn sydd angen ar becyn.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:85
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr ""
+"  -i             - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
+"i bobl.\n"
 
-#: ../urpmi.update:1
+#: ../urpmq:86
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g            - argraffu grwpiau gydag enw hefyd.\n"
+
+#: ../urpmq:87
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - argraffu fersiwn a rhyddhad gydag enw hefyd.\n"
+
+#: ../urpmq:89
+#, c-format
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
+
+#: ../urpmq:90
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"usage: urpmi.update [options] <name> ...\n"
-"lle mai <name> yw'r ewn cyfrwng i'w dynnu.\n"
+" bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
+"eu holi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:150
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", osgoi"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
+
+#: ../urpmq:388
+#, c-format
+msgid "No filelist found\n"
+msgstr ""
+
+#: ../urpmq:398
+#, c-format
+msgid "No changelog found\n"
+msgstr ""
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Mae angen un o'r pecynnau canlynol i osod %s:"
+
+#~ msgid ""
+#~ "urpmq version %s\n"
+#~ "Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "urpmq fersiwn %s\n"
+#~ "Hawlfraint (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL "
+#~ "GNU..\n"
+#~ "\n"
+#~ "defnydd:\n"