updated pot file

1 files changed, 555 insertions, 510 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3a378c62..d6c558fd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2002-01-30 14:07+0100\n"
+"POT-Creation-Date: 2002-02-06 14:21+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,27 +29,31 @@ msgstr ""
 "自动安装软件包...\n"
 "你要求安装软件包 $rpm\n"
 
-#: _irpm:31 po/placeholder.h:178 urpmi:268
+#: _irpm:31 po/placeholder.h:204 po/placeholder.h:322 po/placeholder.h:374
+#: urpme:29 urpmi:268
 msgid "Is it OK?"
 msgstr "这样好了吗?"
 
-#: _irpm:33 po/placeholder.h:170 urpmi:271 urpmi:299
+#: _irpm:33 po/placeholder.h:193 po/placeholder.h:366 urpmi:271 urpmi:299
 msgid "Ok"
 msgstr "确认"
 
-#: _irpm:34 po/placeholder.h:131 urpmi:272 urpmi:300
+#: _irpm:34 po/placeholder.h:162 po/placeholder.h:327 urpmi:272 urpmi:300
 msgid "Cancel"
 msgstr "取消"
 
-#: _irpm:40 po/placeholder.h:143 urpmi:276 urpmi:340 urpmi:364
+#: _irpm:40 po/placeholder.h:176 po/placeholder.h:326 po/placeholder.h:339
+#: urpme:32 urpmi:276 urpmi:340 urpmi:364
 msgid "Nn"
 msgstr "nN不否"
 
-#: _irpm:41 po/placeholder.h:146 urpmi:277 urpmi:341 urpmi:365
+#: _irpm:41 po/placeholder.h:89 po/placeholder.h:321 po/placeholder.h:342
+#: urpme:34 urpmi:277 urpmi:341 urpmi:365
 msgid "Yy"
 msgstr "yY是"
 
-#: _irpm:42 po/placeholder.h:173 urpmi:278
+#: _irpm:42 po/placeholder.h:195 po/placeholder.h:318 po/placeholder.h:369
+#: urpme:94 urpmi:278
 msgid " (Y/n) "
 msgstr " (是(Y)/不(n)) [是] "
 
@@ -57,736 +61,885 @@ msgstr " (是(Y)/不(n)) [是] "
 msgid "$rpm: command not found\n"
 msgstr "$rpm: 命令没找到\n"
 
-#: po/placeholder.h:6
+#: po/placeholder.h:6 po/placeholder.h:154
 #, c-format
 msgid "urpmf version %s"
 msgstr "urpmf 版本 %s"
 
-#: po/placeholder.h:7
+#: po/placeholder.h:7 po/placeholder.h:192
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
-#: po/placeholder.h:8
+#: po/placeholder.h:8 po/placeholder.h:152
 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:9 po/placeholder.h:26 po/placeholder.h:130
 msgid "usage: urpmf [options] <file>"
 msgstr "用法: rpmf [选项] <文件>"
 
-#: po/placeholder.h:10
+#: po/placeholder.h:10 po/placeholder.h:109
 msgid ""
 "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
-#: po/placeholder.h:11
+#: po/placeholder.h:11 po/placeholder.h:153
 msgid "                    line, incompatible with interactive mode)."
 msgstr ""
 
-#: po/placeholder.h:12
+#: po/placeholder.h:12 po/placeholder.h:127
 msgid "  --all           - print all tags."
 msgstr ""
 
-#: po/placeholder.h:13
+#: po/placeholder.h:13 po/placeholder.h:157
 msgid ""
 "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
-#: po/placeholder.h:14
+#: po/placeholder.h:14 po/placeholder.h:159
 msgid "                    command line but without package name)."
 msgstr ""
 
-#: po/placeholder.h:15
+#: po/placeholder.h:15 po/placeholder.h:102
 msgid "  --group         - print tag group: group."
 msgstr ""
 
-#: po/placeholder.h:16
+#: po/placeholder.h:16 po/placeholder.h:87
 msgid "  --size          - print tag size: size."
 msgstr ""
 
-#: po/placeholder.h:17
+#: po/placeholder.h:17 po/placeholder.h:134
 msgid "  --serial        - print tag serial: serial."
 msgstr ""
 
-#: po/placeholder.h:18
+#: po/placeholder.h:18 po/placeholder.h:146
 msgid "  --summary       - print tag summary: summary."
 msgstr ""
 
-#: po/placeholder.h:19
+#: po/placeholder.h:19 po/placeholder.h:120
 msgid "  --description   - print tag description: description."
 msgstr ""
 
-#: po/placeholder.h:20
+#: po/placeholder.h:20 po/placeholder.h:138
 msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:21
+#: po/placeholder.h:21 po/placeholder.h:186
 msgid "  --requires      - print tag requires: all requires (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:22
+#: po/placeholder.h:22 po/placeholder.h:41
 msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:23
+#: po/placeholder.h:23 po/placeholder.h:34
 msgid ""
 "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:24
+#: po/placeholder.h:24 po/placeholder.h:106
 msgid ""
 "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:25
+#: po/placeholder.h:25 po/placeholder.h:128
 msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
 msgstr ""
 
-#: po/placeholder.h:27
+#: po/placeholder.h:27 po/placeholder.h:62
 msgid "try urpmf --help for more options"
 msgstr ""
 
-#: po/placeholder.h:28
+#: po/placeholder.h:28 po/placeholder.h:49
 msgid "no full media list was found"
 msgstr ""
 
-#: po/placeholder.h:29
+#: po/placeholder.h:29 po/placeholder.h:214
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:1892
-msgid "retrieving rpms files..."
+#: po/placeholder.h:30 po/placeholder.h:216
+msgid "examining whole urpmi database"
 msgstr ""
 
-#: po/placeholder.h:31
-msgid "examining whole urpmi database"
+#: po/placeholder.h:31 po/placeholder.h:331 po/placeholder.h:449
+msgid "  -y             - impose fuzzy search.\n"
 msgstr ""
 
-#: po/placeholder.h:32
+#: po/placeholder.h:32 po/placeholder.h:220 urpm.pm:280
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:33 po/placeholder.h:218
 #, fuzzy, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:34
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:280
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr ""
-
-#: po/placeholder.h:36
+#: po/placeholder.h:35 po/placeholder.h:221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法分析hdlist文件 \"%s\""
 
-#: po/placeholder.h:37
+#: po/placeholder.h:36 po/placeholder.h:222
 #, fuzzy, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:38
-#, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr ""
-
-#: po/placeholder.h:39
-#, fuzzy
-msgid "unable to access first installation medium"
-msgstr "无法访问介质\"%s\""
-
-#: po/placeholder.h:40 urpm.pm:1768
-#, c-format
-msgid "package %s is not found."
+#: po/placeholder.h:37 po/placeholder.h:463
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:41 urpm.pm:1129
-#, c-format
-msgid "unmounting %s"
+#: po/placeholder.h:38 po/placeholder.h:341 po/placeholder.h:466
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:39 po/placeholder.h:223
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:43
+#: po/placeholder.h:40 po/placeholder.h:225 urpm.pm:1769
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:209
+#: po/placeholder.h:42 po/placeholder.h:229 urpm.pm:209
 #, c-format
 msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:1413
-msgid "<non printable chars>"
+#: po/placeholder.h:43 po/placeholder.h:317 urpme:52
+msgid "unknown package(s) "
 msgstr ""
 
-#: po/placeholder.h:46
-#, fuzzy
-msgid "problem reading hdlist file, trying again"
-msgstr "写入 depslist 文件 [%s]"
-
-#: po/placeholder.h:47 urpm.pm:233
+#: po/placeholder.h:44 po/placeholder.h:232 urpm.pm:233
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: po/placeholder.h:48
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "无法删除不存在的介质\"%s\""
+#: po/placeholder.h:45 po/placeholder.h:231
+#, fuzzy
+msgid "problem reading hdlist file, trying again"
+msgstr "写入 depslist 文件 [%s]"
 
-#: po/placeholder.h:49 urpm.pm:240
+#: po/placeholder.h:46 po/placeholder.h:234 urpm.pm:240
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47 po/placeholder.h:235
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:51
-#, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "无法为介质\"%s\"创建 synthesis文件"
-
-#: po/placeholder.h:52
+#: po/placeholder.h:48 po/placeholder.h:237
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:53
-#, fuzzy, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "试图选择不存在的介质\"%s\""
-
-#: po/placeholder.h:54 urpm.pm:2125
+#: po/placeholder.h:50 po/placeholder.h:394 urpmi.addmedia:76
+#: urpmi.addmedia:93
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "无法升级介质\"%s\"\n"
 
-#: po/placeholder.h:55
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not be updated otherwise"
+#: po/placeholder.h:51 po/placeholder.h:400 po/placeholder.h:423
+#: po/placeholder.h:442
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:59
+#: po/placeholder.h:52 po/placeholder.h:244
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:60
+#: po/placeholder.h:53 po/placeholder.h:245
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:61
-#, c-format
-msgid "write config file [%s]"
+#: po/placeholder.h:54 po/placeholder.h:452
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:62 urpm.pm:1302
+#: po/placeholder.h:55 po/placeholder.h:247 urpm.pm:1302
 #, c-format
 msgid "no package named %s"
 msgstr "没有名为 %s 的软件包"
 
-#: po/placeholder.h:63
+#: po/placeholder.h:56 po/placeholder.h:365 urpmi:350 urpmi:374
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "尝试更激烈的安装方式吗? (使用 --force) (是(y)/不(N)) [不] "
+
+#: po/placeholder.h:57 po/placeholder.h:250 urpm.pm:275
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr ""
+
+#: po/placeholder.h:58 po/placeholder.h:248
 #, fuzzy, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "无法为介质\"%s\"创建 synthesis文件"
 
-#: po/placeholder.h:64
+#: po/placeholder.h:59 po/placeholder.h:251
+msgid "urpmi database locked"
+msgstr ""
+
+#: po/placeholder.h:60 po/placeholder.h:319 urpme:63
 #, fuzzy
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "无法为介质\"%s\"创建 synthesis文件"
+msgid " (y/N) "
+msgstr " (是(Y)/不(n)) [是] "
 
-#: po/placeholder.h:65 urpm.pm:275
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+#: po/placeholder.h:61 po/placeholder.h:370
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: po/placeholder.h:66
-msgid "urpmi database locked"
-msgstr ""
+#: po/placeholder.h:63 po/placeholder.h:467 urpmq:137
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr "有些软件包要求先删除再升级, 暂不支持\n"
 
-#: po/placeholder.h:67 urpm.pm:1118
+#: po/placeholder.h:64 po/placeholder.h:252 urpm.pm:1118
 #, c-format
 msgid "mounting %s"
 msgstr "正在安装 %s"
 
-#: po/placeholder.h:68 urpm.pm:227
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+#: po/placeholder.h:65 po/placeholder.h:405 po/placeholder.h:443
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:69
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "读取 compss 文件 [%s]"
-
-#: po/placeholder.h:70 urpm.pm:98
+#: po/placeholder.h:66 po/placeholder.h:255 urpm.pm:98
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:71
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "无法创建介质\"%s\"\n"
+#: po/placeholder.h:67 po/placeholder.h:414 urpmi.removemedia:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "没有东西删除(用urpmi.addmedia增加介质)\n"
 
-#: po/placeholder.h:72 urpm.pm:1887
+#: po/placeholder.h:68 po/placeholder.h:257 urpm.pm:1886
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1721 urpm.pm:1747
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+#: po/placeholder.h:69 po/placeholder.h:478
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:74
+#: po/placeholder.h:70 po/placeholder.h:378 urpmi:216
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "需要下列软件包之一:"
+
+#: po/placeholder.h:71 po/placeholder.h:376 urpmi:297
+msgid "Press Enter when it's done..."
+msgstr "准备好后按 Enter 键..."
+
+#: po/placeholder.h:72 po/placeholder.h:259
 msgid "...copying failed"
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:212
+#: po/placeholder.h:73 po/placeholder.h:260 urpm.pm:212
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76
-#, fuzzy
-msgid "retrieving hdlists file..."
-msgstr "写入 depslist 文件 [%s]"
-
-#: po/placeholder.h:77 urpm.pm:253
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:74 po/placeholder.h:448
+msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1208
-msgid "unable to register rpm file"
-msgstr "无法登记 rpm 文件"
+#: po/placeholder.h:75 po/placeholder.h:450
+msgid "  -g             - print groups too with name.\n"
+msgstr ""
 
-#: po/placeholder.h:79
-#, c-format
-msgid "\"%s\""
+#: po/placeholder.h:76 po/placeholder.h:424
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: po/placeholder.h:80 urpm.pm:307
+#: po/placeholder.h:77 po/placeholder.h:267
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: po/placeholder.h:81
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:78 po/placeholder.h:407
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr ""
 
-#: po/placeholder.h:82
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+#: po/placeholder.h:79 po/placeholder.h:454
+msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:299
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: po/placeholder.h:80 po/placeholder.h:455
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:84
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "拷贝 [%s] 失败"
+#: po/placeholder.h:81 po/placeholder.h:338
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1420
+#: po/placeholder.h:82 po/placeholder.h:270 urpm.pm:1420
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "无法分析 [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1421
+#: po/placeholder.h:83 po/placeholder.h:446 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:1421
 #, fuzzy, c-format
 msgid "read synthesis file [%s]"
 msgstr "读取 compss 文件 [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1412 urpm.pm:1419
-#, fuzzy, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "无法分析hdlist文件 \"%s\""
-
-#: po/placeholder.h:88 urpm.pm:93
+#: po/placeholder.h:85 po/placeholder.h:273 urpm.pm:93
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr ""
 
-#: po/placeholder.h:89
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: po/placeholder.h:86 po/placeholder.h:464
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: po/placeholder.h:90
-msgid "...copying done"
-msgstr ""
+#: po/placeholder.h:88 po/placeholder.h:393 urpmi.addmedia:92
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:91
+#: po/placeholder.h:90 po/placeholder.h:276
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:92
-#, fuzzy
-msgid "copying hdlists file..."
-msgstr "写入 depslist 文件 [%s]"
-
-#: po/placeholder.h:93 urpm.pm:188 urpm.pm:200
+#: po/placeholder.h:91 po/placeholder.h:468 urpmq:87
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr ""
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"
 
-#: po/placeholder.h:94
+#: po/placeholder.h:92 po/placeholder.h:324 urpme:39
+#, fuzzy
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "用法: urpmi.removemedia [-a] <名称> ..."
+
+#: po/placeholder.h:93 po/placeholder.h:279
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "创建hdlist [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1822
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "无法从介质\"%2$s\" 读取rpm文件[%1$s]"
+#: po/placeholder.h:94 po/placeholder.h:347 po/placeholder.h:474
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr ""
 
-#: po/placeholder.h:96
+#: po/placeholder.h:95 po/placeholder.h:281
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: po/placeholder.h:97
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr ""
-
-#: po/placeholder.h:98 urpm.pm:1212
-msgid "error registering local packages"
-msgstr ""
-
-#: po/placeholder.h:99
+#: po/placeholder.h:96 po/placeholder.h:280 urpm.pm:1821
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "无法从介质\"%2$s\" 读取rpm文件[%1$s]"
+
+#: po/placeholder.h:97 po/placeholder.h:282
+msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1899
+#: po/placeholder.h:98 po/placeholder.h:285 urpm.pm:1898
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1838
+#: po/placeholder.h:99 po/placeholder.h:286 urpm.pm:1837
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:102
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "无法写入 列表文件\"%s\""
-
-#: po/placeholder.h:103
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "无法创建 hdlist: %s"
-
-#: po/placeholder.h:104 urpm.pm:1812 urpm.pm:1815 urpm.pm:1834
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr ""
-
-#: po/placeholder.h:105 urpm.pm:1203
+#: po/placeholder.h:100 po/placeholder.h:290 urpm.pm:1203
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "非法rpm文件 [%s]"
 
-#: po/placeholder.h:106 urpm.pm:1398
+#: po/placeholder.h:101 po/placeholder.h:291 urpm.pm:1398
 #, c-format
 msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:107 urpm.pm:269
+#: po/placeholder.h:103 po/placeholder.h:357 urpmi:225
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr ""
+msgid "What is your choice? (1-%d) "
+msgstr "请输入您的选择:  (1-%d) "
 
-#: po/placeholder.h:108 urpm.pm:255
+#: po/placeholder.h:104 po/placeholder.h:293 urpm.pm:255
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:2113
+#: po/placeholder.h:105 po/placeholder.h:358 po/placeholder.h:406
+#: po/placeholder.h:444
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:107 po/placeholder.h:294 urpm.pm:2113
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:1204
+#: po/placeholder.h:108 po/placeholder.h:295 urpm.pm:1204
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问rpm 文件[%s]"
 
-#: po/placeholder.h:111
-#, c-format
-msgid ""
-"removing %s to upgrade to %s ...\n"
-"  since it will not upgrade correctly!"
-msgstr ""
-
-#: po/placeholder.h:115 urpm.pm:1190
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "在depslist中重新定位 %s"
+#: po/placeholder.h:110 po/placeholder.h:368 urpmi:228
+msgid "Sorry, bad choice, try again\n"
+msgstr "对不起, 选择无效, 请再试一次\n"
 
-#: po/placeholder.h:116 urpm.pm:1849
+#: po/placeholder.h:111 po/placeholder.h:301 urpm.pm:1848
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质\"%s\""
 
-#: po/placeholder.h:117 urpm.pm:1756
+#: po/placeholder.h:112 po/placeholder.h:300 urpm.pm:1190
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "relocated %s entries in depslist"
+msgstr "在depslist中重新定位 %s"
+
+#: po/placeholder.h:113 po/placeholder.h:371 po/placeholder.h:399
+#: po/placeholder.h:437
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:118
+#: po/placeholder.h:114 po/placeholder.h:303
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "试图选择不存在的介质\"%s\""
 
-#: po/placeholder.h:119 urpm.pm:1305
+#: po/placeholder.h:115 po/placeholder.h:302 urpm.pm:1757
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "下列软件包里有 %s: %s"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:116 po/placeholder.h:305
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 没有发现rpm 文件"
 
-#: po/placeholder.h:121
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "写入 depslist 文件 [%s]"
+#: po/placeholder.h:117 po/placeholder.h:312 urpm.pm:101
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 po/placeholder.h:315 urpm.pm:244
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "无法判断 hdlist文件的介质 [%s]"
+
+#: po/placeholder.h:119 po/placeholder.h:328
+msgid "  --help         - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 po/placeholder.h:329 urpmi:383
+msgid "everything already installed"
+msgstr "全部安装完成"
+
+#: po/placeholder.h:122 po/placeholder.h:215 urpm.pm:1891
+msgid "retrieving rpms files..."
+msgstr ""
+
+#: po/placeholder.h:123 po/placeholder.h:217
+#, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
+
+#: po/placeholder.h:124 po/placeholder.h:332 urpmi:217
+msgid "One of the following packages is needed:"
+msgstr "需要下列软件包之一:"
+
+#: po/placeholder.h:125 po/placeholder.h:219
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
 
-#: po/placeholder.h:122 urpm.pm:1191
+#: po/placeholder.h:126 po/placeholder.h:451 urpmq:90
+#, 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
+msgid "Nothing to remove.\n"
+msgstr ""
+
+#: po/placeholder.h:131 po/placeholder.h:340 urpmi:329 urpmi:336 urpmi:349
+#: urpmi:360 urpmi:373
+msgid "Installation failed"
+msgstr "安装失败"
+
+#: po/placeholder.h:132 po/placeholder.h:224
 #, fuzzy
-msgid "no entries relocated in depslist"
-msgstr "在depslist中重新定位 %s"
+msgid "unable to access first installation medium"
+msgstr "无法访问介质\"%s\""
 
-#: po/placeholder.h:123 urpm.pm:1897
-msgid "...retrieving done"
+#: po/placeholder.h:133 po/placeholder.h:345 po/placeholder.h:469
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:2006
+#: po/placeholder.h:135 po/placeholder.h:226 urpm.pm:1129
 #, c-format
-msgid "selecting %s using obsoletes"
-msgstr "使用过期选择 %s"
+msgid "unmounting %s"
+msgstr ""
 
-#: po/placeholder.h:125 urpm.pm:151
+#: po/placeholder.h:136 po/placeholder.h:227
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:126 urpm.pm:2122
+#: po/placeholder.h:137 po/placeholder.h:228
 #, c-format
-msgid "selecting %s by selection on files"
-msgstr "正在文件上选择 %s"
+msgid "no hdlist file found for medium \"%s\""
+msgstr ""
 
-#: po/placeholder.h:127 urpm.pm:101
-msgid "curl is missing\n"
+#: po/placeholder.h:139 po/placeholder.h:230 urpm.pm:1413
+msgid "<non printable chars>"
+msgstr ""
+
+#: po/placeholder.h:140 po/placeholder.h:352 po/placeholder.h:476
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:128
+#: po/placeholder.h:141 po/placeholder.h:233
 #, fuzzy, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "无法写入 列表文件\"%s\""
+msgid "removing medium \"%s\""
+msgstr "无法删除不存在的介质\"%s\""
 
-#: po/placeholder.h:129 urpm.pm:96
-msgid "wget is missing\n"
+#: po/placeholder.h:142 po/placeholder.h:236
+#, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "无法为介质\"%s\"创建 synthesis文件"
+
+#: po/placeholder.h:143 po/placeholder.h:238
+#, fuzzy, c-format
+msgid "trying to select multiple medium: %s"
+msgstr "试图选择不存在的介质\"%s\""
+
+#: po/placeholder.h:144 po/placeholder.h:447
+msgid "  -a             - select all non-removable media.\n"
+msgstr ""
+
+#: po/placeholder.h:145 po/placeholder.h:354
+msgid "  names or rpm files given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:130 urpm.pm:244
+#: po/placeholder.h:147 po/placeholder.h:239 urpm.pm:2125
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "无法判断 hdlist文件的介质 [%s]"
+msgid "avoid selecting %s as its locales language is not already selected"
+msgstr ""
 
-#: po/placeholder.h:132
-msgid "  --help         - print this help message.\n"
+#: po/placeholder.h:148 po/placeholder.h:356
+msgid "  --complete     - use parsehdlist server to complete selection.\n"
 msgstr ""
 
-#: po/placeholder.h:133 urpmi:383
-msgid "everything already installed"
-msgstr "全部安装完成"
+#: po/placeholder.h:149 po/placeholder.h:246
+#, c-format
+msgid "write config file [%s]"
+msgstr ""
+
+#: po/placeholder.h:150 po/placeholder.h:249
+#, fuzzy
+msgid "unable to build hdlist synthesis, using parsehdlist method"
+msgstr "无法为介质\"%s\"创建 synthesis文件"
+
+#: po/placeholder.h:151 po/placeholder.h:413
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr ""
 
-#: po/placeholder.h:134 urpmi:113
+#: po/placeholder.h:155 po/placeholder.h:253 urpm.pm:227
+#, 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
+#, fuzzy, c-format
+msgid "examining synthesis file [%s]"
+msgstr "读取 compss 文件 [%s]"
+
+#: po/placeholder.h:158 po/placeholder.h:256
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "无法创建介质\"%s\"\n"
+
+#: po/placeholder.h:160 po/placeholder.h:258 urpm.pm:1722 urpm.pm:1748
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr ""
+
+#: po/placeholder.h:161 po/placeholder.h:316 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
+#, fuzzy
+msgid "retrieving hdlists file..."
+msgstr "写入 depslist 文件 [%s]"
+
+#: po/placeholder.h:164 po/placeholder.h:330 urpmi:113
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"
 
-#: po/placeholder.h:135 po/placeholder.h:253
-msgid "  -y             - impose fuzzy search.\n"
+#: po/placeholder.h:165 po/placeholder.h:262 urpm.pm:253
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:136 urpmi:217
-msgid "One of the following packages is needed:"
-msgstr "需要下列软件包之一:"
+#: po/placeholder.h:166 po/placeholder.h:263 urpm.pm:1208
+msgid "unable to register rpm file"
+msgstr "无法登记 rpm 文件"
 
-#: po/placeholder.h:137 po/placeholder.h:257
-msgid "  --update       - use only update media.\n"
+#: po/placeholder.h:167 po/placeholder.h:264
+#, c-format
+msgid "\"%s\""
 msgstr ""
 
-#: po/placeholder.h:138 urpmi:321
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
+#: po/placeholder.h:168 po/placeholder.h:265 urpm.pm:307
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:142
-msgid "  --auto         - automatically select a good package in choices.\n"
+#: po/placeholder.h:169 po/placeholder.h:266
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:144 urpmi:329 urpmi:336 urpmi:349 urpmi:360 urpmi:373
-msgid "Installation failed"
-msgstr "安装失败"
+#: po/placeholder.h:170 po/placeholder.h:268 urpm.pm:299
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
 
-#: po/placeholder.h:145 po/placeholder.h:270
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+#: po/placeholder.h:171 po/placeholder.h:333 po/placeholder.h:453
+msgid "  --update       - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:172 po/placeholder.h:269
+#, c-format
+msgid "copy of [%s] failed"
+msgstr "拷贝 [%s] 失败"
+
+#: po/placeholder.h:173 po/placeholder.h:462
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
+
+#: po/placeholder.h:174 po/placeholder.h:272 urpm.pm:1412 urpm.pm:1419
+#, fuzzy, c-format
+msgid "unable to analyse synthesis data of %s"
+msgstr "无法分析hdlist文件 \"%s\""
+
+#: po/placeholder.h:175 po/placeholder.h:274
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: po/placeholder.h:147
+#: po/placeholder.h:177 po/placeholder.h:343
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:148 urpmi:267
+#: po/placeholder.h:178 po/placeholder.h:275
+msgid "...copying done"
+msgstr ""
+
+#: po/placeholder.h:179 po/placeholder.h:344 urpmi:267
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "我将另外安装下列软件包 (%d MB), 以满足相关性要求"
 
-#: po/placeholder.h:149 po/placeholder.h:273
-msgid "  -P             - do not search in provides to find package.\n"
+#: 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:188 urpm.pm:200
+#, c-format
+msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:342 urpmi:366
+#: po/placeholder.h:182 po/placeholder.h:346 urpmi:342 urpmi:366
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗? (是(y)/不(N)) [不] "
 
-#: po/placeholder.h:151 po/placeholder.h:278
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr ""
-
-#: po/placeholder.h:152
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+#: po/placeholder.h:183 po/placeholder.h:283 urpm.pm:1212
+msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:156 po/placeholder.h:280
-msgid "  -v             - verbose mode.\n"
+#: po/placeholder.h:184 po/placeholder.h:284
+#, c-format
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:157 po/placeholder.h:279
+#: po/placeholder.h:185 po/placeholder.h:353 po/placeholder.h:475
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:158
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr ""
-
-#: po/placeholder.h:159
-msgid "  -q             - quiet mode.\n"
-msgstr ""
-
-#: po/placeholder.h:160
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
-msgstr ""
+#: po/placeholder.h:187 po/placeholder.h:287
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:161 urpmi:225
+#: po/placeholder.h:188 po/placeholder.h:288
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "请输入您的选择:  (1-%d) "
+msgid "unable to build hdlist: %s"
+msgstr "无法创建 hdlist: %s"
 
-#: po/placeholder.h:162 po/placeholder.h:210 po/placeholder.h:233
-msgid "  --wget         - use wget to retrieve distant files.\n"
+#: po/placeholder.h:189 po/placeholder.h:289 urpm.pm:1811 urpm.pm:1814
+#: urpm.pm:1833
+#, c-format
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:163
+#: po/placeholder.h:190 po/placeholder.h:292 urpm.pm:269
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"usage:\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:169 urpmi:350 urpmi:374
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "尝试更激烈的安装方式吗? (使用 --force) (是(y)/不(N)) [不] "
+#: po/placeholder.h:191 po/placeholder.h:355
+msgid "  -q             - quiet mode.\n"
+msgstr ""
 
-#: po/placeholder.h:171 po/placeholder.h:269
+#: po/placeholder.h:194 po/placeholder.h:367 po/placeholder.h:465
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:172 urpmi:228
-msgid "Sorry, bad choice, try again\n"
-msgstr "对不起, 选择无效, 请再试一次\n"
-
-#: po/placeholder.h:174
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-
-#: po/placeholder.h:175 po/placeholder.h:203 po/placeholder.h:226
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: po/placeholder.h:196 po/placeholder.h:320 urpme:62
+#, c-format
+msgid "Using \"%s\" as a substring, I found"
 msgstr ""
 
-#: po/placeholder.h:176 urpmi:316
+#: po/placeholder.h:197 po/placeholder.h:372 urpmi:316
 #, c-format
 msgid "installing %s\n"
 msgstr "正在安装 %s\n"
 
-#: po/placeholder.h:177 urpmi:296
+#: po/placeholder.h:198 po/placeholder.h:325 urpme:30
+msgid "Remove them all?"
+msgstr ""
+
+#: po/placeholder.h:199 po/placeholder.h:373 urpmi:296
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请插入标签 \"%s\" 的介质到设备 [%s]"
 
-#: po/placeholder.h:179 po/placeholder.h:281 urpmi:286 urpmq:151
+#: po/placeholder.h:200 po/placeholder.h:304 urpm.pm:1305
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "下列软件包里有 %s: %s"
+
+#: po/placeholder.h:201 po/placeholder.h:306
+#, fuzzy, c-format
+msgid "examining hdlist file [%s]"
+msgstr "写入 depslist 文件 [%s]"
+
+#: po/placeholder.h:202 po/placeholder.h:307 urpm.pm:1191
+#, fuzzy
+msgid "no entries relocated in depslist"
+msgstr "在depslist中重新定位 %s"
+
+#: po/placeholder.h:203 po/placeholder.h:412
+msgid "  --update       - create an update medium.\n"
+msgstr ""
+
+#: po/placeholder.h:205 po/placeholder.h:445
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
+
+#: po/placeholder.h:206 po/placeholder.h:375 po/placeholder.h:477 urpmi:286
+#: urpmq:151
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包， 中止"
 
-#: po/placeholder.h:180 urpmi:297
-msgid "Press Enter when it's done..."
-msgstr "准备好后按 Enter 键..."
+#: po/placeholder.h:207 po/placeholder.h:308 urpm.pm:1896
+msgid "...retrieving done"
+msgstr ""
+
+#: po/placeholder.h:208 po/placeholder.h:309 urpm.pm:2006
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr "使用过期选择 %s"
+
+#: po/placeholder.h:209 po/placeholder.h:310 urpm.pm:151
+#, c-format
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr ""
+
+#: po/placeholder.h:210 po/placeholder.h:311 urpm.pm:2122
+#, c-format
+msgid "selecting %s by selection on files"
+msgstr "正在文件上选择 %s"
+
+#: po/placeholder.h:211 po/placeholder.h:313
+#, fuzzy, c-format
+msgid "copying source list of \"%s\"..."
+msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:181 urpmi:131
+#: po/placeholder.h:212 po/placeholder.h:377 urpmi:131
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "只有超级用户可以安装本机软件包"
 
-#: po/placeholder.h:182 urpmi:216
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "需要下列软件包之一:"
+#: po/placeholder.h:213 po/placeholder.h:314 urpm.pm:96
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:240
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
+msgstr ""
 
-#: po/placeholder.h:183 urpmi.addmedia:70
+#: po/placeholder.h:296
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+
+#: po/placeholder.h:334 urpmi:321
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:348
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:359
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+msgstr ""
+
+#: po/placeholder.h:379 urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -795,7 +948,7 @@ msgstr ""
 "%s\n"
 "<hdlist相对路径>找不到\n"
 
-#: po/placeholder.h:187
+#: po/placeholder.h:383
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -815,17 +968,7 @@ msgstr ""
 "       http://<主机>/<路径> with <hdlist相对路径>\n"
 "       removable_<设备>://<路径>\n"
 
-#: po/placeholder.h:197 urpmi.addmedia:92
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "无法创建介质\"%s\"\n"
-
-#: po/placeholder.h:198 urpmi.addmedia:76 urpmi.addmedia:93
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "无法升级介质\"%s\"\n"
-
-#: po/placeholder.h:199 po/placeholder.h:222 po/placeholder.h:238
+#: po/placeholder.h:395 po/placeholder.h:415 po/placeholder.h:433
 #: urpmi.addmedia:57
 #, c-format
 msgid ""
@@ -833,11 +976,7 @@ msgid ""
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:204 po/placeholder.h:231 po/placeholder.h:246
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
-
-#: po/placeholder.h:205 urpmi.addmedia:82
+#: po/placeholder.h:401 urpmi.addmedia:82
 #, c-format
 msgid ""
 "%s\n"
@@ -846,15 +985,7 @@ msgstr ""
 "%s\n"
 "<hdlist相对路径>找不到\n"
 
-#: po/placeholder.h:209 po/placeholder.h:232
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
-
-#: po/placeholder.h:211
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr ""
-
-#: po/placeholder.h:212 urpmi.addmedia:84
+#: po/placeholder.h:408 urpmi.addmedia:84
 #, c-format
 msgid ""
 "%s\n"
@@ -863,55 +994,7 @@ msgstr ""
 "%s\n"
 "`with'找不到ftp介质\n"
 
-#: po/placeholder.h:216
-msgid "  --update       - create an update medium.\n"
-msgstr ""
-
-#: po/placeholder.h:217
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr ""
-
-#: po/placeholder.h:218
-#, fuzzy
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"用法: urpmi.removemedia -a <名称> ...\n"
-"   <名称>是要删除的介质名.\n"
-"   -a   选中所有介质.\n"
-"\n"
-"未知选项 '%s'\n"
-
-#: po/placeholder.h:227 urpmi.update:59
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"找不到要升级的项\n"
-"(%s中之一)\n"
-
-#: po/placeholder.h:234
-msgid ""
-"  -d             - force complete computation of depslist.ordered file.\n"
-msgstr ""
-
-#: po/placeholder.h:235 urpmi.update:57
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "没有东西升级(用urpmi.addmedia增加介质)\n"
-
-#: po/placeholder.h:236
-msgid "  -a             - select all non-removable media.\n"
-msgstr ""
-
-#: po/placeholder.h:237 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "没有东西删除(用urpmi.addmedia增加介质)\n"
-
-#: po/placeholder.h:242 urpmi.removemedia:49
+#: po/placeholder.h:419 urpmi.removemedia:49
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -920,11 +1003,7 @@ msgstr ""
 "找不到要删除的项\n"
 "(%s中的一个)\n"
 
-#: po/placeholder.h:247
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: po/placeholder.h:248
+#: po/placeholder.h:425
 #, fuzzy
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -936,32 +1015,28 @@ msgstr ""
 "\n"
 "未知选项 '%s'\n"
 
-#: po/placeholder.h:252
-msgid "  -h             - print this help message.\n"
-msgstr ""
-
-#: po/placeholder.h:254
-msgid "  -g             - print groups too with name.\n"
+#: po/placeholder.h:429
+#, fuzzy
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"用法: urpmi.removemedia -a <名称> ...\n"
+"   <名称>是要删除的介质名.\n"
+"   -a   选中所有介质.\n"
+"\n"
+"未知选项 '%s'\n"
 
-#: po/placeholder.h:255 urpmq:90
+#: po/placeholder.h:438 urpmi.update:59
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: 无法读取rpm文件 \"%s\"\n"
-
-#: po/placeholder.h:256
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-
-#: po/placeholder.h:258
-msgid "  -r             - print version and release too with name.\n"
-msgstr ""
-
-#: po/placeholder.h:259
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"找不到要升级的项\n"
+"(%s中之一)\n"
 
-#: po/placeholder.h:260
+#: po/placeholder.h:456
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -971,42 +1046,12 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:266
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-
-#: po/placeholder.h:267
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-
-#: po/placeholder.h:268
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:271 urpmq:137
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr "有些软件包要求先删除再升级, 暂不支持\n"
-
-#: po/placeholder.h:272 urpmq:87
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"
-
-#: po/placeholder.h:274
+#: po/placeholder.h:470
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:282
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr ""
-
 #: urpm.pm:2030 urpm.pm:2039
 #, c-format
 msgid "removing %s to upgrade to %s ..."
@@ -1050,18 +1095,18 @@ msgstr ""
 msgid ");"
 msgstr ");"
 
-#: urpmi.update:41
-#, fuzzy
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "用法: urpmi.update [-a] <名称>..."
+#: urpmi.removemedia:34
+msgid "usage: urpmi.removemedia [-a] <name> ..."
+msgstr "用法: urpmi.removemedia [-a] <名称> ..."
 
 #: urpmi.removemedia:38 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "用法: urpmi.removemedia [-a] <名称> ..."
+#: urpmi.update:41
+#, fuzzy
+msgid "usage: urpmi.update [options] <name> ..."
+msgstr "用法: urpmi.update [-a] <名称>..."
 
 #: urpmq:34
 #, c-format