updated pot file

1 files changed, 400 insertions, 388 deletions

diff --git a/po/cy.po b/po/cy.po
index 4226b272..0739b36e 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-07-15 12:45+0200\n"
+"POT-Creation-Date: 2002-07-19 12:57+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"
@@ -25,17 +25,17 @@ msgstr ""
 "Gosodiad pecynnau awtomatig...\n"
 "Roeddech wedi gofyn i gael gosod pecyn $rpm\n"
 
-#: _irpm:28 po/placeholder.h:249 po/placeholder.h:359 po/placeholder.h:438
-#: urpme:30 urpmi:409
+#: _irpm:28 po/placeholder.h:251 po/placeholder.h:361 po/placeholder.h:440
+#: urpme:30 urpmi:410
 #, fuzzy
 msgid "Is it OK?"
 msgstr "Mae'r model yn gywir"
 
-#: _irpm:30 po/placeholder.h:239 po/placeholder.h:419 urpmi:412 urpmi:440
+#: _irpm:30 po/placeholder.h:240 po/placeholder.h:426 urpmi:413 urpmi:441
 msgid "Ok"
 msgstr "Iawn"
 
-#: _irpm:31 po/placeholder.h:202 po/placeholder.h:365 urpmi:413 urpmi:441
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:367 urpmi:414 urpmi:442
 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:37 po/placeholder.h:17 po/placeholder.h:219 po/placeholder.h:364
-#: po/placeholder.h:386 urpme:33 urpmi:362 urpmi:369 urpmi:417 urpmi:484
+#: _irpm:37 po/placeholder.h:17 po/placeholder.h:220 po/placeholder.h:366
+#: po/placeholder.h:393 urpme:33 urpmi:364 urpmi:371 urpmi:418 urpmi:486
 msgid "Nn"
 msgstr "Nn"
 
@@ -54,13 +54,13 @@ msgstr "Nn"
 #. 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:112 po/placeholder.h:358
-#: po/placeholder.h:388 urpme:35 urpmi:363 urpmi:370 urpmi:418 urpmi:485
+#: _irpm:38 po/placeholder.h:11 po/placeholder.h:113 po/placeholder.h:360
+#: po/placeholder.h:395 urpme:35 urpmi:365 urpmi:372 urpmi:419 urpmi:487
 msgid "Yy"
 msgstr "Yy"
 
-#: _irpm:39 po/placeholder.h:242 po/placeholder.h:355 po/placeholder.h:422
-#: urpme:121 urpmi:364 urpmi:371 urpmi:419
+#: _irpm:39 po/placeholder.h:242 po/placeholder.h:357 po/placeholder.h:429
+#: urpme:121 urpmi:366 urpmi:373 urpmi:420
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
@@ -69,87 +69,87 @@ msgstr " (Y/n) "
 msgid "$rpm: command not found\n"
 msgstr "Heb ganfod ffeil  RPM"
 
-#: po/placeholder.h:18 po/placeholder.h:190
+#: po/placeholder.h:18 po/placeholder.h:191
 #, fuzzy, c-format
 msgid "urpmf version %s"
 msgstr "Fersiwn y Cnewyllyn:"
 
-#: po/placeholder.h:19 po/placeholder.h:145
+#: po/placeholder.h:19 po/placeholder.h:146
 msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
 msgstr "Hawlfraint (C) 1999, 2000, 2001, 2002 MandrakeSoft."
 
-#: po/placeholder.h:20 po/placeholder.h:186
+#: po/placeholder.h:20 po/placeholder.h:187
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 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:160
+#: po/placeholder.h:21 po/placeholder.h:38 po/placeholder.h:161
 msgid "usage: urpmf [options] <file>"
 msgstr "defnydd: urpmf [dewisiadau] <ffeil>"
 
-#: po/placeholder.h:22 po/placeholder.h:134
+#: po/placeholder.h:22 po/placeholder.h:135
 msgid ""
 "  --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:23 po/placeholder.h:187
+#: po/placeholder.h:23 po/placeholder.h:188
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 "                    linell orchymyn , imae'n anghytûn a'r modd "
 "rhyngweithiol)."
 
-#: po/placeholder.h:24 po/placeholder.h:155
+#: po/placeholder.h:24 po/placeholder.h:156
 #, fuzzy
 msgid "  --all           - print all tags."
 msgstr "Argraffu tudalennau prawf"
 
-#: po/placeholder.h:25 po/placeholder.h:195
+#: po/placeholder.h:25 po/placeholder.h:196
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 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:199
+#: po/placeholder.h:26 po/placeholder.h:200
 msgid "                    command line but without package name)."
 msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
 
-#: po/placeholder.h:27 po/placeholder.h:127
+#: po/placeholder.h:27 po/placeholder.h:128
 #, fuzzy
 msgid "  --group         - print tag group: group."
 msgstr "Argraffu tudalennau prawf"
 
-#: po/placeholder.h:28 po/placeholder.h:110
+#: po/placeholder.h:28 po/placeholder.h:111
 #, fuzzy
 msgid "  --size          - print tag size: size."
 msgstr "Argraffu tudalennau prawf"
 
-#: po/placeholder.h:29 po/placeholder.h:164
+#: po/placeholder.h:29 po/placeholder.h:166
 #, fuzzy
 msgid "  --serial        - print tag serial: serial."
 msgstr "Argraffu tudalennau prawf"
 
-#: po/placeholder.h:30 po/placeholder.h:178
+#: po/placeholder.h:30 po/placeholder.h:179
 #, fuzzy
 msgid "  --summary       - print tag summary: summary."
 msgstr "Argraffu tudalennau prawf"
 
-#: po/placeholder.h:31 po/placeholder.h:149
+#: po/placeholder.h:31 po/placeholder.h:150
 #, fuzzy
 msgid "  --description   - print tag description: description."
 msgstr "Argraffu tudalennau prawf"
 
-#: po/placeholder.h:32 po/placeholder.h:168
+#: po/placeholder.h:32 po/placeholder.h:170
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 "  --provides      - tag argraffu'n darparu: pob darpariaeth (llinellau "
 "lluosog)."
 
-#: po/placeholder.h:33 po/placeholder.h:230
+#: po/placeholder.h:33 po/placeholder.h:231
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 "  --requires      - tag argraffu'n darparu: all requires (multiple lines)."
@@ -164,17 +164,17 @@ msgid ""
 msgstr ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 
-#: po/placeholder.h:36 po/placeholder.h:131
+#: po/placeholder.h:36 po/placeholder.h:132
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 
-#: po/placeholder.h:37 po/placeholder.h:157
+#: po/placeholder.h:37 po/placeholder.h:158
 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:81
+#: po/placeholder.h:39 po/placeholder.h:82
 msgid "try urpmf --help for more options"
 msgstr "try urpmf --help for more options"
 
@@ -182,7 +182,7 @@ msgstr "try urpmf --help for more options"
 msgid "no full media list was found"
 msgstr "ni chanfyddwyd restr cyfrwng llawn"
 
-#: po/placeholder.h:41 po/placeholder.h:260
+#: po/placeholder.h:41 po/placeholder.h:261
 #, fuzzy, c-format
 msgid "unable to write config file [%s]"
 msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
@@ -196,55 +196,55 @@ 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:263
+#: po/placeholder.h:44 po/placeholder.h:266 urpm.pm:429
+#, 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:45 po/placeholder.h:264
 #, 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:265 urpm.pm:429
-#, 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:267
+#, fuzzy, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "Methu canfod ffeil menudrake .glade"
 
-#: po/placeholder.h:47 po/placeholder.h:381
+#: po/placeholder.h:48 po/placeholder.h:383
 #, fuzzy
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto-select  - automatically select packages for upgrading the system.\n"
 
-#: po/placeholder.h:48 po/placeholder.h:266
-#, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "Methu canfod ffeil menudrake .glade"
-
-#: po/placeholder.h:49 po/placeholder.h:267
+#: po/placeholder.h:49 po/placeholder.h:268
 #, 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:50 po/placeholder.h:550
+#: po/placeholder.h:50 po/placeholder.h:555
 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:51 po/placeholder.h:269
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:52
+#: po/placeholder.h:51
 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:53 po/placeholder.h:271 urpm.pm:1609
+#: po/placeholder.h:52 po/placeholder.h:270
+#, c-format
+msgid "retrieving description file of \"%s\"..."
+msgstr ""
+
+#: po/placeholder.h:53 po/placeholder.h:272 urpm.pm:1616
 #, fuzzy, c-format
 msgid "package %s is not found."
 msgstr "Nid yw pecyn %s wedi ei lofnodi"
 
-#: po/placeholder.h:55 po/placeholder.h:274
+#: po/placeholder.h:55 po/placeholder.h:275
 #, c-format
 msgid "trying to select multiple media: %s"
 msgstr ""
@@ -254,21 +254,21 @@ msgstr ""
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:57
-msgid "problem reading hdlist file, trying again"
-msgstr ""
+#: po/placeholder.h:57 po/placeholder.h:356 urpme:51
+#, fuzzy
+msgid "unknown package(s) "
+msgstr "Pecyn anhysbys i urpmq"
 
-#: po/placeholder.h:58 po/placeholder.h:276 urpm.pm:382
+#: po/placeholder.h:58 po/placeholder.h:277 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:59 po/placeholder.h:354 urpme:51
-#, fuzzy
-msgid "unknown package(s) "
-msgstr "Pecyn anhysbys i urpmq"
+#: po/placeholder.h:59
+msgid "problem reading hdlist file, trying again"
+msgstr ""
 
-#: po/placeholder.h:60 po/placeholder.h:279 urpm.pm:389
+#: po/placeholder.h:60 po/placeholder.h:280 urpm.pm:389
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
@@ -277,457 +277,461 @@ msgstr ""
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:62 po/placeholder.h:280
+#: po/placeholder.h:62 po/placeholder.h:281
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:64 po/placeholder.h:411 po/placeholder.h:530
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-
-#: po/placeholder.h:65 po/placeholder.h:455 urpmi.addmedia:94
-#: urpmi.addmedia:111
+#: po/placeholder.h:64 po/placeholder.h:458 urpmi.addmedia:96
+#: urpmi.addmedia:113
 #, fuzzy, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "Methu rhedeg porwr"
 
-#: po/placeholder.h:66 po/placeholder.h:413
-msgid "  --noclean      - keep rpm not used in cache.\n"
+#: po/placeholder.h:65 po/placeholder.h:418 po/placeholder.h:535
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: po/placeholder.h:67 po/placeholder.h:460 po/placeholder.h:497
-#: po/placeholder.h:516
-msgid "  -c             - clean headers cache directory.\n"
+#: po/placeholder.h:66 po/placeholder.h:420
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: po/placeholder.h:68 po/placeholder.h:282 urpm.pm:196
-#, c-format
-msgid "unknown protocol defined for %s"
+#: po/placeholder.h:67 po/placeholder.h:463 po/placeholder.h:501
+#: po/placeholder.h:520
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:69 po/placeholder.h:283
+#: po/placeholder.h:68 po/placeholder.h:284
 #, fuzzy, c-format
 msgid "medium \"%s\" already exists"
 msgstr "Mae'r ffeil yn bodoli eisoes. Defnyddiwch hwn?"
 
-#: po/placeholder.h:70 po/placeholder.h:284
+#: po/placeholder.h:69 po/placeholder.h:283 urpm.pm:196
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr ""
+
+#: po/placeholder.h:70 po/placeholder.h:285
 #, fuzzy, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
 
-#: po/placeholder.h:71 po/placeholder.h:541
+#: po/placeholder.h:71 po/placeholder.h:546
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:72 po/placeholder.h:417 po/placeholder.h:547
+#: po/placeholder.h:72 po/placeholder.h:287 urpm.pm:177
+msgid "Unknown webfetch `$proxy->{type}' !!!\n"
+msgstr ""
+
+#: po/placeholder.h:73 po/placeholder.h:424 po/placeholder.h:552
 #, 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:73 po/placeholder.h:287 urpm.pm:1484
+#: po/placeholder.h:74 po/placeholder.h:288 urpm.pm:1491
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "Dewis pecynnau unigol."
 
-#: po/placeholder.h:74 po/placeholder.h:418 urpmi:492
+#: po/placeholder.h:75 po/placeholder.h:425 urpmi:494
 #, fuzzy
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "grym "
 
-#: po/placeholder.h:75 po/placeholder.h:289
+#: po/placeholder.h:76 po/placeholder.h:291 urpm.pm:424
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76 po/placeholder.h:290 urpm.pm:424
+#: po/placeholder.h:77 po/placeholder.h:290
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:77 po/placeholder.h:291
+#: po/placeholder.h:78 po/placeholder.h:292
 #, fuzzy
 msgid "urpmi database locked"
 msgstr "archwilio cronfa ddata urpmi gyfan"
 
-#: po/placeholder.h:78 po/placeholder.h:292
+#: po/placeholder.h:79 po/placeholder.h:293
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:79 po/placeholder.h:356 urpme:62
+#: po/placeholder.h:80 po/placeholder.h:358 urpme:62
 msgid " (y/N) "
 msgstr ""
 
-#: po/placeholder.h:80 po/placeholder.h:424
+#: po/placeholder.h:81 po/placeholder.h:431
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: po/placeholder.h:82
+#: po/placeholder.h:83
 msgid ""
 "some packages have to be removed for being upgraded, this is not supported "
 "yet\n"
 msgstr ""
 
-#: po/placeholder.h:83 po/placeholder.h:295 urpm.pm:1351
+#: po/placeholder.h:84 po/placeholder.h:296 urpm.pm:1358
 #, c-format
 msgid "mounting %s"
 msgstr ""
 
-#: po/placeholder.h:84 po/placeholder.h:299 urpm.pm:226
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: po/placeholder.h:85 po/placeholder.h:478 po/placeholder.h:521
+#: po/placeholder.h:85 po/placeholder.h:481 po/placeholder.h:525
 #, fuzzy
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "grym"
 
-#: po/placeholder.h:86 po/placeholder.h:488 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: po/placeholder.h:86 po/placeholder.h:300 urpm.pm:226
+#, c-format
+msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:87 po/placeholder.h:440
-msgid "  --env          - use specific environment (typically a bug report).\n"
+#: po/placeholder.h:87 po/placeholder.h:492 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: po/placeholder.h:88 po/placeholder.h:302 urpm.pm:1737
+#: po/placeholder.h:88 po/placeholder.h:303 urpm.pm:1744
 #, fuzzy, c-format
 msgid "malformed input: [%s]"
 msgstr "Mewnbwn/Allbwn"
 
-#: po/placeholder.h:89 po/placeholder.h:442 po/placeholder.h:570
+#: po/placeholder.h:89 po/placeholder.h:442
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+#: po/placeholder.h:90 po/placeholder.h:445 po/placeholder.h:575
 #, fuzzy
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "chwilio"
 
-#: po/placeholder.h:90 po/placeholder.h:305 urpm.pm:291
-#, fuzzy
-msgid "ssh is missing\n"
-msgstr "Mae pecyn gorfodol %s ar goll"
+#: po/placeholder.h:91
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
+msgstr ""
 
-#: po/placeholder.h:91 po/placeholder.h:304
-#, fuzzy
-msgid "...copying failed"
-msgstr "methodd y gosodiad"
+#: po/placeholder.h:92 po/placeholder.h:447 urpmi:314
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "Un:"
 
-#: po/placeholder.h:92
+#: po/placeholder.h:93
 #, fuzzy
 msgid "Press Enter when it's done..."
 msgstr "gorffen."
 
-#: po/placeholder.h:93 po/placeholder.h:444 urpmi:312
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Un:"
+#: po/placeholder.h:94 po/placeholder.h:305
+#, fuzzy
+msgid "...copying failed"
+msgstr "methodd y gosodiad"
 
-#: po/placeholder.h:94
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
+#: po/placeholder.h:95 po/placeholder.h:306 urpm.pm:291
+#, fuzzy
+msgid "ssh is missing\n"
+msgstr "Mae pecyn gorfodol %s ar goll"
 
-#: po/placeholder.h:95
+#: po/placeholder.h:96
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:96 po/placeholder.h:531
+#: po/placeholder.h:97 po/placeholder.h:536
 #, fuzzy
 msgid "  -h             - print this help message.\n"
 msgstr "Dangos y cymorth hwn a gadael"
 
-#: po/placeholder.h:97 po/placeholder.h:498
-#, fuzzy
-msgid "  -a             - select all media.\n"
-msgstr "Dewiswch y cyfrwng ar gyfer cadw wrth gefn..."
-
 #: po/placeholder.h:98
 #, fuzzy
 msgid "  -g             - print groups too with name.\n"
 msgstr "enw"
 
-#: po/placeholder.h:99 po/placeholder.h:312
+#: po/placeholder.h:99 po/placeholder.h:502
+#, fuzzy
+msgid "  -a             - select all media.\n"
+msgstr "Dewiswch y cyfrwng ar gyfer cadw wrth gefn..."
+
+#: po/placeholder.h:100 po/placeholder.h:314
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:100 po/placeholder.h:533
-#, fuzzy
-msgid "  -r             - print version and release with name also.\n"
-msgstr "enw"
-
-#: po/placeholder.h:101 po/placeholder.h:462
+#: po/placeholder.h:101 po/placeholder.h:465
 msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:102
+#: po/placeholder.h:102 po/placeholder.h:538
 #, fuzzy
-msgid "  -r             - print version and release too with name.\n"
+msgid "  -r             - print version and release with name also.\n"
 msgstr "enw"
 
 #: po/placeholder.h:103
-msgid "  --auto         - automatically select a good package in choices.\n"
-msgstr ""
+#, fuzzy
+msgid "  -r             - print version and release too with name.\n"
+msgstr "enw"
 
-#: po/placeholder.h:104 po/placeholder.h:548
+#: po/placeholder.h:104 po/placeholder.h:553
 #, fuzzy
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "enw"
 
 #: po/placeholder.h:105
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
+
+#: po/placeholder.h:106
 #, fuzzy, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "Methu rhedeg porwr"
 
-#: po/placeholder.h:106
+#: po/placeholder.h:107 po/placeholder.h:532 urpmi.update:78
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+
+#: po/placeholder.h:108
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "Y ffeil yn methu darllen ffeil\n"
 
-#: po/placeholder.h:107 po/placeholder.h:528 urpmi.update:76
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr ""
-
-#: po/placeholder.h:108 po/placeholder.h:316 urpm.pm:205
+#: po/placeholder.h:109 po/placeholder.h:318 urpm.pm:205
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:109 po/placeholder.h:551
+#: po/placeholder.h:110 po/placeholder.h:556
 msgid ""
 "  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:111 po/placeholder.h:476 urpmi.addmedia:110
+#: po/placeholder.h:112 po/placeholder.h:479 urpmi.addmedia:112
 #, fuzzy, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "Methu creu'r enw ssh"
 
-#: po/placeholder.h:113 po/placeholder.h:319
+#: po/placeholder.h:114 po/placeholder.h:321
 #, fuzzy, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "llwybr perthynol i synthesis neu hdlist:"
 
-#: po/placeholder.h:114 po/placeholder.h:361 urpme:40
-msgid "usage: urpme [-a] [--auto] <packages...>\n"
-msgstr ""
-
-#: po/placeholder.h:115 po/placeholder.h:555 urpmq:122
+#: po/placeholder.h:115 po/placeholder.h:560 urpmq:122
 #, fuzzy, c-format
 msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr "anhysbus"
 
-#: po/placeholder.h:116 po/placeholder.h:321
+#: po/placeholder.h:116 po/placeholder.h:363 urpme:40
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr ""
+
+#: po/placeholder.h:117 po/placeholder.h:323
 #, fuzzy, c-format
 msgid "building hdlist [%s]"
 msgstr "adeiladu math 1inst"
 
-#: po/placeholder.h:117 po/placeholder.h:323 urpm.pm:1666
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+#: po/placeholder.h:118 po/placeholder.h:400 po/placeholder.h:570
+msgid "  --media        - use only the media listed by comma.\n"
 msgstr ""
 
-#: po/placeholder.h:118 po/placeholder.h:324
+#: po/placeholder.h:119 po/placeholder.h:326
 #, fuzzy, c-format
 msgid "added medium %s"
 msgstr "(wedi ychwanegu %s yn barod)"
 
-#: po/placeholder.h:119 po/placeholder.h:393 po/placeholder.h:565
-msgid "  --media        - use only the media listed by comma.\n"
+#: po/placeholder.h:120 po/placeholder.h:325 urpm.pm:1673
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:120 po/placeholder.h:325
+#: po/placeholder.h:121 po/placeholder.h:327
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:121 po/placeholder.h:328 urpm.pm:1750
+#: po/placeholder.h:122 po/placeholder.h:330 urpm.pm:1756
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "methodd y gosodiad"
 
-#: po/placeholder.h:122 po/placeholder.h:405
-msgid ""
-"  --bug          - output a bug report in directory indicated by next arg.\n"
+#: po/placeholder.h:123 po/placeholder.h:332 urpm.pm:1689
+#, c-format
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:123 po/placeholder.h:329 urpm.pm:1793
+#: po/placeholder.h:124 po/placeholder.h:331 urpm.pm:1801
 msgid "Preparing..."
 msgstr ""
 
-#: po/placeholder.h:124 po/placeholder.h:330 urpm.pm:1682
-#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+#: po/placeholder.h:125 po/placeholder.h:412
+msgid ""
+"  --bug          - output a bug report in directory indicated by next arg.\n"
 msgstr ""
 
-#: po/placeholder.h:125 po/placeholder.h:333 urpm.pm:1389
+#: po/placeholder.h:126 po/placeholder.h:335 urpm.pm:1396
 #, fuzzy, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "Heb ganfod ffeil  RPM"
 
-#: po/placeholder.h:126
+#: po/placeholder.h:127
 #, fuzzy, c-format
 msgid "unknown data associated with %s"
 msgstr "anhysbus"
 
-#: po/placeholder.h:128 po/placeholder.h:414 urpmi:321
+#: po/placeholder.h:129 po/placeholder.h:421 urpmi:323
 #, fuzzy, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Pa fath o gysylltiad IDSN?"
 
-#: po/placeholder.h:129 po/placeholder.h:336 urpm.pm:404
+#: po/placeholder.h:130 po/placeholder.h:338 urpm.pm:404
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:130 po/placeholder.h:415 po/placeholder.h:461
-#: po/placeholder.h:522 po/placeholder.h:532
+#: po/placeholder.h:131 po/placeholder.h:422 po/placeholder.h:464
+#: po/placeholder.h:526 po/placeholder.h:537
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:132
+#: po/placeholder.h:133
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:133 po/placeholder.h:337 urpm.pm:1390 urpm.pm:1834
+#: po/placeholder.h:134 po/placeholder.h:339 urpm.pm:1397 urpm.pm:1848
 #, fuzzy, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "Methu canfod ffeil menudrake .glade"
 
-#: po/placeholder.h:135 po/placeholder.h:338 urpm.pm:1375
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr ""
+#: po/placeholder.h:136 po/placeholder.h:427 urpmi:326
+#, fuzzy
+msgid "Sorry, bad choice, try again\n"
+msgstr "Ymddiheuriad"
 
-#: po/placeholder.h:136 po/placeholder.h:339 urpm.pm:1693
+#: po/placeholder.h:137 po/placeholder.h:341 urpm.pm:1700
 #, fuzzy, c-format
 msgid "unable to access medium \"%s\""
 msgstr "mynediad i offer rpm"
 
-#: po/placeholder.h:137 po/placeholder.h:420 urpmi:324
-#, fuzzy
-msgid "Sorry, bad choice, try again\n"
-msgstr "Ymddiheuriad"
+#: po/placeholder.h:138 po/placeholder.h:340 urpm.pm:1382
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr ""
 
-#: po/placeholder.h:138 po/placeholder.h:425 po/placeholder.h:477
-#: po/placeholder.h:511 po/placeholder.h:554
+#: po/placeholder.h:139 po/placeholder.h:432 po/placeholder.h:480
+#: po/placeholder.h:515 po/placeholder.h:559
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:139
+#: po/placeholder.h:140 po/placeholder.h:342
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "trying to select inexistent medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:140 po/placeholder.h:340
+#: po/placeholder.h:141
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:141 po/placeholder.h:343
+#: po/placeholder.h:142 po/placeholder.h:345
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: po/placeholder.h:142 po/placeholder.h:441 urpmi:172
-#, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr ""
+#: po/placeholder.h:143 po/placeholder.h:349 urpm.pm:290
+#, fuzzy
+msgid "rsync is missing\n"
+msgstr "Mae pecyn gorfodol %s ar goll"
 
-#: po/placeholder.h:143 po/placeholder.h:348 urpm.pm:358
+#: po/placeholder.h:144 po/placeholder.h:350 urpm.pm:358
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:144 po/placeholder.h:347 urpm.pm:290
-#, fuzzy
-msgid "rsync is missing\n"
-msgstr "Mae pecyn gorfodol %s ar goll"
+#: po/placeholder.h:145 po/placeholder.h:444 urpmi:174
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr ""
 
-#: po/placeholder.h:146 po/placeholder.h:349 urpm.pm:229
+#: po/placeholder.h:147 po/placeholder.h:351 urpm.pm:229
 #, fuzzy
 msgid "curl is missing\n"
 msgstr "Mae pecyn gorfodol %s ar goll"
 
-#: po/placeholder.h:147 po/placeholder.h:351 urpm.pm:393
+#: po/placeholder.h:148 po/placeholder.h:353 urpm.pm:393
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:148 po/placeholder.h:366
+#: po/placeholder.h:149 po/placeholder.h:368
 #, fuzzy
 msgid "  --help         - print this help message.\n"
 msgstr "Dangos y cymorth hwn a gadael"
 
-#: po/placeholder.h:150 po/placeholder.h:367 urpmi:502
+#: po/placeholder.h:151 po/placeholder.h:369 urpmi:504
 #, fuzzy
 msgid "everything already installed"
 msgstr "Pecynnau wedi eu gosod eisoes"
 
-#: po/placeholder.h:151 po/placeholder.h:261 urpm.pm:1742
+#: po/placeholder.h:152 po/placeholder.h:262 urpm.pm:1749
 #, fuzzy
 msgid "retrieving rpms files..."
 msgstr "Ffeiliau Defnyddiwr Cadw wrth Gefn..."
 
-#: po/placeholder.h:152 po/placeholder.h:262
+#: po/placeholder.h:153 po/placeholder.h:263
 #, fuzzy, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "dyfais"
 
-#: po/placeholder.h:153 po/placeholder.h:369 urpmi:313
+#: po/placeholder.h:154 po/placeholder.h:371 urpmi:315
 #, fuzzy
 msgid "One of the following packages is needed:"
 msgstr "Un:"
 
-#: po/placeholder.h:154 po/placeholder.h:264
+#: po/placeholder.h:155 po/placeholder.h:265
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:540 urpmq:125
+#: po/placeholder.h:157 po/placeholder.h:545 urpmq:125
 #, fuzzy, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "methu agor y ffeil i ddarllen: %s"
 
-#: po/placeholder.h:158 po/placeholder.h:268 urpm.pm:301
+#: po/placeholder.h:159 po/placeholder.h:362 urpme:83
+#, fuzzy
+msgid "Nothing to remove.\n"
+msgstr "Dim i'w wneud"
+
+#: po/placeholder.h:160 po/placeholder.h:269 urpm.pm:301
 #, c-format
 msgid "rsync failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:159 po/placeholder.h:360 urpme:83
-#, fuzzy
-msgid "Nothing to remove.\n"
-msgstr "Dim i'w wneud"
+#: po/placeholder.h:162 po/placeholder.h:271
+msgid "unable to access first installation medium"
+msgstr ""
 
-#: po/placeholder.h:161 po/placeholder.h:387 urpmi:202 urpmi:464 urpmi:473
-#: urpmi:479 urpmi:491 urpmi:496
+#: po/placeholder.h:163 po/placeholder.h:394 urpmi:204 urpmi:465 urpmi:475
+#: urpmi:481 urpmi:493 urpmi:498
 #, fuzzy
 msgid "Installation failed"
 msgstr "methodd y gosodiad"
 
-#: po/placeholder.h:162 po/placeholder.h:270
-msgid "unable to access first installation medium"
-msgstr ""
-
-#: po/placeholder.h:163 po/placeholder.h:391 po/placeholder.h:556
+#: po/placeholder.h:164 po/placeholder.h:398 po/placeholder.h:561
 #, fuzzy
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "chwilio"
 
-#: po/placeholder.h:165 po/placeholder.h:272 urpm.pm:1362
+#: po/placeholder.h:165 po/placeholder.h:273 urpm.pm:1369
 #, fuzzy, c-format
 msgid "unmounting %s"
 msgstr "gwall dadosod %s: %s"
 
-#: po/placeholder.h:166 po/placeholder.h:273
+#: po/placeholder.h:167 po/placeholder.h:274
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:167 po/placeholder.h:275
+#: po/placeholder.h:168 po/placeholder.h:276
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr ""
@@ -737,403 +741,404 @@ msgstr ""
 msgid "<non printable chars>"
 msgstr "Heb eu gosod yn unig"
 
-#: po/placeholder.h:170 po/placeholder.h:277
+#: po/placeholder.h:171 po/placeholder.h:278
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "Y ffeil yn methu darllen ffeil\n"
 
-#: po/placeholder.h:171 po/placeholder.h:403 po/placeholder.h:567
+#: po/placeholder.h:172 po/placeholder.h:410 po/placeholder.h:572
 #, fuzzy
 msgid "  -v             - verbose mode.\n"
 msgstr "Modd Kudz"
 
-#: po/placeholder.h:172 po/placeholder.h:278
+#: po/placeholder.h:173 po/placeholder.h:279
 #, fuzzy, c-format
 msgid "removing medium \"%s\""
 msgstr "Tynnu LPRng..."
 
-#: po/placeholder.h:173
+#: po/placeholder.h:174
 #, c-format
 msgid "unable to build synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:174
+#: po/placeholder.h:175
 #, c-format
 msgid "trying to select multiple medium: %s"
 msgstr ""
 
-#: po/placeholder.h:175 po/placeholder.h:529
+#: po/placeholder.h:176 po/placeholder.h:534
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:176 po/placeholder.h:410
+#: po/placeholder.h:177 po/placeholder.h:417
 msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:177
+#: po/placeholder.h:178
 #, c-format
 msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:179 po/placeholder.h:281
+#: po/placeholder.h:180 po/placeholder.h:282
 #, fuzzy, c-format
 msgid "reading rpms files from [%s]"
 msgstr "Heb ganfod ffeil  RPM"
 
-#: po/placeholder.h:180
+#: po/placeholder.h:181
 #, fuzzy
 msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr "Gwasanaethwr"
 
-#: po/placeholder.h:181 po/placeholder.h:285
+#: po/placeholder.h:182 po/placeholder.h:286
 #, fuzzy, c-format
 msgid "write config file [%s]"
 msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
 
-#: po/placeholder.h:182 po/placeholder.h:416 urpmi:438
+#: po/placeholder.h:183 po/placeholder.h:423 urpmi:439
 #, fuzzy
 msgid "Press Enter when ready..."
 msgstr "gorffen."
 
-#: po/placeholder.h:183 po/placeholder.h:288 urpm.pm:217
+#: po/placeholder.h:184 po/placeholder.h:289 urpm.pm:217
 #, fuzzy, c-format
 msgid "unable to handle protocol: %s"
 msgstr "Methu rhedeg porwr"
 
-#: po/placeholder.h:184
+#: po/placeholder.h:185
 msgid "unable to build hdlist synthesis, using parsehdlist method"
 msgstr ""
 
-#: po/placeholder.h:185 po/placeholder.h:471
+#: po/placeholder.h:186 po/placeholder.h:474
 msgid ""
 "  --distrib      - automatically create all media from an installation "
 "medium.\n"
 msgstr ""
 
-#: po/placeholder.h:188 po/placeholder.h:293 urpm.pm:1597
-#, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "Methu rhedeg porwr"
-
-#: po/placeholder.h:189 po/placeholder.h:423 po/placeholder.h:553
+#: po/placeholder.h:189 po/placeholder.h:430 po/placeholder.h:558
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: po/placeholder.h:191 po/placeholder.h:294 urpm.pm:1822 urpm.pm:1827
+#: po/placeholder.h:190 po/placeholder.h:294 urpm.pm:1604
 #, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "Methu rhedeg porwr"
 
-#: po/placeholder.h:192 po/placeholder.h:296 urpm.pm:376
+#: po/placeholder.h:192 po/placeholder.h:297 urpm.pm:376
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr ""
 
-#: po/placeholder.h:193 po/placeholder.h:297
+#: po/placeholder.h:193 po/placeholder.h:295 urpm.pm:1836 urpm.pm:1841
+#, fuzzy, c-format
+msgid "unable to install package %s"
+msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
+
+#: po/placeholder.h:194 po/placeholder.h:298
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: po/placeholder.h:194 po/placeholder.h:298
+#: po/placeholder.h:195 po/placeholder.h:299
 #, fuzzy, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "Tynnu LPRng..."
 
-#: po/placeholder.h:196 po/placeholder.h:300 urpm.pm:361
+#: po/placeholder.h:197 po/placeholder.h:301 urpm.pm:361
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:197 po/placeholder.h:301
+#: po/placeholder.h:198 po/placeholder.h:302
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:198 po/placeholder.h:303 urpm.pm:1562 urpm.pm:1588
+#: po/placeholder.h:199 po/placeholder.h:304 urpm.pm:1569 urpm.pm:1595
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:200 po/placeholder.h:571
+#: po/placeholder.h:201 po/placeholder.h:576
 #, fuzzy
 msgid "  -g             - print groups with name also.\n"
 msgstr "enw"
 
-#: po/placeholder.h:201 po/placeholder.h:572
+#: po/placeholder.h:202 po/placeholder.h:577
 #, fuzzy
 msgid "  --list         - list available packages.\n"
 msgstr "Argraffu tudalennau prawf"
 
-#: po/placeholder.h:203 po/placeholder.h:353 urpme:120
+#: po/placeholder.h:203 po/placeholder.h:355 urpme:120
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be removed (%d "
 "MB)"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:306
+#: po/placeholder.h:205 po/placeholder.h:307
 #, fuzzy
 msgid "retrieving hdlists file..."
 msgstr "Ffeiliau Defnyddiwr Cadw wrth Gefn..."
 
-#: po/placeholder.h:205 po/placeholder.h:368 urpmi:147
+#: po/placeholder.h:206 po/placeholder.h:370 urpmi:149
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "anhysbus"
 
-#: po/placeholder.h:206 po/placeholder.h:307 urpm.pm:402
+#: po/placeholder.h:207 po/placeholder.h:309 urpm.pm:402
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:207 po/placeholder.h:309
-#, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
-
-#: po/placeholder.h:208 po/placeholder.h:308 urpm.pm:1394
+#: po/placeholder.h:208 po/placeholder.h:310 urpm.pm:1401
 #, fuzzy
 msgid "unable to register rpm file"
 msgstr "Methu canfod ffeil menudrake .glade"
 
 #: po/placeholder.h:209 po/placeholder.h:311
-#, fuzzy, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "pwyntiau"
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: po/placeholder.h:210 po/placeholder.h:310 urpm.pm:456
+#: po/placeholder.h:210 po/placeholder.h:315
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: po/placeholder.h:211 po/placeholder.h:313
+#: po/placeholder.h:211 po/placeholder.h:312 urpm.pm:456
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:212 po/placeholder.h:314 urpm.pm:448
+#: po/placeholder.h:212 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "pwyntiau"
+
+#: po/placeholder.h:213 po/placeholder.h:316 urpm.pm:448
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:213 po/placeholder.h:376 po/placeholder.h:542
+#: po/placeholder.h:214 po/placeholder.h:378 po/placeholder.h:547
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:214 po/placeholder.h:315
+#: po/placeholder.h:215 po/placeholder.h:317
 #, fuzzy, c-format
 msgid "copy of [%s] failed"
 msgstr "methodd y gosodiad"
 
-#: po/placeholder.h:215
+#: po/placeholder.h:216 po/placeholder.h:554
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
+
+#: po/placeholder.h:217
 #, c-format
 msgid "unable to analyse synthesis data of %s"
 msgstr ""
 
-#: po/placeholder.h:216 po/placeholder.h:549
-msgid "  -d             - extend query to package dependencies.\n"
+#: po/placeholder.h:218 po/placeholder.h:365 urpme:111
+#, c-format
+msgid "removing package %s will break your system\n"
 msgstr ""
 
-#: po/placeholder.h:217 po/placeholder.h:317
+#: po/placeholder.h:219 po/placeholder.h:319
 #, fuzzy, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "llwybr perthynol i synthesis neu hdlist:"
 
-#: po/placeholder.h:218 po/placeholder.h:363 urpme:111
-#, c-format
-msgid "removing package %s will break your system\n"
-msgstr ""
-
-#: po/placeholder.h:220 po/placeholder.h:318
-#, fuzzy
-msgid "...copying done"
-msgstr "Wedi gosod True Type"
-
-#: po/placeholder.h:221 po/placeholder.h:389
+#: po/placeholder.h:221 po/placeholder.h:396
 #, fuzzy
 msgid "  --X            - use X interface.\n"
 msgstr "Rhyngwyneb rhwydwaith"
 
 #: po/placeholder.h:222 po/placeholder.h:320
 #, fuzzy
-msgid "copying hdlists file..."
-msgstr "Rhestr ddewis argraffu"
+msgid "...copying done"
+msgstr "Wedi gosod True Type"
 
-#: po/placeholder.h:223 po/placeholder.h:390 urpmi:399 urpmi:408
+#: po/placeholder.h:223 po/placeholder.h:397 urpmi:400 urpmi:409
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "Un:"
 
-#: po/placeholder.h:224 po/placeholder.h:322 urpm.pm:337 urpm.pm:349
+#: po/placeholder.h:224 po/placeholder.h:322
+#, fuzzy
+msgid "copying hdlists file..."
+msgstr "Rhestr ddewis argraffu"
+
+#: po/placeholder.h:225 po/placeholder.h:324 urpm.pm:337 urpm.pm:349
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:225 po/placeholder.h:392 urpmi:486
+#: po/placeholder.h:226 po/placeholder.h:399 urpmi:488
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
-#: po/placeholder.h:226 po/placeholder.h:398 po/placeholder.h:566
+#: po/placeholder.h:227 po/placeholder.h:405 po/placeholder.h:571
 #, fuzzy
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "chwilio"
 
-#: po/placeholder.h:227 po/placeholder.h:326 urpm.pm:1397
+#: po/placeholder.h:228 po/placeholder.h:328 urpm.pm:1404
 #, fuzzy
 msgid "error registering local packages"
 msgstr "Gwall fformat ffeiliau neu becynnau"
 
-#: po/placeholder.h:228 po/placeholder.h:327
+#: po/placeholder.h:229 po/placeholder.h:329
 #, fuzzy, c-format
 msgid "taking removable device as \"%s\""
 msgstr "dyfais"
 
-#: po/placeholder.h:229 po/placeholder.h:404
+#: po/placeholder.h:230 po/placeholder.h:411
 #, fuzzy
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "chwilio"
 
-#: po/placeholder.h:231 po/placeholder.h:331
+#: po/placeholder.h:232 po/placeholder.h:333
 #, fuzzy, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "Rhestr ddewis argraffu"
 
-#: po/placeholder.h:232 po/placeholder.h:569
+#: po/placeholder.h:233 po/placeholder.h:574
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: po/placeholder.h:233
+#: po/placeholder.h:234
 #, fuzzy, c-format
 msgid "unable to build hdlist: %s"
 msgstr "Methu rhedeg porwr"
 
-#: po/placeholder.h:234 po/placeholder.h:332 urpm.pm:1657 urpm.pm:1660
-#: urpm.pm:1678
+#: po/placeholder.h:235 po/placeholder.h:334 urpm.pm:1664 urpm.pm:1667
+#: urpm.pm:1685
 #, fuzzy, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "Nid yw pecyn %s wedi ei lofnodi"
 
-#: po/placeholder.h:235 po/placeholder.h:334 urpm.pm:418
+#: po/placeholder.h:236 po/placeholder.h:336 urpm.pm:418
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:236 po/placeholder.h:335
-#, fuzzy, c-format
-msgid "unable to read rpms files from [%s]: %s"
-msgstr "Methu canfod ffeil menudrake .glade"
-
-#: po/placeholder.h:237 po/placeholder.h:412
+#: po/placeholder.h:237 po/placeholder.h:419
 #, fuzzy
 msgid "  -q             - quiet mode.\n"
 msgstr "Modd Kudz"
 
-#: po/placeholder.h:238
+#: po/placeholder.h:238 po/placeholder.h:337
+#, fuzzy, c-format
+msgid "unable to read rpms files from [%s]: %s"
+msgstr "Methu canfod ffeil menudrake .glade"
+
+#: po/placeholder.h:239
 #, fuzzy
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Hawlfraint (H) 1999, 2000, 2001, 2002 MandrakeSoft."
 
-#: po/placeholder.h:240 po/placeholder.h:421 po/placeholder.h:552
+#: po/placeholder.h:241 po/placeholder.h:428 po/placeholder.h:557
 #, fuzzy
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "grym grym"
 
-#: po/placeholder.h:241 po/placeholder.h:357 urpme:61
+#: po/placeholder.h:243 po/placeholder.h:359 urpme:61
 #, c-format
 msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:243 po/placeholder.h:362 urpme:31
-#, fuzzy
-msgid "Remove them all?"
-msgstr "Caniatáu pob defnyddiwr"
-
-#: po/placeholder.h:244 po/placeholder.h:426 urpmi:453
+#: po/placeholder.h:244 po/placeholder.h:433 urpmi:454
 #, fuzzy, c-format
 msgid "installing %s\n"
 msgstr "Gosod"
 
-#: po/placeholder.h:245 po/placeholder.h:427 urpmi:437
+#: po/placeholder.h:245 po/placeholder.h:364 urpme:31
+#, fuzzy
+msgid "Remove them all?"
+msgstr "Caniatáu pob defnyddiwr"
+
+#: po/placeholder.h:246 po/placeholder.h:434 urpmi:438
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "dyfais"
 
-#: po/placeholder.h:246 po/placeholder.h:342
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "adeiladu math 1inst"
-
-#: po/placeholder.h:247 po/placeholder.h:341 urpm.pm:1487
+#: po/placeholder.h:247 po/placeholder.h:343 urpm.pm:1494
 #, fuzzy, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Diweddaru'r pecynnau'n unig"
 
-#: po/placeholder.h:248 po/placeholder.h:344 urpm.pm:1376
+#: po/placeholder.h:248 po/placeholder.h:344
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "adeiladu math 1inst"
+
+#: po/placeholder.h:249 po/placeholder.h:346 urpm.pm:1383
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: po/placeholder.h:250 po/placeholder.h:487
+#: po/placeholder.h:250 po/placeholder.h:490
 #, fuzzy
 msgid "  --update       - create an update medium.\n"
 msgstr "Digwyddodd gwall, ceisiwch newid rhai paramedrau"
 
-#: po/placeholder.h:251 po/placeholder.h:345 urpm.pm:1748
+#: po/placeholder.h:252 po/placeholder.h:531
 #, fuzzy
-msgid "...retrieving done"
-msgstr "Wedi gosod True Type"
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr "grym"
 
-#: po/placeholder.h:252 po/placeholder.h:439 po/placeholder.h:568 urpmi:426
+#: po/placeholder.h:253 po/placeholder.h:441 po/placeholder.h:573 urpmi:427
 #: urpmq:216
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: po/placeholder.h:253 po/placeholder.h:527
+#: po/placeholder.h:254 po/placeholder.h:347 urpm.pm:1754
 #, fuzzy
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr "grym"
-
-#: po/placeholder.h:254 po/placeholder.h:346 urpm.pm:286
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr ""
+msgid "...retrieving done"
+msgstr "Wedi gosod True Type"
 
 #: po/placeholder.h:255
 #, fuzzy, c-format
 msgid "selecting %s using obsoletes"
 msgstr "Rhyngwyneb %s (gan ddefnyddio modiwl %s)"
 
-#: po/placeholder.h:256
+#: po/placeholder.h:256 po/placeholder.h:348 urpm.pm:286
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
+
+#: po/placeholder.h:257
 #, c-format
 msgid "selecting %s by selection on files"
 msgstr ""
 
-#: po/placeholder.h:257 po/placeholder.h:350
+#: po/placeholder.h:258 po/placeholder.h:352
 #, fuzzy, c-format
 msgid "copying source list of \"%s\"..."
 msgstr "Rhestr ddewis argraffu"
 
-#: po/placeholder.h:258 po/placeholder.h:352 urpm.pm:220
+#: po/placeholder.h:259 po/placeholder.h:446 urpmi:199
+msgid "Only superuser is allowed to install packages"
+msgstr ""
+
+#: po/placeholder.h:260 po/placeholder.h:354 urpm.pm:220
 #, fuzzy
 msgid "wget is missing\n"
 msgstr "Mae pecyn gorfodol %s ar goll"
 
-#: po/placeholder.h:259 po/placeholder.h:443 urpmi:197
-msgid "Only superuser is allowed to install packages"
-msgstr ""
-
-#: po/placeholder.h:286 urpm.pm:177
-msgid "Unknown webfetch `$proxy->{type}' !!!\n"
-msgstr ""
+#: po/placeholder.h:308 urpm.pm:1831
+#, fuzzy, c-format
+msgid "unable to remove package %s"
+msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
 
-#: po/placeholder.h:370
+#: po/placeholder.h:372
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1146,27 +1151,35 @@ msgstr ""
 "\n"
 " rhydd\n"
 
-#: po/placeholder.h:377 po/placeholder.h:467 po/placeholder.h:523
-#: po/placeholder.h:543
+#: po/placeholder.h:379 po/placeholder.h:470 po/placeholder.h:527
+#: po/placeholder.h:548
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: po/placeholder.h:382 urpmi:458
+#: po/placeholder.h:384 urpmi:459
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:394 po/placeholder.h:479 po/placeholder.h:517
-#: po/placeholder.h:561
+#: po/placeholder.h:388 urpmi:373
+#, 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:401 po/placeholder.h:482 po/placeholder.h:521
+#: po/placeholder.h:566
 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:399
+#: po/placeholder.h:406
 #, fuzzy
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1175,30 +1188,29 @@ msgstr ""
 "\n"
 " X"
 
-#: po/placeholder.h:406 urpmi:405
+#: po/placeholder.h:413 urpmi:406
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: po/placeholder.h:428 urpmi:371
+#: po/placeholder.h:435 urpmi:366
 #, c-format
 msgid ""
-"Some package have to be removed for others to be upgraded:\n"
+"Some package requested cannot be installed:\n"
 "%s\n"
 "do you agree ?"
 msgstr ""
 
-#: po/placeholder.h:433 urpmi:364
-#, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s\n"
-"do you agree ?"
+#. [^:]+(:\d+)?)/*$, or
+#: po/placeholder.h:443 po/placeholder.h:491 po/placeholder.h:533 urpmi:116
+#: urpmi:123 urpmi.addmedia:65 urpmi.addmedia:72 urpmi.update:45
+#: urpmi.update:52
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: po/placeholder.h:445
+#: po/placeholder.h:448
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1219,15 +1231,15 @@ msgstr ""
 " http<host><path>\n"
 "<path>\n"
 
-#: po/placeholder.h:456 po/placeholder.h:489 po/placeholder.h:507
-#: urpmi.addmedia:77
+#: po/placeholder.h:459 po/placeholder.h:493 po/placeholder.h:511
+#: urpmi.addmedia:79
 #, fuzzy, c-format
 msgid ""
 "\n"
 "unknown options '%s'\n"
 msgstr "Dewisiadau modiwl:"
 
-#: po/placeholder.h:463 urpmi.addmedia:102
+#: po/placeholder.h:466 urpmi.addmedia:104
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -1236,7 +1248,7 @@ msgstr ""
 "\n"
 " ftp"
 
-#: po/placeholder.h:472 urpmi.addmedia:88
+#: po/placeholder.h:475 urpmi.addmedia:90
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -1245,21 +1257,21 @@ msgstr ""
 "\n"
 " llwybr"
 
-#: po/placeholder.h:483 urpmi.addmedia:100
+#: po/placeholder.h:486 urpmi.addmedia:102
 #, fuzzy, c-format
 msgid ""
 "%s\n"
 "<relative path of hdlist> missing\n"
 msgstr "llwybr perthynol i synthesis neu hdlist:"
 
-#: po/placeholder.h:493 urpmi.removemedia:49
+#: po/placeholder.h:497 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:499
+#: po/placeholder.h:503
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -1268,7 +1280,7 @@ msgstr ""
 "<name>\n"
 "<name> enw"
 
-#: po/placeholder.h:503
+#: po/placeholder.h:507
 #, fuzzy
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1277,14 +1289,14 @@ msgstr ""
 "<name>\n"
 "<name> enw"
 
-#: po/placeholder.h:512 urpmi.update:78
+#: po/placeholder.h:516 urpmi.update:80
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: po/placeholder.h:534
+#: po/placeholder.h:539
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1297,7 +1309,7 @@ msgstr ""
 "\n"
 " rhydd\n"
 
-#: po/placeholder.h:557
+#: po/placeholder.h:562
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
@@ -1315,9 +1327,9 @@ msgstr "<name><url> llwybr"
 
 #: 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:58 urpmi.update:59
-#: urpmi.update:60 urpmi.update:61 urpmi.update:62 urpmi.update:63
-#: urpmi.update:64
+#: 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 ""
 
@@ -1329,7 +1341,7 @@ msgstr ""
 msgid ", $_);"
 msgstr ""
 
-#: urpmi.update:56
+#: urpmi.update:58
 msgid "usage: urpmi.update [options] <name> ..."
 msgstr ""