updated pot file

1 files changed, 951 insertions, 906 deletions

diff --git a/po/cy.po b/po/cy.po
index da885a11..2907ef0a 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-05-15 14:10+0200\n"
+"POT-Creation-Date: 2003-06-17 22:08+0200\n"
 "PO-Revision-Date: 2003-03-02 17:16-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -145,433 +145,612 @@ msgstr "try urpmf --help for more options"
 msgid "no full media list was found"
 msgstr "ni chanfyddwyd restr cyfrwng llawn"
 
-#: ../_irpm:1
-#, fuzzy, c-format
-msgid "%s: command not found\n"
-msgstr "Heb ganfod ffeil  RPM"
-
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
-#, c-format
-msgid " (Y/n) "
-msgstr " (Y/n) "
-
-#: ../_irpm:1 ../urpmi:1
-#, c-format
-msgid "Cancel"
-msgstr "Dileu"
-
-#: ../_irpm:1 ../urpmi:1
-#, c-format
-msgid "Ok"
-msgstr "Iawn"
-
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
-#, c-format
-msgid "Is this OK?"
-msgstr "Mae'r model yn gywir"
-
-#: ../_irpm:1
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
-"Gosodiad pecynnau awtomatig...\n"
-"Roeddech wedi gofyn i gael gosod pecyn %s\n"
-
-#: ../_irpm:1 ../urpmi:1
-#, c-format
-msgid "installing %s\n"
-msgstr "gosod %s\n"
 
 #: ../urpm.pm:1
 #, c-format
 msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
+#: ../urpmi.update:1 ../urpmq:1
 #, fuzzy, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "Methu rhedeg porwr"
+msgid "  --help         - print this help message.\n"
+msgstr "Argraffu tudalennau prawf"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Mae angen un o'r pecynnau canlynol:"
 
 #: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "Rhaid eich bod yn wraidd i osod pecyn."
+msgid "removing package %s"
+msgstr "Methu estyn pecynnau ffynhonnell."
 
 #: ../urpm.pm:1
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "unable to remove package %s"
-msgstr "Methu estyn pecynnau ffynhonnell."
+msgid "Everything already installed"
+msgstr "Pecynnau wedi eu gosod eisoes"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, fuzzy, c-format
-msgid "removing package %s"
-msgstr "Methu estyn pecynnau ffynhonnell."
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
 
-#: ../urpm.pm:1
+#: ../urpmf:1
 #, fuzzy, c-format
-msgid "unable to create transaction"
-msgstr "Methu creu cyfrwng."
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr ""
+"  --provides      - tag argraffu'n darparu: pob darpariaeth (llinellau "
+"lluosog)."
 
-#: ../urpm.pm:1
+#: ../urpmi:1
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid "What is your choice? (1-%d) "
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:1
 #, c-format
-msgid "Preparing..."
+msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid "...retrieving failed: %s"
-msgstr "Ail-lwytho %s"
+#: ../urpm.pm:1
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr ""
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
 #, c-format
-msgid "...retrieving done"
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
 #: ../urpm.pm:1
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
+msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
 #: ../urpm.pm:1
 #, c-format
-msgid "malformed input: [%s]"
+msgid "retrieving rpm file [%s] ..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:1
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr ""
+
+#: ../urpm.pm:1 ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "unable to access medium \"%s\""
-msgstr "Methu creu cyfrwng."
+msgid "...retrieving failed: %s"
+msgstr "Ail-lwytho %s"
 
 #: ../urpm.pm:1
 #, c-format
-msgid "urpmi database locked"
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:1
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+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"
 
-#: ../urpm.pm:1
+#: ../urpmi:1
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "Package installation..."
 msgstr ""
 
 #: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "Methu creu cyfrwng."
+msgid "invalid rpm file name [%s]"
+msgstr "Methu rhedeg porwr"
 
-#: ../urpm.pm:1
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "distributing %s\n"
+msgstr "gosod %s\n"
+
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "package %s is not found."
+msgid ""
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
 #: ../urpm.pm:1
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is problably not up-to-date, trying to use alternate method"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:1
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+msgid "Sorry, bad choice, try again\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:1
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "Methu creu cyfrwng."
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "Argraffu tudalennau prawf"
 
 #: ../urpm.pm:1 ../urpme:1
 #, fuzzy, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../urpm.pm:1
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "no package named %s"
-msgstr "pecyn anhysbys"
+msgid "  --X            - use X interface.\n"
+msgstr "Argraffu tudalennau prawf"
 
 #: ../urpm.pm:1
 #, c-format
-msgid "error registering local packages"
+msgid "copying source list of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Mae angen un o'r pecynnau canlynol:"
+
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "unable to register rpm file"
-msgstr "Methu rhedeg porwr"
+msgid "Downloading package `%s'..."
+msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../urpm.pm:1
+#: ../urpmi:1
 #, c-format
-msgid "retrieving rpm file [%s] ..."
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
+
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 
 #: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "Methu rhedeg porwr"
+msgid "no package named %s"
+msgstr "pecyn anhysbys"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "enw"
 
 #: ../urpm.pm:1
 #, c-format
-msgid "no entries relocated in depslist"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is problably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:1
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:1
 #, c-format
-msgid "unmounting %s"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
 
 #: ../urpm.pm:1
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "methodd curl: gadael gyda %d neu signal %d\n"
+
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "mounting %s"
-msgstr "gosod %s\n"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
+"\n"
+"%s\n"
+"\n"
+"Ydi hi'n iawn parhau?"
+
+#: ../urpme:1
+#, fuzzy, c-format
+msgid "unknown package"
+msgstr "pecyn anhysbys"
+
+#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Methodd y gosodiad"
 
 #: ../urpm.pm:1
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
 #: ../urpm.pm:1
 #, c-format
-msgid "found %d headers in cache"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (Y/n) "
+
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "enw"
+
+#: ../urpmi:1
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "Initializing..."
 msgstr ""
 
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "Argraffu tudalennau prawf"
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "Argraffu tudalennau prawf"
+
 #: ../urpm.pm:1
 #, c-format
-msgid "examining synthesis file [%s]"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
 #: ../urpm.pm:1
 #, c-format
-msgid "building hdlist [%s]"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:1
 #, c-format
-msgid "reading headers from medium \"%s\""
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:1
 #, c-format
-msgid "performing second pass to compute dependencies\n"
+msgid "Press Enter when ready..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
 #: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "rsync is missing\n"
+msgstr "Mae pecyn gorfodol %s ar goll"
+
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr ""
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
+
+#: ../urpmi:1
+#, fuzzy, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "chwilio"
+
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "Argraffu tudalennau prawf"
 
 #: ../urpm.pm:1
 #, c-format
-msgid "writing list file for medium \"%s\""
+msgid "building hdlist [%s]"
 msgstr ""
 
 #: ../urpm.pm:1
+#, c-format
+msgid "examining MD5SUM file"
+msgstr ""
+
+#: ../_irpm:1
 #, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "Methu creu cyfrwng."
+msgid "%s: command not found\n"
+msgstr "Heb ganfod ffeil  RPM"
 
 #: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "Methu rhedeg porwr"
+
+#: ../urpmi:1
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -i             - print usefull information in human readeable form.\n"
+msgstr "enw"
+
 #: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "Methu creu cyfrwng."
+msgid "unable to handle protocol: %s"
+msgstr "Methu rhedeg porwr"
 
 #: ../urpm.pm:1
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "retrieving hdlists file..."
 msgstr ""
 
 #: ../urpm.pm:1
 #, c-format
-msgid "retrieve of source hdlist (or synthesis) failed"
+msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:1
 #, c-format
-msgid "md5sum mismatch"
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
 #: ../urpm.pm:1
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
 #: ../urpm.pm:1
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
+msgid "md5sum mismatch"
 msgstr ""
 
 #: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "syntax error in config file at line %s"
+msgstr "Methu rhedeg porwr"
+
+#: ../urpmi:1
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
 #, c-format
-msgid "examining MD5SUM file"
+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"
+
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr " dim gyrrwr wedi ei osod."
 
 #: ../urpm.pm:1
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "chwilio"
+
+#: ../urpmi:1
 #, c-format
-msgid "retrieving description file of \"%s\"..."
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
 #: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "Methu estyn pecynnau ffynhonnell."
+
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "retrieving mirrors at %s ..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:1
 #, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "Methu rhedeg porwr"
+msgid "  --url          - print tag url: url.\n"
+msgstr "Argraffu tudalennau prawf"
 
 #: ../urpm.pm:1
 #, c-format
-msgid "reading rpm files from [%s]"
+msgid "unknown protocol defined for %s"
+msgstr "protocol anhysbys ar gyfer %s"
+
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "enw"
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 
 #: ../urpm.pm:1
 #, c-format
-msgid "...copying done"
+msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...copying failed"
-msgstr "methodd y gosodiad"
+#: ../_irpm:1 ../urpmi:1
+#, c-format
+msgid "installing %s\n"
+msgstr "gosod %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:1
 #, c-format
-msgid "copying source list of \"%s\"..."
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
 #: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy of [%s] failed"
-msgstr "methodd y gosodiad"
+msgid "unable to remove package %s"
+msgstr "Methu estyn pecynnau ffynhonnell."
 
 #: ../urpm.pm:1
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgid "problem reading synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:1
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:1
+#, fuzzy, c-format
+msgid "  -a             - select all media.\n"
+msgstr "Argraffu tudalennau prawf"
+
+#: ../urpmi:1
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "Missing signature (%s)"
 msgstr ""
 
 #: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "Methu rhedeg porwr"
+
+#: ../urpm/parallel_ka_run.pm:1
 #, c-format
-msgid "removing medium \"%s\""
-msgstr ""
+msgid "mput failed, maybe a node is unreacheable"
+msgstr "methodd mput, efallai bod nod yn anghyraeddadwy"
+
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
+
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid " (Y/n) "
+msgstr " (Y/n) "
 
 #: ../urpm.pm:1
 #, c-format
-msgid "selecting multiple media: %s"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:1
 #, c-format
-msgid "\"%s\""
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
 
 #: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "Methu creu cyfrwng."
+#, c-format
+msgid "malformed input: [%s]"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:1
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "removing package %s will break your system"
+msgstr "bydd tynnu pecynnau %s yn torri'r system"
+
+#: ../urpmq:1
+#, c-format
+msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:1
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
+
 #: ../urpm.pm:1
 #, c-format
-msgid "retrieving hdlists file..."
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:1
 #, c-format
-msgid "copying hdlists file..."
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - defnyddio curl i estyn ffeiliau pell.\n"
+
+#: ../urpmf:1
 #, fuzzy, c-format
-msgid "unable to access first installation medium"
-msgstr "Methu rhedeg porwr"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "enw"
 
 #: ../urpm.pm:1
 #, c-format
-msgid "added medium %s"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+
+#: ../urpm.pm:1 ../urpmi.addmedia:1
+#, c-format
+msgid "...retrieving done"
 msgstr ""
 
 #: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
 #: ../urpm.pm:1
@@ -579,198 +758,253 @@ msgstr ""
 msgid "skipping package %s"
 msgstr "pecyn anhysbys"
 
+#: ../urpmq:1
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
+
 #: ../urpm.pm:1
 #, c-format
 msgid "problem reading hdlist file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:1
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr ""
+
+#: ../urpmi:1
 #, fuzzy, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
-msgstr "Argraffu tudalennau prawf"
+"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 ""
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
 
 #: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
+msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "Methu creu cyfrwng."
 
-#: ../urpm.pm:1
-#, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr ""
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
 #: ../urpm.pm:1
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
 #: ../urpm.pm:1
 #, c-format
-msgid "examining parallel handler in file [%s]"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
 #: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "Methu rhedeg porwr"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "write config file [%s]"
-msgstr ""
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "Methu creu cyfrwng."
 
 #: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to write config file [%s]"
-msgstr "Methu rhedeg porwr"
+msgid "due to conflicts with %s"
+msgstr "Mae %s yn gwrthdaro gyda %s"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "unable to update medium \"%s\"\n"
 msgstr "Methu creu cyfrwng."
 
-#: ../urpm.pm:1
+#: ../urpmi:1
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
 #: ../urpm.pm:1
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "Preparing..."
 msgstr ""
 
 #: ../urpm.pm:1
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "chwilio"
+
+#: ../urpmi:1
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
 #: ../urpm.pm:1
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
 #: ../urpm.pm:1
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:1
 #, fuzzy, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "Methu rhedeg porwr"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 
-#: ../urpm.pm:1
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "Methu rhedeg porwr"
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+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 ""
 
 #: ../urpm.pm:1
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
 #: ../urpm.pm:1
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "...copying done"
 msgstr ""
 
 #: ../urpm.pm:1
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "Methu creu cyfrwng."
 
 #: ../urpm.pm:1
-#, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
+#, fuzzy, c-format
+msgid "unable to access first installation medium"
+msgstr "Methu rhedeg porwr"
 
 #: ../urpm.pm:1
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "syntax error in config file at line %s"
-msgstr "Methu rhedeg porwr"
-
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% wedi cwblhau, cyflymder = %s"
+msgid "on node %s"
+msgstr "ar nod %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% o %s wedi cwblhau, Cyrraedd = %s, cyflymder = %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - cyfyngu cyflymder y llwytho i lawr.\n"
 
 #: ../urpm.pm:1
 #, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "methodd rsync:gadael gyda %d neu signal %d\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "ssh is missing\n"
-msgstr "Mae pecyn gorfodol %s ar goll"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s\n"
+"do you agree ?"
+msgstr ""
+"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
+"\n"
+"%s\n"
+"\n"
+"Ydi hi'n iawn parhau?"
 
 #: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "rsync is missing\n"
-msgstr "Mae pecyn gorfodol %s ar goll"
+#, c-format
+msgid "no rpm files found from [%s]"
+msgstr ""
 
 #: ../urpm.pm:1
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "methodd curl: gadael gyda %d neu signal %d\n"
+msgid "nothing written in list file for \"%s\""
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "curl is missing\n"
-msgstr "Mae pecyn gorfodol %s ar goll"
+msgid "The following packages have bad signatures"
+msgstr ""
+"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
+"\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:1
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "methodd wget: gadael gyda%d neu signal %d\n"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr ""
 
 #: ../urpm.pm:1
+#, c-format
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr ""
+
+#: ../urpmq:1
 #, fuzzy, c-format
-msgid "wget is missing\n"
-msgstr "Mae pecyn gorfodol %s ar goll"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
 
 #: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "methodd y gosodiad"
+msgid "unable to install package %s"
+msgstr "Rhaid eich bod yn wraidd i osod pecyn."
+
+#: ../urpmi:1
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+
+#: ../urpmq:1
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
 
 #: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to handle protocol: %s"
+msgid "unable to write config file [%s]"
 msgstr "Methu rhedeg porwr"
 
 #: ../urpm.pm:1
@@ -778,127 +1012,101 @@ msgstr "Methu rhedeg porwr"
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr "heb ganfod webfetch (curl na wget)\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protocol anhysbys ar gyfer %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Webfetch `%s' anhysbys!!!\n"
-
 #: ../urpme:1
 #, fuzzy, c-format
-msgid "Removing failed"
-msgstr "Ail-lwytho %s"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
 
-#: ../urpme:1
+#: ../urpmi:1
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr ""
+
+#: ../urpmi:1 ../urpmq:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu tynnu (%d MB)"
 
-#: ../urpme:1
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "Checking to remove the following packages"
-msgstr "Mae angen un o'r pecynnau canlynol:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "Methu creu cyfrwng."
 
-#: ../urpme:1
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "Nothing to remove"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:1
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "bydd tynnu pecynnau %s yn torri'r system"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
-#: ../urpme:1
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unknown package"
-msgstr "pecyn anhysbys"
+msgid "wget is missing\n"
+msgstr "Mae pecyn gorfodol %s ar goll"
 
 #: ../urpme:1
 #, fuzzy, c-format
-msgid "unknown packages"
-msgstr "pecyn anhysbys"
+msgid "Checking to remove the following packages"
+msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../urpme:1
+#: ../urpm.pm:1
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
+msgid "unable to access rpm file [%s]"
+msgstr "Methu rhedeg porwr"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:1
 #, fuzzy, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "enw"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files         - print tag files: all files (multiple lines)."
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr ""
-"  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "Methu rhedeg porwr"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
-
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid "Do you want to continue installation ?"
 msgstr ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "Argraffu tudalennau prawf"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "Methu creu cyfrwng."
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+#: ../urpm.pm:1
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:1
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --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 ""
-"galw nôl yw: \n"
-"%s\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
+#: ../urpmi.addmedia:1
+#, c-format
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
-"gywir.\n"
 
-#: ../urpmf:1
+#: ../urpm/parallel_ssh.pm:1
 #, fuzzy, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr ""
-"  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
-"gywir.\n"
+msgid "host %s does not have a good version of urpmi"
+msgstr "nid oes gan y gwesteiwr fersiwn dda o urpmi"
 
 #: ../urpmf:1
 #, fuzzy, c-format
@@ -907,111 +1115,135 @@ msgstr ""
 "  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
 "gywir.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:1
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+msgid "unmounting %s"
 msgstr ""
-"  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
-"gywir.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:1
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
-"  -a             - gweithredwr deuaidd AND, gwir os yw'r ddau ymadrodd yn "
-"gywir.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:1 ../urpmi:1
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% wedi cwblhau, cyflymder = %s"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "examining synthesis file [%s]"
+msgstr ""
+
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "enw"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "grym "
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "enw"
+msgid "...copying failed"
+msgstr "methodd y gosodiad"
 
-#: ../urpmf:1
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "chwilio"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "Methu rhedeg porwr"
 
-#: ../urpmf:1
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgid "  -q             - quiet mode.\n"
+msgstr "enw"
 
 #: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files         - print tag files: all files (multiple lines)."
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - give all source packages before downloading (root only).\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+#: ../urpmq:1
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --requires      - tag argraffu'n darparu: all requires (multiple lines)."
 
-#: ../urpmf:1
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+msgid "unknown packages"
+msgstr "pecyn anhysbys"
+
+#: ../urpm.pm:1
+#, c-format
+msgid "selecting multiple media: %s"
 msgstr ""
-"  --provides      - tag argraffu'n darparu: pob darpariaeth (llinellau "
-"lluosog)."
 
-#: ../urpmf:1
+#: ../urpmf:1 ../urpmq:1
 #, fuzzy, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "Argraffu tudalennau prawf"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "enw"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --files         - print tag files: all files (multiple lines)."
+#: ../urpm.pm:1
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr ""
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "Argraffu tudalennau prawf"
+#: ../urpmi.removemedia:1
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "Argraffu tudalennau prawf"
+#: ../urpm.pm:1
+#, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
 #, fuzzy, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "Argraffu tudalennau prawf"
+msgid "Installation failed on node %s"
+msgstr "Methodd y gosodiad"
 
-#: ../urpmf:1
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "Argraffu tudalennau prawf"
+msgid "curl is missing\n"
+msgstr "Mae pecyn gorfodol %s ar goll"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "Argraffu tudalennau prawf"
+#: ../urpm.pm:1
+#, c-format
+msgid "found parallel handler for nodes: %s"
+msgstr ""
 
 #: ../urpmf:1
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"galw nôl yw: \n"
+"%s\n"
+
+#: ../urpmq:1
 #, fuzzy, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "Argraffu tudalennau prawf"
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "chwilio"
 
 #: ../urpmf:1
 #, fuzzy, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "Argraffu tudalennau prawf"
+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"
+msgstr ""
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
 
 #: ../urpmf:1
 #, fuzzy, c-format
@@ -1022,15 +1254,10 @@ msgstr ""
 "  --name          - argraffu enw'r tag: enw ffeil rpm (dyfaliad os nad oed "
 "tag yn cael ei gynnig"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "Argraffu tudalennau prawf"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "Argraffu tudalennau prawf"
+#: ../urpm.pm:1
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "Webfetch `%s' anhysbys!!!\n"
 
 #: ../urpmf:1
 #, fuzzy, c-format
@@ -1043,438 +1270,396 @@ msgstr ""
 "yn cael ei roi ar "
 
 #: ../urpmf:1
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr ""
-
-#: ../urpmf:1 ../urpmq:1
-#, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, fuzzy, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, fuzzy, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "Argraffu tudalennau prawf"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
+msgstr "Argraffu tudalennau prawf"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
-
-#: ../urpmf:1
-#, fuzzy, 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"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Everything already installed"
-msgstr "Pecynnau wedi eu gosod eisoes"
-
-#: ../urpmi:1 ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
-#, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "Methodd y gosodiad"
+#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#, c-format
+msgid "Is this OK?"
+msgstr "Mae'r model yn gywir"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "methodd y gosodiad"
+#: ../urpmf:1 ../urpmq:1
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
 #: ../urpmi:1
 #, fuzzy, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "grym "
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr ""
+"I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu tynnu (%d MB)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpme:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "distributing %s\n"
-msgstr "gosod %s\n"
-
-#: ../urpmi:1
+#: ../urpmq:1
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
 #: ../urpmi:1
-#, fuzzy, c-format
-msgid " (y/N) "
-msgstr " (Y/n) "
-
-#: ../urpmi:1
 #, c-format
-msgid "Do you want to continue installation ?"
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "The following packages have bad signatures"
+#: ../urpm.pm:1
+#, c-format
+msgid "reading headers from medium \"%s\""
 msgstr ""
-"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
-"\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:1
 #, c-format
-msgid "Press Enter when ready..."
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "methodd wget: gadael gyda%d neu signal %d\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "Downloading package `%s'..."
-msgstr "Methu estyn pecynnau ffynhonnell."
+msgid "copy failed: %s"
+msgstr "methodd y gosodiad"
 
-#: ../urpmi:1
-#, c-format
-msgid "Initializing..."
-msgstr ""
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "Argraffu tudalennau prawf"
 
-#: ../urpmi:1
-#, c-format
-msgid "Package installation..."
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
+"  --requires      - tag argraffu'n darparu: all requires (multiple lines)."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "unable to get source packages, aborting"
-msgstr "Methu estyn pecynnau ffynhonnell."
+msgid "unable to write list file of \"%s\""
+msgstr "Methu creu cyfrwng."
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+#: ../urpme:1
+#, c-format
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
 msgstr ""
-"I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu tynnu (%d MB)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
-msgstr "Rhaid eich bod yn wraidd i osod pecyn."
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "Methu creu cyfrwng."
 
-#: ../urpmi:1
+#: ../urpmf:1
 #, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "Argraffu tudalennau prawf"
+
+#: ../urpmi.addmedia:1
+#, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"do you agree ?"
+"`with' missing for network media\n"
 msgstr ""
-"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
-"\n"
-"%s\n"
-"\n"
-"Ydi hi'n iawn parhau?"
 
-#: ../urpmi:1
+#: ../urpm/parallel_ka_run.pm:1
 #, c-format
-msgid "unrequested"
-msgstr ""
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr "methodd rshp, efallai bod nod yn anghyraeddadwy"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:1 ../urpmi.update:1
 #, fuzzy, c-format
-msgid "due to conflicts with %s"
-msgstr "Mae %s yn gwrthdaro gyda %s"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
 
-#: ../urpmi:1
+#: ../urpmq:1
 #, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "Mae pecyn gorfodol %s ar goll"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "Argraffu tudalennau prawf"
 
-#: ../urpmi:1
+#: ../urpm.pm:1
 #, c-format
-msgid "due to unsatisfied %s"
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "in order to install %s"
-msgstr " dim gyrrwr wedi ei osod."
-
-#: ../urpmi:1
+#: ../urpmi:1 ../urpmq:1
 #, fuzzy, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
-msgstr "Nid oes modd gosod rhai pecynnau"
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
 
-#: ../urpmi:1
+#: ../urpm.pm:1
 #, c-format
-msgid "Sorry, bad choice, try again\n"
+msgid "reading rpm files from [%s]"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1
 #, c-format
-msgid "What is your choice? (1-%d) "
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpmi:1
-#, c-format
-msgid "One of the following packages is needed:"
-msgstr "Mae angen un o'r pecynnau canlynol:"
+#: ../urpme:1 ../urpmi:1
+#, fuzzy, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 
-#: ../urpmi:1
+#: ../urpme:1
 #, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Mae angen un o'r pecynnau canlynol:"
+msgid "Removing failed"
+msgstr "Ail-lwytho %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1
 #, c-format
-msgid "Only superuser is allowed to install packages"
+msgid "package %s is not found."
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "ddefnyddio amgylchedd penodol ar %s\n"
+msgid "removing medium \"%s\""
+msgstr ""
 
-#: ../urpmi:1
+#: ../_irpm:1 ../urpmi:1
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr ""
+msgid "Cancel"
+msgstr "Dileu"
 
-#: ../urpmi:1
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
 #: ../urpmi:1
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgid ""
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "ssh is missing\n"
+msgstr "Mae pecyn gorfodol %s ar goll"
 
 #: ../urpmi:1
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
+msgid "  --split-level  - build small transaction of minimal given length.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, fuzzy, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "enw"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
+msgid "unable to access medium \"%s\""
+msgstr "Methu creu cyfrwng."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:1
 #, fuzzy, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "enw"
+msgid "unable to create medium \"%s\"\n"
+msgstr "Methu creu cyfrwng."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm/parallel_ssh.pm:1
 #, fuzzy, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "chwilio"
+msgid "scp failed on host %s"
+msgstr "methodd y gosodiad"
 
-#: ../urpmi:1
+#: ../urpmf:1
 #, fuzzy, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "chwilio"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "Argraffu tudalennau prawf"
 
 #: ../urpmi:1
 #, fuzzy, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "enw"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr "Rhaid eich bod yn wraidd i osod pecyn."
 
-#: ../urpmi:1
-#, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "Methu rhedeg porwr"
+
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
+"  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
+"gywir.\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:1
 #, c-format
-msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+msgid "examining hdlist file [%s]"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:1
 #, fuzzy, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "Argraffu tudalennau prawf"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --files         - print tag files: all files (multiple lines)."
 
-#: ../urpmi:1
+#: ../urpm.pm:1
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+msgid "writing list file for medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpme:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
 msgstr ""
+"  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "gosod %s\n"
+
+#: ../urpm.pm:1
 #, c-format
 msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
-"  --proxy        - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
-"                   rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
-#, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - cyfyngu cyflymder y llwytho i lawr.\n"
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "unable to get source packages, aborting"
+msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - defnyddio curl i estyn ffeiliau pell.\n"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "methodd rsync:gadael gyda %d neu signal %d\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1 ../urpmi:1
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% o %s wedi cwblhau, Cyrraedd = %s, cyflymder = %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1
 #, c-format
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 
 #: ../urpmi:1
 #, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
-#, c-format
+#: ../urpmq:1
+#, fuzzy, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"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 ""
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
 
-#: ../urpmi:1
+#: ../urpm.pm:1
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:1
+#, fuzzy, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "enw"
+
+#: ../urpm.pm:1
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
 #: ../urpmi:1
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
+msgid "Only superuser is allowed to install packages"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:1
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
+msgid "using specific environment on %s\n"
+msgstr "ddefnyddio amgylchedd penodol ar %s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmf:1
 #, fuzzy, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+"  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
+"gywir.\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:1
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
+#: ../urpmf:1
+#, 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"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
+"  -a             - gweithredwr deuaidd AND, gwir os yw'r ddau ymadrodd yn "
+"gywir.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:1
 #, fuzzy, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "Methu creu cyfrwng."
+msgid "  --group        - print tag group: group.\n"
+msgstr "Argraffu tudalennau prawf"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, fuzzy, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "Methu creu cyfrwng."
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpmi.addmedia:1
-#, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "unable to create transaction"
+msgstr "Methu creu cyfrwng."
 
 #: ../urpmi.addmedia:1
 #, c-format
@@ -1483,305 +1668,165 @@ msgid ""
 "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
-#, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr ""
-
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
+msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../urpme:1
 #, c-format
 msgid ""
-"\n"
-"unknown options '%s'\n"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
+"I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu tynnu (%d MB)"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
-#, fuzzy, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
-
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../urpmi:1
 #, fuzzy, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
+msgid "Installation failed"
+msgstr "methodd y gosodiad"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1
 #, c-format
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+msgid "write config file [%s]"
 msgstr ""
 
-#: ../urpmi.addmedia:1
-#, 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"
-msgstr ""
+#: ../urpmi.update:1
+#, fuzzy, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpmi.addmedia:1
-#, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
+#: ../urpmf:1
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "Argraffu tudalennau prawf"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:1
 #, 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"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:1
 #, c-format
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
-#: ../urpmi.addmedia:1
-#, c-format
+#: ../urpmi:1
+#, fuzzy, c-format
 msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr ""
-
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
+"Some package requested cannot be installed:\n"
+"%s\n"
+"do you agree ?"
+msgstr "Nid oes modd gosod rhai pecynnau"
 
 #: ../urpmi.addmedia:1
 #, fuzzy, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:1 ../urpmq:1
+#, fuzzy, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "enw"
+
+#: ../_irpm:1 ../urpmi:1
 #, 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 ""
+msgid "Ok"
+msgstr "Iawn"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\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 ""
 
-#: ../urpmi.removemedia:1
+#: ../urpmf:1
 #, fuzzy, c-format
-msgid "  -a             - select all media.\n"
+msgid "  --size         - print tag size: size.\n"
 msgstr "Argraffu tudalennau prawf"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../_irpm:1
 #, c-format
 msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-
-#: ../urpmi.update:1
-#, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
+"Gosodiad pecynnau awtomatig...\n"
+"Roeddech wedi gofyn i gael gosod pecyn %s\n"
 
-#: ../urpmi.update:1
-#, fuzzy, c-format
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
-
-#: ../urpmi.update:1
-#, fuzzy, c-format
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
-
-#: ../urpmi.update:1
-#, fuzzy, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
-
-#: ../urpmi.update:1
+#: ../urpm.pm:1
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "urpmi database locked"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:1
 #, fuzzy, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "Argraffu tudalennau prawf"
-
-#: ../urpmq:1
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
+msgid "copy of [%s] failed"
+msgstr "methodd y gosodiad"
 
-#: ../urpmq:1
+#: ../urpm.pm:1
 #, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:1 ../urpmq:1
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
 #: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "enw"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "enw"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -i             - print usefull information in human readeable form.\n"
-msgstr "enw"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "chwilio"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
-
-#: ../urpmq:1
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:1
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:1
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "Mae pecyn gorfodol %s ar goll"
+
+#: ../urpmf:1 ../urpmi:1 ../urpmq:1
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpmq:1
+#: ../urpmi.update:1
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:1
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "Argraffu tudalennau prawf"
-
-#: ../urpmq:1
+#: ../urpme:1 ../urpmi:1
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr ""
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "Argraffu tudalennau prawf"
-
-#: ../urpmq:1
-#, 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"
-"\n"
-"usage:\n"
-msgstr ""
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
-
-#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
-#, fuzzy, c-format
-msgid "Installation failed on node %s"
-msgstr "Methodd y gosodiad"
-
-#: ../urpm/parallel_ka_run.pm:1
-#, c-format
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "methodd rshp, efallai bod nod yn anghyraeddadwy"
-
-#: ../urpm/parallel_ka_run.pm:1
-#, c-format
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "methodd mput, efallai bod nod yn anghyraeddadwy"
-
-#: ../urpm/parallel_ka_run.pm:1 ../urpm/parallel_ssh.pm:1
-#, c-format
-msgid "on node %s"
-msgstr "ar nod %s"
-
-#: ../urpm/parallel_ssh.pm:1
-#, fuzzy, c-format
-msgid "scp failed on host %s"
-msgstr "methodd y gosodiad"
-
-#: ../urpm/parallel_ssh.pm:1
-#, fuzzy, c-format
-msgid "host %s does not have a good version of urpmi"
-msgstr "nid oes gan y gwesteiwr fersiwn dda o urpmi"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
 
 #~ msgid "%s conflicts with %s"
 #~ msgstr "Mae %s yn gwrthdaro gyda %s"