updated pot file

1 files changed, 465 insertions, 302 deletions

diff --git a/po/cy.po b/po/cy.po
index 64c1ce48..40719212 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-03-11 11:06+0100\n"
+"POT-Creation-Date: 2002-07-09 11:43+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,11 +13,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-14\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _irpm:21
+#: _irpm:18
 msgid "installing $rpm\n"
 msgstr "gosod $rpm\n"
 
-#: _irpm:31
+#: _irpm:28
 msgid ""
 "Automatic installation of packages...\n"
 "You requested installation of package $rpm\n"
@@ -25,17 +25,17 @@ msgstr ""
 "Gosodiad pecynnau awtomatig...\n"
 "Roeddech wedi gofyn i gael gosod pecyn $rpm\n"
 
-#: _irpm:31 po/placeholder.h:223 po/placeholder.h:342 po/placeholder.h:402
-#: urpme:30 urpmi:308
+#: _irpm:28 po/placeholder.h:224 po/placeholder.h:332 po/placeholder.h:403
+#: urpme:30 urpmi:393
 #, fuzzy
 msgid "Is it OK?"
 msgstr "Mae'r model yn gywir"
 
-#: _irpm:33 po/placeholder.h:213 po/placeholder.h:393 urpmi:311 urpmi:344
+#: _irpm:30 po/placeholder.h:213 po/placeholder.h:384 urpmi:396 urpmi:424
 msgid "Ok"
 msgstr "Iawn"
 
-#: _irpm:34 po/placeholder.h:178 po/placeholder.h:348 urpmi:312 urpmi:345
+#: _irpm:31 po/placeholder.h:179 po/placeholder.h:338 urpmi:397 urpmi:425
 msgid "Cancel"
 msgstr "Dileu"
 
@@ -44,8 +44,8 @@ msgstr "Dileu"
 #. can hit those keys in their keyboard to reply.
 #. please keep the 'Nn' for compatibility reasons
 #.
-#: _irpm:40 po/placeholder.h:17 po/placeholder.h:195 po/placeholder.h:347
-#: po/placeholder.h:365 urpme:33 urpmi:316 urpmi:397 urpmi:417
+#: _irpm:37 po/placeholder.h:17 po/placeholder.h:195 po/placeholder.h:337
+#: po/placeholder.h:355 urpme:33 urpmi:346 urpmi:353 urpmi:401 urpmi:468
 msgid "Nn"
 msgstr "Nn"
 
@@ -54,17 +54,17 @@ msgstr "Nn"
 #. can hit those keys in their keyboard to reply.
 #. please keep the 'Yy' for compatibility reasons
 #.
-#: _irpm:41 po/placeholder.h:11 po/placeholder.h:104 po/placeholder.h:341
-#: po/placeholder.h:368 urpme:35 urpmi:317 urpmi:398 urpmi:418
+#: _irpm:38 po/placeholder.h:11 po/placeholder.h:104 po/placeholder.h:331
+#: po/placeholder.h:357 urpme:35 urpmi:347 urpmi:354 urpmi:402 urpmi:469
 msgid "Yy"
 msgstr "Yy"
 
-#: _irpm:42 po/placeholder.h:216 po/placeholder.h:338 po/placeholder.h:396
-#: urpme:121 urpmi:319 urpmi:321
+#: _irpm:39 po/placeholder.h:215 po/placeholder.h:328 po/placeholder.h:387
+#: urpme:121 urpmi:348 urpmi:355 urpmi:403
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: _irpm:61
+#: _irpm:58
 #, fuzzy
 msgid "$rpm: command not found\n"
 msgstr "Heb ganfod ffeil  RPM"
@@ -187,7 +187,7 @@ msgstr "ni chanfyddwyd restr cyfrwng llawn"
 msgid "unable to write config file [%s]"
 msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
 
-#: po/placeholder.h:42 po/placeholder.h:236
+#: po/placeholder.h:42
 msgid "examining whole urpmi database"
 msgstr "archwilio cronfa ddata urpmi gyfan"
 
@@ -196,444 +196,443 @@ msgstr "archwilio cronfa ddata urpmi gyfan"
 msgid "  -y             - impose fuzzy search.\n"
 msgstr "Chwilio am ffontiau wedi eu gosod"
 
-#: po/placeholder.h:44 po/placeholder.h:238
-#, 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:45 po/placeholder.h:240 urpm.pm:327
+#: po/placeholder.h:44 po/placeholder.h:239 urpm.pm:369
 #, 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:47 po/placeholder.h:241
+#: po/placeholder.h:45 po/placeholder.h:237
+#, 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:47 po/placeholder.h:240
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "Methu canfod ffeil menudrake .glade"
 
-#: po/placeholder.h:48 po/placeholder.h:242
+#: po/placeholder.h:48 po/placeholder.h:241
 #, 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:49 po/placeholder.h:492
+#: po/placeholder.h:49 po/placeholder.h:494
 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:50 po/placeholder.h:243
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:51 po/placeholder.h:367 po/placeholder.h:495
+#: po/placeholder.h:50
 msgid ""
 "  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 "  --auto-select  - automatically select packages for upgrading the system.\n"
 
-#: po/placeholder.h:52 po/placeholder.h:245 urpm.pm:1882
+#: po/placeholder.h:51 po/placeholder.h:243
+#, c-format
+msgid "retrieving description file of \"%s\"..."
+msgstr ""
+
+#: po/placeholder.h:52 po/placeholder.h:245 urpm.pm:1547
 #, fuzzy, c-format
 msgid "package %s is not found."
 msgstr "Nid yw pecyn %s wedi ei lofnodi"
 
-#: po/placeholder.h:54 po/placeholder.h:249 urpm.pm:256
+#: po/placeholder.h:54
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:55 po/placeholder.h:251
-msgid "problem reading hdlist file, trying again"
-msgstr ""
+#: po/placeholder.h:55 po/placeholder.h:327 urpme:51
+#, fuzzy
+msgid "unknown package(s) "
+msgstr "Pecyn anhysbys i urpmq"
 
-#: po/placeholder.h:56 po/placeholder.h:252 urpm.pm:280
+#: po/placeholder.h:56 po/placeholder.h:250 urpm.pm:322
 #, fuzzy, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "enw"
 
-#: po/placeholder.h:57 po/placeholder.h:337 urpme:51
-#, fuzzy
-msgid "unknown package(s) "
-msgstr "Pecyn anhysbys i urpmq"
+#: po/placeholder.h:57
+msgid "problem reading hdlist file, trying again"
+msgstr ""
 
-#: po/placeholder.h:58 po/placeholder.h:254 urpm.pm:287
+#: po/placeholder.h:58 po/placeholder.h:253 urpm.pm:329
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:59 po/placeholder.h:255
+#: po/placeholder.h:59
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:60 po/placeholder.h:257
+#: po/placeholder.h:60 po/placeholder.h:254
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:62 po/placeholder.h:386 po/placeholder.h:477
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-
-#: po/placeholder.h:63 po/placeholder.h:423 urpmi.addmedia:75
-#: urpmi.addmedia:92
+#: po/placeholder.h:62 po/placeholder.h:425 urpmi.addmedia:78
+#: urpmi.addmedia:95
 #, fuzzy, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "Methu rhedeg porwr"
 
-#: po/placeholder.h:64 po/placeholder.h:388
+#: po/placeholder.h:63 po/placeholder.h:376 po/placeholder.h:479
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+
+#: po/placeholder.h:64 po/placeholder.h:378
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: po/placeholder.h:65 po/placeholder.h:429 po/placeholder.h:452
-#: po/placeholder.h:471
+#: po/placeholder.h:65 po/placeholder.h:431 po/placeholder.h:454
+#: po/placeholder.h:473
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:66 po/placeholder.h:264
+#: po/placeholder.h:66 po/placeholder.h:257
 #, fuzzy, c-format
 msgid "medium \"%s\" already exists"
 msgstr "Mae'r ffeil yn bodoli eisoes. Defnyddiwch hwn?"
 
-#: po/placeholder.h:67 po/placeholder.h:265
+#: po/placeholder.h:67 po/placeholder.h:258
 #, fuzzy, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
 
-#: po/placeholder.h:68 po/placeholder.h:487
+#: po/placeholder.h:68 po/placeholder.h:489
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:69 po/placeholder.h:267 urpm.pm:1369
+#: po/placeholder.h:69 po/placeholder.h:260 urpm.pm:1422
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "Dewis pecynnau unigol."
 
-#: po/placeholder.h:70 po/placeholder.h:392 urpmi:400 urpmi:402 urpmi:431
-#: urpmi:433
+#: po/placeholder.h:70 po/placeholder.h:383 urpmi:476
 #, fuzzy
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "grym "
 
-#: po/placeholder.h:71 po/placeholder.h:268
+#: po/placeholder.h:71 po/placeholder.h:263 urpm.pm:364
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:72 po/placeholder.h:270 urpm.pm:322
+#: po/placeholder.h:72 po/placeholder.h:262
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:73 po/placeholder.h:271
+#: po/placeholder.h:73 po/placeholder.h:264
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "archwilio cronfa ddata urpmi gyfan"
 
-#: po/placeholder.h:74 po/placeholder.h:339 urpme:62
+#: po/placeholder.h:74 po/placeholder.h:329 urpme:62
 msgid " (y/N) "
 msgstr ""
 
-#: po/placeholder.h:75 po/placeholder.h:398
+#: po/placeholder.h:75 po/placeholder.h:389
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: po/placeholder.h:77 po/placeholder.h:497 urpmq:159
+#: po/placeholder.h:77
 msgid ""
 "some packages have to be removed for being upgraded, this is not supported "
 "yet\n"
 msgstr ""
 
-#: po/placeholder.h:78 po/placeholder.h:272 urpm.pm:1177
+#: po/placeholder.h:78 po/placeholder.h:268 urpm.pm:1289
 #, c-format
 msgid "mounting %s"
 msgstr ""
 
-#: po/placeholder.h:79 po/placeholder.h:275 urpm.pm:144
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: po/placeholder.h:80 po/placeholder.h:434 po/placeholder.h:472
+#: po/placeholder.h:79 po/placeholder.h:436 po/placeholder.h:474
 #, fuzzy
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "grym"
 
-#: po/placeholder.h:81 po/placeholder.h:443 urpmi.removemedia:47
+#: po/placeholder.h:80 po/placeholder.h:272 urpm.pm:172
+#, c-format
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr ""
+
+#: po/placeholder.h:81 po/placeholder.h:445 urpmi.removemedia:47
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:82 po/placeholder.h:277 urpm.pm:2010
+#: po/placeholder.h:82 po/placeholder.h:275 urpm.pm:1675
 #, fuzzy, c-format
 msgid "malformed input: [%s]"
 msgstr "Mewnbwn/Allbwn"
 
-#: po/placeholder.h:83 po/placeholder.h:404 po/placeholder.h:509
+#: po/placeholder.h:83 po/placeholder.h:407 po/placeholder.h:509
 #, fuzzy
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "chwilio"
 
-#: po/placeholder.h:84 po/placeholder.h:279
-#, fuzzy
-msgid "...copying failed"
-msgstr "methodd y gosodiad"
-
-#: po/placeholder.h:85 po/placeholder.h:405 urpmi:342
-#, fuzzy
-msgid "Press Enter when it's done..."
-msgstr "gorffen."
+#: po/placeholder.h:84
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
 
-#: po/placeholder.h:86 po/placeholder.h:407 urpmi:243
+#: po/placeholder.h:85 po/placeholder.h:409 urpmi:296
 #, fuzzy, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Un:"
 
-#: po/placeholder.h:87 po/placeholder.h:510
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
+#: po/placeholder.h:86
+#, fuzzy
+msgid "Press Enter when it's done..."
+msgstr "gorffen."
+
+#: po/placeholder.h:87 po/placeholder.h:277
+#, fuzzy
+msgid "...copying failed"
+msgstr "methodd y gosodiad"
 
-#: po/placeholder.h:88 po/placeholder.h:280 urpm.pm:259
+#: po/placeholder.h:88
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:89 po/placeholder.h:478
+#: po/placeholder.h:89 po/placeholder.h:480
 #, fuzzy
 msgid "  -h             - print this help message.\n"
 msgstr "Dangos y cymorth hwn a gadael"
 
-#: po/placeholder.h:90 po/placeholder.h:453
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "Dewiswch y cyfrwng ar gyfer cadw wrth gefn..."
-
-#: po/placeholder.h:91 po/placeholder.h:479
+#: po/placeholder.h:90
 #, fuzzy
 msgid "  -g             - print groups too with name.\n"
 msgstr "enw"
 
-#: po/placeholder.h:92 po/placeholder.h:287
+#: po/placeholder.h:91 po/placeholder.h:455
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr "Dewiswch y cyfrwng ar gyfer cadw wrth gefn..."
+
+#: po/placeholder.h:92 po/placeholder.h:285
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:93 po/placeholder.h:436
+#: po/placeholder.h:93 po/placeholder.h:438
 msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:94 po/placeholder.h:489
+#: po/placeholder.h:94
 #, fuzzy
 msgid "  -r             - print version and release too with name.\n"
 msgstr "enw"
 
-#: po/placeholder.h:95 po/placeholder.h:364
-msgid "  --auto         - automatically select a good package in choices.\n"
-msgstr ""
-
-#: po/placeholder.h:96 po/placeholder.h:490
+#: po/placeholder.h:95 po/placeholder.h:492
 #, fuzzy
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "enw"
 
+#: po/placeholder.h:96
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
+
 #: po/placeholder.h:97
 #, fuzzy, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "Methu rhedeg porwr"
 
-#: po/placeholder.h:98 po/placeholder.h:291 urpm.pm:1485
+#: po/placeholder.h:98 po/placeholder.h:477 urpmi.update:60
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+
+#: po/placeholder.h:99
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "Y ffeil yn methu darllen ffeil\n"
 
-#: po/placeholder.h:99 po/placeholder.h:475 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-
-#: po/placeholder.h:100 po/placeholder.h:293 urpm.pm:137
+#: po/placeholder.h:100 po/placeholder.h:289 urpm.pm:153
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:101 po/placeholder.h:493
+#: po/placeholder.h:101 po/placeholder.h:495
 msgid ""
 "  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:103 po/placeholder.h:422 urpmi.addmedia:91
+#: po/placeholder.h:103 po/placeholder.h:424 urpmi.addmedia:94
 #, fuzzy, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "Methu creu'r enw ssh"
 
-#: po/placeholder.h:105 po/placeholder.h:296
+#: po/placeholder.h:105 po/placeholder.h:292
 #, fuzzy, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "llwybr perthynol i synthesis neu hdlist:"
 
-#: po/placeholder.h:106 po/placeholder.h:344 urpme:40
-msgid "usage: urpme [-a] [--auto] <packages...>\n"
-msgstr ""
-
-#: po/placeholder.h:107 po/placeholder.h:498 urpmq:95
+#: po/placeholder.h:106 po/placeholder.h:498 urpmq:104
 #, fuzzy, c-format
 msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr "anhysbus"
 
-#: po/placeholder.h:108 po/placeholder.h:299
+#: po/placeholder.h:107 po/placeholder.h:334 urpme:40
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr ""
+
+#: po/placeholder.h:108 po/placeholder.h:294
 #, fuzzy, c-format
 msgid "building hdlist [%s]"
 msgstr "adeiladu math 1inst"
 
-#: po/placeholder.h:109 po/placeholder.h:300 urpm.pm:1939
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+#: po/placeholder.h:109 po/placeholder.h:362 po/placeholder.h:504
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:110 po/placeholder.h:301
+#: po/placeholder.h:110 po/placeholder.h:297
 #, fuzzy, c-format
 msgid "added medium %s"
 msgstr "(wedi ychwanegu %s yn barod)"
 
-#: po/placeholder.h:111 po/placeholder.h:373 po/placeholder.h:504
-msgid "  --media        - use only the media listed by comma.\n"
+#: po/placeholder.h:111 po/placeholder.h:296 urpm.pm:1604
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:112 po/placeholder.h:302
+#: po/placeholder.h:112 po/placeholder.h:298
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:113 po/placeholder.h:305 urpm.pm:2022
+#: po/placeholder.h:113 po/placeholder.h:301 urpm.pm:1687
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "methodd y gosodiad"
 
-#: po/placeholder.h:114 po/placeholder.h:306 urpm.pm:1955
+#: po/placeholder.h:114 po/placeholder.h:303 urpm.pm:1620
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:115 po/placeholder.h:310 urpm.pm:1262
+#: po/placeholder.h:115 po/placeholder.h:306 urpm.pm:1327
 #, fuzzy, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "Heb ganfod ffeil  RPM"
 
-#: po/placeholder.h:116 po/placeholder.h:311 urpm.pm:1465
+#: po/placeholder.h:116
 #, fuzzy, c-format
 msgid "unknown data associated with %s"
 msgstr "anhysbus"
 
-#: po/placeholder.h:118 po/placeholder.h:390 urpmi:252
+#: po/placeholder.h:118 po/placeholder.h:379 urpmi:305
 #, fuzzy, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Pa fath o gysylltiad IDSN?"
 
-#: po/placeholder.h:119 po/placeholder.h:313 urpm.pm:302
+#: po/placeholder.h:119 po/placeholder.h:309 urpm.pm:344
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:120 po/placeholder.h:391 po/placeholder.h:435
-#: po/placeholder.h:473
+#: po/placeholder.h:120 po/placeholder.h:380 po/placeholder.h:437
+#: po/placeholder.h:475
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:122 po/placeholder.h:314 urpm.pm:2250
+#: po/placeholder.h:122
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:123 po/placeholder.h:315 urpm.pm:1263
+#: po/placeholder.h:123 po/placeholder.h:310 urpm.pm:1328 urpm.pm:1771
 #, fuzzy, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "Methu canfod ffeil menudrake .glade"
 
-#: po/placeholder.h:125 po/placeholder.h:320 urpm.pm:1249
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr ""
+#: po/placeholder.h:125 po/placeholder.h:386 urpmi:308
+#, fuzzy
+msgid "Sorry, bad choice, try again\n"
+msgstr "Ymddiheuriad"
 
-#: po/placeholder.h:126 po/placeholder.h:321 urpm.pm:1966
+#: po/placeholder.h:126 po/placeholder.h:312 urpm.pm:1631
 #, fuzzy, c-format
 msgid "unable to access medium \"%s\""
 msgstr "mynediad i offer rpm"
 
-#: po/placeholder.h:127 po/placeholder.h:395 urpmi:256
-#, fuzzy
-msgid "Sorry, bad choice, try again\n"
-msgstr "Ymddiheuriad"
+#: po/placeholder.h:127 po/placeholder.h:311 urpm.pm:1313
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr ""
 
-#: po/placeholder.h:128 po/placeholder.h:399 po/placeholder.h:428
-#: po/placeholder.h:466
+#: po/placeholder.h:128 po/placeholder.h:390 po/placeholder.h:430
+#: po/placeholder.h:468
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:129 po/placeholder.h:322 urpm.pm:1870
+#: po/placeholder.h:129 po/placeholder.h:313
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:130 po/placeholder.h:323
+#: po/placeholder.h:130
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:131 po/placeholder.h:325
+#: po/placeholder.h:131 po/placeholder.h:316
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:133 po/placeholder.h:332 urpm.pm:147
+#: po/placeholder.h:133 po/placeholder.h:322 urpm.pm:175
 #, fuzzy
 msgid "curl is missing\n"
 msgstr "Mae pecyn gorfodol %s ar goll"
 
-#: po/placeholder.h:134 po/placeholder.h:335 urpm.pm:291
+#: po/placeholder.h:134 po/placeholder.h:325 urpm.pm:333
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:135 po/placeholder.h:349
+#: po/placeholder.h:135 po/placeholder.h:339
 #, fuzzy
 msgid "  --help         - print this help message.\n"
 msgstr "Dangos y cymorth hwn a gadael"
 
-#: po/placeholder.h:137 po/placeholder.h:350 urpmi:443
+#: po/placeholder.h:137 po/placeholder.h:340 urpmi:486
 #, fuzzy
 msgid "everything already installed"
 msgstr "Pecynnau wedi eu gosod eisoes"
 
-#: po/placeholder.h:138 po/placeholder.h:235 urpm.pm:2015
+#: po/placeholder.h:138 po/placeholder.h:235 urpm.pm:1680
 #, fuzzy
 msgid "retrieving rpms files..."
 msgstr "Ffeiliau Defnyddiwr Cadw wrth Gefn..."
 
-#: po/placeholder.h:139 po/placeholder.h:237
+#: po/placeholder.h:139 po/placeholder.h:236
 #, fuzzy, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "dyfais"
 
-#: po/placeholder.h:140 po/placeholder.h:352 urpmi:244
+#: po/placeholder.h:140 po/placeholder.h:342 urpmi:297
 #, fuzzy
 msgid "One of the following packages is needed:"
 msgstr "Un:"
 
-#: po/placeholder.h:141 po/placeholder.h:239
+#: po/placeholder.h:141 po/placeholder.h:238
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr ""
 
-#: po/placeholder.h:143 po/placeholder.h:486 urpmq:98
+#: po/placeholder.h:143 po/placeholder.h:488 urpmq:107
 #, fuzzy, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "methu agor y ffeil i ddarllen: %s"
 
-#: po/placeholder.h:145 po/placeholder.h:343 urpme:83
+#: po/placeholder.h:145 po/placeholder.h:333 urpme:83
 #, fuzzy
 msgid "Nothing to remove.\n"
 msgstr "Dim i'w wneud"
 
-#: po/placeholder.h:147 po/placeholder.h:366 urpmi:385 urpmi:392 urpmi:412
-#: urpmi:429
+#: po/placeholder.h:147 po/placeholder.h:356 urpmi:186 urpmi:448 urpmi:457
+#: urpmi:463 urpmi:475 urpmi:480
 #, fuzzy
 msgid "Installation failed"
 msgstr "methodd y gosodiad"
@@ -642,12 +641,12 @@ msgstr "methodd y gosodiad"
 msgid "unable to access first installation medium"
 msgstr ""
 
-#: po/placeholder.h:149 po/placeholder.h:371 po/placeholder.h:499
+#: po/placeholder.h:149 po/placeholder.h:360 po/placeholder.h:499
 #, fuzzy
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "chwilio"
 
-#: po/placeholder.h:151 po/placeholder.h:246 urpm.pm:1188
+#: po/placeholder.h:151 po/placeholder.h:246 urpm.pm:1300
 #, fuzzy, c-format
 msgid "unmounting %s"
 msgstr "gwall dadosod %s: %s"
@@ -657,209 +656,248 @@ msgstr "gwall dadosod %s: %s"
 msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:153 po/placeholder.h:248
+#: po/placeholder.h:153 po/placeholder.h:249
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:155 po/placeholder.h:250 urpm.pm:1481
+#: po/placeholder.h:155
 #, fuzzy
 msgid "<non printable chars>"
 msgstr "Heb eu gosod yn unig"
 
-#: po/placeholder.h:156 po/placeholder.h:379 po/placeholder.h:507
+#: po/placeholder.h:156 po/placeholder.h:368 po/placeholder.h:506
 #, fuzzy
 msgid "  -v             - verbose mode.\n"
 msgstr "Modd Kudz"
 
-#: po/placeholder.h:157 po/placeholder.h:253
+#: po/placeholder.h:157 po/placeholder.h:252
 #, fuzzy, c-format
 msgid "removing medium \"%s\""
 msgstr "Tynnu LPRng..."
 
-#: po/placeholder.h:158 po/placeholder.h:256
+#: po/placeholder.h:158
 #, c-format
 msgid "unable to build synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:159 po/placeholder.h:258
+#: po/placeholder.h:159
 #, c-format
 msgid "trying to select multiple medium: %s"
 msgstr ""
 
-#: po/placeholder.h:160 po/placeholder.h:476
+#: po/placeholder.h:160 po/placeholder.h:478
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:161 po/placeholder.h:385
+#: po/placeholder.h:161 po/placeholder.h:375
 msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:259 urpm.pm:2262
+#: po/placeholder.h:162
 #, c-format
 msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:164 po/placeholder.h:389
+#: po/placeholder.h:164
 #, fuzzy
 msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr "Gwasanaethwr"
 
-#: po/placeholder.h:165 po/placeholder.h:266
+#: po/placeholder.h:165 po/placeholder.h:259
 #, fuzzy, c-format
 msgid "write config file [%s]"
 msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
 
-#: po/placeholder.h:166 po/placeholder.h:269
+#: po/placeholder.h:166
 msgid "unable to build hdlist synthesis, using parsehdlist method"
 msgstr ""
 
-#: po/placeholder.h:167 po/placeholder.h:442
+#: po/placeholder.h:167 po/placeholder.h:444
 msgid ""
 "  --distrib      - automatically create all media from an installation "
 "medium.\n"
 msgstr ""
 
-#: po/placeholder.h:170 po/placeholder.h:397 po/placeholder.h:496
+#: po/placeholder.h:170 po/placeholder.h:388 po/placeholder.h:497
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: po/placeholder.h:172 po/placeholder.h:273 urpm.pm:274
+#: po/placeholder.h:172 po/placeholder.h:269 urpm.pm:316
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr ""
 
-#: po/placeholder.h:173 po/placeholder.h:274
+#: po/placeholder.h:173 po/placeholder.h:270
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:175 po/placeholder.h:276
+#: po/placeholder.h:175 po/placeholder.h:274
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:176 po/placeholder.h:278 urpm.pm:1835 urpm.pm:1861
+#: po/placeholder.h:176 po/placeholder.h:276 urpm.pm:1500 urpm.pm:1526
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:182 po/placeholder.h:282 urpm.pm:300
+#: po/placeholder.h:178 po/placeholder.h:326 urpme:120
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid ""
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
 msgstr ""
 
-#: po/placeholder.h:183 po/placeholder.h:284
+#: po/placeholder.h:180 po/placeholder.h:279
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "Ffeiliau Defnyddiwr Cadw wrth Gefn..."
+
+#: po/placeholder.h:181 po/placeholder.h:341 urpmi:131
+#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "anhysbus"
+
+#: po/placeholder.h:182 po/placeholder.h:280 urpm.pm:342
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr ""
 
-#: po/placeholder.h:184 po/placeholder.h:283 urpm.pm:1267
+#: po/placeholder.h:183 po/placeholder.h:281 urpm.pm:1332
 #, fuzzy
 msgid "unable to register rpm file"
 msgstr "Methu canfod ffeil menudrake .glade"
 
-#: po/placeholder.h:185 po/placeholder.h:286
-#, fuzzy, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "pwyntiau"
+#: po/placeholder.h:184 po/placeholder.h:282
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: po/placeholder.h:186 po/placeholder.h:285 urpm.pm:354
+#: po/placeholder.h:185 po/placeholder.h:286
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: po/placeholder.h:187 po/placeholder.h:288
+#: po/placeholder.h:186 po/placeholder.h:283 urpm.pm:396
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:188 po/placeholder.h:289 urpm.pm:346
+#: po/placeholder.h:187 po/placeholder.h:284
+#, fuzzy, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "pwyntiau"
+
+#: po/placeholder.h:188 po/placeholder.h:287 urpm.pm:388
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:189 po/placeholder.h:359 po/placeholder.h:488
+#: po/placeholder.h:189 po/placeholder.h:349 po/placeholder.h:490
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:190 po/placeholder.h:290
+#: po/placeholder.h:190 po/placeholder.h:288
 #, fuzzy, c-format
 msgid "copy of [%s] failed"
 msgstr "methodd y gosodiad"
 
-#: po/placeholder.h:191 po/placeholder.h:292 urpm.pm:1480
+#: po/placeholder.h:191 po/placeholder.h:493
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
+
+#: po/placeholder.h:192
 #, c-format
 msgid "unable to analyse synthesis data of %s"
 msgstr ""
 
-#: po/placeholder.h:192 po/placeholder.h:491
-msgid "  -d             - extend query to package dependencies.\n"
+#: po/placeholder.h:193 po/placeholder.h:336 urpme:111
+#, c-format
+msgid "removing package %s will break your system\n"
 msgstr ""
 
-#: po/placeholder.h:193 po/placeholder.h:294
+#: po/placeholder.h:194 po/placeholder.h:290
 #, fuzzy, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "llwybr perthynol i synthesis neu hdlist:"
 
-#: po/placeholder.h:194 po/placeholder.h:346 urpme:111
-#, c-format
-msgid "removing package %s will break your system\n"
-msgstr ""
+#: po/placeholder.h:196 po/placeholder.h:358
+#, fuzzy
+msgid "  --X            - use X interface.\n"
+msgstr "Rhyngwyneb rhwydwaith"
 
-#: po/placeholder.h:196 po/placeholder.h:295
+#: po/placeholder.h:197 po/placeholder.h:291
 #, fuzzy
 msgid "...copying done"
 msgstr "Wedi gosod True Type"
 
-#: po/placeholder.h:197 po/placeholder.h:369
+#: po/placeholder.h:198 po/placeholder.h:359 urpmi:383 urpmi:392
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "Un:"
+
+#: po/placeholder.h:199 po/placeholder.h:293
 #, fuzzy
-msgid "  --X            - use X interface.\n"
-msgstr "Rhyngwyneb rhwydwaith"
+msgid "copying hdlists file..."
+msgstr "Rhestr ddewis argraffu"
 
-#: po/placeholder.h:200 po/placeholder.h:298 urpm.pm:235 urpm.pm:247
+#: po/placeholder.h:200 po/placeholder.h:295 urpm.pm:277 urpm.pm:289
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:201 po/placeholder.h:372 urpmi:420 urpmi:422
+#: po/placeholder.h:201 po/placeholder.h:361 urpmi:470
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
-#: po/placeholder.h:203 po/placeholder.h:303 urpm.pm:1271
+#: po/placeholder.h:202 po/placeholder.h:363 po/placeholder.h:505
+#, fuzzy
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "chwilio"
+
+#: po/placeholder.h:203 po/placeholder.h:299 urpm.pm:1335
 #, fuzzy
 msgid "error registering local packages"
 msgstr "Gwall fformat ffeiliau neu becynnau"
 
-#: po/placeholder.h:204 po/placeholder.h:304
+#: po/placeholder.h:204 po/placeholder.h:300
 #, fuzzy, c-format
 msgid "taking removable device as \"%s\""
 msgstr "dyfais"
 
-#: po/placeholder.h:205 po/placeholder.h:380 po/placeholder.h:506
+#: po/placeholder.h:205 po/placeholder.h:369
 #, fuzzy
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "chwilio"
 
-#: po/placeholder.h:208 po/placeholder.h:308
+#: po/placeholder.h:207 po/placeholder.h:304
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "Rhestr ddewis argraffu"
+
+#: po/placeholder.h:208
 #, fuzzy, c-format
 msgid "unable to build hdlist: %s"
 msgstr "Methu rhedeg porwr"
 
-#: po/placeholder.h:209 po/placeholder.h:309 urpm.pm:1930 urpm.pm:1933
-#: urpm.pm:1951
+#: po/placeholder.h:209 po/placeholder.h:305 urpm.pm:1595 urpm.pm:1598
+#: urpm.pm:1616
 #, fuzzy, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "Nid yw pecyn %s wedi ei lofnodi"
 
-#: po/placeholder.h:210 po/placeholder.h:312 urpm.pm:316
+#: po/placeholder.h:210 po/placeholder.h:307 urpm.pm:358
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:211 po/placeholder.h:387
+#: po/placeholder.h:211 po/placeholder.h:377
 #, fuzzy
 msgid "  -q             - quiet mode.\n"
 msgstr "Modd Kudz"
@@ -869,106 +907,176 @@ msgstr "Modd Kudz"
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Hawlfraint (H) 1999, 2000, 2001, 2002 MandrakeSoft."
 
-#: po/placeholder.h:214 po/placeholder.h:394 po/placeholder.h:494
+#: po/placeholder.h:214 po/placeholder.h:385 po/placeholder.h:496
 #, fuzzy
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "grym grym"
 
-#: po/placeholder.h:215 po/placeholder.h:340 urpme:61
+#: po/placeholder.h:216 po/placeholder.h:330 urpme:61
 #, c-format
 msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:217 po/placeholder.h:345 urpme:31
-#, fuzzy
-msgid "Remove them all?"
-msgstr "Caniatáu pob defnyddiwr"
-
-#: po/placeholder.h:218 po/placeholder.h:400 urpmi:367 urpmi:369
+#: po/placeholder.h:217 po/placeholder.h:391 urpmi:437
 #, fuzzy, c-format
 msgid "installing %s\n"
 msgstr "Gosod"
 
-#: po/placeholder.h:219 po/placeholder.h:401 urpmi:341
+#: po/placeholder.h:218 po/placeholder.h:335 urpme:31
+#, fuzzy
+msgid "Remove them all?"
+msgstr "Caniatáu pob defnyddiwr"
+
+#: po/placeholder.h:219 po/placeholder.h:392 urpmi:421
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "dyfais"
 
-#: po/placeholder.h:221 po/placeholder.h:324 urpm.pm:1372
+#: po/placeholder.h:220 po/placeholder.h:314 urpm.pm:1425
 #, fuzzy, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Diweddaru'r pecynnau'n unig"
 
-#: po/placeholder.h:222 po/placeholder.h:327 urpm.pm:1250
+#: po/placeholder.h:221 po/placeholder.h:315
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "adeiladu math 1inst"
+
+#: po/placeholder.h:222 po/placeholder.h:317 urpm.pm:1314
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: po/placeholder.h:224 po/placeholder.h:441
+#: po/placeholder.h:223 po/placeholder.h:443
 #, fuzzy
 msgid "  --update       - create an update medium.\n"
 msgstr "Digwyddodd gwall, ceisiwch newid rhai paramedrau"
 
-#: po/placeholder.h:225 po/placeholder.h:328 urpm.pm:2020
-#, fuzzy
-msgid "...retrieving done"
-msgstr "Wedi gosod True Type"
-
-#: po/placeholder.h:226 po/placeholder.h:403 po/placeholder.h:508 urpmi:330
-#: urpmq:174
-msgid "unable to get source packages, aborting"
-msgstr ""
-
-#: po/placeholder.h:227 po/placeholder.h:474
+#: po/placeholder.h:225 po/placeholder.h:476
 #, fuzzy
 msgid ""
 "  -d             - force complete computation of depslist.ordered file.\n"
 msgstr "grym"
 
-#: po/placeholder.h:228 po/placeholder.h:330 urpm.pm:198
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+#: po/placeholder.h:226 po/placeholder.h:404 po/placeholder.h:507 urpmi:410
+#: urpmq:198
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: po/placeholder.h:229 po/placeholder.h:329 urpm.pm:2137
+#: po/placeholder.h:227 po/placeholder.h:318 urpm.pm:1685
+#, fuzzy
+msgid "...retrieving done"
+msgstr "Wedi gosod True Type"
+
+#: po/placeholder.h:228
 #, fuzzy, c-format
 msgid "selecting %s using obsoletes"
 msgstr "Rhyngwyneb %s (gan ddefnyddio modiwl %s)"
 
-#: po/placeholder.h:230 po/placeholder.h:331 urpm.pm:2259
+#: po/placeholder.h:229 po/placeholder.h:320 urpm.pm:226
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
+
+#: po/placeholder.h:230
 #, c-format
 msgid "selecting %s by selection on files"
 msgstr ""
 
-#: po/placeholder.h:231 po/placeholder.h:333
+#: po/placeholder.h:231 po/placeholder.h:323
 #, fuzzy, c-format
 msgid "copying source list of \"%s\"..."
 msgstr "Rhestr ddewis argraffu"
 
-#: po/placeholder.h:232 po/placeholder.h:334 urpm.pm:140
+#: po/placeholder.h:232 po/placeholder.h:408 urpmi:181
+msgid "Only superuser is allowed to install packages"
+msgstr ""
+
+#: po/placeholder.h:233 po/placeholder.h:324 urpm.pm:168
 #, fuzzy
 msgid "wget is missing\n"
 msgstr "Mae pecyn gorfodol %s ar goll"
 
-#: po/placeholder.h:233 po/placeholder.h:406 urpmi:150
-msgid "Only superuser is allowed to install packages"
+#: po/placeholder.h:242 urpm.pm:241
+#, c-format
+msgid "rsync failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:260
+#: po/placeholder.h:248
 #, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+msgid "trying to select multiple media: %s"
+msgstr ""
+
+#: po/placeholder.h:251
+#, fuzzy, c-format
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "Y ffeil yn methu darllen ffeil\n"
+
+#: po/placeholder.h:255
+#, fuzzy, c-format
+msgid "reading rpms files from [%s]"
+msgstr "Heb ganfod ffeil  RPM"
+
+#: po/placeholder.h:256 urpm.pm:144
+#, c-format
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: po/placeholder.h:316
+#: po/placeholder.h:261 urpm.pm:165
+#, fuzzy, c-format
+msgid "unable to handle protocol: %s"
+msgstr "Methu rhedeg porwr"
+
+#: po/placeholder.h:265
 #, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:353
+#: po/placeholder.h:266 urpm.pm:1535
+#, fuzzy, c-format
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "Methu rhedeg porwr"
+
+#: po/placeholder.h:267 urpm.pm:1759 urpm.pm:1764
+#, fuzzy, c-format
+msgid "unable to install package %s"
+msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
+
+#: po/placeholder.h:271
+#, fuzzy, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "Tynnu LPRng..."
+
+#: po/placeholder.h:273 urpm.pm:301
+#, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+
+#: po/placeholder.h:278 urpm.pm:231
+#, fuzzy
+msgid "ssh is missing\n"
+msgstr "Mae pecyn gorfodol %s ar goll"
+
+#: po/placeholder.h:302 urpm.pm:1730
+msgid "Preparing..."
+msgstr ""
+
+#: po/placeholder.h:308
+#, fuzzy, c-format
+msgid "unable to read rpms files from [%s]: %s"
+msgstr "Methu canfod ffeil menudrake .glade"
+
+#: po/placeholder.h:319 urpm.pm:230
+#, fuzzy
+msgid "rsync is missing\n"
+msgstr "Mae pecyn gorfodol %s ar goll"
+
+#: po/placeholder.h:321 urpm.pm:298
+#, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+
+#: po/placeholder.h:343
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -981,13 +1089,19 @@ msgstr ""
 "\n"
 " rhydd\n"
 
-#: po/placeholder.h:360 urpmi:375
+#: po/placeholder.h:350
+#, fuzzy
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+
+#: po/placeholder.h:351 urpmi:442
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:375
+#: po/placeholder.h:364
 #, fuzzy
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -996,14 +1110,56 @@ msgstr ""
 "\n"
 " X"
 
-#: po/placeholder.h:381 urpmi:304
+#: po/placeholder.h:370
+msgid ""
+"  --bug          - output a bug report in directory indicated by next arg.\n"
+msgstr ""
+
+#: po/placeholder.h:371 urpmi:389
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: po/placeholder.h:408 urpmi.addmedia:69
+#: po/placeholder.h:381 urpmi:422
+#, fuzzy
+msgid "Press Enter when ready..."
+msgstr "gorffen."
+
+#: po/placeholder.h:382 po/placeholder.h:491
+#, 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:393 urpmi:355
+#, c-format
+msgid ""
+"Some package have to be removed for others to be upgraded:\n"
+"%s\n"
+"do you agree ?"
+msgstr ""
+
+#: po/placeholder.h:398 urpmi:348
+#, c-format
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s\n"
+"do you agree ?"
+msgstr ""
+
+#: po/placeholder.h:405
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+#: po/placeholder.h:406 urpmi:156
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr ""
+
+#: po/placeholder.h:410 urpmi.addmedia:72
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -1012,7 +1168,7 @@ msgstr ""
 "\n"
 " llwybr"
 
-#: po/placeholder.h:412
+#: po/placeholder.h:414
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1033,22 +1189,22 @@ msgstr ""
 " http<host><path>\n"
 "<path>\n"
 
-#: po/placeholder.h:424 po/placeholder.h:444 po/placeholder.h:462
-#: urpmi.addmedia:58
+#: po/placeholder.h:426 po/placeholder.h:446 po/placeholder.h:464
+#: urpmi.addmedia:61
 #, fuzzy, c-format
 msgid ""
 "\n"
 "unknown options '%s'\n"
 msgstr "Dewisiadau modiwl:"
 
-#: po/placeholder.h:430 urpmi.addmedia:81
+#: po/placeholder.h:432 urpmi.addmedia:84
 #, fuzzy, c-format
 msgid ""
 "%s\n"
 "<relative path of hdlist> missing\n"
 msgstr "llwybr perthynol i synthesis neu hdlist:"
 
-#: po/placeholder.h:437 urpmi.addmedia:83
+#: po/placeholder.h:439 urpmi.addmedia:86
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -1057,14 +1213,14 @@ msgstr ""
 "\n"
 " ftp"
 
-#: po/placeholder.h:448 urpmi.removemedia:49
+#: po/placeholder.h:450 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:454
+#: po/placeholder.h:456
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -1073,7 +1229,7 @@ msgstr ""
 "<name>\n"
 "<name> enw"
 
-#: po/placeholder.h:458
+#: po/placeholder.h:460
 #, fuzzy
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1082,14 +1238,19 @@ msgstr ""
 "<name>\n"
 "<name> enw"
 
-#: po/placeholder.h:467 urpmi.update:59
+#: po/placeholder.h:469 urpmi.update:62
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:480
+#: po/placeholder.h:481
+#, fuzzy
+msgid "  -r             - print version and release with name also.\n"
+msgstr "enw"
+
+#: po/placeholder.h:482
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1108,27 +1269,21 @@ msgid ""
 "                   stdout (root only).\n"
 msgstr ""
 
-#: urpm.pm:2163 urpm.pm:2172
-#, fuzzy, c-format
-msgid "removing %s to upgrade to %s ..."
-msgstr "I ysgogi'r llygoden,"
-
-#: urpm.pm:2164 urpm.pm:2173
-msgid ", $otherPackage, "
-msgstr ""
-
-#: urpm.pm:2164 urpm.pm:2173
-msgid "));"
+#: po/placeholder.h:508
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: urpm.pm:2169
+#: po/placeholder.h:510
 #, fuzzy
-msgid "$p->{name}-$p->{version}-$p->{release}"
-msgstr "Fersiwn Gnome o ghostview"
+msgid "  -g             - print groups with name also.\n"
+msgstr "enw"
 
-#: urpm.pm:2179
-msgid "$prefix/$_"
-msgstr ""
+#: po/placeholder.h:511
+#, fuzzy
+msgid "  --list         - list available packages.\n"
+msgstr "Argraffu tudalennau prawf"
 
 #: urpmi:58
 #, fuzzy, c-format
@@ -1142,9 +1297,9 @@ msgstr "<name><url> llwybr"
 
 #: urpmi.addmedia:38 urpmi.addmedia:39 urpmi.addmedia:40 urpmi.addmedia:41
 #: urpmi.addmedia:42 urpmi.addmedia:43 urpmi.addmedia:44 urpmi.removemedia:36
-#: urpmi.removemedia:37 urpmi.removemedia:38 urpmi.update:43 urpmi.update:44
-#: urpmi.update:45 urpmi.update:46 urpmi.update:47 urpmi.update:48
-#: urpmi.update:49
+#: urpmi.removemedia:37 urpmi.removemedia:38 urpmi.update:46 urpmi.update:47
+#: urpmi.update:48 urpmi.update:49 urpmi.update:50 urpmi.update:51
+#: urpmi.update:52
 msgid ") . _("
 msgstr ""
 
@@ -1156,11 +1311,11 @@ msgstr ""
 msgid "usage: urpmi.removemedia [-a] <name> ..."
 msgstr ""
 
-#: urpmi.removemedia:38 urpmi.update:49
+#: urpmi.removemedia:38 urpmi.update:52
 msgid ", $_);"
 msgstr ""
 
-#: urpmi.update:41
+#: urpmi.update:44
 msgid "usage: urpmi.update [options] <name> ..."
 msgstr ""
 
@@ -1168,3 +1323,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid "urpmq version %s"
 msgstr "Fersiwn y Cnewyllyn:"
+
+#, fuzzy
+#~ msgid "removing %s to upgrade to %s ..."
+#~ msgstr "I ysgogi'r llygoden,"
+
+#, fuzzy
+#~ msgid "$p->{name}-$p->{version}-$p->{release}"
+#~ msgstr "Fersiwn Gnome o ghostview"