Changed remaining gettext("foo $bar") into _("foo %s", $bar)

Added russian man pages
redo the way the *.pot file is created
rebuild *.po files

1 files changed, 845 insertions, 957 deletions

diff --git a/po/cy.po b/po/cy.po
index c68aa96e..68670016 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: 2002-08-13 12:00+0200\n"
+"POT-Creation-Date: 2002-08-24 02:19+0200\n"
 "PO-Revision-Date: 2002-03-07 21:04-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@ntlworld.com>\n"
 "Language-Team: Cymraeg/Welsh <cy@li.org>\n"
@@ -13,1406 +13,1294 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-14\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _irpm:18
-msgid "installing $rpm\n"
-msgstr "gosod $rpm\n"
+#: ../_irpm_.c:23 ../urpmi_.c:495
+#, c-format
+msgid "installing %s\n"
+msgstr "gosod %s\n"
 
-#: _irpm:28
+#: ../_irpm_.c:33
+#, c-format
 msgid ""
 "Automatic installation of packages...\n"
-"You requested installation of package $rpm\n"
+"You requested installation of package %s\n"
 msgstr ""
 "Gosodiad pecynnau awtomatig...\n"
-"Roeddech wedi gofyn i gael gosod pecyn $rpm\n"
+"Roeddech wedi gofyn i gael gosod pecyn %s\n"
 
-#: _irpm:28 po/placeholder.h:258 po/placeholder.h:374 po/placeholder.h:461
-#: urpme:32 urpmi:438
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:410
 #, fuzzy
 msgid "Is it OK?"
 msgstr "Mae'r model yn gywir"
 
-#: _irpm:30 po/placeholder.h:247 po/placeholder.h:445 urpmi:375 urpmi:392
-#: urpmi:441 urpmi:469 urpmi:497
+#: ../_irpm_.c:35 ../urpmi_.c:347 ../urpmi_.c:364 ../urpmi_.c:413
+#: ../urpmi_.c:441 ../urpmi_.c:469
 msgid "Ok"
 msgstr "Iawn"
 
-#: _irpm:31 po/placeholder.h:209 po/placeholder.h:380 urpmi:376 urpmi:393
-#: urpmi:442 urpmi:470 urpmi:498
+#: ../_irpm_.c:36 ../urpmi_.c:348 ../urpmi_.c:365 ../urpmi_.c:414
+#: ../urpmi_.c:442 ../urpmi_.c:470
 msgid "Cancel"
 msgstr "Dileu"
 
-#. This is a list of chars acceptable as a 'no' answer to a Yes/No question;
-#. you can put here the letters for 'no' for your language, so people
-#. can hit those keys in their keyboard to reply.
-#. please keep the 'Nn' for compatibility reasons
-#.
-#: _irpm:37 po/placeholder.h:17 po/placeholder.h:227 po/placeholder.h:379
-#: po/placeholder.h:410 urpme:35 urpmi:380 urpmi:397 urpmi:446 urpmi:502
-#: urpmi:543
+#. Translator: Add here the keys which might be pressed in the "No"-case.
+#: ../_irpm_.c:42 ../urpme_.c:35 ../urpmi_.c:352 ../urpmi_.c:369
+#: ../urpmi_.c:418 ../urpmi_.c:474 ../urpmi_.c:522 placeholder.h:17
 msgid "Nn"
 msgstr "Nn"
 
-#. This is a list of chars acceptable as a 'yes' answer to a Yes/No question;
-#. you can put here the letters for 'yes' for your language, so people
-#. can hit those keys in their keyboard to reply.
-#. please keep the 'Yy' for compatibility reasons
-#.
-#: _irpm:38 po/placeholder.h:11 po/placeholder.h:116 po/placeholder.h:372
-#: po/placeholder.h:412 urpme:37 urpmi:381 urpmi:398 urpmi:447 urpmi:503
-#: urpmi:544
+#. Translator: Add here the keys which might be pressed in the "Yes"-case.
+#: ../_irpm_.c:43 ../urpme_.c:37 ../urpmi_.c:353 ../urpmi_.c:370
+#: ../urpmi_.c:419 ../urpmi_.c:475 ../urpmi_.c:523 placeholder.h:11
 msgid "Yy"
 msgstr "Yy"
 
-#: _irpm:39 po/placeholder.h:249 po/placeholder.h:369 po/placeholder.h:449
-#: urpme:126 urpmi:382 urpmi:399 urpmi:448
+#: ../_irpm_.c:44 ../urpme_.c:126 ../urpmi_.c:354 ../urpmi_.c:371
+#: ../urpmi_.c:420
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: _irpm:58
-#, fuzzy
-msgid "$rpm: command not found\n"
-msgstr "Heb ganfod ffeil  RPM"
-
-#: po/placeholder.h:18 po/placeholder.h:195
+#: ../_irpm_.c:63
 #, fuzzy, c-format
-msgid "urpmf version %s"
-msgstr "Fersiwn y Cnewyllyn:"
-
-#: po/placeholder.h:19 po/placeholder.h:150
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Hawlfraint (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgid "%s: command not found\n"
+msgstr "Heb ganfod ffeil  RPM"
 
-#: po/placeholder.h:20 po/placeholder.h:191
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#. Translator: the %s here is a program name
+#: ../urpm.pm_.c:178
+#, c-format
+msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
 
-#: po/placeholder.h:21 po/placeholder.h:38 po/placeholder.h:165
-msgid "usage: urpmf [options] <file>"
-msgstr "defnydd: urpmf [dewisiadau] <ffeil>"
-
-#: po/placeholder.h:22 po/placeholder.h:139
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+#: ../urpm.pm_.c:197
+#, c-format
+msgid "unknown protocol defined for %s"
 msgstr ""
-"  --quiet         - peidiwch argraffu enw tag (rhagosodedig os nad oes tag "
-"yn cael ei roi ar "
 
-#: po/placeholder.h:23 po/placeholder.h:192
-msgid "                    line, incompatible with interactive mode)."
+#: ../urpm.pm_.c:206
+msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
-"                    linell orchymyn , imae'n anghytūn a'r modd "
-"rhyngweithiol)."
 
-#: po/placeholder.h:24 po/placeholder.h:160
+#: ../urpm.pm_.c:218
+#, fuzzy, c-format
+msgid "unable to handle protocol: %s"
+msgstr "Methu rhedeg porwr"
+
+#: ../urpm.pm_.c:221
 #, fuzzy
-msgid "  --all           - print all tags."
-msgstr "Argraffu tudalennau prawf"
+msgid "wget is missing\n"
+msgstr "Mae pecyn gorfodol %s ar goll"
 
-#: po/placeholder.h:25 po/placeholder.h:201
-msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+#: ../urpm.pm_.c:227
+#, c-format
+msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
-"  --name          - argraffu enw'r tag: enw ffeil rpm (dyfaliad os nad oed "
-"tag yn cael ei gynnig"
-
-#: po/placeholder.h:26 po/placeholder.h:205
-msgid "                    command line but without package name)."
-msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
-
-#: po/placeholder.h:27 po/placeholder.h:132
-#, fuzzy
-msgid "  --group         - print tag group: group."
-msgstr "Argraffu tudalennau prawf"
 
-#: po/placeholder.h:28 po/placeholder.h:114
+#: ../urpm.pm_.c:230
 #, fuzzy
-msgid "  --size          - print tag size: size."
-msgstr "Argraffu tudalennau prawf"
+msgid "curl is missing\n"
+msgstr "Mae pecyn gorfodol %s ar goll"
 
-#: po/placeholder.h:29 po/placeholder.h:170
-#, fuzzy
-msgid "  --serial        - print tag serial: serial."
-msgstr "Argraffu tudalennau prawf"
+#: ../urpm.pm_.c:287
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
 
-#: po/placeholder.h:30 po/placeholder.h:183
+#: ../urpm.pm_.c:291
 #, fuzzy
-msgid "  --summary       - print tag summary: summary."
-msgstr "Argraffu tudalennau prawf"
+msgid "rsync is missing\n"
+msgstr "Mae pecyn gorfodol %s ar goll"
 
-#: po/placeholder.h:31 po/placeholder.h:154
+#: ../urpm.pm_.c:292
 #, fuzzy
-msgid "  --description   - print tag description: description."
-msgstr "Argraffu tudalennau prawf"
+msgid "ssh is missing\n"
+msgstr "Mae pecyn gorfodol %s ar goll"
 
-#: po/placeholder.h:32 po/placeholder.h:174
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: ../urpm.pm_.c:302
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
 msgstr ""
-"  --provides      - tag argraffu'n darparu: pob darpariaeth (llinellau "
-"lluosog)."
 
-#: po/placeholder.h:33 po/placeholder.h:238
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: ../urpm.pm_.c:338 ../urpm.pm_.c:350
+#, c-format
+msgid "syntax error in config file at line %s"
 msgstr ""
-"  --requires      - tag argraffu'n darparu: all requires (multiple lines)."
 
-#: po/placeholder.h:34 po/placeholder.h:55
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - print tag files: all files (multiple lines)."
+#: ../urpm.pm_.c:359
+#, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
 
-#: po/placeholder.h:35 po/placeholder.h:47
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#: ../urpm.pm_.c:362
+#, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 
-#: po/placeholder.h:36 po/placeholder.h:136
+#: ../urpm.pm_.c:377
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-
-#: po/placeholder.h:37 po/placeholder.h:162
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-
-#: po/placeholder.h:39 po/placeholder.h:84
-msgid "try urpmf --help for more options"
-msgstr "try urpmf --help for more options"
-
-#: po/placeholder.h:40 po/placeholder.h:65
-msgid "no full media list was found"
-msgstr "ni chanfyddwyd restr cyfrwng llawn"
 
-#: po/placeholder.h:41 po/placeholder.h:269
+#: ../urpm.pm_.c:383
 #, fuzzy, c-format
-msgid "unable to write config file [%s]"
-msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "enw"
 
-#: po/placeholder.h:42 po/placeholder.h:270 urpm.pm:1896
+#: ../urpm.pm_.c:390
 #, c-format
-msgid "%s conflicts with %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:43
-msgid "examining whole urpmi database"
-msgstr "archwilio cronfa ddata urpmi gyfan"
-
-#: po/placeholder.h:44
-#, fuzzy
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "Chwilio am ffontiau wedi eu gosod"
-
-#: po/placeholder.h:45 po/placeholder.h:275 urpm.pm:429
+#: ../urpm.pm_.c:394
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "methu canfod ffeil rhestr ar gyfer \"%s\", cyfrwng wedi ei anwybyddu"
-
-#: po/placeholder.h:46 po/placeholder.h:273
-#, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr "dim byd i'w ysgrifennu yn ffeil rhestr ar gyfer \"%s\""
-
-#: po/placeholder.h:48 po/placeholder.h:276
-#, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "Methu canfod ffeil menudrake .glade"
-
-#: po/placeholder.h:49 po/placeholder.h:400
-#, fuzzy
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
 
-#: po/placeholder.h:50 po/placeholder.h:277
+#: ../urpm.pm_.c:403
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "dim wedi ei ysgrifennu yn y ffeil rhestr ar gyfer \"%s\""
-
-#: po/placeholder.h:51 po/placeholder.h:580
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - give all source packages before downloading (root only).\n"
-
-#: po/placeholder.h:52
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
 
-#: po/placeholder.h:53 po/placeholder.h:279
+#: ../urpm.pm_.c:405
 #, c-format
-msgid "retrieving description file of \"%s\"..."
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:54 po/placeholder.h:281 urpm.pm:1661
-#, fuzzy, c-format
-msgid "package %s is not found."
-msgstr "Nid yw pecyn %s wedi ei lofnodi"
-
-#: po/placeholder.h:56
+#: ../urpm.pm_.c:419
 #, c-format
-msgid "trying to select multiple media: %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:57 po/placeholder.h:285
+#: ../urpm.pm_.c:425
 #, c-format
-msgid "selecting multiple media: %s"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:58
+#: ../urpm.pm_.c:430
 #, c-format
-msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:59 po/placeholder.h:368 urpme:53
-#, fuzzy
-msgid "unknown package(s) "
-msgstr "Pecyn anhysbys i urpmq"
-
-#: po/placeholder.h:60 po/placeholder.h:286 urpm.pm:382
-#, fuzzy, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "enw"
-
-#: po/placeholder.h:61
-msgid "problem reading hdlist file, trying again"
-msgstr ""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "methu canfod ffeil rhestr ar gyfer \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: po/placeholder.h:62 po/placeholder.h:289 urpm.pm:389
+#: ../urpm.pm_.c:449
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-
-#: po/placeholder.h:63
-msgid "keeping only files referenced in provides"
+msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:64 po/placeholder.h:290
+#: ../urpm.pm_.c:457
 #, c-format
-msgid "found %d headers in cache"
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:66 po/placeholder.h:483 urpmi.addmedia:96
-#: urpmi.addmedia:113
+#: ../urpm.pm_.c:488
 #, fuzzy, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "Methu rhedeg porwr"
-
-#: po/placeholder.h:67 po/placeholder.h:436 po/placeholder.h:560
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-
-#: po/placeholder.h:68 po/placeholder.h:438
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr ""
+msgid "too many mount points for removable medium \"%s\""
+msgstr "pwyntiau"
 
-#: po/placeholder.h:69 po/placeholder.h:488 po/placeholder.h:526
-#: po/placeholder.h:545
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
+#: ../urpm.pm_.c:489
+#, fuzzy, c-format
+msgid "taking removable device as \"%s\""
+msgstr "dyfais"
 
-#: po/placeholder.h:70 po/placeholder.h:293
+#: ../urpm.pm_.c:493
 #, fuzzy, c-format
-msgid "medium \"%s\" already exists"
-msgstr "Mae'r ffeil yn bodoli eisoes. Defnyddiwch hwn?"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "dyfais"
 
-#: po/placeholder.h:71 po/placeholder.h:292 urpm.pm:196
+#: ../urpm.pm_.c:497 ../urpm.pm_.c:500
 #, c-format
-msgid "unknown protocol defined for %s"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:72 po/placeholder.h:294
+#: ../urpm.pm_.c:513
 #, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
+msgid "unable to write config file [%s]"
 msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
 
-#: po/placeholder.h:73 po/placeholder.h:571
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:74 po/placeholder.h:296 urpm.pm:177
-msgid "Unknown webfetch `$proxy->{type}' !!!\n"
-msgstr ""
-
-#: po/placeholder.h:75 po/placeholder.h:443 po/placeholder.h:577
-#, fuzzy
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
-
-#: po/placeholder.h:76 po/placeholder.h:297 urpm.pm:1536
+#: ../urpm.pm_.c:525
 #, fuzzy, c-format
-msgid "no package named %s"
-msgstr "Dewis pecynnau unigol."
-
-#: po/placeholder.h:77 po/placeholder.h:444 urpmi:553
-#, fuzzy
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "grym "
+msgid "write config file [%s]"
+msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
 
-#: po/placeholder.h:78 po/placeholder.h:300 urpm.pm:424
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+#: ../urpm.pm_.c:539
+msgid "--synthesis cannot be used with --media, --update or --parallel"
 msgstr ""
 
-#: po/placeholder.h:79 po/placeholder.h:299
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+#: ../urpm.pm_.c:555 ../urpm.pm_.c:1138 ../urpm.pm_.c:1153 ../urpm.pm_.c:1283
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "adeiladu math 1inst"
 
-#: po/placeholder.h:80 po/placeholder.h:301
-#, fuzzy
-msgid "urpmi database locked"
-msgstr "archwilio cronfa ddata urpmi gyfan"
+#: ../urpm.pm_.c:559
+#, fuzzy, c-format
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "Y ffeil yn methu darllen ffeil\n"
 
-#: po/placeholder.h:81 po/placeholder.h:302
+#: ../urpm.pm_.c:570 ../urpm.pm_.c:864 ../urpm.pm_.c:946 ../urpm.pm_.c:1081
+#: ../urpm.pm_.c:1143 ../urpm.pm_.c:1148 ../urpm.pm_.c:1210 ../urpm.pm_.c:1278
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:82 po/placeholder.h:370 po/placeholder.h:448 urpme:64
-#: urpmi:504
-msgid " (y/N) "
-msgstr ""
+#: ../urpm.pm_.c:574 ../urpm.pm_.c:868 ../urpm.pm_.c:949 ../urpm.pm_.c:1085
+#: ../urpm.pm_.c:1213
+#, fuzzy, c-format
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "Y ffeil yn methu darllen ffeil\n"
 
-#: po/placeholder.h:83 po/placeholder.h:452
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
+#: ../urpm.pm_.c:607
+#, fuzzy, c-format
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "Methu canfod ffeil menudrake .glade"
 
-#: po/placeholder.h:85
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr ""
+#: ../urpm.pm_.c:618
+#, fuzzy, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "adeiladu math 1inst"
 
-#: po/placeholder.h:86 po/placeholder.h:305 urpm.pm:1403
+#: ../urpm.pm_.c:628
 #, c-format
-msgid "mounting %s"
+msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: po/placeholder.h:87 po/placeholder.h:506 po/placeholder.h:550
-#, fuzzy
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "grym"
-
-#: po/placeholder.h:88 po/placeholder.h:309 urpm.pm:226
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr ""
+#: ../urpm.pm_.c:632
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "Methu rhedeg porwr"
 
-#: po/placeholder.h:89 po/placeholder.h:517 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
+#: ../urpm.pm_.c:653
+#, fuzzy, c-format
+msgid "medium \"%s\" already exists"
+msgstr "Mae'r ffeil yn bodoli eisoes. Defnyddiwch hwn?"
 
-#: po/placeholder.h:90 po/placeholder.h:313 urpm.pm:1791
+#: ../urpm.pm_.c:684
 #, fuzzy, c-format
-msgid "malformed input: [%s]"
-msgstr "Mewnbwn/Allbwn"
+msgid "added medium %s"
+msgstr "(wedi ychwanegu %s yn barod)"
 
-#: po/placeholder.h:91 po/placeholder.h:463
-msgid "  --env          - use specific environment (typically a bug report).\n"
+#: ../urpm.pm_.c:699
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: po/placeholder.h:92 po/placeholder.h:466 po/placeholder.h:600
+#: ../urpm.pm_.c:703
 #, fuzzy
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "chwilio"
-
-#: po/placeholder.h:93
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
-#: po/placeholder.h:94 po/placeholder.h:472 urpmi:326
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Un:"
+msgid "copying hdlists file..."
+msgstr "Rhestr ddewis argraffu"
 
-#: po/placeholder.h:95
+#: ../urpm.pm_.c:705 ../urpm.pm_.c:923 ../urpm.pm_.c:931 ../urpm.pm_.c:964
 #, fuzzy
-msgid "Press Enter when it's done..."
-msgstr "gorffen."
+msgid "...copying done"
+msgstr "Wedi gosod True Type"
 
-#: po/placeholder.h:96 po/placeholder.h:315
+#: ../urpm.pm_.c:705 ../urpm.pm_.c:923 ../urpm.pm_.c:931 ../urpm.pm_.c:964
 #, fuzzy
 msgid "...copying failed"
 msgstr "methodd y gosodiad"
 
-#: po/placeholder.h:97 po/placeholder.h:316 urpm.pm:291
-#, fuzzy
-msgid "ssh is missing\n"
-msgstr "Mae pecyn gorfodol %s ar goll"
-
-#: po/placeholder.h:98
-#, c-format
-msgid "medium \"%s\" tries to use an already used list, medium ignored"
+#: ../urpm.pm_.c:707 ../urpm.pm_.c:721 ../urpm.pm_.c:746
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: po/placeholder.h:99 po/placeholder.h:319 urpm.pm:1878
-#, fuzzy, c-format
-msgid "unable to remove package %s"
-msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
-
-#: po/placeholder.h:100 po/placeholder.h:561
+#: ../urpm.pm_.c:713
 #, fuzzy
-msgid "  -h             - print this help message.\n"
-msgstr "Dangos y cymorth hwn a gadael"
+msgid "retrieving hdlists file..."
+msgstr "Ffeiliau Defnyddiwr Cadw wrth Gefn..."
 
-#: po/placeholder.h:101
+#: ../urpm.pm_.c:715 ../urpm.pm_.c:1019 ../urpm.pm_.c:1071 ../urpm.pm_.c:1895
 #, fuzzy
-msgid "  -g             - print groups too with name.\n"
-msgstr "enw"
+msgid "...retrieving done"
+msgstr "Wedi gosod True Type"
 
-#: po/placeholder.h:102 po/placeholder.h:527
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "Dewiswch y cyfrwng ar gyfer cadw wrth gefn..."
+#: ../urpm.pm_.c:717 ../urpm.pm_.c:1066 ../urpm.pm_.c:1897
+#, fuzzy, c-format
+msgid "...retrieving failed: %s"
+msgstr "methodd y gosodiad"
 
-#: po/placeholder.h:103 po/placeholder.h:325
+#: ../urpm.pm_.c:737
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:104 po/placeholder.h:490
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+#: ../urpm.pm_.c:779
+#, c-format
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:105 po/placeholder.h:563
-#, fuzzy
-msgid "  -r             - print version and release with name also.\n"
-msgstr "enw"
-
-#: po/placeholder.h:106
-#, fuzzy
-msgid "  -r             - print version and release too with name.\n"
-msgstr "enw"
-
-#: po/placeholder.h:107 po/placeholder.h:578
-#, fuzzy
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "enw"
+#: ../urpm.pm_.c:781
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: po/placeholder.h:108
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: ../urpm.pm_.c:781
+#, c-format
+msgid "selecting multiple media: %s"
 msgstr ""
 
-#: po/placeholder.h:109
+#: ../urpm.pm_.c:798
 #, fuzzy, c-format
-msgid "unable to parse correctly [%s]"
-msgstr "Methu rhedeg porwr"
+msgid "removing medium \"%s\""
+msgstr "Tynnu LPRng..."
 
-#: po/placeholder.h:110 po/placeholder.h:557 urpmi.update:78
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
+#: ../urpm.pm_.c:844
+#, fuzzy
+msgid "urpmi database locked"
+msgstr "archwilio cronfa ddata urpmi gyfan"
 
-#: po/placeholder.h:111
+#: ../urpm.pm_.c:888 ../urpm.pm_.c:890 ../urpm.pm_.c:1839
 #, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "Y ffeil yn methu darllen ffeil\n"
-
-#: po/placeholder.h:112 po/placeholder.h:330 urpm.pm:205
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr ""
-
-#: po/placeholder.h:113 po/placeholder.h:581
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
+msgid "unable to access medium \"%s\""
+msgstr "mynediad i offer rpm"
 
-#: po/placeholder.h:115 po/placeholder.h:504 urpmi.addmedia:112
+#: ../urpm.pm_.c:921
 #, fuzzy, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "Methu creu'r enw ssh"
+msgid "copying description file of \"%s\"..."
+msgstr "Rhestr ddewis argraffu"
 
-#: po/placeholder.h:117 po/placeholder.h:333
+#: ../urpm.pm_.c:929
 #, fuzzy, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "llwybr perthynol i synthesis neu hdlist:"
 
-#: po/placeholder.h:118 po/placeholder.h:373 urpme:85
-#, fuzzy
-msgid "unknown package "
-msgstr "Pecyn anhysbys i urpmq"
-
-#: po/placeholder.h:119 po/placeholder.h:585 urpmq:122
+#: ../urpm.pm_.c:934
 #, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "anhysbus"
-
-#: po/placeholder.h:120 po/placeholder.h:376 urpme:42
-msgid "usage: urpme [-a] [--auto] <packages...>\n"
-msgstr ""
+msgid "copy of [%s] failed"
+msgstr "methodd y gosodiad"
 
-#: po/placeholder.h:121 po/placeholder.h:335
+#: ../urpm.pm_.c:962
 #, fuzzy, c-format
-msgid "building hdlist [%s]"
-msgstr "adeiladu math 1inst"
+msgid "copying source list of \"%s\"..."
+msgstr "Rhestr ddewis argraffu"
 
-#: po/placeholder.h:122 po/placeholder.h:417 po/placeholder.h:595
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
+#: ../urpm.pm_.c:979
+#, fuzzy, c-format
+msgid "reading rpms files from [%s]"
+msgstr "Heb ganfod ffeil  RPM"
 
-#: po/placeholder.h:123 po/placeholder.h:338
+#: ../urpm.pm_.c:998
 #, fuzzy, c-format
-msgid "added medium %s"
-msgstr "(wedi ychwanegu %s yn barod)"
+msgid "unable to read rpms files from [%s]: %s"
+msgstr "Methu canfod ffeil menudrake .glade"
 
-#: po/placeholder.h:124 po/placeholder.h:337 urpm.pm:1718
+#: ../urpm.pm_.c:1003
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:125 po/placeholder.h:339
-msgid "retrieve of source hdlist (or synthesis) failed"
+#: ../urpm.pm_.c:1016
+#, c-format
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:126 po/placeholder.h:342 urpm.pm:1803
+#: ../urpm.pm_.c:1028
 #, fuzzy, c-format
-msgid "...retrieving failed: %s"
-msgstr "methodd y gosodiad"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "llwybr perthynol i synthesis neu hdlist:"
 
-#: po/placeholder.h:127 po/placeholder.h:344 urpm.pm:1734
-#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+#: ../urpm.pm_.c:1110
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:128 po/placeholder.h:343 urpm.pm:1848
-msgid "Preparing..."
+#: ../urpm.pm_.c:1117
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:129 po/placeholder.h:430
-msgid ""
-"  --bug          - output a bug report in directory indicated by next arg.\n"
+#: ../urpm.pm_.c:1129 ../urpm.pm_.c:1173
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:130 po/placeholder.h:347 urpm.pm:1441
+#: ../urpm.pm_.c:1160
 #, fuzzy, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "Heb ganfod ffeil  RPM"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "Methu canfod ffeil menudrake .glade"
 
-#: po/placeholder.h:131
-#, fuzzy, c-format
-msgid "unknown data associated with %s"
-msgstr "anhysbus"
+#: ../urpm.pm_.c:1187
+#, c-format
+msgid "nothing to write in list file for \"%s\""
+msgstr "dim byd i'w ysgrifennu yn ffeil rhestr ar gyfer \"%s\""
 
-#: po/placeholder.h:133 po/placeholder.h:439 urpmi:335
+#: ../urpm.pm_.c:1194
 #, fuzzy, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Pa fath o gysylltiad IDSN?"
+msgid "unable to write list file of \"%s\""
+msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
 
-#: po/placeholder.h:134 po/placeholder.h:350 urpm.pm:404
+#: ../urpm.pm_.c:1201
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
-
-#: po/placeholder.h:135 po/placeholder.h:440 po/placeholder.h:489
-#: po/placeholder.h:551 po/placeholder.h:562
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
+msgid "nothing written in list file for \"%s\""
+msgstr "dim wedi ei ysgrifennu yn y ffeil rhestr ar gyfer \"%s\""
 
-#: po/placeholder.h:137
-#, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+#: ../urpm.pm_.c:1243
+msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: po/placeholder.h:138 po/placeholder.h:351 urpm.pm:1442 urpm.pm:1908
+#: ../urpm.pm_.c:1256
 #, fuzzy, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "Methu canfod ffeil menudrake .glade"
-
-#: po/placeholder.h:140 po/placeholder.h:447 urpmi:338
-#, fuzzy
-msgid "Sorry, bad choice, try again\n"
-msgstr "Ymddiheuriad"
+msgid "reading headers from medium \"%s\""
+msgstr "Tynnu LPRng..."
 
-#: po/placeholder.h:141 po/placeholder.h:353 urpm.pm:1745
+#: ../urpm.pm_.c:1261
 #, fuzzy, c-format
-msgid "unable to access medium \"%s\""
-msgstr "mynediad i offer rpm"
+msgid "building hdlist [%s]"
+msgstr "adeiladu math 1inst"
 
-#: po/placeholder.h:142 po/placeholder.h:352 urpm.pm:1427
+#: ../urpm.pm_.c:1273 ../urpm.pm_.c:1292
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr ""
-
-#: po/placeholder.h:143 po/placeholder.h:451 po/placeholder.h:505
-#: po/placeholder.h:540 po/placeholder.h:584
-msgid "  --curl         - use curl to retrieve distant files.\n"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:144 po/placeholder.h:354
+#: ../urpm.pm_.c:1310
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:145
+#: ../urpm.pm_.c:1314
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:146 po/placeholder.h:357
+#: ../urpm.pm_.c:1470
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "mounting %s"
 msgstr ""
 
-#: po/placeholder.h:147 po/placeholder.h:361 urpm.pm:290
-#, fuzzy
-msgid "rsync is missing\n"
-msgstr "Mae pecyn gorfodol %s ar goll"
+#: ../urpm.pm_.c:1481
+#, fuzzy, c-format
+msgid "unmounting %s"
+msgstr "gwall dadosod %s: %s"
 
-#: po/placeholder.h:148 po/placeholder.h:362 urpm.pm:358
+#: ../urpm.pm_.c:1494
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:149 po/placeholder.h:465 urpmi:185
-#, c-format
-msgid "Unable to create directory [%s] for bug report"
+#: ../urpm.pm_.c:1495
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: po/placeholder.h:151 po/placeholder.h:363 urpm.pm:229
-#, fuzzy
-msgid "curl is missing\n"
-msgstr "Mae pecyn gorfodol %s ar goll"
-
-#: po/placeholder.h:152 po/placeholder.h:365 urpm.pm:393
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr ""
+#: ../urpm.pm_.c:1508
+#, fuzzy, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "Heb ganfod ffeil  RPM"
 
-#: po/placeholder.h:153 po/placeholder.h:381
-#, fuzzy
-msgid "  --help         - print this help message.\n"
-msgstr "Dangos y cymorth hwn a gadael"
+#: ../urpm.pm_.c:1509 ../urpm.pm_.c:1997
+#, fuzzy, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "Methu canfod ffeil menudrake .glade"
 
-#: po/placeholder.h:155 po/placeholder.h:382 urpmi:564
+#: ../urpm.pm_.c:1513
 #, fuzzy
-msgid "everything already installed"
-msgstr "Pecynnau wedi eu gosod eisoes"
+msgid "unable to register rpm file"
+msgstr "Methu canfod ffeil menudrake .glade"
 
-#: po/placeholder.h:156 po/placeholder.h:271 urpm.pm:1796
+#: ../urpm.pm_.c:1516
 #, fuzzy
-msgid "retrieving rpms files..."
-msgstr "Ffeiliau Defnyddiwr Cadw wrth Gefn..."
+msgid "error registering local packages"
+msgstr "Gwall fformat ffeiliau neu becynnau"
 
-#: po/placeholder.h:157 po/placeholder.h:272
+#: ../urpm.pm_.c:1604
 #, fuzzy, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "dyfais"
+msgid "no package named %s"
+msgstr "Dewis pecynnau unigol."
 
-#: po/placeholder.h:158 po/placeholder.h:388 urpmi:327
-#, fuzzy
-msgid "One of the following packages is needed:"
-msgstr "Un:"
+#: ../urpm.pm_.c:1607
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Diweddaru'r pecynnau'n unig"
 
-#: po/placeholder.h:159 po/placeholder.h:274
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+#: ../urpm.pm_.c:1708 ../urpm.pm_.c:1734
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:161 po/placeholder.h:570 urpmq:125
+#: ../urpm.pm_.c:1743
 #, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "methu agor y ffeil i ddarllen: %s"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "Methu rhedeg porwr"
 
-#: po/placeholder.h:163 po/placeholder.h:375 urpme:90
-#, fuzzy
-msgid "Nothing to remove.\n"
-msgstr "Dim i'w wneud"
+#: ../urpm.pm_.c:1755
+#, fuzzy, c-format
+msgid "package %s is not found."
+msgstr "Nid yw pecyn %s wedi ei lofnodi"
+
+#: ../urpm.pm_.c:1803 ../urpm.pm_.c:1806 ../urpm.pm_.c:1824
+#, fuzzy, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "Nid yw pecyn %s wedi ei lofnodi"
 
-#: po/placeholder.h:164 po/placeholder.h:278 urpm.pm:301
+#: ../urpm.pm_.c:1812
 #, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
+msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:166 po/placeholder.h:280
-msgid "unable to access first installation medium"
+#: ../urpm.pm_.c:1828
+#, c-format
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:167 po/placeholder.h:411 urpmi:215 urpmi:521 urpmi:531
-#: urpmi:538 urpmi:551 urpmi:558
-#, fuzzy
-msgid "Installation failed"
-msgstr "methodd y gosodiad"
+#: ../urpm.pm_.c:1885
+#, fuzzy, c-format
+msgid "malformed input: [%s]"
+msgstr "Mewnbwn/Allbwn"
 
-#: po/placeholder.h:168 po/placeholder.h:415 po/placeholder.h:586
+#: ../urpm.pm_.c:1890
 #, fuzzy
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "chwilio"
+msgid "retrieving rpms files..."
+msgstr "Ffeiliau Defnyddiwr Cadw wrth Gefn..."
+
+#: ../urpm.pm_.c:1939
+msgid "Preparing..."
+msgstr ""
 
-#: po/placeholder.h:169 po/placeholder.h:282 urpm.pm:1414
+#: ../urpm.pm_.c:1967
 #, fuzzy, c-format
-msgid "unmounting %s"
-msgstr "gwall dadosod %s: %s"
+msgid "unable to remove package %s"
+msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
+
+#: ../urpm.pm_.c:1972 ../urpm.pm_.c:1977
+#, fuzzy, c-format
+msgid "unable to install package %s"
+msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
 
-#: po/placeholder.h:171 po/placeholder.h:283
+#: ../urpm.pm_.c:1984
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "%s is needed by %s"
 msgstr ""
 
-#: po/placeholder.h:172 po/placeholder.h:284
+#: ../urpm.pm_.c:1985
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "%s conflicts with %s"
 msgstr ""
 
-#: po/placeholder.h:173
+#: ../urpme_.c:33
 #, fuzzy
-msgid "<non printable chars>"
-msgstr "Heb eu gosod yn unig"
+msgid "Remove them all?"
+msgstr "Caniatįu pob defnyddiwr"
 
-#: po/placeholder.h:175 po/placeholder.h:287
-#, fuzzy, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "Y ffeil yn methu darllen ffeil\n"
+#: ../urpme_.c:42
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr ""
 
-#: po/placeholder.h:176 po/placeholder.h:428 po/placeholder.h:597
+#: ../urpme_.c:53
 #, fuzzy
-msgid "  -v             - verbose mode.\n"
-msgstr "Modd Kudz"
-
-#: po/placeholder.h:177 po/placeholder.h:288
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "Tynnu LPRng..."
+msgid "unknown package(s) "
+msgstr "Pecyn anhysbys i urpmq"
 
-#: po/placeholder.h:178
+#: ../urpme_.c:63
 #, c-format
-msgid "unable to build synthesis file for medium \"%s\""
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:179
+#: ../urpme_.c:64 ../urpmi_.c:476
+msgid " (y/N) "
+msgstr ""
+
+#: ../urpme_.c:85
+#, fuzzy
+msgid "unknown package "
+msgstr "Pecyn anhysbys i urpmq"
+
+#: ../urpme_.c:90
+#, fuzzy
+msgid "Nothing to remove.\n"
+msgstr "Dim i'w wneud"
+
+#: ../urpme_.c:116
 #, c-format
-msgid "trying to select multiple medium: %s"
+msgid "removing package %s will break your system\n"
 msgstr ""
 
-#: po/placeholder.h:180 po/placeholder.h:559
-msgid "  -a             - select all non-removable media.\n"
+#: ../urpme_.c:125
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
 
-#: po/placeholder.h:181 po/placeholder.h:435
-msgid "  names or rpm files given on command line are installed.\n"
+#: ../urpmi.addmedia_.c:29
+#, fuzzy
+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 ""
+"<name><url> llwybr\n"
+"<url>\n"
+"<path>\n"
+" ftp<login><password><host><path>\n"
+" ftp<host><path>\n"
+" http<host><path>\n"
+"<path>\n"
 
-#: po/placeholder.h:182
-#, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
+#: ../urpmi.addmedia_.c:38 ../urpmi.removemedia_.c:37 ../urpmi.update_.c:61
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:184 po/placeholder.h:291
-#, fuzzy, c-format
-msgid "reading rpms files from [%s]"
-msgstr "Heb ganfod ffeil  RPM"
+#: ../urpmi.addmedia_.c:39
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr ""
 
-#: po/placeholder.h:185
+#: ../urpmi.addmedia_.c:40 ../urpmi.update_.c:63
 #, fuzzy
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
-msgstr "Gwasanaethwr"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "grym"
 
-#: po/placeholder.h:186 po/placeholder.h:295
-#, fuzzy, c-format
-msgid "write config file [%s]"
-msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
+#: ../urpmi.addmedia_.c:41 ../urpmi.update_.c:64 ../urpmi_.c:83 ../urpmq_.c:62
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
 
-#: po/placeholder.h:187 po/placeholder.h:442 urpmi:467
-#, fuzzy
-msgid "Press Enter when ready..."
-msgstr "gorffen."
+#: ../urpmi.addmedia_.c:42 ../urpmi.update_.c:65 ../urpmi_.c:84 ../urpmq_.c:63
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
 
-#: po/placeholder.h:188 po/placeholder.h:298 urpm.pm:217
-#, fuzzy, c-format
-msgid "unable to handle protocol: %s"
-msgstr "Methu rhedeg porwr"
+#: ../urpmi.addmedia_.c:43 ../urpmi.update_.c:66 ../urpmi_.c:85 ../urpmq_.c:64
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
 
-#: po/placeholder.h:189
-msgid "unable to build hdlist synthesis, using parsehdlist method"
+#: ../urpmi.addmedia_.c:45 ../urpmi.update_.c:68 ../urpmi_.c:87 ../urpmq_.c:66
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: po/placeholder.h:190 po/placeholder.h:499
+#: ../urpmi.addmedia_.c:47
+#, fuzzy
+msgid "  --update       - create an update medium.\n"
+msgstr "Digwyddodd gwall, ceisiwch newid rhai paramedrau"
+
+#: ../urpmi.addmedia_.c:48
 msgid ""
 "  --distrib      - automatically create all media from an installation "
 "medium.\n"
 msgstr ""
 
-#: po/placeholder.h:193 po/placeholder.h:450 po/placeholder.h:583
-msgid "  -s             - next package is a source package (same as --src).\n"
+#: ../urpmi.addmedia_.c:90
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
 msgstr ""
+"\n"
+" llwybr"
 
-#: po/placeholder.h:194 po/placeholder.h:303 urpm.pm:1649
+#: ../urpmi.addmedia_.c:96 ../urpmi.addmedia_.c:113
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
+msgid "unable to update medium \"%s\"\n"
 msgstr "Methu rhedeg porwr"
 
-#: po/placeholder.h:196 po/placeholder.h:306 urpm.pm:376
-#, c-format
+#: ../urpmi.addmedia_.c:102
+#, fuzzy, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"%s\n"
+"<relative path of hdlist> missing\n"
+msgstr "llwybr perthynol i synthesis neu hdlist:"
+
+#: ../urpmi.addmedia_.c:104
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"`with' missing for ftp media\n"
 msgstr ""
+"\n"
+" ftp"
 
-#: po/placeholder.h:197 po/placeholder.h:304 urpm.pm:1883 urpm.pm:1888
+#: ../urpmi.addmedia_.c:112
 #, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
+msgid "unable to create medium \"%s\"\n"
+msgstr "Methu creu'r enw ssh"
 
-#: po/placeholder.h:198 po/placeholder.h:307
-#, c-format
-msgid "examining synthesis file [%s]"
+#: ../urpmi.removemedia_.c:34
+#, fuzzy
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
+"<name>\n"
+"<name> enw"
 
-#: po/placeholder.h:199 po/placeholder.h:308
+#: ../urpmi.removemedia_.c:36
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr "Dewiswch y cyfrwng ar gyfer cadw wrth gefn..."
+
+#: ../urpmi.removemedia_.c:38 ../urpmi.update_.c:70
 #, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "Tynnu LPRng..."
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr "Dewisiadau modiwl:"
 
-#: po/placeholder.h:200 po/placeholder.h:310
-msgid "performing second pass to compute dependencies\n"
+#: ../urpmi.removemedia_.c:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:202 po/placeholder.h:311 urpm.pm:361
+#: ../urpmi.removemedia_.c:49
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:203 po/placeholder.h:312
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+#: ../urpmi.update_.c:58
+#, fuzzy
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"<name>\n"
+"<name> enw"
 
-#: po/placeholder.h:204 po/placeholder.h:314 urpm.pm:1614 urpm.pm:1640
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: ../urpmi.update_.c:60
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:206 po/placeholder.h:601
+#: ../urpmi.update_.c:62
 #, fuzzy
-msgid "  -g             - print groups with name also.\n"
-msgstr "enw"
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "grym"
 
-#: po/placeholder.h:207 po/placeholder.h:602
-#, fuzzy
-msgid "  --list         - list available packages.\n"
-msgstr "Argraffu tudalennau prawf"
+#: ../urpmi.update_.c:78
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
 
-#: po/placeholder.h:208 po/placeholder.h:367 urpme:125
+#: ../urpmi.update_.c:80
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:210 po/placeholder.h:317 urpm.pm:1895
-#, c-format
-msgid "%s is needed by %s"
+#: ../urpmi_.c:63
+#, fuzzy, 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 ""
+"\n"
+"\n"
+" rhydd\n"
 
-#: po/placeholder.h:211 po/placeholder.h:318
+#: ../urpmi_.c:68
 #, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "Ffeiliau Defnyddiwr Cadw wrth Gefn..."
-
-#: po/placeholder.h:212 po/placeholder.h:383 urpmi:160
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "anhysbus"
+msgid "  --help         - print this help message.\n"
+msgstr "Dangos y cymorth hwn a gadael"
 
-#: po/placeholder.h:213 po/placeholder.h:320 urpm.pm:402
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: ../urpmi_.c:69 ../urpmq_.c:51
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:214 po/placeholder.h:321 urpm.pm:1446
-#, fuzzy
-msgid "unable to register rpm file"
-msgstr "Methu canfod ffeil menudrake .glade"
-
-#: po/placeholder.h:215 po/placeholder.h:322
-#, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+#: ../urpmi_.c:70 ../urpmq_.c:52
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:216 po/placeholder.h:326
-#, c-format
-msgid "found probed hdlist (or synthesis) as %s"
+#: ../urpmi_.c:71 ../urpmq_.c:53
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: po/placeholder.h:217 po/placeholder.h:323 urpm.pm:456
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+#: ../urpmi_.c:72
+#, fuzzy
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 
-#: po/placeholder.h:218 po/placeholder.h:324
-#, fuzzy, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "pwyntiau"
+#: ../urpmi_.c:73 ../urpmq_.c:54
+#, fuzzy
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 
-#: po/placeholder.h:219 po/placeholder.h:328
-#, fuzzy, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "Y ffeil yn methu darllen ffeil\n"
+#: ../urpmi_.c:74 ../urpmq_.c:55
+#, fuzzy
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "chwilio"
 
-#: po/placeholder.h:220 po/placeholder.h:327 urpm.pm:448
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: ../urpmi_.c:75 ../urpmq_.c:57
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: po/placeholder.h:221 po/placeholder.h:395 po/placeholder.h:572
-msgid "  --update       - use only update media.\n"
+#: ../urpmi_.c:76
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: po/placeholder.h:222 po/placeholder.h:329
-#, fuzzy, c-format
-msgid "copy of [%s] failed"
-msgstr "methodd y gosodiad"
+#: ../urpmi_.c:77 ../urpmq_.c:61
+#, fuzzy
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "grym grym"
 
-#: po/placeholder.h:223 po/placeholder.h:579
-msgid "  -d             - extend query to package dependencies.\n"
+#: ../urpmi_.c:78
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: po/placeholder.h:224
-#, c-format
-msgid "unable to analyse synthesis data of %s"
+#: ../urpmi_.c:80
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: po/placeholder.h:225 po/placeholder.h:378 urpme:116
-#, c-format
-msgid "removing package %s will break your system\n"
+#: ../urpmi_.c:82
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
 msgstr ""
 
-#: po/placeholder.h:226 po/placeholder.h:331
-#, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "llwybr perthynol i synthesis neu hdlist:"
+#: ../urpmi_.c:89
+msgid ""
+"  --bug          - output a bug report in directory indicated by next arg.\n"
+msgstr ""
 
-#: po/placeholder.h:228 po/placeholder.h:413
+#: ../urpmi_.c:90
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+#: ../urpmi_.c:91
 #, fuzzy
 msgid "  --X            - use X interface.\n"
 msgstr "Rhyngwyneb rhwydwaith"
 
-#: po/placeholder.h:229 po/placeholder.h:332
+#: ../urpmi_.c:92
 #, fuzzy
-msgid "...copying done"
-msgstr "Wedi gosod True Type"
-
-#: po/placeholder.h:230 po/placeholder.h:414 urpmi:428 urpmi:437
-#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "Un:"
-
-#: po/placeholder.h:231 po/placeholder.h:334
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "Rhestr ddewis argraffu"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+"\n"
+" X"
 
-#: po/placeholder.h:232 po/placeholder.h:336 urpm.pm:337 urpm.pm:349
-#, c-format
-msgid "syntax error in config file at line %s"
+#: ../urpmi_.c:94
+msgid "  --verify-rpm   - verify rpm signature before installation.\n"
 msgstr ""
 
-#: po/placeholder.h:233 po/placeholder.h:416 urpmi:545
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpmi_.c:95
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: po/placeholder.h:234 po/placeholder.h:422 po/placeholder.h:596
+#: ../urpmi_.c:96
 #, fuzzy
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr "chwilio"
 
-#: po/placeholder.h:235 po/placeholder.h:340 urpm.pm:1449
+#: ../urpmi_.c:97 ../urpmq_.c:45
 #, fuzzy
-msgid "error registering local packages"
-msgstr "Gwall fformat ffeiliau neu becynnau"
-
-#: po/placeholder.h:236 po/placeholder.h:341
-#, fuzzy, c-format
-msgid "taking removable device as \"%s\""
-msgstr "dyfais"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "chwilio"
 
-#: po/placeholder.h:237 po/placeholder.h:429
+#: ../urpmi_.c:98 ../urpmq_.c:46
 #, fuzzy
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "chwilio"
 
-#: po/placeholder.h:239 po/placeholder.h:345
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "Rhestr ddewis argraffu"
-
-#: po/placeholder.h:240 po/placeholder.h:599
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-
-#: po/placeholder.h:241
-#, fuzzy, c-format
-msgid "unable to build hdlist: %s"
-msgstr "Methu rhedeg porwr"
-
-#: po/placeholder.h:242 po/placeholder.h:346 urpm.pm:1709 urpm.pm:1712
-#: urpm.pm:1730
-#, fuzzy, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "Nid yw pecyn %s wedi ei lofnodi"
-
-#: po/placeholder.h:243 po/placeholder.h:348 urpm.pm:418
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+#: ../urpmi_.c:99 ../urpmq_.c:47
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: po/placeholder.h:244 po/placeholder.h:437
+#: ../urpmi_.c:100
 #, fuzzy
 msgid "  -q             - quiet mode.\n"
 msgstr "Modd Kudz"
 
-#: po/placeholder.h:245 po/placeholder.h:349
-#, fuzzy, c-format
-msgid "unable to read rpms files from [%s]: %s"
-msgstr "Methu canfod ffeil menudrake .glade"
-
-#: po/placeholder.h:246
+#: ../urpmi_.c:101 ../urpmq_.c:41
 #, fuzzy
-msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
-msgstr "Hawlfraint (H) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgid "  -v             - verbose mode.\n"
+msgstr "Modd Kudz"
 
-#: po/placeholder.h:248 po/placeholder.h:446 po/placeholder.h:582
-#, fuzzy
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "grym grym"
+#: ../urpmi_.c:102
+msgid "  names or rpm files given on command line are installed.\n"
+msgstr ""
 
-#: po/placeholder.h:250 po/placeholder.h:371 urpme:63
+#: ../urpmi_.c:166
+#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "anhysbus"
+
+#: ../urpmi_.c:191
 #, c-format
-msgid "Using \"%s\" as a substring, I found"
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: po/placeholder.h:251 po/placeholder.h:453 urpmi:510
-#, fuzzy, c-format
-msgid "installing %s\n"
-msgstr "Gosod"
+#: ../urpmi_.c:216
+msgid "Only superuser is allowed to install packages"
+msgstr ""
 
-#: po/placeholder.h:252 po/placeholder.h:377 urpme:33
+#: ../urpmi_.c:221 ../urpmi_.c:500 ../urpmi_.c:510 ../urpmi_.c:517
+#: ../urpmi_.c:530 ../urpmi_.c:537
 #, fuzzy
-msgid "Remove them all?"
-msgstr "Caniatįu pob defnyddiwr"
+msgid "Installation failed"
+msgstr "methodd y gosodiad"
 
-#: po/placeholder.h:253 po/placeholder.h:454 urpmi:466
+#: ../urpmi_.c:314
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "dyfais"
+msgid "One of the following packages is needed to install %s:"
+msgstr "Un:"
 
-#: po/placeholder.h:254 po/placeholder.h:355 urpm.pm:1539
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Diweddaru'r pecynnau'n unig"
+#: ../urpmi_.c:315
+#, fuzzy
+msgid "One of the following packages is needed:"
+msgstr "Un:"
 
-#: po/placeholder.h:255 po/placeholder.h:356
+#: ../urpmi_.c:323
 #, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "adeiladu math 1inst"
-
-#: po/placeholder.h:256 po/placeholder.h:358 urpm.pm:1428
-msgid "no entries relocated in depslist"
-msgstr ""
+msgid "What is your choice? (1-%d) "
+msgstr "Pa fath o gysylltiad IDSN?"
 
-#: po/placeholder.h:257 po/placeholder.h:515
+#: ../urpmi_.c:326
 #, fuzzy
-msgid "  --update       - create an update medium.\n"
-msgstr "Digwyddodd gwall, ceisiwch newid rhai paramedrau"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Ymddiheuriad"
 
-#: po/placeholder.h:259 po/placeholder.h:556
-#, fuzzy
+#: ../urpmi_.c:345
+#, c-format
 msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "grym"
-
-#: po/placeholder.h:260 po/placeholder.h:462 po/placeholder.h:598 urpmi:455
-#: urpmq:216
-msgid "unable to get source packages, aborting"
+"Some package requested cannot be installed:\n"
+"%s\n"
+"do you agree ?"
 msgstr ""
 
-#: po/placeholder.h:261 po/placeholder.h:359 urpm.pm:1801
-#, fuzzy
-msgid "...retrieving done"
-msgstr "Wedi gosod True Type"
+#: ../urpmi_.c:362
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s\n"
+"do you agree ?"
+msgstr ""
 
-#: po/placeholder.h:262
+#: ../urpmi_.c:400 ../urpmi_.c:409
 #, fuzzy, c-format
-msgid "selecting %s using obsoletes"
-msgstr "Rhyngwyneb %s (gan ddefnyddio modiwl %s)"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "Un:"
 
-#: po/placeholder.h:263 po/placeholder.h:360 urpm.pm:286
+#: ../urpmi_.c:406
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
 
-#. [^:]+(:\d+)?)/*$, or
-#: po/placeholder.h:264 po/placeholder.h:464 po/placeholder.h:516
-#: po/placeholder.h:558 urpmi:126 urpmi:133 urpmi.addmedia:65
-#: urpmi.addmedia:72 urpmi.update:45 urpmi.update:52
-msgid "bad proxy declaration on command line\n"
+#: ../urpmi_.c:427 ../urpmq_.c:200
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: po/placeholder.h:265
-#, c-format
-msgid "selecting %s by selection on files"
+#: ../urpmi_.c:438
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "dyfais"
+
+#: ../urpmi_.c:439
+#, fuzzy
+msgid "Press Enter when ready..."
+msgstr "gorffen."
+
+#: ../urpmi_.c:461
+#, fuzzy
+msgid "The following packages have bad signatures"
+msgstr "Diweddaru'r pecynnau'n unig"
+
+#: ../urpmi_.c:462
+msgid "Do you want to continue installation ?"
+msgstr ""
+
+#: ../urpmi_.c:485
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:266 po/placeholder.h:364
+#: ../urpmi_.c:490
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "Rhestr ddewis argraffu"
+msgid "distributing %s\n"
+msgstr "gosod %s\n"
 
-#: po/placeholder.h:267 po/placeholder.h:471 urpmi:210
-msgid "Only superuser is allowed to install packages"
+#: ../urpmi_.c:524
+msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
-#: po/placeholder.h:268 po/placeholder.h:366 urpm.pm:220
+#: ../urpmi_.c:532
 #, fuzzy
-msgid "wget is missing\n"
-msgstr "Mae pecyn gorfodol %s ar goll"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "grym "
 
-#: po/placeholder.h:384
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
+#: ../urpmi_.c:544
+#, fuzzy
+msgid "everything already installed"
+msgstr "Pecynnau wedi eu gosod eisoes"
 
-#: po/placeholder.h:389
+#: ../urpmq_.c:35
 #, fuzzy, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\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 ""
 "\n"
 "\n"
 " rhydd\n"
 
-#: po/placeholder.h:396 po/placeholder.h:495 po/placeholder.h:552
-#: po/placeholder.h:573
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
+#: ../urpmq_.c:40
+#, fuzzy
+msgid "  -h             - print this help message.\n"
+msgstr "Dangos y cymorth hwn a gadael"
 
-#: po/placeholder.h:401 urpmi:515
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: ../urpmq_.c:42
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:405 urpmi:390
-#, c-format
+#: ../urpmq_.c:43
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s\n"
-"do you agree ?"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: po/placeholder.h:418 po/placeholder.h:507 po/placeholder.h:546
-#: po/placeholder.h:591
+#: ../urpmq_.c:44
 msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:423
-msgid "  --verify-rpm   - verify rpm signature before installation.\n"
-msgstr ""
+#: ../urpmq_.c:48
+#, fuzzy
+msgid "  -g             - print groups with name also.\n"
+msgstr "enw"
 
-#: po/placeholder.h:424
+#: ../urpmq_.c:49
 #, fuzzy
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"\n"
-" X"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "enw"
 
-#: po/placeholder.h:431 urpmi:434
-#, c-format
-msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
-msgstr ""
+#: ../urpmq_.c:50
+#, fuzzy
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "enw"
 
-#: po/placeholder.h:441 urpmi:489
+#: ../urpmq_.c:56
 #, fuzzy
-msgid "The following packages have bad signatures"
-msgstr "Diweddaru'r pecynnau'n unig"
+msgid "  --list         - list available packages.\n"
+msgstr "Argraffu tudalennau prawf"
 
-#: po/placeholder.h:455 urpmi:373
-#, c-format
+#: ../urpmq_.c:58
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
-msgstr ""
-
-#: po/placeholder.h:460 urpmi:490
-msgid "Do you want to continue installation ?"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:467
+#: ../urpmq_.c:60
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
+"  --sources      - give all source packages before downloading (root only).\n"
 
-#: po/placeholder.h:473
-#, fuzzy
-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"
-"and [options] are from\n"
+#: ../urpmq_.c:68
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"<name><url> llwybr\n"
-"<url>\n"
-"<path>\n"
-" ftp<login><password><host><path>\n"
-" ftp<host><path>\n"
-" http<host><path>\n"
-"<path>\n"
 
-#: po/placeholder.h:484 po/placeholder.h:518 po/placeholder.h:536
-#: urpmi.addmedia:79
+#: ../urpmq_.c:124
 #, fuzzy, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr "Dewisiadau modiwl:"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "anhysbus"
 
-#: po/placeholder.h:491 urpmi.addmedia:104
+#: ../urpmq_.c:127
 #, fuzzy, c-format
-msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
-msgstr ""
-"\n"
-" ftp"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "methu agor y ffeil i ddarllen: %s"
 
-#: po/placeholder.h:500 urpmi.addmedia:90
+#: placeholder.h:18
 #, fuzzy, c-format
+msgid "urpmf version %s"
+msgstr "Fersiwn y Cnewyllyn:"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Hawlfraint (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+
+#: placeholder.h:20
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL."
 msgstr ""
-"\n"
-" llwybr"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
 
-#: po/placeholder.h:511 urpmi.addmedia:102
-#, fuzzy, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr "llwybr perthynol i synthesis neu hdlist:"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "defnydd: urpmf [dewisiadau] <ffeil>"
 
-#: po/placeholder.h:522 urpmi.removemedia:49
-#, c-format
+#: placeholder.h:22
 msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+"  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
+"  --quiet         - peidiwch argraffu enw tag (rhagosodedig os nad oes tag "
+"yn cael ei roi ar "
 
-#: po/placeholder.h:528
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr ""
+"                    linell orchymyn , imae'n anghytūn a'r modd "
+"rhyngweithiol)."
+
+#: placeholder.h:24
 #, fuzzy
+msgid "  --all           - print all tags."
+msgstr "Argraffu tudalennau prawf"
+
+#: placeholder.h:25
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
-"<name>\n"
-"<name> enw"
+"  --name          - argraffu enw'r tag: enw ffeil rpm (dyfaliad os nad oed "
+"tag yn cael ei gynnig"
+
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
 
-#: po/placeholder.h:532
+#: placeholder.h:27
 #, fuzzy
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "  --group         - print tag group: group."
+msgstr "Argraffu tudalennau prawf"
+
+#: placeholder.h:28
+#, fuzzy
+msgid "  --size          - print tag size: size."
+msgstr "Argraffu tudalennau prawf"
+
+#: placeholder.h:29
+#, fuzzy
+msgid "  --serial        - print tag serial: serial."
+msgstr "Argraffu tudalennau prawf"
+
+#: placeholder.h:30
+#, fuzzy
+msgid "  --summary       - print tag summary: summary."
+msgstr "Argraffu tudalennau prawf"
+
+#: placeholder.h:31
+#, fuzzy
+msgid "  --description   - print tag description: description."
+msgstr "Argraffu tudalennau prawf"
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
-"<name>\n"
-"<name> enw"
+"  --provides      - tag argraffu'n darparu: pob darpariaeth (llinellau "
+"lluosog)."
 
-#: po/placeholder.h:541 urpmi.update:80
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
+"  --requires      - tag argraffu'n darparu: all requires (multiple lines)."
 
-#: po/placeholder.h:564
-#, fuzzy, c-format
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - print tag files: all files (multiple lines)."
+
+#: placeholder.h:35
 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:\n"
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
-"\n"
-"\n"
-" rhydd\n"
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 
-#: po/placeholder.h:587
+#: placeholder.h:36
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 
-#: urpmi:61
-#, fuzzy, c-format
-msgid "urpmi version %s"
-msgstr "Fersiwn y Cnewyllyn:"
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "try urpmf --help for more options"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "ni chanfyddwyd restr cyfrwng llawn"
+
+#~ msgid "examining whole urpmi database"
+#~ msgstr "archwilio cronfa ddata urpmi gyfan"
 
-#: urpmi.addmedia:29
 #, fuzzy
-msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
-msgstr "<name><url> llwybr"
+#~ msgid "  -y             - impose fuzzy search.\n"
+#~ msgstr "Chwilio am ffontiau wedi eu gosod"
 
-#: urpmi.addmedia:38 urpmi.addmedia:39 urpmi.addmedia:40 urpmi.addmedia:41
-#: urpmi.addmedia:42 urpmi.addmedia:43 urpmi.removemedia:36
-#: urpmi.removemedia:37 urpmi.removemedia:38 urpmi.update:60 urpmi.update:61
-#: urpmi.update:62 urpmi.update:63 urpmi.update:64 urpmi.update:65
-#: urpmi.update:66
-msgid ") . _("
-msgstr ""
+#~ msgid ""
+#~ "  --auto-select  - automatically select packages for upgrading the "
+#~ "system.\n"
+#~ msgstr ""
+#~ "  --auto-select  - automatically select packages for upgrading the "
+#~ "system.\n"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr ""
+#, fuzzy
+#~ msgid "Press Enter when it's done..."
+#~ msgstr "gorffen."
 
-#: urpmi.removemedia:38
-msgid ", $_);"
-msgstr ""
+#, fuzzy
+#~ msgid "  -g             - print groups too with name.\n"
+#~ msgstr "enw"
 
-#: urpmi.update:58
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr ""
+#, fuzzy
+#~ msgid "  -r             - print version and release too with name.\n"
+#~ msgstr "enw"
 
-#: urpmq:35
-#, fuzzy, c-format
-msgid "urpmq version %s"
-msgstr "Fersiwn y Cnewyllyn:"
+#, fuzzy
+#~ msgid "unable to parse correctly [%s]"
+#~ msgstr "Methu rhedeg porwr"
+
+#, fuzzy
+#~ msgid "read synthesis file [%s]"
+#~ msgstr "Y ffeil yn methu darllen ffeil\n"
+
+#, fuzzy
+#~ msgid "unknown data associated with %s"
+#~ msgstr "anhysbus"
+
+#, fuzzy
+#~ msgid "<non printable chars>"
+#~ msgstr "Heb eu gosod yn unig"
+
+#, fuzzy
+#~ msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#~ msgstr "Gwasanaethwr"
+
+#, fuzzy
+#~ msgid "unable to build hdlist: %s"
+#~ msgstr "Methu rhedeg porwr"
+
+#, fuzzy
+#~ msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
+#~ msgstr "Hawlfraint (H) 1999, 2000, 2001, 2002 MandrakeSoft."
+
+#, fuzzy
+#~ msgid "selecting %s using obsoletes"
+#~ msgstr "Rhyngwyneb %s (gan ddefnyddio modiwl %s)"
+
+#, fuzzy
+#~ msgid "urpmi version %s"
+#~ msgstr "Fersiwn y Cnewyllyn:"
 
 #, fuzzy
-#~ msgid "removing %s to upgrade to %s ..."
-#~ msgstr "I ysgogi'r llygoden,"
+#~ msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
+#~ msgstr "<name><url> llwybr"
 
 #, fuzzy
-#~ msgid "$p->{name}-$p->{version}-$p->{release}"
-#~ msgstr "Fersiwn Gnome o ghostview"
+#~ msgid "urpmq version %s"
+#~ msgstr "Fersiwn y Cnewyllyn:"