updated pot file

1 files changed, 358 insertions, 349 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0f822a32..c39828ba 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2002-07-23 19:17+0200\n"
+"POT-Creation-Date: 2002-07-24 19:55+0200\n"
 "PO-Revision-Date: 2001-08-22 18:07+0800\n"
 "Last-Translator: Jesse Kuang <kjx@mandrakesoft.com>\n"
 "Language-Team: Chinese (GB) <future-cjk@mandrakesoft.com>\n"
@@ -29,16 +29,16 @@ msgstr ""
 "自动安装软件包...\n"
 "你要求安装软件包 $rpm\n"
 
-#: _irpm:28 po/placeholder.h:253 po/placeholder.h:368 po/placeholder.h:447
-#: urpme:30 urpmi:407
+#: _irpm:28 po/placeholder.h:255 po/placeholder.h:371 po/placeholder.h:450
+#: urpme:32 urpmi:407
 msgid "Is it OK?"
 msgstr "这样好了吗?"
 
-#: _irpm:30 po/placeholder.h:243 po/placeholder.h:433 urpmi:410 urpmi:438
+#: _irpm:30 po/placeholder.h:244 po/placeholder.h:436 urpmi:410 urpmi:438
 msgid "Ok"
 msgstr "确认"
 
-#: _irpm:31 po/placeholder.h:206 po/placeholder.h:374 urpmi:411 urpmi:439
+#: _irpm:31 po/placeholder.h:206 po/placeholder.h:377 urpmi:411 urpmi:439
 msgid "Cancel"
 msgstr "取消"
 
@@ -47,8 +47,8 @@ msgstr "取消"
 #. 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:223 po/placeholder.h:373
-#: po/placeholder.h:400 urpme:33 urpmi:361 urpmi:368 urpmi:415 urpmi:484
+#: _irpm:37 po/placeholder.h:17 po/placeholder.h:224 po/placeholder.h:376
+#: po/placeholder.h:403 urpme:35 urpmi:361 urpmi:368 urpmi:415 urpmi:484
 msgid "Nn"
 msgstr "nN不否"
 
@@ -57,13 +57,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:115 po/placeholder.h:367
-#: po/placeholder.h:402 urpme:35 urpmi:362 urpmi:369 urpmi:416 urpmi:485
+#: _irpm:38 po/placeholder.h:11 po/placeholder.h:115 po/placeholder.h:369
+#: po/placeholder.h:405 urpme:37 urpmi:362 urpmi:369 urpmi:416 urpmi:485
 msgid "Yy"
 msgstr "yY是"
 
-#: _irpm:39 po/placeholder.h:246 po/placeholder.h:364 po/placeholder.h:436
-#: urpme:121 urpmi:363 urpmi:370 urpmi:417
+#: _irpm:39 po/placeholder.h:246 po/placeholder.h:366 po/placeholder.h:439
+#: urpme:126 urpmi:363 urpmi:370 urpmi:417
 msgid " (Y/n) "
 msgstr " (是(Y)/不(n)) [是] "
 
@@ -136,7 +136,7 @@ msgstr ""
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:33 po/placeholder.h:234
+#: po/placeholder.h:33 po/placeholder.h:235
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
@@ -166,12 +166,12 @@ msgstr ""
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:41 po/placeholder.h:265
+#: po/placeholder.h:41 po/placeholder.h:266
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:42 po/placeholder.h:266 urpm.pm:1866
+#: po/placeholder.h:42 po/placeholder.h:267 urpm.pm:1872
 #, c-format
 msgid "%s conflicts with %s"
 msgstr ""
@@ -184,51 +184,51 @@ msgstr ""
 msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:45 po/placeholder.h:269
-#, fuzzy, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr "无法写入 列表文件\"%s\""
-
-#: po/placeholder.h:46 po/placeholder.h:271 urpm.pm:429
+#: po/placeholder.h:45 po/placeholder.h:272 urpm.pm:429
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:48 po/placeholder.h:390
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
+#: po/placeholder.h:46 po/placeholder.h:270
+#, fuzzy, c-format
+msgid "nothing to write in list file for \"%s\""
+msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:49 po/placeholder.h:272
+#: po/placeholder.h:48 po/placeholder.h:273
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法分析hdlist文件 \"%s\""
 
-#: po/placeholder.h:50 po/placeholder.h:273
+#: po/placeholder.h:49 po/placeholder.h:393
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+
+#: po/placeholder.h:50 po/placeholder.h:274
 #, fuzzy, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:51 po/placeholder.h:562
+#: po/placeholder.h:51 po/placeholder.h:565
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:52 po/placeholder.h:275
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:53
+#: po/placeholder.h:52
 msgid ""
 "  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:54 po/placeholder.h:277 urpm.pm:1633
+#: po/placeholder.h:53 po/placeholder.h:276
+#, c-format
+msgid "retrieving description file of \"%s\"..."
+msgstr ""
+
+#: po/placeholder.h:54 po/placeholder.h:278 urpm.pm:1639
 #, c-format
 msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:56 po/placeholder.h:280
+#: po/placeholder.h:56 po/placeholder.h:281
 #, fuzzy, c-format
 msgid "trying to select multiple media: %s"
 msgstr "试图选择不存在的介质\"%s\""
@@ -238,21 +238,21 @@ msgstr "试图选择不存在的介质\"%s\""
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:58
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "写入 depslist 文件 [%s]"
+#: po/placeholder.h:58 po/placeholder.h:365 urpme:53
+msgid "unknown package(s) "
+msgstr ""
 
-#: po/placeholder.h:59 po/placeholder.h:282 urpm.pm:382
+#: po/placeholder.h:59 po/placeholder.h:283 urpm.pm:382
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:60 po/placeholder.h:363 urpme:51
-msgid "unknown package(s) "
-msgstr ""
+#: po/placeholder.h:60
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "写入 depslist 文件 [%s]"
 
-#: po/placeholder.h:61 po/placeholder.h:285 urpm.pm:389
+#: po/placeholder.h:61 po/placeholder.h:286 urpm.pm:389
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
@@ -261,92 +261,92 @@ msgstr ""
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:63 po/placeholder.h:286
+#: po/placeholder.h:63 po/placeholder.h:287
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:65 po/placeholder.h:425 po/placeholder.h:542
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-
-#: po/placeholder.h:66 po/placeholder.h:465 urpmi.addmedia:96
+#: po/placeholder.h:65 po/placeholder.h:468 urpmi.addmedia:96
 #: urpmi.addmedia:113
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "无法升级介质\"%s\"\n"
 
-#: po/placeholder.h:67 po/placeholder.h:427
+#: po/placeholder.h:66 po/placeholder.h:428 po/placeholder.h:545
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+
+#: po/placeholder.h:67 po/placeholder.h:430
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: po/placeholder.h:68 po/placeholder.h:470 po/placeholder.h:508
-#: po/placeholder.h:527
+#: po/placeholder.h:68 po/placeholder.h:473 po/placeholder.h:511
+#: po/placeholder.h:530
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:69 po/placeholder.h:288 urpm.pm:196
+#: po/placeholder.h:69 po/placeholder.h:290
 #, c-format
-msgid "unknown protocol defined for %s"
+msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:70 po/placeholder.h:289
+#: po/placeholder.h:70 po/placeholder.h:289 urpm.pm:196
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: po/placeholder.h:71 po/placeholder.h:290
+#: po/placeholder.h:71 po/placeholder.h:291
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:72 po/placeholder.h:553
+#: po/placeholder.h:72 po/placeholder.h:556
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:73 po/placeholder.h:431 po/placeholder.h:559
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+#: po/placeholder.h:73 po/placeholder.h:293 urpm.pm:177
+msgid "Unknown webfetch `$proxy->{type}' !!!\n"
 msgstr ""
 
-#: po/placeholder.h:74 po/placeholder.h:292 urpm.pm:177
-msgid "Unknown webfetch `$proxy->{type}' !!!\n"
+#: po/placeholder.h:74 po/placeholder.h:434 po/placeholder.h:562
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: po/placeholder.h:75 po/placeholder.h:293 urpm.pm:1508
+#: po/placeholder.h:75 po/placeholder.h:294 urpm.pm:1514
 #, c-format
 msgid "no package named %s"
 msgstr "没有名为 %s 的软件包"
 
-#: po/placeholder.h:76 po/placeholder.h:432 urpmi:493
+#: po/placeholder.h:76 po/placeholder.h:435 urpmi:493
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "尝试更激烈的安装方式吗? (使用 --force) (是(y)/不(N)) [不] "
 
-#: po/placeholder.h:77 po/placeholder.h:295
-#, fuzzy, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "无法为介质\"%s\"创建 synthesis文件"
-
-#: po/placeholder.h:78 po/placeholder.h:296 urpm.pm:424
+#: po/placeholder.h:77 po/placeholder.h:297 urpm.pm:424
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:79 po/placeholder.h:297
+#: po/placeholder.h:78 po/placeholder.h:296
+#, fuzzy, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "无法为介质\"%s\"创建 synthesis文件"
+
+#: po/placeholder.h:79 po/placeholder.h:298
 msgid "urpmi database locked"
 msgstr ""
 
-#: po/placeholder.h:80 po/placeholder.h:298
+#: po/placeholder.h:80 po/placeholder.h:299
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:81 po/placeholder.h:365 urpme:62
+#: po/placeholder.h:81 po/placeholder.h:367 urpme:64
 #, fuzzy
 msgid " (y/N) "
 msgstr " (是(Y)/不(n)) [是] "
 
-#: po/placeholder.h:82 po/placeholder.h:438
+#: po/placeholder.h:82 po/placeholder.h:441
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
@@ -356,57 +356,57 @@ msgid ""
 "yet\n"
 msgstr "有些软件包要求先删除再升级, 暂不支持\n"
 
-#: po/placeholder.h:85 po/placeholder.h:301 urpm.pm:1375
+#: po/placeholder.h:85 po/placeholder.h:302 urpm.pm:1381
 #, c-format
 msgid "mounting %s"
 msgstr "正在安装 %s"
 
-#: po/placeholder.h:86 po/placeholder.h:305 urpm.pm:226
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
+#: po/placeholder.h:86 po/placeholder.h:491 po/placeholder.h:535
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:87 po/placeholder.h:488 po/placeholder.h:532
-msgid "  -f             - force generation of hdlist files.\n"
+#: po/placeholder.h:87 po/placeholder.h:306 urpm.pm:226
+#, c-format
+msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:88 po/placeholder.h:499 urpmi.removemedia:47
+#: po/placeholder.h:88 po/placeholder.h:502 urpmi.removemedia:47
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "没有东西删除(用urpmi.addmedia增加介质)\n"
 
-#: po/placeholder.h:89 po/placeholder.h:449
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-
-#: po/placeholder.h:90 po/placeholder.h:308 urpm.pm:1761
+#: po/placeholder.h:89 po/placeholder.h:310 urpm.pm:1767
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:91 po/placeholder.h:452 po/placeholder.h:582
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: po/placeholder.h:90 po/placeholder.h:452
+msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
-#: po/placeholder.h:92 po/placeholder.h:311 urpm.pm:291
-msgid "ssh is missing\n"
+#: po/placeholder.h:91 po/placeholder.h:455 po/placeholder.h:585
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: po/placeholder.h:93 po/placeholder.h:310
-msgid "...copying failed"
+#: po/placeholder.h:92
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
+#: po/placeholder.h:93 po/placeholder.h:457 urpmi:315
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "需要下列软件包之一:"
+
 #: po/placeholder.h:94
 msgid "Press Enter when it's done..."
 msgstr "准备好后按 Enter 键..."
 
-#: po/placeholder.h:95 po/placeholder.h:454 urpmi:315
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "需要下列软件包之一:"
+#: po/placeholder.h:95 po/placeholder.h:312
+msgid "...copying failed"
+msgstr ""
 
-#: po/placeholder.h:96
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
+#: po/placeholder.h:96 po/placeholder.h:313 urpm.pm:291
+msgid "ssh is missing\n"
 msgstr ""
 
 #: po/placeholder.h:97
@@ -414,46 +414,46 @@ msgstr ""
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:98 po/placeholder.h:314 urpm.pm:1848
+#: po/placeholder.h:98 po/placeholder.h:316 urpm.pm:1854
 #, fuzzy, c-format
 msgid "unable to remove package %s"
 msgstr "只有超级用户可以安装本机软件包"
 
-#: po/placeholder.h:99 po/placeholder.h:543
+#: po/placeholder.h:99 po/placeholder.h:546
 msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:100 po/placeholder.h:509
-msgid "  -a             - select all media.\n"
+#: po/placeholder.h:100
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:101
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:101 po/placeholder.h:512
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:102 po/placeholder.h:320
+#: po/placeholder.h:102 po/placeholder.h:322
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:103 po/placeholder.h:545
-msgid "  -r             - print version and release with name also.\n"
+#: po/placeholder.h:103 po/placeholder.h:475
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:104 po/placeholder.h:472
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+#: po/placeholder.h:104 po/placeholder.h:548
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
 #: po/placeholder.h:105
 msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:106
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:106 po/placeholder.h:563
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:107 po/placeholder.h:560
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:107
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
 #: po/placeholder.h:108
@@ -461,87 +461,87 @@ msgstr ""
 msgid "unable to parse correctly [%s]"
 msgstr "无法分析 [%s]"
 
-#: po/placeholder.h:109
+#: po/placeholder.h:109 po/placeholder.h:542 urpmi.update:78
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "没有东西升级(用urpmi.addmedia增加介质)\n"
+
+#: po/placeholder.h:110
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "读取 compss 文件 [%s]"
 
-#: po/placeholder.h:110 po/placeholder.h:539 urpmi.update:78
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "没有东西升级(用urpmi.addmedia增加介质)\n"
-
-#: po/placeholder.h:111 po/placeholder.h:325 urpm.pm:205
+#: po/placeholder.h:111 po/placeholder.h:327 urpm.pm:205
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:112 po/placeholder.h:563
+#: po/placeholder.h:112 po/placeholder.h:566
 msgid ""
 "  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:114 po/placeholder.h:486 urpmi.addmedia:112
+#: po/placeholder.h:114 po/placeholder.h:489 urpmi.addmedia:112
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:116 po/placeholder.h:328
+#: po/placeholder.h:116 po/placeholder.h:330
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:117 po/placeholder.h:370 urpme:40
-#, fuzzy
-msgid "usage: urpme [-a] [--auto] <packages...>\n"
-msgstr "用法: urpmi.removemedia [-a] <名称> ..."
-
-#: po/placeholder.h:118 po/placeholder.h:567 urpmq:122
+#: po/placeholder.h:117 po/placeholder.h:570 urpmq:122
 #, c-format
 msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"
 
-#: po/placeholder.h:119 po/placeholder.h:330
+#: po/placeholder.h:118 po/placeholder.h:373 urpme:42
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "用法: urpmi.removemedia [-a] <名称> ..."
+
+#: po/placeholder.h:119 po/placeholder.h:332
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "创建hdlist [%s]"
 
-#: po/placeholder.h:120 po/placeholder.h:332 urpm.pm:1690
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "无法从介质\"%2$s\" 读取rpm文件[%1$s]"
+#: po/placeholder.h:120 po/placeholder.h:410 po/placeholder.h:580
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:121 po/placeholder.h:333
+#: po/placeholder.h:121 po/placeholder.h:335
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:122 po/placeholder.h:407 po/placeholder.h:577
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
+#: po/placeholder.h:122 po/placeholder.h:334 urpm.pm:1696
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "无法从介质\"%2$s\" 读取rpm文件[%1$s]"
 
-#: po/placeholder.h:123 po/placeholder.h:334
+#: po/placeholder.h:123 po/placeholder.h:336
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:124 po/placeholder.h:337 urpm.pm:1773
+#: po/placeholder.h:124 po/placeholder.h:339 urpm.pm:1779
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:125 po/placeholder.h:419
-msgid ""
-"  --bug          - output a bug report in directory indicated by next arg.\n"
+#: po/placeholder.h:125 po/placeholder.h:341 urpm.pm:1712
+#, c-format
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:126 po/placeholder.h:338 urpm.pm:1818
+#: po/placeholder.h:126 po/placeholder.h:340 urpm.pm:1824
 msgid "Preparing..."
 msgstr ""
 
-#: po/placeholder.h:127 po/placeholder.h:339 urpm.pm:1706
-#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+#: po/placeholder.h:127 po/placeholder.h:422
+msgid ""
+"  --bug          - output a bug report in directory indicated by next arg.\n"
 msgstr ""
 
-#: po/placeholder.h:128 po/placeholder.h:342 urpm.pm:1413
+#: po/placeholder.h:128 po/placeholder.h:344 urpm.pm:1419
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "非法rpm文件 [%s]"
@@ -551,18 +551,18 @@ msgstr "非法rpm文件 [%s]"
 msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:131 po/placeholder.h:428 urpmi:324
+#: po/placeholder.h:131 po/placeholder.h:431 urpmi:324
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:  (1-%d) "
 
-#: po/placeholder.h:132 po/placeholder.h:345 urpm.pm:404
+#: po/placeholder.h:132 po/placeholder.h:347 urpm.pm:404
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:133 po/placeholder.h:429 po/placeholder.h:471
-#: po/placeholder.h:533 po/placeholder.h:544
+#: po/placeholder.h:133 po/placeholder.h:432 po/placeholder.h:474
+#: po/placeholder.h:536 po/placeholder.h:547
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
@@ -571,134 +571,134 @@ msgstr ""
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:136 po/placeholder.h:346 urpm.pm:1414 urpm.pm:1878
+#: po/placeholder.h:136 po/placeholder.h:348 urpm.pm:1420 urpm.pm:1884
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问rpm 文件[%s]"
 
-#: po/placeholder.h:138 po/placeholder.h:347 urpm.pm:1399
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "在depslist中重新定位 %s"
+#: po/placeholder.h:138 po/placeholder.h:437 urpmi:327
+msgid "Sorry, bad choice, try again\n"
+msgstr "对不起, 选择无效, 请再试一次\n"
 
-#: po/placeholder.h:139 po/placeholder.h:348 urpm.pm:1717
+#: po/placeholder.h:139 po/placeholder.h:350 urpm.pm:1723
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质\"%s\""
 
-#: po/placeholder.h:140 po/placeholder.h:434 urpmi:327
-msgid "Sorry, bad choice, try again\n"
-msgstr "对不起, 选择无效, 请再试一次\n"
+#: po/placeholder.h:140 po/placeholder.h:349 urpm.pm:1405
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "在depslist中重新定位 %s"
 
-#: po/placeholder.h:141 po/placeholder.h:439 po/placeholder.h:487
-#: po/placeholder.h:522 po/placeholder.h:566
+#: po/placeholder.h:141 po/placeholder.h:442 po/placeholder.h:490
+#: po/placeholder.h:525 po/placeholder.h:569
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:142
-#, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr ""
-
-#: po/placeholder.h:143 po/placeholder.h:349
+#: po/placeholder.h:142 po/placeholder.h:351
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "试图选择不存在的介质\"%s\""
 
-#: po/placeholder.h:144 po/placeholder.h:352
+#: po/placeholder.h:143
+#, c-format
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr ""
+
+#: po/placeholder.h:144 po/placeholder.h:354
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 没有发现rpm 文件"
 
-#: po/placeholder.h:145 po/placeholder.h:451 urpmi:174
-#, c-format
-msgid "Unable to create directory [%s] for bug report"
+#: po/placeholder.h:145 po/placeholder.h:358 urpm.pm:290
+msgid "rsync is missing\n"
 msgstr ""
 
-#: po/placeholder.h:146 po/placeholder.h:357 urpm.pm:358
+#: po/placeholder.h:146 po/placeholder.h:359 urpm.pm:358
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:147 po/placeholder.h:356 urpm.pm:290
-msgid "rsync is missing\n"
+#: po/placeholder.h:147 po/placeholder.h:454 urpmi:174
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: po/placeholder.h:149 po/placeholder.h:358 urpm.pm:229
+#: po/placeholder.h:149 po/placeholder.h:360 urpm.pm:229
 msgid "curl is missing\n"
 msgstr ""
 
-#: po/placeholder.h:150 po/placeholder.h:360 urpm.pm:393
+#: po/placeholder.h:150 po/placeholder.h:362 urpm.pm:393
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "无法判断 hdlist文件的介质 [%s]"
 
-#: po/placeholder.h:151 po/placeholder.h:375
+#: po/placeholder.h:151 po/placeholder.h:378
 msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:153 po/placeholder.h:376 urpmi:504
+#: po/placeholder.h:153 po/placeholder.h:379 urpmi:504
 msgid "everything already installed"
 msgstr "全部安装完成"
 
-#: po/placeholder.h:154 po/placeholder.h:267 urpm.pm:1766
+#: po/placeholder.h:154 po/placeholder.h:268 urpm.pm:1772
 msgid "retrieving rpms files..."
 msgstr ""
 
-#: po/placeholder.h:155 po/placeholder.h:268
+#: po/placeholder.h:155 po/placeholder.h:269
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:378 urpmi:316
+#: po/placeholder.h:156 po/placeholder.h:381 urpmi:316
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: po/placeholder.h:157 po/placeholder.h:270
+#: po/placeholder.h:157 po/placeholder.h:271
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr ""
 
-#: po/placeholder.h:159 po/placeholder.h:552 urpmq:125
+#: po/placeholder.h:159 po/placeholder.h:555 urpmq:125
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取rpm文件 \"%s\"\n"
 
-#: po/placeholder.h:161 po/placeholder.h:274 urpm.pm:301
+#: po/placeholder.h:161 po/placeholder.h:372 urpme:90
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:162 po/placeholder.h:275 urpm.pm:301
 #, c-format
 msgid "rsync failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:162 po/placeholder.h:369 urpme:83
-msgid "Nothing to remove.\n"
-msgstr ""
+#: po/placeholder.h:164 po/placeholder.h:277
+#, fuzzy
+msgid "unable to access first installation medium"
+msgstr "无法访问介质\"%s\""
 
-#: po/placeholder.h:164 po/placeholder.h:401 urpmi:204 urpmi:462 urpmi:472
+#: po/placeholder.h:165 po/placeholder.h:404 urpmi:204 urpmi:462 urpmi:472
 #: urpmi:479 urpmi:492 urpmi:498
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: po/placeholder.h:165 po/placeholder.h:276
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "无法访问介质\"%s\""
-
-#: po/placeholder.h:166 po/placeholder.h:405 po/placeholder.h:568
+#: po/placeholder.h:166 po/placeholder.h:408 po/placeholder.h:571
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:167 po/placeholder.h:278 urpm.pm:1386
+#: po/placeholder.h:167 po/placeholder.h:279 urpm.pm:1392
 #, c-format
 msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:169 po/placeholder.h:279
+#: po/placeholder.h:169 po/placeholder.h:280
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:170 po/placeholder.h:281
+#: po/placeholder.h:170 po/placeholder.h:282
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr ""
@@ -707,16 +707,16 @@ msgstr ""
 msgid "<non printable chars>"
 msgstr ""
 
-#: po/placeholder.h:173 po/placeholder.h:283
+#: po/placeholder.h:173 po/placeholder.h:284
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "无法为介质\"%s\"创建 synthesis文件"
 
-#: po/placeholder.h:174 po/placeholder.h:417 po/placeholder.h:579
+#: po/placeholder.h:174 po/placeholder.h:420 po/placeholder.h:582
 msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:175 po/placeholder.h:284
+#: po/placeholder.h:175 po/placeholder.h:285
 #, fuzzy, c-format
 msgid "removing medium \"%s\""
 msgstr "无法删除不存在的介质\"%s\""
@@ -731,11 +731,11 @@ msgstr "无法为介质\"%s\"创建 synthesis文件"
 msgid "trying to select multiple medium: %s"
 msgstr "试图选择不存在的介质\"%s\""
 
-#: po/placeholder.h:178 po/placeholder.h:541
+#: po/placeholder.h:178 po/placeholder.h:544
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:179 po/placeholder.h:424
+#: po/placeholder.h:179 po/placeholder.h:427
 msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
@@ -744,7 +744,7 @@ msgstr ""
 msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:182 po/placeholder.h:287
+#: po/placeholder.h:182 po/placeholder.h:288
 #, fuzzy, c-format
 msgid "reading rpms files from [%s]"
 msgstr "[%s] 没有发现rpm 文件"
@@ -753,17 +753,17 @@ msgstr "[%s] 没有发现rpm 文件"
 msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:184 po/placeholder.h:291
+#: po/placeholder.h:184 po/placeholder.h:292
 #, c-format
 msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:185 po/placeholder.h:430 urpmi:436
+#: po/placeholder.h:185 po/placeholder.h:433 urpmi:436
 #, fuzzy
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: po/placeholder.h:186 po/placeholder.h:294 urpm.pm:217
+#: po/placeholder.h:186 po/placeholder.h:295 urpm.pm:217
 #, fuzzy, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法创建 hdlist: %s"
@@ -773,335 +773,344 @@ msgstr "无法创建 hdlist: %s"
 msgid "unable to build hdlist synthesis, using parsehdlist method"
 msgstr "无法为介质\"%s\"创建 synthesis文件"
 
-#: po/placeholder.h:188 po/placeholder.h:481
+#: po/placeholder.h:188 po/placeholder.h:484
 msgid ""
 "  --distrib      - automatically create all media from an installation "
 "medium.\n"
 msgstr ""
 
-#: po/placeholder.h:191 po/placeholder.h:299 urpm.pm:1621
-#, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "无法从介质\"%2$s\" 读取rpm文件[%1$s]"
-
-#: po/placeholder.h:192 po/placeholder.h:437 po/placeholder.h:565
+#: po/placeholder.h:191 po/placeholder.h:440 po/placeholder.h:568
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: po/placeholder.h:194 po/placeholder.h:300 urpm.pm:1853 urpm.pm:1858
+#: po/placeholder.h:192 po/placeholder.h:300 urpm.pm:1627
 #, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "只有超级用户可以安装本机软件包"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "无法从介质\"%2$s\" 读取rpm文件[%1$s]"
 
-#: po/placeholder.h:195 po/placeholder.h:302 urpm.pm:376
+#: po/placeholder.h:194 po/placeholder.h:303 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:196 po/placeholder.h:303
+#: po/placeholder.h:195 po/placeholder.h:301 urpm.pm:1859 urpm.pm:1864
+#, fuzzy, c-format
+msgid "unable to install package %s"
+msgstr "只有超级用户可以安装本机软件包"
+
+#: po/placeholder.h:196 po/placeholder.h:304
 #, fuzzy, c-format
 msgid "examining synthesis file [%s]"
 msgstr "读取 compss 文件 [%s]"
 
-#: po/placeholder.h:197 po/placeholder.h:304
+#: po/placeholder.h:197 po/placeholder.h:305
 #, fuzzy, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "无法删除不存在的介质\"%s\""
 
-#: po/placeholder.h:199 po/placeholder.h:306 urpm.pm:361
+#: po/placeholder.h:199 po/placeholder.h:308 urpm.pm:361
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:200 po/placeholder.h:307
+#: po/placeholder.h:200 po/placeholder.h:309
 #, fuzzy, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:201 po/placeholder.h:309 urpm.pm:1586 urpm.pm:1612
+#: po/placeholder.h:201 po/placeholder.h:311 urpm.pm:1592 urpm.pm:1618
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:203 po/placeholder.h:583
+#: po/placeholder.h:203 po/placeholder.h:586
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:584
+#: po/placeholder.h:204 po/placeholder.h:587
 msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: po/placeholder.h:205 po/placeholder.h:312 urpm.pm:1865
-#, c-format
-msgid "%s is needed by %s"
-msgstr ""
-
-#: po/placeholder.h:207 po/placeholder.h:362 urpme:120
+#: po/placeholder.h:205 po/placeholder.h:364 urpme:125
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be removed (%d "
 "MB)"
 msgstr "我将另外安装下列软件包 (%d MB), 以满足相关性要求"
 
-#: po/placeholder.h:208 po/placeholder.h:313
+#: po/placeholder.h:207 po/placeholder.h:314 urpm.pm:1871
+#, c-format
+msgid "%s is needed by %s"
+msgstr ""
+
+#: po/placeholder.h:208 po/placeholder.h:315
 #, fuzzy
 msgid "retrieving hdlists file..."
 msgstr "写入 depslist 文件 [%s]"
 
-#: po/placeholder.h:209 po/placeholder.h:377 urpmi:149
+#: po/placeholder.h:209 po/placeholder.h:380 urpmi:149
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"
 
-#: po/placeholder.h:210 po/placeholder.h:315 urpm.pm:402
+#: po/placeholder.h:210 po/placeholder.h:317 urpm.pm:402
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:211 po/placeholder.h:317
+#: po/placeholder.h:211 po/placeholder.h:318 urpm.pm:1424
+msgid "unable to register rpm file"
+msgstr "无法登记 rpm 文件"
+
+#: po/placeholder.h:212 po/placeholder.h:319
 #, c-format
 msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:212 po/placeholder.h:316 urpm.pm:1418
-msgid "unable to register rpm file"
-msgstr "无法登记 rpm 文件"
-
-#: po/placeholder.h:213 po/placeholder.h:319
+#: po/placeholder.h:213 po/placeholder.h:323
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: po/placeholder.h:214 po/placeholder.h:318 urpm.pm:456
+#: po/placeholder.h:214 po/placeholder.h:320 urpm.pm:456
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
 #: po/placeholder.h:215 po/placeholder.h:321
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:216 po/placeholder.h:322 urpm.pm:448
+#: po/placeholder.h:216 po/placeholder.h:325
+#, fuzzy, c-format
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "无法为介质\"%s\"创建 synthesis文件"
+
+#: po/placeholder.h:217 po/placeholder.h:324 urpm.pm:448
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:217 po/placeholder.h:385 po/placeholder.h:554
+#: po/placeholder.h:218 po/placeholder.h:388 po/placeholder.h:557
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:218 po/placeholder.h:324
+#: po/placeholder.h:219 po/placeholder.h:326
 #, c-format
 msgid "copy of [%s] failed"
 msgstr "拷贝 [%s] 失败"
 
-#: po/placeholder.h:219
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "无法分析hdlist文件 \"%s\""
-
-#: po/placeholder.h:220 po/placeholder.h:561
+#: po/placeholder.h:220 po/placeholder.h:564
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:221 po/placeholder.h:326
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr ""
+#: po/placeholder.h:221
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "无法分析hdlist文件 \"%s\""
 
-#: po/placeholder.h:222 po/placeholder.h:372 urpme:111
+#: po/placeholder.h:222 po/placeholder.h:375 urpme:116
 #, c-format
 msgid "removing package %s will break your system\n"
 msgstr ""
 
-#: po/placeholder.h:224 po/placeholder.h:327
-msgid "...copying done"
+#: po/placeholder.h:223 po/placeholder.h:328
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:225 po/placeholder.h:403
+#: po/placeholder.h:225 po/placeholder.h:406
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
 #: po/placeholder.h:226 po/placeholder.h:329
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "写入 depslist 文件 [%s]"
+msgid "...copying done"
+msgstr ""
 
-#: po/placeholder.h:227 po/placeholder.h:404 urpmi:397 urpmi:406
+#: po/placeholder.h:227 po/placeholder.h:407 urpmi:397 urpmi:406
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "我将另外安装下列软件包 (%d MB), 以满足相关性要求"
 
-#: po/placeholder.h:228 po/placeholder.h:331 urpm.pm:337 urpm.pm:349
+#: po/placeholder.h:228 po/placeholder.h:331
+#, fuzzy
+msgid "copying hdlists file..."
+msgstr "写入 depslist 文件 [%s]"
+
+#: po/placeholder.h:229 po/placeholder.h:333 urpm.pm:337 urpm.pm:349
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:229 po/placeholder.h:406 urpmi:486
+#: po/placeholder.h:230 po/placeholder.h:409 urpmi:486
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗? (是(y)/不(N)) [不] "
 
-#: po/placeholder.h:230 po/placeholder.h:412 po/placeholder.h:578
+#: po/placeholder.h:231 po/placeholder.h:415 po/placeholder.h:581
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: po/placeholder.h:231 po/placeholder.h:335 urpm.pm:1421
+#: po/placeholder.h:232 po/placeholder.h:337 urpm.pm:1427
 msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:232 po/placeholder.h:336
+#: po/placeholder.h:233 po/placeholder.h:338
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:233 po/placeholder.h:418
+#: po/placeholder.h:234 po/placeholder.h:421
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:235 po/placeholder.h:340
+#: po/placeholder.h:236 po/placeholder.h:342
 #, fuzzy, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:236 po/placeholder.h:581
+#: po/placeholder.h:237 po/placeholder.h:584
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: po/placeholder.h:237
+#: po/placeholder.h:238
 #, c-format
 msgid "unable to build hdlist: %s"
 msgstr "无法创建 hdlist: %s"
 
-#: po/placeholder.h:238 po/placeholder.h:341 urpm.pm:1681 urpm.pm:1684
-#: urpm.pm:1702
+#: po/placeholder.h:239 po/placeholder.h:343 urpm.pm:1687 urpm.pm:1690
+#: urpm.pm:1708
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:239 po/placeholder.h:343 urpm.pm:418
+#: po/placeholder.h:240 po/placeholder.h:345 urpm.pm:418
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:240 po/placeholder.h:344
+#: po/placeholder.h:241 po/placeholder.h:429
+msgid "  -q             - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:242 po/placeholder.h:346
 #, fuzzy, c-format
 msgid "unable to read rpms files from [%s]: %s"
 msgstr "无法从介质\"%2$s\" 读取rpm文件[%1$s]"
 
-#: po/placeholder.h:241 po/placeholder.h:426
-msgid "  -q             - quiet mode.\n"
-msgstr ""
-
-#: po/placeholder.h:242
+#: po/placeholder.h:243
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:244 po/placeholder.h:435 po/placeholder.h:564
+#: po/placeholder.h:245 po/placeholder.h:438 po/placeholder.h:567
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:245 po/placeholder.h:366 urpme:61
+#: po/placeholder.h:247 po/placeholder.h:368 urpme:63
 #, c-format
 msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:247 po/placeholder.h:371 urpme:31
-msgid "Remove them all?"
-msgstr ""
-
-#: po/placeholder.h:248 po/placeholder.h:440 urpmi:451
+#: po/placeholder.h:248 po/placeholder.h:443 urpmi:451
 #, c-format
 msgid "installing %s\n"
 msgstr "正在安装 %s\n"
 
-#: po/placeholder.h:249 po/placeholder.h:441 urpmi:435
+#: po/placeholder.h:249 po/placeholder.h:374 urpme:33
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:250 po/placeholder.h:444 urpmi:435
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请插入标签 \"%s\" 的介质到设备 [%s]"
 
-#: po/placeholder.h:250 po/placeholder.h:351
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "写入 depslist 文件 [%s]"
-
-#: po/placeholder.h:251 po/placeholder.h:350 urpm.pm:1511
+#: po/placeholder.h:251 po/placeholder.h:352 urpm.pm:1517
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: po/placeholder.h:252 po/placeholder.h:353 urpm.pm:1400
+#: po/placeholder.h:252 po/placeholder.h:353
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "写入 depslist 文件 [%s]"
+
+#: po/placeholder.h:253 po/placeholder.h:355 urpm.pm:1406
 #, fuzzy
 msgid "no entries relocated in depslist"
 msgstr "在depslist中重新定位 %s"
 
-#: po/placeholder.h:254 po/placeholder.h:497
+#: po/placeholder.h:254 po/placeholder.h:500
 msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: po/placeholder.h:255 po/placeholder.h:354 urpm.pm:1771
-msgid "...retrieving done"
+#: po/placeholder.h:256 po/placeholder.h:541
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:256 po/placeholder.h:448 po/placeholder.h:580 urpmi:424
+#: po/placeholder.h:257 po/placeholder.h:451 po/placeholder.h:583 urpmi:424
 #: urpmq:216
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包， 中止"
 
-#: po/placeholder.h:257 po/placeholder.h:538
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+#: po/placeholder.h:258 po/placeholder.h:356 urpm.pm:1777
+msgid "...retrieving done"
 msgstr ""
 
-#. [^:]+(:\d+)?)/*$, or
-#: po/placeholder.h:258 po/placeholder.h:450 po/placeholder.h:498
-#: po/placeholder.h:540 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:259
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr "使用过期选择 %s"
 
-#: po/placeholder.h:259 po/placeholder.h:355 urpm.pm:286
+#: po/placeholder.h:260 po/placeholder.h:357 urpm.pm:286
 #, c-format
 msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:260
-#, c-format
-msgid "selecting %s using obsoletes"
-msgstr "使用过期选择 %s"
+#. [^:]+(:\d+)?)/*$, or
+#: po/placeholder.h:261 po/placeholder.h:453 po/placeholder.h:501
+#: po/placeholder.h:543 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:261
+#: po/placeholder.h:262
 #, c-format
 msgid "selecting %s by selection on files"
 msgstr "正在文件上选择 %s"
 
-#: po/placeholder.h:262 po/placeholder.h:359
+#: po/placeholder.h:263 po/placeholder.h:361
 #, fuzzy, c-format
 msgid "copying source list of \"%s\"..."
 msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:263 po/placeholder.h:361 urpm.pm:220
-msgid "wget is missing\n"
-msgstr ""
-
-#: po/placeholder.h:264 po/placeholder.h:453 urpmi:199
+#: po/placeholder.h:264 po/placeholder.h:456 urpmi:199
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "只有超级用户可以安装本机软件包"
 
-#: po/placeholder.h:323
-#, fuzzy, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "无法为介质\"%s\"创建 synthesis文件"
+#: po/placeholder.h:265 po/placeholder.h:363 urpm.pm:220
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:307
+msgid "performing second pass to compute dependencies\n"
+msgstr ""
+
+#: po/placeholder.h:370 urpme:85
+#, fuzzy
+msgid "unknown package "
+msgstr "没有名为 %s 的软件包"
 
-#: po/placeholder.h:379
+#: po/placeholder.h:382
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1111,20 +1120,20 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:386 po/placeholder.h:477 po/placeholder.h:534
-#: po/placeholder.h:555
+#: po/placeholder.h:389 po/placeholder.h:480 po/placeholder.h:537
+#: po/placeholder.h:558
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: po/placeholder.h:391 urpmi:456
+#: po/placeholder.h:394 urpmi:456
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:395 urpmi:370
+#: po/placeholder.h:398 urpmi:370
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1132,27 +1141,27 @@ msgid ""
 "do you agree ?"
 msgstr "有些软件包要求先删除再升级, 暂不支持\n"
 
-#: po/placeholder.h:408 po/placeholder.h:489 po/placeholder.h:528
-#: po/placeholder.h:573
+#: po/placeholder.h:411 po/placeholder.h:492 po/placeholder.h:531
+#: po/placeholder.h:576
 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:413
+#: po/placeholder.h:416
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: po/placeholder.h:420 urpmi:403
+#: po/placeholder.h:423 urpmi:403
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: po/placeholder.h:442 urpmi:363
+#: po/placeholder.h:445 urpmi:363
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1160,7 +1169,7 @@ msgid ""
 "do you agree ?"
 msgstr ""
 
-#: po/placeholder.h:455
+#: po/placeholder.h:458
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1180,7 +1189,7 @@ msgstr ""
 "       http://<主机>/<路径> with <hdlist相对路径>\n"
 "       removable_<设备>://<路径>\n"
 
-#: po/placeholder.h:466 po/placeholder.h:500 po/placeholder.h:518
+#: po/placeholder.h:469 po/placeholder.h:503 po/placeholder.h:521
 #: urpmi.addmedia:79
 #, c-format
 msgid ""
@@ -1188,7 +1197,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:473 urpmi.addmedia:104
+#: po/placeholder.h:476 urpmi.addmedia:104
 #, c-format
 msgid ""
 "%s\n"
@@ -1197,7 +1206,7 @@ msgstr ""
 "%s\n"
 "`with'找不到ftp介质\n"
 
-#: po/placeholder.h:482 urpmi.addmedia:90
+#: po/placeholder.h:485 urpmi.addmedia:90
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -1206,7 +1215,7 @@ msgstr ""
 "%s\n"
 "<hdlist相对路径>找不到\n"
 
-#: po/placeholder.h:493 urpmi.addmedia:102
+#: po/placeholder.h:496 urpmi.addmedia:102
 #, c-format
 msgid ""
 "%s\n"
@@ -1215,7 +1224,7 @@ msgstr ""
 "%s\n"
 "<hdlist相对路径>找不到\n"
 
-#: po/placeholder.h:504 urpmi.removemedia:49
+#: po/placeholder.h:507 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1224,7 +1233,7 @@ msgstr ""
 "找不到要删除的项\n"
 "(%s中的一个)\n"
 
-#: po/placeholder.h:510
+#: po/placeholder.h:513
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -1236,7 +1245,7 @@ msgstr ""
 "\n"
 "未知选项 '%s'\n"
 
-#: po/placeholder.h:514
+#: po/placeholder.h:517
 #, fuzzy
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1248,7 +1257,7 @@ msgstr ""
 "\n"
 "未知选项 '%s'\n"
 
-#: po/placeholder.h:523 urpmi.update:80
+#: po/placeholder.h:526 urpmi.update:80
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1257,7 +1266,7 @@ msgstr ""
 "找不到要升级的项\n"
 "(%s中之一)\n"
 
-#: po/placeholder.h:546
+#: po/placeholder.h:549
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1267,7 +1276,7 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:569
+#: po/placeholder.h:572
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"