updated pot file

1 files changed, 248 insertions, 208 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index f4f4491b..5031b36c 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-08-24 02:19+0200\n"
+"POT-Creation-Date: 2002-08-27 19:58+0200\n"
 "PO-Revision-Date: 2002-8-15 15:00+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:495
+#: ../_irpm_.c:23 ../urpmi_.c:503
 #, 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:410
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:418
 msgid "Is it OK?"
 msgstr "这样好了吗?"
 
-#: ../_irpm_.c:35 ../urpmi_.c:347 ../urpmi_.c:364 ../urpmi_.c:413
-#: ../urpmi_.c:441 ../urpmi_.c:469
+#: ../_irpm_.c:35 ../urpmi_.c:355 ../urpmi_.c:372 ../urpmi_.c:421
+#: ../urpmi_.c:449 ../urpmi_.c:477
 msgid "Ok"
 msgstr "确认"
 
-#: ../_irpm_.c:36 ../urpmi_.c:348 ../urpmi_.c:365 ../urpmi_.c:414
-#: ../urpmi_.c:442 ../urpmi_.c:470
+#: ../_irpm_.c:36 ../urpmi_.c:356 ../urpmi_.c:373 ../urpmi_.c:422
+#: ../urpmi_.c:450 ../urpmi_.c:478
 msgid "Cancel"
 msgstr "取消"
 
 #. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:35 ../urpmi_.c:352 ../urpmi_.c:369
-#: ../urpmi_.c:418 ../urpmi_.c:474 ../urpmi_.c:522 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:35 ../urpmi_.c:360 ../urpmi_.c:377
+#: ../urpmi_.c:426 ../urpmi_.c:482 ../urpmi_.c:531 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:353 ../urpmi_.c:370
-#: ../urpmi_.c:419 ../urpmi_.c:475 ../urpmi_.c:523 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:37 ../urpmi_.c:361 ../urpmi_.c:378
+#: ../urpmi_.c:427 ../urpmi_.c:483 ../urpmi_.c:532 placeholder.h:11
 msgid "Yy"
 msgstr "yY是"
 
-#: ../_irpm_.c:44 ../urpme_.c:126 ../urpmi_.c:354 ../urpmi_.c:371
-#: ../urpmi_.c:420
+#: ../_irpm_.c:44 ../urpme_.c:126 ../urpmi_.c:362 ../urpmi_.c:379
+#: ../urpmi_.c:428
 msgid " (Y/n) "
 msgstr " (是(Y)/不(n)) [是] "
 
@@ -67,502 +67,521 @@ msgstr " (是(Y)/不(n)) [是] "
 msgid "%s: command not found\n"
 msgstr "%s: 命令没找到\n"
 
-#. Translator: the %s here is a program name
-#: ../urpm.pm_.c:178
+#: ../urpm.pm_.c:177
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
 msgstr "未知 webfetch `%s' !!!\n"
 
-#: ../urpm.pm_.c:197
+#: ../urpm.pm_.c:196
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm.pm_.c:206
+#: ../urpm.pm_.c:205
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr "没有发现下载工具(curl 或 wget) \n"
 
-#: ../urpm.pm_.c:218
+#: ../urpm.pm_.c:217
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
 
-#: ../urpm.pm_.c:221
+#: ../urpm.pm_.c:220
 msgid "wget is missing\n"
 msgstr "没有 wget\n"
 
-#: ../urpm.pm_.c:227
+#: ../urpm.pm_.c:226
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr "wget 失败: 退出代码%d 或信号 %d\n"
 
-#: ../urpm.pm_.c:230
+#: ../urpm.pm_.c:229
 msgid "curl is missing\n"
 msgstr "没有 curl\n"
 
-#: ../urpm.pm_.c:287
+#: ../urpm.pm_.c:286
 #, c-format
 msgid "curl failed: exited with %d or signal %d\n"
 msgstr "curl 失败: 退出代码 %d, 信号 %d\n"
 
-#: ../urpm.pm_.c:291
+#: ../urpm.pm_.c:290
 msgid "rsync is missing\n"
 msgstr "没有 rsync\n"
 
-#: ../urpm.pm_.c:292
+#: ../urpm.pm_.c:291
 msgid "ssh is missing\n"
 msgstr "没有 ssh\n"
 
-#: ../urpm.pm_.c:302
+#: ../urpm.pm_.c:301
 #, c-format
 msgid "rsync failed: exited with %d or signal %d\n"
 msgstr "rsync 失败: 退出代码 %d 或信号 %d\n"
 
-#: ../urpm.pm_.c:338 ../urpm.pm_.c:350
+#: ../urpm.pm_.c:337 ../urpm.pm_.c:349
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "配置文件的的 %s 行由语法错误"
 
-#: ../urpm.pm_.c:359
+#: ../urpm.pm_.c:358
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "介质 \"%s\" 试图使用一个已经使用的hdlist, 忽略介质"
 
-#: ../urpm.pm_.c:362
+#: ../urpm.pm_.c:361
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "介质 \"%s\" 试图使用已经使用的列表, 忽略介质"
 
-#: ../urpm.pm_.c:377
+#: ../urpm.pm_.c:376
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr "无法处理介质 \"%s\", 其它介质在使用列表文件"
 
-#: ../urpm.pm_.c:383
+#: ../urpm.pm_.c:382
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "不能把这个介质命名为 \"%s\", 这个名字已经被使用"
 
-#: ../urpm.pm_.c:390
+#: ../urpm.pm_.c:389
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "不能计算介质 \"%s\", 它的列表文件 [%s] 不存在"
 
-#: ../urpm.pm_.c:394
+#: ../urpm.pm_.c:393
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "无法判断 hdlist文件的介质 [%s]"
 
-#: ../urpm.pm_.c:403
+#: ../urpm.pm_.c:402
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "无法访问 \"%s\" 的 hdlist 文件, 忽略该介质"
 
-#: ../urpm.pm_.c:405
+#: ../urpm.pm_.c:404
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问 \"%s\"的列表文件, 忽略介质"
 
-#: ../urpm.pm_.c:419
+#: ../urpm.pm_.c:418
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "试图略过现有的介质 \"%s\", 避免"
 
-#: ../urpm.pm_.c:425
+#: ../urpm.pm_.c:424
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "无法找到 \"%s\"的 hdlist 文件, 忽略这个介质"
 
-#: ../urpm.pm_.c:430
+#: ../urpm.pm_.c:429
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "无法找到 \"%s\" 的列表文件, 忽略该介质"
 
-#: ../urpm.pm_.c:449
+#: ../urpm.pm_.c:448
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "\"%s\" 的列表文件不连贯, 忽略该介质"
 
-#: ../urpm.pm_.c:457
+#: ../urpm.pm_.c:456
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "无法检查 \"%s\" 的列表文件, 忽略该介质"
 
-#: ../urpm.pm_.c:488
+#: ../urpm.pm_.c:487
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "可移动介质 \"%s\" 加载次数太多"
 
-#: ../urpm.pm_.c:489
+#: ../urpm.pm_.c:488
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "把可移动设备当作 \"%s\""
 
-#: ../urpm.pm_.c:493
+#: ../urpm.pm_.c:492
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "不同的可移动 [%s] 用于 \"%s\""
 
-#: ../urpm.pm_.c:497 ../urpm.pm_.c:500
+#: ../urpm.pm_.c:496 ../urpm.pm_.c:499
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "无法取得可移动介质 \"%s\" 的路径"
 
-#: ../urpm.pm_.c:513
+#: ../urpm.pm_.c:512
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件 [%s]"
 
-#: ../urpm.pm_.c:525
+#: ../urpm.pm_.c:524
 #, c-format
 msgid "write config file [%s]"
 msgstr "写入 [%s]"
 
-#: ../urpm.pm_.c:539
+#: ../urpm.pm_.c:544
+#, fuzzy, c-format
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "无法访问rpm 文件[%s]"
+
+#: ../urpm.pm_.c:555
+#, fuzzy, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "检查 hdlist 文件 [%s]"
+
+#: ../urpm.pm_.c:565
+#, fuzzy, c-format
+msgid "found parallel handler for nodes: %s"
+msgstr "列表文件 %s"
+
+#: ../urpm.pm_.c:569
+#, c-format
+msgid "using associated media for parallel mode : %s"
+msgstr ""
+
+#: ../urpm.pm_.c:573
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "无法更新介质\"%s\"\n"
+
+#: ../urpm.pm_.c:583
 msgid "--synthesis cannot be used with --media, --update or --parallel"
 msgstr ""
 
-#: ../urpm.pm_.c:555 ../urpm.pm_.c:1138 ../urpm.pm_.c:1153 ../urpm.pm_.c:1283
+#: ../urpm.pm_.c:599 ../urpm.pm_.c:1143 ../urpm.pm_.c:1158 ../urpm.pm_.c:1288
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "检查 hdlist 文件 [%s]"
 
-#: ../urpm.pm_.c:559
+#: ../urpm.pm_.c:603
 #, c-format
 msgid "problem reading hdlist file of medium \"%s\""
 msgstr "读取 \"%s\"的 hdlist 文件有问题"
 
-#: ../urpm.pm_.c:570 ../urpm.pm_.c:864 ../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:614 ../urpm.pm_.c:869 ../urpm.pm_.c:951 ../urpm.pm_.c:1086
+#: ../urpm.pm_.c:1148 ../urpm.pm_.c:1153 ../urpm.pm_.c:1215 ../urpm.pm_.c:1283
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "检查综合文件 [%s]"
 
-#: ../urpm.pm_.c:574 ../urpm.pm_.c:868 ../urpm.pm_.c:949 ../urpm.pm_.c:1085
-#: ../urpm.pm_.c:1213
+#: ../urpm.pm_.c:618 ../urpm.pm_.c:873 ../urpm.pm_.c:954 ../urpm.pm_.c:1090
+#: ../urpm.pm_.c:1218
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "无法读取介质\"%s\"的综合文件"
 
-#: ../urpm.pm_.c:607
-#, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "无法访问rpm 文件[%s]"
-
-#: ../urpm.pm_.c:618
-#, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "检查 hdlist 文件 [%s]"
-
-#: ../urpm.pm_.c:628
-#, fuzzy, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "列表文件 %s"
-
-#: ../urpm.pm_.c:632
-#, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "无法更新介质\"%s\"\n"
-
-#: ../urpm.pm_.c:653
+#: ../urpm.pm_.c:658
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质 \"%s\" 已经存在"
 
-#: ../urpm.pm_.c:684
+#: ../urpm.pm_.c:689
 #, c-format
 msgid "added medium %s"
 msgstr "添加介质 %s"
 
-#: ../urpm.pm_.c:699
+#: ../urpm.pm_.c:704
 msgid "unable to access first installation medium"
 msgstr "无法访问最初的安装介质"
 
-#: ../urpm.pm_.c:703
+#: ../urpm.pm_.c:708
 msgid "copying hdlists file..."
 msgstr "复制 hdlists..."
 
-#: ../urpm.pm_.c:705 ../urpm.pm_.c:923 ../urpm.pm_.c:931 ../urpm.pm_.c:964
+#: ../urpm.pm_.c:710 ../urpm.pm_.c:928 ../urpm.pm_.c:936 ../urpm.pm_.c:969
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm.pm_.c:705 ../urpm.pm_.c:923 ../urpm.pm_.c:931 ../urpm.pm_.c:964
+#: ../urpm.pm_.c:710 ../urpm.pm_.c:928 ../urpm.pm_.c:936 ../urpm.pm_.c:969
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm.pm_.c:707 ../urpm.pm_.c:721 ../urpm.pm_.c:746
+#: ../urpm.pm_.c:712 ../urpm.pm_.c:726 ../urpm.pm_.c:751
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr "无法访问最初的安装介质 (没有找到 Mandrake/base/hdlists) "
 
-#: ../urpm.pm_.c:713
+#: ../urpm.pm_.c:718
 msgid "retrieving hdlists file..."
 msgstr "取出 hdlists 文件..."
 
-#: ../urpm.pm_.c:715 ../urpm.pm_.c:1019 ../urpm.pm_.c:1071 ../urpm.pm_.c:1895
+#: ../urpm.pm_.c:720 ../urpm.pm_.c:1024 ../urpm.pm_.c:1076 ../urpm.pm_.c:1921
 msgid "...retrieving done"
 msgstr "...收取完成"
 
-#: ../urpm.pm_.c:717 ../urpm.pm_.c:1066 ../urpm.pm_.c:1897
+#: ../urpm.pm_.c:722 ../urpm.pm_.c:1071 ../urpm.pm_.c:1923
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...收取失败: %s"
 
-#: ../urpm.pm_.c:737
+#: ../urpm.pm_.c:742
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlist 文件中错误的描述 \"%s\""
 
-#: ../urpm.pm_.c:779
+#: ../urpm.pm_.c:784
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "试图选择不存在的介质\"%s\""
 
-#: ../urpm.pm_.c:781
+#: ../urpm.pm_.c:786
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm_.c:781
+#: ../urpm.pm_.c:786
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质\"%s\""
 
-#: ../urpm.pm_.c:798
+#: ../urpm.pm_.c:803
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质\"%s\""
 
-#: ../urpm.pm_.c:844
+#: ../urpm.pm_.c:849
 msgid "urpmi database locked"
 msgstr "urpmi 数据库已经锁定"
 
-#: ../urpm.pm_.c:888 ../urpm.pm_.c:890 ../urpm.pm_.c:1839
+#: ../urpm.pm_.c:893 ../urpm.pm_.c:895 ../urpm.pm_.c:1865
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质\"%s\""
 
-#: ../urpm.pm_.c:921
+#: ../urpm.pm_.c:926
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "复制 \"%s\" 的描述文件"
 
-#: ../urpm.pm_.c:929
+#: ../urpm.pm_.c:934
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "复制源 \"%s\" 的 hdlist 或 synthesis..."
 
-#: ../urpm.pm_.c:934
+#: ../urpm.pm_.c:939
 #, c-format
 msgid "copy of [%s] failed"
 msgstr "拷贝 [%s] 失败"
 
-#: ../urpm.pm_.c:962
+#: ../urpm.pm_.c:967
 #, c-format
 msgid "copying source list of \"%s\"..."
 msgstr "复制 \"%s\" 的源文件列表"
 
-#: ../urpm.pm_.c:979
-#, c-format
-msgid "reading rpms files from [%s]"
+#: ../urpm.pm_.c:984
+#, fuzzy, c-format
+msgid "reading rpm files from [%s]"
 msgstr "从 [%s]读取 rpm 文件"
 
-#: ../urpm.pm_.c:998
-#, c-format
-msgid "unable to read rpms files from [%s]: %s"
+#: ../urpm.pm_.c:1003
+#, fuzzy, c-format
+msgid "unable to read rpm files from [%s]: %s"
 msgstr "无法从介质 [%s] 读取 rpm 文件: %s"
 
-#: ../urpm.pm_.c:1003
+#: ../urpm.pm_.c:1008
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 没有发现rpm 文件"
 
-#: ../urpm.pm_.c:1016
+#: ../urpm.pm_.c:1021
 #, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "找回 \"%s\" 的描述文件..."
 
-#: ../urpm.pm_.c:1028
+#: ../urpm.pm_.c:1033
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "收取 \"%s\"的源 hdlist (synthesis)..."
 
-#: ../urpm.pm_.c:1110
+#: ../urpm.pm_.c:1115
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr "获取源的 hdlist (或 synthesis)失败"
 
-#: ../urpm.pm_.c:1117
+#: ../urpm.pm_.c:1122
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "没有找到介质 \"%s\"的 hdlist 文件"
 
-#: ../urpm.pm_.c:1129 ../urpm.pm_.c:1173
+#: ../urpm.pm_.c:1134 ../urpm.pm_.c:1178
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "文件 [%s] 已经被同样的介质 \"%s\"使用"
 
-#: ../urpm.pm_.c:1160
+#: ../urpm.pm_.c:1165
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法分析hdlist文件 \"%s\""
 
-#: ../urpm.pm_.c:1187
+#: ../urpm.pm_.c:1192
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr " \"%s\" 没有需要写入列表文件"
 
-#: ../urpm.pm_.c:1194
+#: ../urpm.pm_.c:1199
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入 列表文件\"%s\""
 
-#: ../urpm.pm_.c:1201
+#: ../urpm.pm_.c:1206
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "\"%s\"没有写入列表文件"
 
-#: ../urpm.pm_.c:1243
+#: ../urpm.pm_.c:1248
 msgid "performing second pass to compute dependencies\n"
 msgstr "进行第二轮, 计算依赖性\n"
 
-#: ../urpm.pm_.c:1256
+#: ../urpm.pm_.c:1261
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "从介质\"%s\"读取软件包头信息"
 
-#: ../urpm.pm_.c:1261
+#: ../urpm.pm_.c:1266
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "创建hdlist [%s]"
 
-#: ../urpm.pm_.c:1273 ../urpm.pm_.c:1292
+#: ../urpm.pm_.c:1278 ../urpm.pm_.c:1297
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "为介质\"%s\"创建 hdlist 综合文件"
 
-#: ../urpm.pm_.c:1310
+#: ../urpm.pm_.c:1315
 #, c-format
 msgid "found %d headers in cache"
 msgstr "缓存中有 %d 个文件头"
 
-#: ../urpm.pm_.c:1314
+#: ../urpm.pm_.c:1319
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "从缓存删除 %d 过时的头"
 
-#: ../urpm.pm_.c:1470
+#: ../urpm.pm_.c:1475
 #, c-format
 msgid "mounting %s"
 msgstr "正在安装 %s"
 
-#: ../urpm.pm_.c:1481
+#: ../urpm.pm_.c:1486
 #, c-format
 msgid "unmounting %s"
 msgstr "卸载 %s"
 
-#: ../urpm.pm_.c:1494
+#: ../urpm.pm_.c:1499
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "在depslist中重新定位 %s"
 
-#: ../urpm.pm_.c:1495
+#: ../urpm.pm_.c:1500
 msgid "no entries relocated in depslist"
 msgstr "在depslist中没有重新定位的条目"
 
-#: ../urpm.pm_.c:1508
+#: ../urpm.pm_.c:1513
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "非法rpm文件 [%s]"
 
-#: ../urpm.pm_.c:1509 ../urpm.pm_.c:1997
+#: ../urpm.pm_.c:1514 ../urpm.pm_.c:2023
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问rpm 文件[%s]"
 
-#: ../urpm.pm_.c:1513
+#: ../urpm.pm_.c:1518
 msgid "unable to register rpm file"
 msgstr "无法登记 rpm 文件"
 
-#: ../urpm.pm_.c:1516
+#: ../urpm.pm_.c:1521
 msgid "error registering local packages"
 msgstr "登记本地软件包出错"
 
-#: ../urpm.pm_.c:1604
+#: ../urpm.pm_.c:1609
 #, c-format
 msgid "no package named %s"
 msgstr "没有名为 %s 的软件包"
 
-#: ../urpm.pm_.c:1607
+#: ../urpm.pm_.c:1612
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm.pm_.c:1708 ../urpm.pm_.c:1734
+#: ../urpm.pm_.c:1734 ../urpm.pm_.c:1760
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "多个软件包是用相同的 rpm 文件名 \"%s\""
 
-#: ../urpm.pm_.c:1743
+#: ../urpm.pm_.c:1769
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "无法正确的解析 [%s] 的值 \"%s\""
 
-#: ../urpm.pm_.c:1755
+#: ../urpm.pm_.c:1781
 #, c-format
 msgid "package %s is not found."
 msgstr "没有找到软件包 %s."
 
-#: ../urpm.pm_.c:1803 ../urpm.pm_.c:1806 ../urpm.pm_.c:1824
+#: ../urpm.pm_.c:1829 ../urpm.pm_.c:1832 ../urpm.pm_.c:1850
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "介质 \"%s\" 没有选中"
 
-#: ../urpm.pm_.c:1812
+#: ../urpm.pm_.c:1838
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质\"%2$s\" 读取rpm文件[%1$s]"
 
-#: ../urpm.pm_.c:1828
+#: ../urpm.pm_.c:1854
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "不连贯的介质 \"%s\" 标记为可移动但其实不是"
 
-#: ../urpm.pm_.c:1885
+#: ../urpm.pm_.c:1911
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "输入格式错误: [%s]"
 
-#: ../urpm.pm_.c:1890
-msgid "retrieving rpms files..."
+#: ../urpm.pm_.c:1916
+#, fuzzy
+msgid "retrieving rpm files..."
 msgstr "收取 rpms 文件..."
 
-#: ../urpm.pm_.c:1939
+#: ../urpm.pm_.c:1965
 msgid "Preparing..."
 msgstr "准备中..."
 
-#: ../urpm.pm_.c:1967
+#: ../urpm.pm_.c:1993
 #, c-format
 msgid "unable to remove package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm_.c:1972 ../urpm.pm_.c:1977
+#: ../urpm.pm_.c:1998 ../urpm.pm_.c:2003
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm.pm_.c:1984
+#: ../urpm.pm_.c:2010
 #, c-format
 msgid "%s is needed by %s"
 msgstr "%s 是 %s 需要的"
 
-#: ../urpm.pm_.c:1985
+#: ../urpm.pm_.c:2011
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s 与 %s 冲突"
 
+#: ../urpm/parallel_ka_run.pm_.c:55 ../urpm/parallel_ka_run.pm_.c:88
+msgid "rshp failed"
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm_.c:92 ../urpm/parallel_ssh.pm_.c:94
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "安装失败"
+
+#: ../urpm/parallel_ssh.pm_.c:57
+#, c-format
+msgid "host %s does not have a good version of urpmi"
+msgstr ""
+
 #: ../urpme_.c:33
 msgid "Remove them all?"
 msgstr "全部删除?"
@@ -580,7 +599,7 @@ msgstr "未知的软件包"
 msgid "Using \"%s\" as a substring, I found"
 msgstr "搜索包含 \"%s\" 的项目, 我发现"
 
-#: ../urpme_.c:64 ../urpmi_.c:476
+#: ../urpme_.c:64 ../urpmi_.c:484
 msgid " (y/N) "
 msgstr " (y/N) "
 
@@ -604,7 +623,10 @@ msgid ""
 "MB)"
 msgstr "为满足相关性要求, 需要删除下列软件包 (%d MB)"
 
-#: ../urpmi.addmedia_.c:29
+#. Translator: The URI types strings "file:", "ftp:", "http:",
+#. Translator: and "removable:" must not be translated! neither the ``with''.
+#. Translator: only what is between <brakets> can be translated.
+#: ../urpmi.addmedia_.c:32
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -626,27 +648,27 @@ msgstr ""
 "\n"
 "而 [options] 可以是\n"
 
-#: ../urpmi.addmedia_.c:38 ../urpmi.removemedia_.c:37 ../urpmi.update_.c:61
+#: ../urpmi.addmedia_.c:41 ../urpmi.removemedia_.c:37 ../urpmi.update_.c:61
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - 直接清除软件包头缓存.\n"
 
-#: ../urpmi.addmedia_.c:39
+#: ../urpmi.addmedia_.c:42
 msgid "  -h             - try to find and use synthesis or hdlist file.\n"
 msgstr "  -h             - 使用综合文件或 hdlist 文件\n"
 
-#: ../urpmi.addmedia_.c:40 ../urpmi.update_.c:63
+#: ../urpmi.addmedia_.c:43 ../urpmi.update_.c:63
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - 强迫生成 hdlist 文件.\n"
 
-#: ../urpmi.addmedia_.c:41 ../urpmi.update_.c:64 ../urpmi_.c:83 ../urpmq_.c:62
+#: ../urpmi.addmedia_.c:44 ../urpmi.update_.c:64 ../urpmi_.c:84 ../urpmq_.c:62
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 用 wget 取远处的文件.\n"
 
-#: ../urpmi.addmedia_.c:42 ../urpmi.update_.c:65 ../urpmi_.c:84 ../urpmq_.c:63
+#: ../urpmi.addmedia_.c:45 ../urpmi.update_.c:65 ../urpmi_.c:85 ../urpmq_.c:63
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 用 crul 取远处的文件.\n"
 
-#: ../urpmi.addmedia_.c:43 ../urpmi.update_.c:66 ../urpmi_.c:85 ../urpmq_.c:64
+#: ../urpmi.addmedia_.c:46 ../urpmi.update_.c:66 ../urpmi_.c:86 ../urpmq_.c:64
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -654,7 +676,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理, 缺省的端口号是\n"
 "                   1080 (格式如 <proxyhost[:port]>).\n"
 
-#: ../urpmi.addmedia_.c:45 ../urpmi.update_.c:68 ../urpmi_.c:87 ../urpmq_.c:66
+#: ../urpmi.addmedia_.c:48 ../urpmi.update_.c:68 ../urpmi_.c:88 ../urpmq_.c:66
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -662,17 +684,17 @@ msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
 "                   口令(格式如 <用户:口令>).\n"
 
-#: ../urpmi.addmedia_.c:47
+#: ../urpmi.addmedia_.c:50
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - 创建一个更新介质.\n"
 
-#: ../urpmi.addmedia_.c:48
+#: ../urpmi.addmedia_.c:51
 msgid ""
 "  --distrib      - automatically create all media from an installation "
 "medium.\n"
 msgstr " --distrib      - 自动从安装介质创建全部介质\n"
 
-#: ../urpmi.addmedia_.c:90
+#: ../urpmi.addmedia_.c:93
 #, c-format
 msgid ""
 "%s\n"
@@ -681,12 +703,12 @@ msgstr ""
 "%s\n"
 "使用 --distrib 不需要提供 <hdlist的相对路径>"
 
-#: ../urpmi.addmedia_.c:96 ../urpmi.addmedia_.c:113
+#: ../urpmi.addmedia_.c:99 ../urpmi.addmedia_.c:116
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "无法更新介质\"%s\"\n"
 
-#: ../urpmi.addmedia_.c:102
+#: ../urpmi.addmedia_.c:105
 #, c-format
 msgid ""
 "%s\n"
@@ -695,7 +717,7 @@ msgstr ""
 "%s\n"
 "<hdlist相对路径>找不到\n"
 
-#: ../urpmi.addmedia_.c:104
+#: ../urpmi.addmedia_.c:107
 #, c-format
 msgid ""
 "%s\n"
@@ -704,7 +726,7 @@ msgstr ""
 "%s\n"
 "`with'找不到ftp介质\n"
 
-#: ../urpmi.addmedia_.c:112
+#: ../urpmi.addmedia_.c:115
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质\"%s\"\n"
@@ -773,7 +795,7 @@ msgstr ""
 "找不到要升级的项\n"
 "(%s中之一)\n"
 
-#: ../urpmi_.c:63
+#: ../urpmi_.c:64
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -789,49 +811,49 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmi_.c:68
+#: ../urpmi_.c:69
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息.\n"
 
-#: ../urpmi_.c:69 ../urpmq_.c:51
+#: ../urpmi_.c:70 ../urpmq_.c:51
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质.\n"
 
-#: ../urpmi_.c:70 ../urpmq_.c:52
+#: ../urpmi_.c:71 ../urpmq_.c:52
 msgid "  --media        - use only the media listed by comma.\n"
 msgstr "  --media        - 只使用列出的介质.\n"
 
-#: ../urpmi_.c:71 ../urpmq_.c:53
+#: ../urpmi_.c:72 ../urpmq_.c:53
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi_.c:72
+#: ../urpmi_.c:73
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自动选中软件包.\n"
 
-#: ../urpmi_.c:73 ../urpmq_.c:54
+#: ../urpmi_.c:74 ../urpmq_.c:54
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自动选择升级系统的软件包.\n"
 
-#: ../urpmi_.c:74 ../urpmq_.c:55
+#: ../urpmi_.c:75 ../urpmq_.c:55
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - 利用模糊查询 (和 -y 一样).\n"
 
-#: ../urpmi_.c:75 ../urpmq_.c:57
+#: ../urpmi_.c:76 ../urpmq_.c:57
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下一个软件包是源程序包, (和 -s 一样).\n"
 
-#: ../urpmi_.c:76
+#: ../urpmi_.c:77
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - 保留缓存中没有使用的rpm.\n"
 
-#: ../urpmi_.c:77 ../urpmq_.c:61
+#: ../urpmi_.c:78 ../urpmq_.c:61
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 强制执行, 即使某些软件包并不存在.\n"
 
-#: ../urpmi_.c:78
+#: ../urpmi_.c:79
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -839,7 +861,7 @@ msgstr ""
 "  --allow-nodeps - 允许要求用户不经过依赖性检验\n"
 "                   就安装软件包.\n"
 
-#: ../urpmi_.c:80
+#: ../urpmi_.c:81
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -847,24 +869,29 @@ msgstr ""
 "  --allow-force  - 允许提示用户安装软件包而不\n"
 "                   检查依赖性和完整性.\n"
 
-#: ../urpmi_.c:82
+#: ../urpmi_.c:83
 msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
 msgstr ""
 
-#: ../urpmi_.c:89
+#: ../urpmi_.c:90
+#, fuzzy
 msgid ""
-"  --bug          - output a bug report in directory indicated by next arg.\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr "  --bug          - 在指定的目录中输出故障报告.\n"
 
-#: ../urpmi_.c:90
-msgid "  --env          - use specific environment (typically a bug report).\n"
+#: ../urpmi_.c:92
+#, fuzzy
+msgid ""
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr "  --env          - 使用指定的环境 (特别是进行故障报告时).\n"
 
-#: ../urpmi_.c:91
+#: ../urpmi_.c:94
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - 使用 X 界面.\n"
 
-#: ../urpmi_.c:92
+#: ../urpmi_.c:95
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
@@ -872,80 +899,88 @@ msgstr ""
 "  --best-output  - 根据运行环境选择最好的界面:\n"
 "                   X 或文本模式.\n"
 
-#: ../urpmi_.c:94
-msgid "  --verify-rpm   - verify rpm signature before installation.\n"
+#: ../urpmi_.c:97
+#, fuzzy
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr "  --verify-rpm   - 安装之前验证 rpm 签署.\n"
 
-#: ../urpmi_.c:95
+#: ../urpmi_.c:99
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
+
+#: ../urpmi_.c:100
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配.\n"
 
-#: ../urpmi_.c:96
+#: ../urpmi_.c:101
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在提供的项目中寻找软件包.\n"
 
-#: ../urpmi_.c:97 ../urpmq_.c:45
+#: ../urpmi_.c:102 ../urpmq_.c:45
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 部搜索提供标签中的软件包.\n"
 
-#: ../urpmi_.c:98 ../urpmq_.c:46
+#: ../urpmi_.c:103 ../urpmq_.c:46
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样).\n"
 
-#: ../urpmi_.c:99 ../urpmq_.c:47
+#: ../urpmi_.c:104 ../urpmq_.c:47
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下一个软件包是源程序包 ( 和 --src 一样).\n"
 
-#: ../urpmi_.c:100
+#: ../urpmi_.c:105
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安静模式.\n"
 
-#: ../urpmi_.c:101 ../urpmq_.c:41
+#: ../urpmi_.c:106 ../urpmq_.c:41
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             -详细的提示.\n"
 
-#: ../urpmi_.c:102
+#: ../urpmi_.c:107
 msgid "  names or rpm files given on command line are installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件已经安装.\n"
 
-#: ../urpmi_.c:166
+#: ../urpmi_.c:174
 #, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmi: 未知选项 \"-%s\", 用--help 检查用法\n"
 
-#: ../urpmi_.c:191
+#: ../urpmi_.c:199
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi_.c:216
+#: ../urpmi_.c:224
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
 
-#: ../urpmi_.c:221 ../urpmi_.c:500 ../urpmi_.c:510 ../urpmi_.c:517
-#: ../urpmi_.c:530 ../urpmi_.c:537
+#: ../urpmi_.c:229 ../urpmi_.c:509 ../urpmi_.c:519 ../urpmi_.c:526
+#: ../urpmi_.c:539 ../urpmi_.c:546
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../urpmi_.c:314
+#: ../urpmi_.c:322
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "需要下列软件包之一才能安装 %s:"
 
-#: ../urpmi_.c:315
+#: ../urpmi_.c:323
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../urpmi_.c:323
+#: ../urpmi_.c:331
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:  (1-%d) "
 
-#: ../urpmi_.c:326
+#: ../urpmi_.c:334
 msgid "Sorry, bad choice, try again\n"
 msgstr "对不起, 选择无效, 请再试一次\n"
 
-#: ../urpmi_.c:345
+#: ../urpmi_.c:353
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -956,7 +991,7 @@ msgstr ""
 "%s\n"
 "可以吗 ?"
 
-#: ../urpmi_.c:362
+#: ../urpmi_.c:370
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -967,14 +1002,14 @@ msgstr ""
 "%s\n"
 "您同意吗?"
 
-#: ../urpmi_.c:400 ../urpmi_.c:409
+#: ../urpmi_.c:408 ../urpmi_.c:417
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "我将另外安装下列软件包 (%d MB), 以满足相关性要求"
 
-#: ../urpmi_.c:406
+#: ../urpmi_.c:414
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -983,28 +1018,28 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi_.c:427 ../urpmq_.c:200
+#: ../urpmi_.c:435 ../urpmq_.c:200
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包， 中止"
 
-#: ../urpmi_.c:438
+#: ../urpmi_.c:446
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请插入标签 \"%s\" 的介质到设备 [%s]"
 
-#: ../urpmi_.c:439
+#: ../urpmi_.c:447
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi_.c:461
+#: ../urpmi_.c:469
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签署有错误"
 
-#: ../urpmi_.c:462
+#: ../urpmi_.c:470
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpmi_.c:485
+#: ../urpmi_.c:493
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your urpmi database"
@@ -1012,20 +1047,25 @@ msgstr ""
 "安装失败, 缺少某些文件.\n"
 "最好更新您的 urpmi 数据库"
 
-#: ../urpmi_.c:490
+#: ../urpmi_.c:498
 #, fuzzy, c-format
 msgid "distributing %s\n"
 msgstr "正在安装 %s\n"
 
-#: ../urpmi_.c:524
+#: ../urpmi_.c:533
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗? (是(y)/不(N)) [不] "
 
-#: ../urpmi_.c:532
+#: ../urpmi_.c:541
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "尝试更激烈的安装方式吗? (使用 --force) (是(y)/不(N)) [不] "
 
-#: ../urpmi_.c:544
+#: ../urpmi_.c:549
+#, fuzzy
+msgid "Installation is possible"
+msgstr "安装失败"
+
+#: ../urpmi_.c:555
 msgid "everything already installed"
 msgstr "全部安装完成"