updated pot file

1 files changed, 315 insertions, 310 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index bfd52a28..91d55ac4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,8 +8,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-02-14 11:46+0100\n"
+"Project-Id-Version: urpmi 3.3\n"
+"POT-Creation-Date: 2002-02-18 20:20+0100\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,30 +29,30 @@ msgstr ""
 "自动安装软件包...\n"
 "你要求安装软件包 $rpm\n"
 
-#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:377
+#: _irpm:31 po/placeholder.h:208 po/placeholder.h:328 po/placeholder.h:383
 #: urpme:29 urpmi:295
 msgid "Is it OK?"
 msgstr "这样好了吗?"
 
-#: _irpm:33 po/placeholder.h:193 po/placeholder.h:368 urpmi:298 urpmi:327
+#: _irpm:33 po/placeholder.h:198 po/placeholder.h:374 urpmi:298 urpmi:327
 msgid "Ok"
 msgstr "确认"
 
-#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:299 urpmi:328
+#: _irpm:34 po/placeholder.h:165 po/placeholder.h:333 urpmi:299 urpmi:328
 msgid "Cancel"
 msgstr "取消"
 
-#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:338
+#: _irpm:40 po/placeholder.h:179 po/placeholder.h:332 po/placeholder.h:344
 #: urpme:32 urpmi:303 urpmi:368 urpmi:384
 msgid "Nn"
 msgstr "nN不否"
 
-#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:341
+#: _irpm:41 po/placeholder.h:91 po/placeholder.h:327 po/placeholder.h:347
 #: urpme:34 urpmi:304 urpmi:369 urpmi:385
 msgid "Yy"
 msgstr "yY是"
 
-#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:371
+#: _irpm:42 po/placeholder.h:201 po/placeholder.h:324 po/placeholder.h:377
 #: urpme:94 urpmi:305
 msgid " (Y/n) "
 msgstr " (是(Y)/不(n)) [是] "
@@ -61,72 +61,72 @@ msgstr " (是(Y)/不(n)) [是] "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: 命令没找到\n"
 
-#: po/placeholder.h:6 po/placeholder.h:154
+#: po/placeholder.h:6 po/placeholder.h:158
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf 版本 %s"
 
-#: po/placeholder.h:7 po/placeholder.h:192
+#: po/placeholder.h:7 po/placeholder.h:197
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8 po/placeholder.h:152
+#: po/placeholder.h:8 po/placeholder.h:155
 msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:130
+#: po/placeholder.h:9 po/placeholder.h:26 po/placeholder.h:133
 msgid "usage: urpmf [options] <file>"
 msgstr "用法: rpmf [选项] <文件>"
 
-#: po/placeholder.h:10 po/placeholder.h:109
+#: po/placeholder.h:10 po/placeholder.h:112
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11 po/placeholder.h:153
+#: po/placeholder.h:11 po/placeholder.h:156
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12 po/placeholder.h:126
+#: po/placeholder.h:12 po/placeholder.h:129
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13 po/placeholder.h:157
+#: po/placeholder.h:13 po/placeholder.h:161
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14 po/placeholder.h:160
+#: po/placeholder.h:14 po/placeholder.h:164
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15 po/placeholder.h:102
+#: po/placeholder.h:15 po/placeholder.h:105
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16 po/placeholder.h:87
+#: po/placeholder.h:16 po/placeholder.h:90
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17 po/placeholder.h:134
+#: po/placeholder.h:17 po/placeholder.h:137
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18 po/placeholder.h:146
+#: po/placeholder.h:18 po/placeholder.h:150
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19 po/placeholder.h:120
+#: po/placeholder.h:19 po/placeholder.h:123
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20 po/placeholder.h:138
+#: po/placeholder.h:20 po/placeholder.h:141
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21 po/placeholder.h:186
+#: po/placeholder.h:21 po/placeholder.h:191
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
@@ -139,16 +139,16 @@ msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24 po/placeholder.h:106
+#: po/placeholder.h:24 po/placeholder.h:109
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25 po/placeholder.h:128
+#: po/placeholder.h:25 po/placeholder.h:131
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27 po/placeholder.h:62
+#: po/placeholder.h:27 po/placeholder.h:64
 msgid "try urpmf --help for more options"
 msgstr ""
 
@@ -156,12 +156,12 @@ msgstr ""
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29 po/placeholder.h:214
+#: po/placeholder.h:29 po/placeholder.h:219
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 po/placeholder.h:216
+#: po/placeholder.h:30 po/placeholder.h:221
 msgid "examining whole urpmi database"
 msgstr ""
 
@@ -169,779 +169,792 @@ msgstr ""
 msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:325
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr ""
-
-#: po/placeholder.h:33 po/placeholder.h:218
+#: po/placeholder.h:32 po/placeholder.h:223
 #, fuzzy, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:35 po/placeholder.h:221
+#: po/placeholder.h:33 po/placeholder.h:225 urpm.pm:328
+#, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:35 po/placeholder.h:226
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法分析hdlist文件 \"%s\""
 
-#: po/placeholder.h:36 po/placeholder.h:222
+#: po/placeholder.h:36 po/placeholder.h:227
 #, fuzzy, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:37 po/placeholder.h:467
+#: po/placeholder.h:37 po/placeholder.h:473
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:38 po/placeholder.h:340 po/placeholder.h:470
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
-msgstr ""
-
-#: po/placeholder.h:39 po/placeholder.h:223
+#: po/placeholder.h:38 po/placeholder.h:228
 #, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1835
+#: po/placeholder.h:39 po/placeholder.h:346 po/placeholder.h:476
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:40 po/placeholder.h:230 urpm.pm:1846
 #, c-format
 msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:254
+#: po/placeholder.h:42 po/placeholder.h:234 urpm.pm:257
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
-msgid "unknown package(s) "
-msgstr ""
+#: po/placeholder.h:43 po/placeholder.h:236
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "写入 depslist 文件 [%s]"
 
-#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:278
+#: po/placeholder.h:44 po/placeholder.h:237 urpm.pm:281
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:45 po/placeholder.h:231
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "写入 depslist 文件 [%s]"
+#: po/placeholder.h:45 po/placeholder.h:323 urpme:52
+msgid "unknown package(s) "
+msgstr ""
 
-#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:285
+#: po/placeholder.h:46 po/placeholder.h:239 urpm.pm:288
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:47 po/placeholder.h:235
+#: po/placeholder.h:47 po/placeholder.h:240
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:48 po/placeholder.h:237
+#: po/placeholder.h:48 po/placeholder.h:242
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:50 po/placeholder.h:398 urpmi.addmedia:76
+#: po/placeholder.h:50 po/placeholder.h:361 po/placeholder.h:458
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+
+#: po/placeholder.h:51 po/placeholder.h:404 urpmi.addmedia:76
 #: urpmi.addmedia:93
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "无法升级介质\"%s\"\n"
 
-#: po/placeholder.h:51 po/placeholder.h:404 po/placeholder.h:427
-#: po/placeholder.h:446
+#: po/placeholder.h:52 po/placeholder.h:363
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr ""
+
+#: po/placeholder.h:53 po/placeholder.h:410 po/placeholder.h:433
+#: po/placeholder.h:452
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:52 po/placeholder.h:244
+#: po/placeholder.h:54 po/placeholder.h:249
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:53 po/placeholder.h:245
+#: po/placeholder.h:55 po/placeholder.h:250
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:54 po/placeholder.h:456
+#: po/placeholder.h:56 po/placeholder.h:462
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1355
+#: po/placeholder.h:57 po/placeholder.h:252 urpm.pm:1365
 #, c-format
 msgid "no package named %s"
 msgstr "没有名为 %s 的软件包"
 
-#: po/placeholder.h:56 po/placeholder.h:367 urpmi:370 urpmi:393
+#: po/placeholder.h:58 po/placeholder.h:373 urpmi:370 urpmi:393
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "尝试更激烈的安装方式吗? (使用 --force) (是(y)/不(N)) [不] "
 
-#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:320
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr ""
-
-#: po/placeholder.h:58 po/placeholder.h:248
+#: po/placeholder.h:59 po/placeholder.h:253
 #, fuzzy, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "无法为介质\"%s\"创建 synthesis文件"
 
-#: po/placeholder.h:59 po/placeholder.h:251
+#: po/placeholder.h:60 po/placeholder.h:255 urpm.pm:323
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:61 po/placeholder.h:256
 msgid "urpmi database locked"
 msgstr ""
 
-#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
+#: po/placeholder.h:62 po/placeholder.h:325 urpme:63
 #, fuzzy
 msgid " (y/N) "
 msgstr " (是(Y)/不(n)) [是] "
 
-#: po/placeholder.h:61 po/placeholder.h:373
+#: po/placeholder.h:63 po/placeholder.h:379
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: po/placeholder.h:63 po/placeholder.h:472 urpmq:158
+#: po/placeholder.h:65 po/placeholder.h:478 urpmq:158
 msgid ""
 "some packages have to be removed for being upgraded, this is not supported "
 "yet\n"
 msgstr "有些软件包要求先删除再升级, 暂不支持\n"
 
-#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1165
+#: po/placeholder.h:66 po/placeholder.h:257 urpm.pm:1175
 #, c-format
 msgid "mounting %s"
 msgstr "正在安装 %s"
 
-#: po/placeholder.h:65 po/placeholder.h:409 po/placeholder.h:447
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
-
-#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:143
+#: po/placeholder.h:67 po/placeholder.h:260 urpm.pm:145
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:67 po/placeholder.h:418 urpmi.removemedia:47
+#: po/placeholder.h:68 po/placeholder.h:415 po/placeholder.h:453
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr ""
+
+#: po/placeholder.h:69 po/placeholder.h:424 urpmi.removemedia:47
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "没有东西删除(用urpmi.addmedia增加介质)\n"
 
-#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1952
+#: po/placeholder.h:70 po/placeholder.h:262 urpm.pm:1963
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:69 po/placeholder.h:485
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
+#: po/placeholder.h:71 po/placeholder.h:385 po/placeholder.h:490
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: po/placeholder.h:70 po/placeholder.h:382 urpmi:244
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "需要下列软件包之一:"
+#: po/placeholder.h:72 po/placeholder.h:264
+msgid "...copying failed"
+msgstr ""
 
-#: po/placeholder.h:71 po/placeholder.h:380 urpmi:325
+#: po/placeholder.h:73 po/placeholder.h:386 urpmi:325
 msgid "Press Enter when it's done..."
 msgstr "准备好后按 Enter 键..."
 
-#: po/placeholder.h:72 po/placeholder.h:259
-msgid "...copying failed"
+#: po/placeholder.h:74 po/placeholder.h:388 urpmi:244
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "需要下列软件包之一:"
+
+#: po/placeholder.h:75 po/placeholder.h:491
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:257
+#: po/placeholder.h:76 po/placeholder.h:265 urpm.pm:260
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:74 po/placeholder.h:453
+#: po/placeholder.h:77 po/placeholder.h:459
 msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:75 po/placeholder.h:454
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:78 po/placeholder.h:434
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:76 po/placeholder.h:428
-msgid "  -a             - select all media.\n"
+#: po/placeholder.h:79 po/placeholder.h:460
+msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:77 po/placeholder.h:267
+#: po/placeholder.h:80 po/placeholder.h:272
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:78 po/placeholder.h:411
+#: po/placeholder.h:81 po/placeholder.h:417
 msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:79 po/placeholder.h:458
+#: po/placeholder.h:82 po/placeholder.h:464
 msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:80 po/placeholder.h:459
-msgid "  -f             - print version, release and arch with name.\n"
+#: po/placeholder.h:83 po/placeholder.h:343
+msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:81 po/placeholder.h:337
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:84 po/placeholder.h:465
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1473
+#: po/placeholder.h:85 po/placeholder.h:276 urpm.pm:1483
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "无法分析 [%s]"
 
-#: po/placeholder.h:83 po/placeholder.h:450 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "没有东西升级(用urpmi.addmedia增加介质)\n"
-
-#: po/placeholder.h:84 po/placeholder.h:271 urpm.pm:1474
+#: po/placeholder.h:86 po/placeholder.h:277 urpm.pm:1484
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "读取 compss 文件 [%s]"
 
-#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:138
+#: po/placeholder.h:87 po/placeholder.h:456 urpmi.update:57
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "没有东西升级(用urpmi.addmedia增加介质)\n"
+
+#: po/placeholder.h:88 po/placeholder.h:279 urpm.pm:138
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:86 po/placeholder.h:468
+#: po/placeholder.h:89 po/placeholder.h:474
 msgid ""
 "  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:88 po/placeholder.h:397 urpmi.addmedia:92
+#: po/placeholder.h:92 po/placeholder.h:403 urpmi.addmedia:92
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:90 po/placeholder.h:276
+#: po/placeholder.h:93 po/placeholder.h:282
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:91 po/placeholder.h:473 urpmq:94
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"
-
-#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#: po/placeholder.h:94 po/placeholder.h:330 urpme:39
 #, fuzzy
 msgid "usage: urpme [-a] [--auto] <packages...>\n"
 msgstr "用法: urpmi.removemedia [-a] <名称> ..."
 
-#: po/placeholder.h:93 po/placeholder.h:279
+#: po/placeholder.h:95 po/placeholder.h:479 urpmq:94
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"
+
+#: po/placeholder.h:96 po/placeholder.h:285
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "创建hdlist [%s]"
 
-#: po/placeholder.h:94 po/placeholder.h:346 po/placeholder.h:479
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
+#: po/placeholder.h:97 po/placeholder.h:286 urpm.pm:1898
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "无法从介质\"%2$s\" 读取rpm文件[%1$s]"
 
-#: po/placeholder.h:95 po/placeholder.h:281
+#: po/placeholder.h:98 po/placeholder.h:287
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1887
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "无法从介质\"%2$s\" 读取rpm文件[%1$s]"
+#: po/placeholder.h:99 po/placeholder.h:352 po/placeholder.h:485
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:97 po/placeholder.h:282
+#: po/placeholder.h:100 po/placeholder.h:288
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1964
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1975
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1903
+#: po/placeholder.h:102 po/placeholder.h:292 urpm.pm:1914
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1250
+#: po/placeholder.h:103 po/placeholder.h:296 urpm.pm:1260
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "非法rpm文件 [%s]"
 
-#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1451
+#: po/placeholder.h:104 po/placeholder.h:297 urpm.pm:1461
 #, c-format
 msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:103 po/placeholder.h:359 urpmi:253
+#: po/placeholder.h:106 po/placeholder.h:365 urpmi:253
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:  (1-%d) "
 
-#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:300
+#: po/placeholder.h:107 po/placeholder.h:299 urpm.pm:303
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:105 po/placeholder.h:360 po/placeholder.h:410
-#: po/placeholder.h:448
+#: po/placeholder.h:108 po/placeholder.h:366 po/placeholder.h:416
+#: po/placeholder.h:454
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2192
+#: po/placeholder.h:110 po/placeholder.h:300 urpm.pm:2203
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1251
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1261
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问rpm 文件[%s]"
 
-#: po/placeholder.h:110 po/placeholder.h:370 urpmi:256
-msgid "Sorry, bad choice, try again\n"
-msgstr "对不起, 选择无效, 请再试一次\n"
+#: po/placeholder.h:113 po/placeholder.h:306 urpm.pm:1247
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "在depslist中重新定位 %s"
 
-#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1914
+#: po/placeholder.h:114 po/placeholder.h:307 urpm.pm:1925
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质\"%s\""
 
-#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1237
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "在depslist中重新定位 %s"
+#: po/placeholder.h:115 po/placeholder.h:376 urpmi:256
+msgid "Sorry, bad choice, try again\n"
+msgstr "对不起, 选择无效, 请再试一次\n"
 
-#: po/placeholder.h:113 po/placeholder.h:374 po/placeholder.h:403
-#: po/placeholder.h:441
+#: po/placeholder.h:116 po/placeholder.h:380 po/placeholder.h:409
+#: po/placeholder.h:447
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:114 po/placeholder.h:303
-#, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "试图选择不存在的介质\"%s\""
-
-#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1823
+#: po/placeholder.h:117 po/placeholder.h:308 urpm.pm:1834
 #, c-format
 msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:116 po/placeholder.h:305
+#: po/placeholder.h:118 po/placeholder.h:309
+#, c-format
+msgid "trying to select inexistent medium \"%s\""
+msgstr "试图选择不存在的介质\"%s\""
+
+#: po/placeholder.h:119 po/placeholder.h:311
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 没有发现rpm 文件"
 
-#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:146
+#: po/placeholder.h:120 po/placeholder.h:318 urpm.pm:148
 msgid "curl is missing\n"
 msgstr ""
 
-#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:289
+#: po/placeholder.h:121 po/placeholder.h:321 urpm.pm:292
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "无法判断 hdlist文件的介质 [%s]"
 
-#: po/placeholder.h:119 po/placeholder.h:328
+#: po/placeholder.h:122 po/placeholder.h:334
 msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:121 po/placeholder.h:329 urpmi:402
+#: po/placeholder.h:124 po/placeholder.h:335 urpmi:402
 msgid "everything already installed"
 msgstr "全部安装完成"
 
-#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1957
+#: po/placeholder.h:125 po/placeholder.h:220 urpm.pm:1968
 msgid "retrieving rpms files..."
 msgstr ""
 
-#: po/placeholder.h:123 po/placeholder.h:217
+#: po/placeholder.h:126 po/placeholder.h:222
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:124 po/placeholder.h:331 urpmi:245
+#: po/placeholder.h:127 po/placeholder.h:337 urpmi:245
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: po/placeholder.h:125 po/placeholder.h:219
+#: po/placeholder.h:128 po/placeholder.h:224
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr ""
 
-#: po/placeholder.h:127 po/placeholder.h:455 urpmq:97
+#: po/placeholder.h:130 po/placeholder.h:461 urpmq:97
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取rpm文件 \"%s\"\n"
 
-#: po/placeholder.h:129 po/placeholder.h:323 urpme:87
+#: po/placeholder.h:132 po/placeholder.h:329 urpme:87
 msgid "Nothing to remove.\n"
 msgstr ""
 
-#: po/placeholder.h:131 po/placeholder.h:339 urpmi:356 urpmi:363 urpmi:379
+#: po/placeholder.h:134 po/placeholder.h:345 urpmi:356 urpmi:363 urpmi:379
 #: urpmi:392
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: po/placeholder.h:132 po/placeholder.h:224
+#: po/placeholder.h:135 po/placeholder.h:229
 #, fuzzy
 msgid "unable to access first installation medium"
 msgstr "无法访问介质\"%s\""
 
-#: po/placeholder.h:133 po/placeholder.h:344 po/placeholder.h:474
+#: po/placeholder.h:136 po/placeholder.h:350 po/placeholder.h:480
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1176
+#: po/placeholder.h:138 po/placeholder.h:231 urpm.pm:1186
 #, c-format
 msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:136 po/placeholder.h:227
+#: po/placeholder.h:139 po/placeholder.h:232
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:137 po/placeholder.h:228
+#: po/placeholder.h:140 po/placeholder.h:233
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1466
+#: po/placeholder.h:142 po/placeholder.h:235 urpm.pm:1476
 msgid "<non printable chars>"
 msgstr ""
 
-#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:482
+#: po/placeholder.h:143 po/placeholder.h:358 po/placeholder.h:488
 msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:141 po/placeholder.h:233
+#: po/placeholder.h:144 po/placeholder.h:238
 #, fuzzy, c-format
 msgid "removing medium \"%s\""
 msgstr "无法删除不存在的介质\"%s\""
 
-#: po/placeholder.h:142 po/placeholder.h:236
+#: po/placeholder.h:145 po/placeholder.h:241
 #, c-format
 msgid "unable to build synthesis file for medium \"%s\""
 msgstr "无法为介质\"%s\"创建 synthesis文件"
 
-#: po/placeholder.h:143 po/placeholder.h:238
+#: po/placeholder.h:146 po/placeholder.h:243
 #, fuzzy, c-format
 msgid "trying to select multiple medium: %s"
 msgstr "试图选择不存在的介质\"%s\""
 
-#: po/placeholder.h:144 po/placeholder.h:451
+#: po/placeholder.h:147 po/placeholder.h:457
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:354
+#: po/placeholder.h:148 po/placeholder.h:360
 msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2204
+#: po/placeholder.h:149 po/placeholder.h:244 urpm.pm:2215
 #, c-format
 msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:148 po/placeholder.h:358
+#: po/placeholder.h:151 po/placeholder.h:364
 msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:149 po/placeholder.h:246
+#: po/placeholder.h:152 po/placeholder.h:251
 #, c-format
 msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:150 po/placeholder.h:249
+#: po/placeholder.h:153 po/placeholder.h:254
 #, fuzzy
 msgid "unable to build hdlist synthesis, using parsehdlist method"
 msgstr "无法为介质\"%s\"创建 synthesis文件"
 
-#: po/placeholder.h:151 po/placeholder.h:417
+#: po/placeholder.h:154 po/placeholder.h:423
 msgid ""
 "  --distrib      - automatically create all media from an installation "
 "medium.\n"
 msgstr ""
 
-#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:272
+#: po/placeholder.h:157 po/placeholder.h:378 po/placeholder.h:477
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+
+#: po/placeholder.h:159 po/placeholder.h:258 urpm.pm:275
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:254
+#: po/placeholder.h:160 po/placeholder.h:259
 #, fuzzy, c-format
 msgid "examining synthesis file [%s]"
 msgstr "读取 compss 文件 [%s]"
 
-#: po/placeholder.h:158 po/placeholder.h:256
+#: po/placeholder.h:162 po/placeholder.h:261
 #, fuzzy, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:159 po/placeholder.h:258 urpm.pm:1788 urpm.pm:1814
+#: po/placeholder.h:163 po/placeholder.h:263 urpm.pm:1799 urpm.pm:1825
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:161 po/placeholder.h:316 urpme:93
+#: po/placeholder.h:166 po/placeholder.h:322 urpme:93
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be removed (%d "
 "MB)"
 msgstr "我将另外安装下列软件包 (%d MB), 以满足相关性要求"
 
-#: po/placeholder.h:163 po/placeholder.h:261
+#: po/placeholder.h:167 po/placeholder.h:266
 #, fuzzy
 msgid "retrieving hdlists file..."
 msgstr "写入 depslist 文件 [%s]"
 
-#: po/placeholder.h:164 po/placeholder.h:330 urpmi:124
+#: po/placeholder.h:168 po/placeholder.h:336 urpmi:124
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"
 
-#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:298
+#: po/placeholder.h:169 po/placeholder.h:267 urpm.pm:301
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1255
-msgid "unable to register rpm file"
-msgstr "无法登记 rpm 文件"
-
-#: po/placeholder.h:167 po/placeholder.h:264
+#: po/placeholder.h:170 po/placeholder.h:269
 #, c-format
 msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:352
+#: po/placeholder.h:171 po/placeholder.h:268 urpm.pm:1265
+msgid "unable to register rpm file"
+msgstr "无法登记 rpm 文件"
+
+#: po/placeholder.h:172 po/placeholder.h:271
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:169 po/placeholder.h:266
+#: po/placeholder.h:173 po/placeholder.h:270 urpm.pm:355
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:344
+#: po/placeholder.h:174 po/placeholder.h:274 urpm.pm:347
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:332 po/placeholder.h:457
+#: po/placeholder.h:175 po/placeholder.h:338 po/placeholder.h:463
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:172 po/placeholder.h:269
+#: po/placeholder.h:176 po/placeholder.h:275
 #, c-format
 msgid "copy of [%s] failed"
 msgstr "拷贝 [%s] 失败"
 
-#: po/placeholder.h:173 po/placeholder.h:466
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1465 urpm.pm:1472
+#: po/placeholder.h:177 po/placeholder.h:278 urpm.pm:1475 urpm.pm:1482
 #, fuzzy, c-format
 msgid "unable to analyse synthesis data of %s"
 msgstr "无法分析hdlist文件 \"%s\""
 
-#: po/placeholder.h:175 po/placeholder.h:274
+#: po/placeholder.h:178 po/placeholder.h:472
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
+
+#: po/placeholder.h:180 po/placeholder.h:280
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:177 po/placeholder.h:342
-msgid "  --X            - use X interface.\n"
+#: po/placeholder.h:181 po/placeholder.h:281
+msgid "...copying done"
 msgstr ""
 
-#: po/placeholder.h:178 po/placeholder.h:275
-msgid "...copying done"
+#: po/placeholder.h:182 po/placeholder.h:348
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:179 po/placeholder.h:343 urpmi:294
+#: po/placeholder.h:183 po/placeholder.h:283
+#, fuzzy
+msgid "copying hdlists file..."
+msgstr "写入 depslist 文件 [%s]"
+
+#: po/placeholder.h:184 po/placeholder.h:349 urpmi:294
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "我将另外安装下列软件包 (%d MB), 以满足相关性要求"
 
-#: po/placeholder.h:180 po/placeholder.h:277
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "写入 depslist 文件 [%s]"
-
-#: po/placeholder.h:181 po/placeholder.h:278 urpm.pm:233 urpm.pm:245
+#: po/placeholder.h:185 po/placeholder.h:284 urpm.pm:236 urpm.pm:248
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:182 po/placeholder.h:345 urpmi:386
+#: po/placeholder.h:186 po/placeholder.h:351 urpmi:386
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗? (是(y)/不(N)) [不] "
 
-#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1259
+#: po/placeholder.h:187 po/placeholder.h:353 po/placeholder.h:486
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr ""
+
+#: po/placeholder.h:188 po/placeholder.h:289 urpm.pm:1269
 msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:184 po/placeholder.h:284
+#: po/placeholder.h:189 po/placeholder.h:290
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:481
+#: po/placeholder.h:190 po/placeholder.h:359 po/placeholder.h:487
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:187 po/placeholder.h:287
+#: po/placeholder.h:192 po/placeholder.h:293
 #, fuzzy, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:188 po/placeholder.h:288
+#: po/placeholder.h:193 po/placeholder.h:294
 #, c-format
 msgid "unable to build hdlist: %s"
 msgstr "无法创建 hdlist: %s"
 
-#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1877 urpm.pm:1880
-#: urpm.pm:1899
+#: po/placeholder.h:194 po/placeholder.h:295 urpm.pm:1888 urpm.pm:1891
+#: urpm.pm:1910
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:314
+#: po/placeholder.h:195 po/placeholder.h:298 urpm.pm:317
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:191 po/placeholder.h:356
+#: po/placeholder.h:196 po/placeholder.h:362
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: po/placeholder.h:194 po/placeholder.h:369 po/placeholder.h:469
+#: po/placeholder.h:199 po/placeholder.h:375 po/placeholder.h:475
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#: po/placeholder.h:200 po/placeholder.h:326 urpme:62
 #, c-format
 msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:197 po/placeholder.h:375 urpmi:343
+#: po/placeholder.h:202 po/placeholder.h:331 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:203 po/placeholder.h:381 urpmi:343
 #, c-format
 msgid "installing %s\n"
 msgstr "正在安装 %s\n"
 
-#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
-msgid "Remove them all?"
-msgstr ""
-
-#: po/placeholder.h:199 po/placeholder.h:376 urpmi:324
+#: po/placeholder.h:204 po/placeholder.h:382 urpmi:324
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请插入标签 \"%s\" 的介质到设备 [%s]"
 
-#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1358
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "下列软件包里有 %s: %s"
-
-#: po/placeholder.h:201 po/placeholder.h:306
+#: po/placeholder.h:205 po/placeholder.h:312
 #, fuzzy, c-format
 msgid "examining hdlist file [%s]"
 msgstr "写入 depslist 文件 [%s]"
 
-#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1238
+#: po/placeholder.h:206 po/placeholder.h:310 urpm.pm:1368
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "下列软件包里有 %s: %s"
+
+#: po/placeholder.h:207 po/placeholder.h:313 urpm.pm:1248
 #, fuzzy
 msgid "no entries relocated in depslist"
 msgstr "在depslist中重新定位 %s"
 
-#: po/placeholder.h:203 po/placeholder.h:416
+#: po/placeholder.h:209 po/placeholder.h:422
 msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: po/placeholder.h:205 po/placeholder.h:449
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
+#: po/placeholder.h:210 po/placeholder.h:314 urpm.pm:1973
+msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:206 po/placeholder.h:378 po/placeholder.h:483 urpmi:313
+#: po/placeholder.h:211 po/placeholder.h:384 po/placeholder.h:489 urpmi:313
 #: urpmq:172
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包， 中止"
 
-#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1962
-msgid "...retrieving done"
+#: po/placeholder.h:212 po/placeholder.h:455
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
 msgstr ""
 
-#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2079
-#, c-format
-msgid "selecting %s using obsoletes"
-msgstr "使用过期选择 %s"
-
-#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:196
+#: po/placeholder.h:213 po/placeholder.h:316 urpm.pm:199
 #, c-format
 msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2201
+#: po/placeholder.h:214 po/placeholder.h:315 urpm.pm:2090
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr "使用过期选择 %s"
+
+#: po/placeholder.h:215 po/placeholder.h:317 urpm.pm:2212
 #, c-format
 msgid "selecting %s by selection on files"
 msgstr "正在文件上选择 %s"
 
-#: po/placeholder.h:211 po/placeholder.h:313
+#: po/placeholder.h:216 po/placeholder.h:319
 #, fuzzy, c-format
 msgid "copying source list of \"%s\"..."
 msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:212 po/placeholder.h:381 urpmi:148
+#: po/placeholder.h:217 po/placeholder.h:320 urpm.pm:141
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:218 po/placeholder.h:387 urpmi:148
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "只有超级用户可以安装本机软件包"
 
-#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:141
-msgid "wget is missing\n"
-msgstr ""
-
-#: po/placeholder.h:240
+#: po/placeholder.h:245
 #, c-format
 msgid ""
 "removing %s to upgrade to %s ...\n"
 "  since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:296
+#: po/placeholder.h:273
+#, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr ""
+
+#: po/placeholder.h:302
 #, c-format
 msgid ""
 "removing %s to upgrade to %s ...\n"
 "  since it will not upgrade correctly!"
 msgstr ""
 
-#: po/placeholder.h:333 urpmi:348
+#: po/placeholder.h:339 urpmi:348
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:347 po/placeholder.h:480
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr ""
-
-#: po/placeholder.h:348
+#: po/placeholder.h:354
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: po/placeholder.h:355 po/placeholder.h:452
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-
-#: po/placeholder.h:357
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr ""
-
-#: po/placeholder.h:361
+#: po/placeholder.h:367
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -951,15 +964,7 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:372 po/placeholder.h:471
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-
-#: po/placeholder.h:379 po/placeholder.h:484
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr ""
-
-#: po/placeholder.h:383 urpmi.addmedia:70
+#: po/placeholder.h:389 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -968,7 +973,7 @@ msgstr ""
 "%s\n"
 "<hdlist相对路径>找不到\n"
 
-#: po/placeholder.h:387
+#: po/placeholder.h:393
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -988,7 +993,7 @@ msgstr ""
 "       http://<主机>/<路径> with <hdlist相对路径>\n"
 "       removable_<设备>://<路径>\n"
 
-#: po/placeholder.h:399 po/placeholder.h:419 po/placeholder.h:437
+#: po/placeholder.h:405 po/placeholder.h:425 po/placeholder.h:443
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -996,7 +1001,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:405 urpmi.addmedia:82
+#: po/placeholder.h:411 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -1005,7 +1010,7 @@ msgstr ""
 "%s\n"
 "<hdlist相对路径>找不到\n"
 
-#: po/placeholder.h:412 urpmi.addmedia:84
+#: po/placeholder.h:418 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -1014,7 +1019,7 @@ msgstr ""
 "%s\n"
 "`with'找不到ftp介质\n"
 
-#: po/placeholder.h:423 urpmi.removemedia:49
+#: po/placeholder.h:429 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1023,7 +1028,7 @@ msgstr ""
 "找不到要删除的项\n"
 "(%s中的一个)\n"
 
-#: po/placeholder.h:429
+#: po/placeholder.h:435
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -1035,7 +1040,7 @@ msgstr ""
 "\n"
 "未知选项 '%s'\n"
 
-#: po/placeholder.h:433
+#: po/placeholder.h:439
 #, fuzzy
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1047,7 +1052,7 @@ msgstr ""
 "\n"
 "未知选项 '%s'\n"
 
-#: po/placeholder.h:442 urpmi.update:59
+#: po/placeholder.h:448 urpmi.update:59
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1056,7 +1061,7 @@ msgstr ""
 "找不到要升级的项\n"
 "(%s中之一)\n"
 
-#: po/placeholder.h:460
+#: po/placeholder.h:466
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1066,30 +1071,30 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:475
+#: po/placeholder.h:481
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: urpm.pm:2105 urpm.pm:2114
+#: urpm.pm:2116 urpm.pm:2125
 #, c-format
 msgid "removing %s to upgrade to %s ..."
 msgstr ""
 
-#: urpm.pm:2106 urpm.pm:2115
+#: urpm.pm:2117 urpm.pm:2126
 msgid ", $otherPackage, "
 msgstr ", $otherPackage, "
 
-#: urpm.pm:2106 urpm.pm:2115
+#: urpm.pm:2117 urpm.pm:2126
 msgid "));"
 msgstr "));"
 
-#: urpm.pm:2111
+#: urpm.pm:2122
 msgid "$p->{name}-$p->{version}-$p->{release}"
 msgstr "$p->{name}-$p->{version}-$p->{release}"
 
-#: urpm.pm:2121
+#: urpm.pm:2132
 msgid "$prefix/$_"
 msgstr "$prefix/$_"