updated pot file

1 files changed, 299 insertions, 254 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2afb49fc..59c88809 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-09-05 21:39+0200\n"
+"POT-Creation-Date: 2002-11-11 15:04+0100\n"
 "PO-Revision-Date: 2002-09-04 12:15+0800\n"
 "Last-Translator: Danny Zeng <danny@zeng.com.cn>\n"
 "Language-Team: Chinese (GB) <future-cjk@mandrakesoft.com>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:511
+#: ../_irpm_.c:23 ../urpmi_.c:513
 #, c-format
 msgid "installing %s\n"
 msgstr "正在安装 %s\n"
@@ -31,34 +31,34 @@ msgstr ""
 "自动安装软件包...\n"
 "你要求安装软件包 %s\n"
 
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:425
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:427
 msgid "Is this OK?"
 msgstr "这样好了吗?"
 
-#: ../_irpm_.c:35 ../urpmi_.c:362 ../urpmi_.c:379 ../urpmi_.c:428
-#: ../urpmi_.c:456 ../urpmi_.c:484
+#: ../_irpm_.c:35 ../urpmi_.c:364 ../urpmi_.c:381 ../urpmi_.c:430
+#: ../urpmi_.c:458 ../urpmi_.c:486
 msgid "Ok"
 msgstr "确认"
 
-#: ../_irpm_.c:36 ../urpmi_.c:363 ../urpmi_.c:380 ../urpmi_.c:429
-#: ../urpmi_.c:457 ../urpmi_.c:485
+#: ../_irpm_.c:36 ../urpmi_.c:365 ../urpmi_.c:382 ../urpmi_.c:431
+#: ../urpmi_.c:459 ../urpmi_.c:487
 msgid "Cancel"
 msgstr "取消"
 
 #. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:35 ../urpmi_.c:367 ../urpmi_.c:384
-#: ../urpmi_.c:433 ../urpmi_.c:489 ../urpmi_.c:540 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:35 ../urpmi_.c:369 ../urpmi_.c:386
+#: ../urpmi_.c:435 ../urpmi_.c:491 ../urpmi_.c:542 placeholder.h:17
 msgid "Nn"
 msgstr "nN不否"
 
 #. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:37 ../urpmi_.c:368 ../urpmi_.c:385
-#: ../urpmi_.c:434 ../urpmi_.c:490 ../urpmi_.c:541 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:37 ../urpmi_.c:370 ../urpmi_.c:387
+#: ../urpmi_.c:436 ../urpmi_.c:492 ../urpmi_.c:543 placeholder.h:11
 msgid "Yy"
 msgstr "yY是"
 
-#: ../_irpm_.c:44 ../urpme_.c:184 ../urpmi_.c:369 ../urpmi_.c:386
-#: ../urpmi_.c:435
+#: ../_irpm_.c:44 ../urpme_.c:192 ../urpmi_.c:371 ../urpmi_.c:388
+#: ../urpmi_.c:437
 msgid " (Y/n) "
 msgstr " (是(Y)/不(n)) [是] "
 
@@ -67,511 +67,521 @@ msgstr " (是(Y)/不(n)) [是] "
 msgid "%s: command not found\n"
 msgstr "%s: 命令没找到\n"
 
-#: ../urpm.pm_.c:177
+#: ../urpm.pm_.c:179
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
 msgstr "未知 webfetch `%s' !!!\n"
 
-#: ../urpm.pm_.c:196
+#: ../urpm.pm_.c:198
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm.pm_.c:205
+#: ../urpm.pm_.c:207
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr "没有发现下载工具(curl 或 wget) \n"
 
-#: ../urpm.pm_.c:217
+#: ../urpm.pm_.c:219
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
 
-#: ../urpm.pm_.c:220
+#: ../urpm.pm_.c:222
 msgid "wget is missing\n"
 msgstr "没有 wget\n"
 
-#: ../urpm.pm_.c:226
+#: ../urpm.pm_.c:228
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr "wget 失败: 退出代码%d 或信号 %d\n"
 
-#: ../urpm.pm_.c:229
+#: ../urpm.pm_.c:231
 msgid "curl is missing\n"
 msgstr "没有 curl\n"
 
-#: ../urpm.pm_.c:286
+#: ../urpm.pm_.c:288
 #, c-format
 msgid "curl failed: exited with %d or signal %d\n"
 msgstr "curl 失败: 退出代码 %d, 信号 %d\n"
 
-#: ../urpm.pm_.c:290
+#: ../urpm.pm_.c:292
 msgid "rsync is missing\n"
 msgstr "没有 rsync\n"
 
-#: ../urpm.pm_.c:291
+#: ../urpm.pm_.c:293
 msgid "ssh is missing\n"
 msgstr "没有 ssh\n"
 
-#: ../urpm.pm_.c:301
+#: ../urpm.pm_.c:303
 #, c-format
 msgid "rsync failed: exited with %d or signal %d\n"
 msgstr "rsync 失败: 退出代码 %d 或信号 %d\n"
 
-#: ../urpm.pm_.c:337 ../urpm.pm_.c:349
+#: ../urpm.pm_.c:339 ../urpm.pm_.c:351
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "配置文件的的 %s 行由语法错误"
 
-#: ../urpm.pm_.c:358
+#: ../urpm.pm_.c:360
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "介质 \"%s\" 试图使用一个已经使用的hdlist, 忽略介质"
 
-#: ../urpm.pm_.c:361
+#: ../urpm.pm_.c:363
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "介质 \"%s\" 试图使用已经使用的列表, 忽略介质"
 
-#: ../urpm.pm_.c:376
+#: ../urpm.pm_.c:378
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr "无法处理介质 \"%s\", 其它介质在使用列表文件"
 
-#: ../urpm.pm_.c:382
+#: ../urpm.pm_.c:384
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "不能把这个介质命名为 \"%s\", 这个名字已经被使用"
 
-#: ../urpm.pm_.c:389
+#: ../urpm.pm_.c:391
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "不能计算介质 \"%s\", 它的列表文件 [%s] 不存在"
 
-#: ../urpm.pm_.c:393
+#: ../urpm.pm_.c:395
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "无法判断 hdlist文件的介质 [%s]"
 
-#: ../urpm.pm_.c:402
+#: ../urpm.pm_.c:404
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "无法访问 \"%s\" 的 hdlist 文件, 忽略该介质"
 
-#: ../urpm.pm_.c:404
+#: ../urpm.pm_.c:406
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问 \"%s\"的列表文件, 忽略介质"
 
-#: ../urpm.pm_.c:418
+#: ../urpm.pm_.c:420
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "试图略过现有的介质 \"%s\", 避免"
 
-#: ../urpm.pm_.c:424
+#: ../urpm.pm_.c:426
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "无法找到 \"%s\"的 hdlist 文件, 忽略这个介质"
 
-#: ../urpm.pm_.c:429
+#: ../urpm.pm_.c:431
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "无法找到 \"%s\" 的列表文件, 忽略该介质"
 
-#: ../urpm.pm_.c:448
+#: ../urpm.pm_.c:450
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "\"%s\" 的列表文件不连贯, 忽略该介质"
 
-#: ../urpm.pm_.c:456
+#: ../urpm.pm_.c:458
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "无法检查 \"%s\" 的列表文件, 忽略该介质"
 
-#: ../urpm.pm_.c:487
+#: ../urpm.pm_.c:489
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "可移动介质 \"%s\" 加载次数太多"
 
-#: ../urpm.pm_.c:488
+#: ../urpm.pm_.c:490
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "把可移动设备当作 \"%s\""
 
-#: ../urpm.pm_.c:492
+#: ../urpm.pm_.c:494
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "不同的可移动 [%s] 用于 \"%s\""
 
-#: ../urpm.pm_.c:496 ../urpm.pm_.c:499
+#: ../urpm.pm_.c:498 ../urpm.pm_.c:501
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "无法取得可移动介质 \"%s\" 的路径"
 
-#: ../urpm.pm_.c:512
+#: ../urpm.pm_.c:514
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件 [%s]"
 
-#: ../urpm.pm_.c:524
+#: ../urpm.pm_.c:526
 #, c-format
 msgid "write config file [%s]"
 msgstr "写入 [%s]"
 
-#: ../urpm.pm_.c:544
+#: ../urpm.pm_.c:546
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "无法解读文件[%2$s]中的\"%1$s\""
 
-#: ../urpm.pm_.c:555
+#: ../urpm.pm_.c:557
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "检查文件 [%s] 中的并行处理"
 
-#: ../urpm.pm_.c:565
+#: ../urpm.pm_.c:567
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "发现下列节点的并行处理: %s"
 
-#: ../urpm.pm_.c:569
+#: ../urpm.pm_.c:571
 #, c-format
 msgid "using associated media for parallel mode : %s"
 msgstr "将相关的介质用于并行处理: %s"
 
-#: ../urpm.pm_.c:573
+#: ../urpm.pm_.c:575
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "无法使用并行处理选项 \"%s\""
 
-#: ../urpm.pm_.c:583
+#: ../urpm.pm_.c:585
 msgid "--synthesis cannot be used with --media, --update or --parallel"
 msgstr "--synthesis 不能和 --media, --update 或 --parallel 一起使用"
 
-#: ../urpm.pm_.c:598 ../urpm.pm_.c:1138 ../urpm.pm_.c:1153 ../urpm.pm_.c:1283
+#: ../urpm.pm_.c:600 ../urpm.pm_.c:1180 ../urpm.pm_.c:1195 ../urpm.pm_.c:1328
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "检查 hdlist 文件 [%s]"
 
-#: ../urpm.pm_.c:602
+#: ../urpm.pm_.c:604
 #, c-format
 msgid "problem reading hdlist file of medium \"%s\""
 msgstr "读取 \"%s\"的 hdlist 文件有问题"
 
-#: ../urpm.pm_.c:613 ../urpm.pm_.c:866 ../urpm.pm_.c:946 ../urpm.pm_.c:1081
-#: ../urpm.pm_.c:1143 ../urpm.pm_.c:1148 ../urpm.pm_.c:1210 ../urpm.pm_.c:1278
+#: ../urpm.pm_.c:615 ../urpm.pm_.c:868 ../urpm.pm_.c:964 ../urpm.pm_.c:1122
+#: ../urpm.pm_.c:1185 ../urpm.pm_.c:1190 ../urpm.pm_.c:1255 ../urpm.pm_.c:1323
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "检查综合文件 [%s]"
 
-#: ../urpm.pm_.c:617 ../urpm.pm_.c:870 ../urpm.pm_.c:949 ../urpm.pm_.c:1085
-#: ../urpm.pm_.c:1213
+#: ../urpm.pm_.c:619 ../urpm.pm_.c:872 ../urpm.pm_.c:967 ../urpm.pm_.c:1126
+#: ../urpm.pm_.c:1258
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "无法读取介质\"%s\"的综合文件"
 
-#: ../urpm.pm_.c:655
+#: ../urpm.pm_.c:657
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质 \"%s\" 已经存在"
 
-#: ../urpm.pm_.c:686
+#: ../urpm.pm_.c:688
 #, c-format
 msgid "added medium %s"
 msgstr "添加介质 %s"
 
-#: ../urpm.pm_.c:701
+#: ../urpm.pm_.c:703
 msgid "unable to access first installation medium"
 msgstr "无法访问最初的安装介质"
 
-#: ../urpm.pm_.c:705
+#: ../urpm.pm_.c:707
 msgid "copying hdlists file..."
 msgstr "复制 hdlists..."
 
-#: ../urpm.pm_.c:707 ../urpm.pm_.c:923 ../urpm.pm_.c:931 ../urpm.pm_.c:964
+#: ../urpm.pm_.c:709 ../urpm.pm_.c:925 ../urpm.pm_.c:933 ../urpm.pm_.c:983
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm.pm_.c:707 ../urpm.pm_.c:923 ../urpm.pm_.c:931 ../urpm.pm_.c:964
+#: ../urpm.pm_.c:709 ../urpm.pm_.c:925 ../urpm.pm_.c:933 ../urpm.pm_.c:983
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm.pm_.c:709 ../urpm.pm_.c:723 ../urpm.pm_.c:748
+#: ../urpm.pm_.c:711 ../urpm.pm_.c:725 ../urpm.pm_.c:750
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr "无法访问最初的安装介质 (没有找到 Mandrake/base/hdlists) "
 
-#: ../urpm.pm_.c:715
+#: ../urpm.pm_.c:717
 msgid "retrieving hdlists file..."
 msgstr "取出 hdlists 文件..."
 
-#: ../urpm.pm_.c:717 ../urpm.pm_.c:1019 ../urpm.pm_.c:1071 ../urpm.pm_.c:1929
+#: ../urpm.pm_.c:719 ../urpm.pm_.c:1038 ../urpm.pm_.c:1091 ../urpm.pm_.c:1985
 msgid "...retrieving done"
 msgstr "...收取完成"
 
-#: ../urpm.pm_.c:719 ../urpm.pm_.c:1066 ../urpm.pm_.c:1931
+#: ../urpm.pm_.c:721 ../urpm.pm_.c:1086 ../urpm.pm_.c:1987
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...收取失败: %s"
 
-#: ../urpm.pm_.c:739
+#: ../urpm.pm_.c:741
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlist 文件中错误的描述 \"%s\""
 
-#: ../urpm.pm_.c:781
+#: ../urpm.pm_.c:783
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "试图选择不存在的介质\"%s\""
 
-#: ../urpm.pm_.c:783
+#: ../urpm.pm_.c:785
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm_.c:783
+#: ../urpm.pm_.c:785
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质\"%s\""
 
-#: ../urpm.pm_.c:800
+#: ../urpm.pm_.c:802
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质\"%s\""
 
-#: ../urpm.pm_.c:846
+#: ../urpm.pm_.c:848
 msgid "urpmi database locked"
 msgstr "urpmi 数据库被锁定"
 
-#: ../urpm.pm_.c:891 ../urpm.pm_.c:1873
+#: ../urpm.pm_.c:893 ../urpm.pm_.c:1929
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质\"%s\""
 
-#: ../urpm.pm_.c:921
+#: ../urpm.pm_.c:923
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "复制 \"%s\" 的描述文件"
 
-#: ../urpm.pm_.c:929
+#: ../urpm.pm_.c:931
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "复制源 \"%s\" 的 hdlist 或 synthesis..."
 
-#: ../urpm.pm_.c:934
+#: ../urpm.pm_.c:936
 #, c-format
 msgid "copy of [%s] failed"
 msgstr "拷贝 [%s] 失败"
 
-#: ../urpm.pm_.c:962
+#: ../urpm.pm_.c:941 ../urpm.pm_.c:1101
+#, fuzzy
+msgid "examining MD5SUM file"
+msgstr "检查 hdlist 文件 [%s]"
+
+#: ../urpm.pm_.c:981
 #, c-format
 msgid "copying source list of \"%s\"..."
 msgstr "复制 \"%s\" 的源文件列表"
 
-#: ../urpm.pm_.c:979
+#: ../urpm.pm_.c:998
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "从 [%s]读取 rpm 文件"
 
-#: ../urpm.pm_.c:998
+#: ../urpm.pm_.c:1017
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "无法从 [%s] 读取 rpm 文件: %s"
 
-#: ../urpm.pm_.c:1003
+#: ../urpm.pm_.c:1022
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 没有发现rpm 文件"
 
-#: ../urpm.pm_.c:1016
+#: ../urpm.pm_.c:1035
 #, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "找回 \"%s\" 的描述文件..."
 
-#: ../urpm.pm_.c:1028
+#: ../urpm.pm_.c:1047
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "收取 \"%s\"的源 hdlist (synthesis)..."
 
-#: ../urpm.pm_.c:1110
+#: ../urpm.pm_.c:1152
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr "获取源的 hdlist (或 synthesis)失败"
 
-#: ../urpm.pm_.c:1117
+#: ../urpm.pm_.c:1159
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "没有找到介质 \"%s\"的 hdlist 文件"
 
-#: ../urpm.pm_.c:1129 ../urpm.pm_.c:1173
+#: ../urpm.pm_.c:1171 ../urpm.pm_.c:1215
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "文件 [%s] 已经被同样的介质 \"%s\"使用"
 
-#: ../urpm.pm_.c:1160
+#: ../urpm.pm_.c:1202
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法分析hdlist文件 \"%s\""
 
-#: ../urpm.pm_.c:1187
+#: ../urpm.pm_.c:1229
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr " \"%s\" 没有需要写入列表文件"
 
-#: ../urpm.pm_.c:1194
+#: ../urpm.pm_.c:1236
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入 列表文件\"%s\""
 
-#: ../urpm.pm_.c:1201
+#: ../urpm.pm_.c:1243
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "没有找到介质 \"%s\"的 hdlist 文件"
+
+#: ../urpm.pm_.c:1245
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "\"%s\"没有写入列表文件"
 
-#: ../urpm.pm_.c:1243
+#: ../urpm.pm_.c:1288
 msgid "performing second pass to compute dependencies\n"
 msgstr "进行第二轮, 计算依赖性\n"
 
-#: ../urpm.pm_.c:1256
+#: ../urpm.pm_.c:1301
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "从介质\"%s\"读取软件包头信息"
 
-#: ../urpm.pm_.c:1261
+#: ../urpm.pm_.c:1306
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "创建hdlist [%s]"
 
-#: ../urpm.pm_.c:1273 ../urpm.pm_.c:1292
+#: ../urpm.pm_.c:1318 ../urpm.pm_.c:1337
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "为介质\"%s\"创建 hdlist 综合文件"
 
-#: ../urpm.pm_.c:1310
+#: ../urpm.pm_.c:1355
 #, c-format
 msgid "found %d headers in cache"
 msgstr "缓存中有 %d 个文件头"
 
-#: ../urpm.pm_.c:1314
+#: ../urpm.pm_.c:1359
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "从缓存删除 %d 过时的头"
 
-#: ../urpm.pm_.c:1470
+#: ../urpm.pm_.c:1515
 #, c-format
 msgid "mounting %s"
 msgstr "正在安装 %s"
 
-#: ../urpm.pm_.c:1481
+#: ../urpm.pm_.c:1527
 #, c-format
 msgid "unmounting %s"
 msgstr "卸载 %s"
 
-#: ../urpm.pm_.c:1494
+#: ../urpm.pm_.c:1549
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "在depslist中重新定位 %s"
 
-#: ../urpm.pm_.c:1495
+#: ../urpm.pm_.c:1550
 msgid "no entries relocated in depslist"
 msgstr "在depslist中没有重新定位的条目"
 
-#: ../urpm.pm_.c:1508
+#: ../urpm.pm_.c:1563
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "非法rpm文件 [%s]"
 
-#: ../urpm.pm_.c:1509 ../urpm.pm_.c:2033
+#: ../urpm.pm_.c:1564 ../urpm.pm_.c:2089
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问rpm 文件[%s]"
 
-#: ../urpm.pm_.c:1513
+#: ../urpm.pm_.c:1568
 msgid "unable to register rpm file"
 msgstr "无法登记 rpm 文件"
 
-#: ../urpm.pm_.c:1516
+#: ../urpm.pm_.c:1571
 msgid "error registering local packages"
 msgstr "登记本地软件包出错"
 
-#: ../urpm.pm_.c:1604
+#: ../urpm.pm_.c:1660
 #, c-format
 msgid "no package named %s"
 msgstr "没有名为 %s 的软件包"
 
-#: ../urpm.pm_.c:1607
+#: ../urpm.pm_.c:1663
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm.pm_.c:1738 ../urpm.pm_.c:1768
+#: ../urpm.pm_.c:1794 ../urpm.pm_.c:1824
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "多个软件包是用相同的 rpm 文件名 \"%s\""
 
-#: ../urpm.pm_.c:1777
+#: ../urpm.pm_.c:1833
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "无法正确的解析 [%s] 的值 \"%s\""
 
-#: ../urpm.pm_.c:1789
+#: ../urpm.pm_.c:1845
 #, c-format
 msgid "package %s is not found."
 msgstr "没有找到软件包 %s."
 
-#: ../urpm.pm_.c:1837 ../urpm.pm_.c:1840 ../urpm.pm_.c:1858
+#: ../urpm.pm_.c:1893 ../urpm.pm_.c:1896 ../urpm.pm_.c:1914
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "介质 \"%s\" 没有选中"
 
-#: ../urpm.pm_.c:1846
+#: ../urpm.pm_.c:1902
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质\"%2$s\" 读取rpm文件[%1$s]"
 
-#: ../urpm.pm_.c:1862
+#: ../urpm.pm_.c:1918
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "不连贯的介质 \"%s\" 标记为可移动但其实不是"
 
-#: ../urpm.pm_.c:1919
+#: ../urpm.pm_.c:1975
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "输入格式错误: [%s]"
 
-#: ../urpm.pm_.c:1924
+#: ../urpm.pm_.c:1980
 msgid "retrieving rpm files..."
 msgstr "收取 rpms 文件..."
 
-#: ../urpm.pm_.c:1973
+#: ../urpm.pm_.c:2029
 msgid "Preparing..."
 msgstr "准备中..."
 
-#: ../urpm.pm_.c:2001
+#: ../urpm.pm_.c:2057
 #, c-format
 msgid "unable to remove package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm_.c:2007 ../urpm.pm_.c:2013
+#: ../urpm.pm_.c:2063 ../urpm.pm_.c:2069
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm.pm_.c:2020
+#: ../urpm.pm_.c:2076
 #, c-format
 msgid "%s is needed by %s"
 msgstr "%s 是 %s 需要的"
 
-#: ../urpm.pm_.c:2021
+#: ../urpm.pm_.c:2077
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s 与 %s 冲突"
 
-#: ../urpm/parallel_ka_run.pm_.c:79 ../urpm/parallel_ka_run.pm_.c:112
+#: ../urpm/parallel_ka_run.pm_.c:80 ../urpm/parallel_ka_run.pm_.c:111
 msgid "rshp failed"
 msgstr "rshp 失败"
 
-#: ../urpm/parallel_ka_run.pm_.c:116 ../urpm/parallel_ssh.pm_.c:118
+#: ../urpm/parallel_ka_run.pm_.c:115 ../urpm/parallel_ssh.pm_.c:118
 #, c-format
 msgid "Installation failed on node %s"
 msgstr "在节点 %s 安装失败"
@@ -586,36 +596,62 @@ msgid "Remove them all?"
 msgstr "全部删除?"
 
 #: ../urpme_.c:42
-msgid "usage: urpme [-a] [--auto] <packages...>\n"
-msgstr "用法: urpmi [-a] [--auto] <软件包列表...>\n"
+#, fuzzy, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi 版本 %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"这是自由软件, 可以依照 GNU GPL 重新发布.\n"
+"\n"
+"用法:\n"
+
+#: ../urpme_.c:47 ../urpmi.addmedia_.c:42 ../urpmi.removemedia_.c:36
+#: ../urpmi.update_.c:60 ../urpmi_.c:74 ../urpmq_.c:40
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - 打印帮助信息.\n"
+
+#: ../urpme_.c:48 ../urpmi_.c:78
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - 自动选中软件包.\n"
+
+#: ../urpme_.c:49
+#, fuzzy
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - 在命令行选择所有匹配.\n"
 
-#: ../urpme_.c:111
+#: ../urpme_.c:119
 msgid "unknown package "
 msgstr "未知的软件包"
 
-#: ../urpme_.c:111
+#: ../urpme_.c:119
 msgid "unknown packages "
 msgstr "未知的软件包"
 
-#: ../urpme_.c:134
+#: ../urpme_.c:142
 #, c-format
 msgid "Using \"%s\" as a substring, I found"
 msgstr "搜索包含 \"%s\" 的项目, 我发现"
 
-#: ../urpme_.c:135 ../urpmi_.c:491
+#: ../urpme_.c:143 ../urpmi_.c:493
 msgid " (y/N) "
 msgstr " (y/N) "
 
-#: ../urpme_.c:142
+#: ../urpme_.c:150
 msgid "Nothing to remove.\n"
 msgstr "不需要删除如何东西.\n"
 
-#: ../urpme_.c:172
+#: ../urpme_.c:180
 #, c-format
 msgid "removing package %s will break your system\n"
 msgstr "如果删除软件包 %s 会破坏您的系统\n"
 
-#: ../urpme_.c:183
+#: ../urpme_.c:191
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be removed (%d "
@@ -648,27 +684,15 @@ msgstr ""
 "\n"
 "而 [options] 可以是\n"
 
-#: ../urpmi.addmedia_.c:42 ../urpmi.removemedia_.c:37 ../urpmi.update_.c:61
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - 直接清除软件包头缓存.\n"
-
-#: ../urpmi.addmedia_.c:43
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  -h             - 使用综合文件或 hdlist 文件\n"
-
-#: ../urpmi.addmedia_.c:44 ../urpmi.update_.c:63
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - 强迫生成 hdlist 文件.\n"
-
-#: ../urpmi.addmedia_.c:45 ../urpmi.update_.c:64 ../urpmi_.c:88 ../urpmq_.c:65
+#: ../urpmi.addmedia_.c:43 ../urpmi.update_.c:61 ../urpmi_.c:90 ../urpmq_.c:56
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 用 wget 取远处的文件.\n"
 
-#: ../urpmi.addmedia_.c:46 ../urpmi.update_.c:65 ../urpmi_.c:89 ../urpmq_.c:66
+#: ../urpmi.addmedia_.c:44 ../urpmi.update_.c:62 ../urpmi_.c:91 ../urpmq_.c:57
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 用 crul 取远处的文件.\n"
 
-#: ../urpmi.addmedia_.c:47 ../urpmi.update_.c:66 ../urpmi_.c:90 ../urpmq_.c:67
+#: ../urpmi.addmedia_.c:45 ../urpmi.update_.c:63 ../urpmi_.c:92 ../urpmq_.c:58
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -676,7 +700,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理, 缺省的端口号是\n"
 "                   1080 (格式如 <proxyhost[:port]>).\n"
 
-#: ../urpmi.addmedia_.c:49 ../urpmi.update_.c:68 ../urpmi_.c:92 ../urpmq_.c:69
+#: ../urpmi.addmedia_.c:47 ../urpmi.update_.c:65 ../urpmi_.c:94 ../urpmq_.c:60
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -684,17 +708,29 @@ msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
 "                   口令(格式如 <用户:口令>).\n"
 
-#: ../urpmi.addmedia_.c:51
+#: ../urpmi.addmedia_.c:49
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - 创建一个更新介质.\n"
 
-#: ../urpmi.addmedia_.c:52
+#: ../urpmi.addmedia_.c:50
 msgid ""
 "  --distrib      - automatically create all media from an installation "
 "medium.\n"
 msgstr " --distrib      - 自动从安装介质创建全部介质\n"
 
-#: ../urpmi.addmedia_.c:94
+#: ../urpmi.addmedia_.c:51 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:68
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - 直接清除软件包头缓存.\n"
+
+#: ../urpmi.addmedia_.c:52
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr "  -h             - 使用综合文件或 hdlist 文件\n"
+
+#: ../urpmi.addmedia_.c:53 ../urpmi.update_.c:70
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - 强迫生成 hdlist 文件.\n"
+
+#: ../urpmi.addmedia_.c:95
 #, c-format
 msgid ""
 "%s\n"
@@ -703,12 +739,12 @@ msgstr ""
 "%s\n"
 "使用 --distrib 不需要提供 <hdlist的相对路径>"
 
-#: ../urpmi.addmedia_.c:100 ../urpmi.addmedia_.c:117
+#: ../urpmi.addmedia_.c:101 ../urpmi.addmedia_.c:118
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "无法更新介质\"%s\"\n"
 
-#: ../urpmi.addmedia_.c:106
+#: ../urpmi.addmedia_.c:107
 #, c-format
 msgid ""
 "%s\n"
@@ -717,7 +753,7 @@ msgstr ""
 "%s\n"
 "<hdlist相对路径>找不到\n"
 
-#: ../urpmi.addmedia_.c:108
+#: ../urpmi.addmedia_.c:109
 #, c-format
 msgid ""
 "%s\n"
@@ -726,7 +762,7 @@ msgstr ""
 "%s\n"
 "`with'找不到ftp介质\n"
 
-#: ../urpmi.addmedia_.c:116
+#: ../urpmi.addmedia_.c:117
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质\"%s\"\n"
@@ -739,11 +775,11 @@ msgstr ""
 "用法: urpmi.removemedia -a <名称> ...\n"
 "其中 <名称> 是要删除的介质名.\n"
 
-#: ../urpmi.removemedia_.c:36
+#: ../urpmi.removemedia_.c:37
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - 选择所有介质.\n"
 
-#: ../urpmi.removemedia_.c:38 ../urpmi.update_.c:70
+#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:71
 #, c-format
 msgid ""
 "\n"
@@ -752,11 +788,11 @@ msgstr ""
 "\n"
 "未知的选项 '%s'\n"
 
-#: ../urpmi.removemedia_.c:47
+#: ../urpmi.removemedia_.c:48
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "没有可删除的(用urpmi.addmedia增加介质)\n"
 
-#: ../urpmi.removemedia_.c:49
+#: ../urpmi.removemedia_.c:50
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -773,20 +809,20 @@ msgstr ""
 "用法: urpmi.update [选项] <名称> ...\n"
 "其中 <名称> 是要删除的介质名.\n"
 
-#: ../urpmi.update_.c:60
+#: ../urpmi.update_.c:67
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 选择所有不可移动的介质.\n"
 
-#: ../urpmi.update_.c:62
+#: ../urpmi.update_.c:69
 msgid ""
 "  -d             - force complete computation of depslist.ordered file.\n"
 msgstr "  -d             - 强迫完成 depslist.ordered 文件的计算.\n"
 
-#: ../urpmi.update_.c:78
+#: ../urpmi.update_.c:79
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "没有东西升级(用urpmi.addmedia增加介质)\n"
 
-#: ../urpmi.update_.c:80
+#: ../urpmi.update_.c:81
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -795,7 +831,7 @@ msgstr ""
 "找不到要升级的项\n"
 "(%s中之一)\n"
 
-#: ../urpmi_.c:67
+#: ../urpmi_.c:69
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -811,53 +847,45 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmi_.c:72
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - 打印帮助信息.\n"
-
-#: ../urpmi_.c:73 ../urpmq_.c:51
+#: ../urpmi_.c:75 ../urpmq_.c:41
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质.\n"
 
-#: ../urpmi_.c:74 ../urpmq_.c:52
+#: ../urpmi_.c:76 ../urpmq_.c:42
 msgid "  --media        - use only the media listed by comma.\n"
 msgstr "  --media        - 只使用列出的介质.\n"
 
-#: ../urpmi_.c:75 ../urpmq_.c:53
+#: ../urpmi_.c:77 ../urpmq_.c:43
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的 synthesis 而不是 urpmi db.\n"
 
-#: ../urpmi_.c:76
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - 自动选中软件包.\n"
-
-#: ../urpmi_.c:77 ../urpmq_.c:54
+#: ../urpmi_.c:79 ../urpmq_.c:44
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自动选择升级系统的软件包.\n"
 
-#: ../urpmi_.c:78 ../urpmq_.c:55
+#: ../urpmi_.c:80 ../urpmq_.c:45
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - 利用模糊查询 (和 -y 一样).\n"
 
-#: ../urpmi_.c:79 ../urpmq_.c:59
+#: ../urpmi_.c:81 ../urpmq_.c:50
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下一个软件包是源程序包, (和 -s 一样).\n"
 
-#: ../urpmi_.c:80
+#: ../urpmi_.c:82
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "   --clean        -  首先删除缓存中的rpm.\n"
 
-#: ../urpmi_.c:81
+#: ../urpmi_.c:83
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - 保留缓存中没有使用的rpm.\n"
 
-#: ../urpmi_.c:82 ../urpmq_.c:63
+#: ../urpmi_.c:84 ../urpmq_.c:54
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 强制执行, 即使某些软件包并不存在.\n"
 
-#: ../urpmi_.c:83
+#: ../urpmi_.c:85
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -865,7 +893,7 @@ msgstr ""
 "  --allow-nodeps - 允许要求用户不经过依赖性检验\n"
 "                   就安装软件包.\n"
 
-#: ../urpmi_.c:85
+#: ../urpmi_.c:87
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -873,11 +901,11 @@ msgstr ""
 "  --allow-force  - 允许提示用户安装软件包而不\n"
 "                   检查依赖性和完整性.\n"
 
-#: ../urpmi_.c:87 ../urpmq_.c:64
+#: ../urpmi_.c:89 ../urpmq_.c:55
 msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi .\n"
 
-#: ../urpmi_.c:94
+#: ../urpmi_.c:96
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -885,17 +913,17 @@ msgstr ""
 "  --bug          - 输出故障报告\n"
 "\t\t\t下一个参数指定输出目录.\n"
 
-#: ../urpmi_.c:96
+#: ../urpmi_.c:98
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr "  --env          - 使用指定的环境 (特别是进行故障报告时).\n"
 
-#: ../urpmi_.c:98
+#: ../urpmi_.c:100
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - 使用 X 界面.\n"
 
-#: ../urpmi_.c:99
+#: ../urpmi_.c:101
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
@@ -903,7 +931,7 @@ msgstr ""
 "  --best-output  - 根据运行环境选择最好的界面:\n"
 "                   X 或文本模式.\n"
 
-#: ../urpmi_.c:101
+#: ../urpmi_.c:103
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
@@ -911,81 +939,81 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署.\n"
 "\t\t(--no-verify-rpm 禁止它, 缺省是激活的).\n"
 
-#: ../urpmi_.c:103
+#: ../urpmi_.c:105
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - 验证安装是否可以正确进行.\n"
 
-#: ../urpmi_.c:104
+#: ../urpmi_.c:106
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配.\n"
 
-#: ../urpmi_.c:105
+#: ../urpmi_.c:107
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在提供的项目中寻找软件包.\n"
 
-#: ../urpmi_.c:106 ../urpmq_.c:45
+#: ../urpmi_.c:108 ../urpmq_.c:66
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 部搜索提供标签中的软件包.\n"
 
-#: ../urpmi_.c:107 ../urpmq_.c:46
+#: ../urpmi_.c:109 ../urpmq_.c:68
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样).\n"
 
-#: ../urpmi_.c:108 ../urpmq_.c:47
+#: ../urpmi_.c:110 ../urpmq_.c:69
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下一个软件包是源程序包 ( 和 --src 一样).\n"
 
-#: ../urpmi_.c:109
+#: ../urpmi_.c:111
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安静模式.\n"
 
-#: ../urpmi_.c:110 ../urpmq_.c:41
+#: ../urpmi_.c:112 ../urpmq_.c:62
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             -详细的提示.\n"
 
-#: ../urpmi_.c:111
+#: ../urpmi_.c:113
 msgid "  names or rpm files given on command line are installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件已经安装.\n"
 
-#: ../urpmi_.c:181
+#: ../urpmi_.c:183
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmi: 未知选项 \"-%s\", 用--help 检查用法\n"
 
-#: ../urpmi_.c:206
+#: ../urpmi_.c:208
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi_.c:231
+#: ../urpmi_.c:233
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
 
-#: ../urpmi_.c:236 ../urpmi_.c:517 ../urpmi_.c:527 ../urpmi_.c:535
-#: ../urpmi_.c:549 ../urpmi_.c:557
+#: ../urpmi_.c:238 ../urpmi_.c:519 ../urpmi_.c:529 ../urpmi_.c:537
+#: ../urpmi_.c:551 ../urpmi_.c:559
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../urpmi_.c:329
+#: ../urpmi_.c:331
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "需要下列软件包之一才能安装 %s:"
 
-#: ../urpmi_.c:330
+#: ../urpmi_.c:332
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../urpmi_.c:338
+#: ../urpmi_.c:340
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:  (1-%d) "
 
-#: ../urpmi_.c:341
+#: ../urpmi_.c:343
 msgid "Sorry, bad choice, try again\n"
 msgstr "对不起, 选择无效, 请再试一次\n"
 
-#: ../urpmi_.c:360
+#: ../urpmi_.c:362
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -996,7 +1024,7 @@ msgstr ""
 "%s\n"
 "可以吗 ?"
 
-#: ../urpmi_.c:377
+#: ../urpmi_.c:379
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1007,14 +1035,14 @@ msgstr ""
 "%s\n"
 "您同意吗?"
 
-#: ../urpmi_.c:415 ../urpmi_.c:424
+#: ../urpmi_.c:417 ../urpmi_.c:426
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "我将另外安装下列软件包 (%d MB), 以满足相关性要求"
 
-#: ../urpmi_.c:421
+#: ../urpmi_.c:423
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1023,28 +1051,28 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi_.c:442 ../urpmq_.c:220
+#: ../urpmi_.c:444 ../urpmq_.c:296
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包， 中止"
 
-#: ../urpmi_.c:453
+#: ../urpmi_.c:455
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请插入标签 \"%s\" 的介质到设备 [%s]"
 
-#: ../urpmi_.c:454
+#: ../urpmi_.c:456
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi_.c:476
+#: ../urpmi_.c:478
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签署有错误"
 
-#: ../urpmi_.c:477
+#: ../urpmi_.c:479
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpmi_.c:500
+#: ../urpmi_.c:502
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your urpmi database"
@@ -1052,24 +1080,24 @@ msgstr ""
 "安装失败, 缺少某些文件.\n"
 "最好更新您的 urpmi 数据库"
 
-#: ../urpmi_.c:505
+#: ../urpmi_.c:507
 #, c-format
 msgid "distributing %s\n"
 msgstr "正在分布安装 %s\n"
 
-#: ../urpmi_.c:542
+#: ../urpmi_.c:544
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗? (是(y)/不(N)) [不] "
 
-#: ../urpmi_.c:551
+#: ../urpmi_.c:553
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "尝试更激烈的安装方式吗? (使用 --force) (是(y)/不(N)) [不] "
 
-#: ../urpmi_.c:560
+#: ../urpmi_.c:562
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpmi_.c:566
+#: ../urpmi_.c:568
 msgid "everything already installed"
 msgstr "全部安装完成"
 
@@ -1089,66 +1117,77 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmq_.c:40
-msgid "  -h             - print this help message.\n"
-msgstr "  -h             - 打印帮助信息.\n"
+#: ../urpmq_.c:46
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - 列出可用的软件包.\n"
+
+#: ../urpmq_.c:47
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - 列出可用的介质.\n"
 
-#: ../urpmq_.c:42
+#: ../urpmq_.c:48
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - 如果使用了 --parallel, 列出所有可用的节点.\n"
+
+#: ../urpmq_.c:49
+#, fuzzy
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-media   - 列出可用的介质.\n"
+
+#: ../urpmq_.c:51
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - 从 urpmi 数据库提取软件包的头信息\n"
+"                   用 stdout 输出 (root 专用).\n"
+
+#: ../urpmq_.c:53
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --sources      - 下载前给出所有的源文件包 (root 专用).\n"
+
+#: ../urpmq_.c:63
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - 扩展软件包依赖性查询.\n"
 
-#: ../urpmq_.c:43
+#: ../urpmq_.c:64
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - 如果更新的版本已经安装, 就删除软件包\n"
 
-#: ../urpmq_.c:44
+#: ../urpmq_.c:65
 msgid ""
 "  -c             - choose complete method for resolving requires closure.\n"
 msgstr "  -c             - 采用完成方法解决需求.\n"
 
-#: ../urpmq_.c:48
+#: ../urpmq_.c:67
+#, fuzzy
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -p             - 允许在提供的项目中寻找软件包.\n"
+
+#: ../urpmq_.c:70
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - 打印组名.\n"
 
-#: ../urpmq_.c:49
+#: ../urpmq_.c:71
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 和名称一起打印版本和发行号.\n"
 
-#: ../urpmq_.c:50
+#: ../urpmq_.c:72
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 和名称一起打印版本, 发行号和平台.\n"
 
-#: ../urpmq_.c:56
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - 列出可用的软件包.\n"
-
-#: ../urpmq_.c:57
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - 列出可用的介质.\n"
-
-#: ../urpmq_.c:58
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - 如果使用了 --parallel, 列出所有可用的节点.\n"
-
-#: ../urpmq_.c:60
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - 从 urpmi 数据库提取软件包的头信息\n"
-"                   用 stdout 输出 (root 专用).\n"
-
-#: ../urpmq_.c:62
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - 下载前给出所有的源文件包 (root 专用).\n"
-
-#: ../urpmq_.c:71
+#: ../urpmq_.c:73
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  需要在命令行给出名称或 rpm 文件.\n"
 
+#: ../urpmq_.c:173
+#, fuzzy
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--synthesis 不能和 --media, --update 或 --parallel 一起使用"
+
 #: placeholder.h:18
 #, c-format
 msgid "urpmf version %s"
@@ -1244,6 +1283,12 @@ msgstr "尝试 urpmf --help 了解更多选项"
 msgid "no full media list was found"
 msgstr "没有找到完整的介质清单"
 
+#~ msgid "usage: urpme [-a] [--auto] <packages...>\n"
+#~ msgstr "用法: urpmi [-a] [--auto] <软件包列表...>\n"
+
+#~ msgid "  -h             - print this help message.\n"
+#~ msgstr "  -h             - 打印帮助信息.\n"
+
 #~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 #~ msgstr "urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"