updated pot file

1 files changed, 433 insertions, 444 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3c4c9d8a..e6dc0f55 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-06 12:53+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -53,22 +53,22 @@ msgstr ""
 "自动安装软件包...\n"
 "您要求安装软件包 %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "这样好了吗?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
@@ -78,7 +78,7 @@ msgstr "(是(Y)/否(n))[是]"
 msgid "%s: command not found\n"
 msgstr "%s: 命令没找到\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -87,242 +87,181 @@ msgstr ""
 "用法：%s [选项]\n"
 "[选项]的格式为\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "  -h|--help       - 打印帮助信息。\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  -g [组]         - 限制结果为给定组。\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    默认为 %s。\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "未知 webfetch“%s”!!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "复制失败: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "没有 wget\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget 失败: 退出代码 %d 或信号 %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "没有 curl\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl 失败: 退出代码 %d 或信号 %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "没有 rsync\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync 失败: 退出代码 %d 或信号 %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "没有 ssh\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        已完成 %s%%，总共 %s，ETA = %s，速度 = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        已完成 %s%%，速度 = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...获取失败: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "配置文件的第 %s 行语法错误"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "介质“%s”试图使用已经用过的 hdlist，介质被忽略"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "介质“%s”试图打开已经用过的列表，介质被忽略"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr "无法照顾介质“%s”，因为列表文件已经被另外的介质所用"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "无法给未命名介质起名为“%s”，因为该名称已被使用"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "无法考虑“%s”，因为不存在列表文件[%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "无法决定此 hdlist 文件[%s]的介质"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "试图跳过已有介质“%s”，避免中"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr "虚拟介质“%s”不应在 hdlist 或列表文件中定义，介质被忽略"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "虚拟介质“%s”应该有清楚的 URL，介质被忽略"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "找不到“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "找不到“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "“%s”的列表文件不连贯，介质被忽略"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "无法检查“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "可移动介质“%s”的载入点太多"
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "将可移动设备认作“%s”"
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "无法获取可移动介质“%s”的路径名称"
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件[%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "写入配置文件[%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "无法与发行模式一起使用并行模式"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "无法处理文件[%2$s]中的“%1$s”"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "正在检查文件[%s]中的并行处理"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "找到结点的并行处理: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "并行模式时使用关联介质: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "无法使用并行选项“%s”"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -331,133 +270,139 @@ msgstr ""
 "--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update 或 --"
 "parallel 一起使用"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "正在检查 hdlist 文件 [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "虚拟介质“%s”不是本地的，介质被忽略"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "正在执行第二遍依赖关系的计算\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "跳过软件包 %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "将安装而非升级软件包 %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已存在"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "虚拟介质必须位于本地"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "已添加介质 %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "无法访问介质的首次安装"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "正在复制 hdlists 文件..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr "无法访问首次安装介质(未发现 Mandrake/base/hdlists 文件)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "正在获取 hdlists 文件..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...获取失败: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlists 文件中的 hdlist 描述“%s”无效"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -467,229 +412,229 @@ msgstr ""
 "无法访问介质“%s”，\n"
 "这可能是因为您在创建介质时是手动装载的目录。"
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件，介质被忽略"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "正在检查 MD5SUM 文件"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "复制[%s]失败(md5sum 不匹配)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "正在从[%s]读取 rpm 文件"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "无法从[%s]读取 rpm 文件: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 中未发现 rpm 文件"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "发现探测的 hdlist(或综合文件) 为 %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum 不匹配"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "获取源 hdlist(或综合文件) 失败"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "介质“%s”未发现 hdlist 文件"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "文件[%s]已经在相同的介质“%s”中使用"
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法处理“%s”的 hdlist 文件"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入“%s”的列表文件"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "正在写入介质“%s”的列表文件"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "“%s”的列表文件中没有写入内容"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%s”中导入了密钥 %s"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "正在从介质“%s”读取头"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "正在创建 hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "创建介质“%s”的 hdlist 综合文件"
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "缓存中找到了 %d 个头"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "删除缓存中的 %d 个过时头"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "正在装载 %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "depslist 中重新分配了 %s 项"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "depslist 中没有重新分配项"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "有多个文件名都为“%s”的 rpm 软件包"
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "无法正确处理[%s]为值“%s”"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -698,143 +643,158 @@ msgstr ""
 "介质“%s”使用了无效的列表文件:\n"
 "  介质可能不是最新，正在尝试使用其它方式"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "介质“%s”没有定义任何 rpm 文件的位置"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi 数据库已锁定"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "介质“%s”未选中"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "非连贯介质“%s”标为可移动但实际不是"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质“%s”"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "输入格式错误: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "使用进程 %d 执行交易"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "未请求"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "无效的签名(%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "无效的密钥 ID(%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "缺少签名(%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "命令的代理声明无效\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "对不起，选择无效，请再试一次\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -850,40 +810,40 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自动选中软件包。\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -892,72 +852,62 @@ msgstr ""
 "  --use-distrib  - 配置 urpmi 实时从发行树中抓取，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             -详细的提示。\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: 未知选项“-%s”，请用--help 检查用法\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "未知的软件包"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "未知的软件包"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "不需要删除任何东西。"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "检查删除下列软件包"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "为满足相关性要求，需要删除下列软件包(%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "删除失败"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "对不起，选择无效，请再试一次\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -973,38 +923,38 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质。\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -v             -详细的提示。\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1015,137 +965,137 @@ msgstr ""
 "就是不打印，\n"
 "与会话方式不相兼容)。\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq          - 不打印相同行。\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - 打印全部标识符。\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - 打印标识符组: 分组。\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - 打印标识符大小: 大小。\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch          - 打印标识符周期: 周期。\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - 打印标识符摘要: 摘要。\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   -打印标识符描述: 描述。\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - 打印标识符源 rpm: 源 rpm。\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - 打印标识符打包者: 打包者。\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - 打印标识符创建主机: 创建主机。\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - 打印标识符 url: url。\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - 打印提供标识符: 所有的提供。\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires      - 打印需要标识符: 所有需要。\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - 打印文件标识符: 所有文件。\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - 打印冲突标识符: 所有的冲突。\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - 打印废除标识符: 所有的废除。\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - 忽略各种情况下的冲突。\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr "  -a             - 二元 AND 操作符，如果两个表达都为真，则为真。\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - 二元 OR 操作符，如果两个表达中的一个为真，则为真。\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - 一元 NOT，如果表达为假，则为真。\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - 左括号用来打开一组表达。\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - 右括号用来关闭一组表达。\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1154,12 +1104,12 @@ msgstr ""
 "召回是:\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1175,25 +1125,25 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1201,7 +1151,7 @@ msgid ""
 msgstr ""
 "  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1211,37 +1161,37 @@ msgstr ""
 "  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
 "                   较小的交易。默认为 %d。\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 小交易长度，默认为 %d。\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - 利用模糊查询(和 -y 一样)。\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下一个软件包是源程序包(和 -s 一样)。\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "   --clean        -  首先删除缓存中的rpm。\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - 保留缓存中没有使用的rpm。\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1250,7 +1200,7 @@ msgstr ""
 "  --allow-nodeps - 允许要求用户不经过依赖性检验\n"
 "                   就安装软件包。\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1259,7 +1209,7 @@ msgstr ""
 "  --allow-force  - 允许提示用户安装软件包而不\n"
 "                   检查依赖性和完整性。\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1268,22 +1218,22 @@ msgstr ""
 "  --use-distrib  - 配置 urpmi 实时从发行树中抓取，特别用于在 --root 选项\n"
 "                   下安装 chroot。\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 用 wget 取远程文件。\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 用 crul 取远程文件。\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 降低下载速度。\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1292,7 +1242,7 @@ msgstr ""
 "  --resume       - 续传未下载完成的文件\n"
 "                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1301,7 +1251,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1310,7 +1260,7 @@ msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
 "                   口令(格式如 <用户: 口令>)。\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1319,12 +1269,12 @@ msgstr ""
 "  --bug          - 输出故障报告\n"
 "                   下一个参数指定输出目录。\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - 使用 X 界面。\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1333,7 +1283,7 @@ msgstr ""
 "  --best-output  - 根据运行环境选择最好的界面:\n"
 "                   X 或文本模式。\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1342,73 +1292,62 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署。\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - 排除文档文件。\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在提供的项目中寻找软件包。\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不搜索提供标签中的软件包。\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安静模式。\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "选择保存文件的位置"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "命令的代理声明无效\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: 未知选项“-%s”，用--help 检查用法\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "对二进制 rpm 文件使用 --install-src 将会达到什么效果"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1429,22 +1368,22 @@ msgstr ""
 "\n"
 "您想要执行什么操作?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "什么也不做"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "是，进行安装"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "保存文件"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1459,54 +1398,54 @@ msgstr ""
 "\n"
 "您也可以选择只是保存相应的软件包。您要进行什么操作?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "安装"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "需要下列软件包之一才能安装 %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1515,12 +1454,12 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "您同意吗?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1530,7 +1469,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1539,14 +1478,14 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "我将另外安装下列软件包(%d MB)，以满足相关性要求"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1555,37 +1494,47 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请插入标签“%s”的介质到设备 [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        已完成 %s%%，总共 %s，ETA = %s，速度 = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        已完成 %s%%，速度 = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1596,57 +1545,57 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "尝试更激烈的安装方式吗?(使用 --force)(是(y)/否(N))[否] "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 安装交易失败"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "全部安装完成"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新启动 urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1669,36 +1618,36 @@ msgstr ""
 "\n"
 "而 [options] 可以来自\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - 创建一个更新介质。\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - 试图查找并使用综合文件。\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - 试图查找并使用 hdlist 文件。\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr "  --no-probe     - 不试图查找任何综合文件或 hdlist 文件。\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - 自动从安装介质创建全部介质。\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1708,14 +1657,14 @@ msgstr ""
 "  --distrib-XXX  - 自动为发行版的某一部分创建介质，这些部分可能包括\n"
 "                   主要、贡献、更新或任何其它的配置。 ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr "  --from         - 使用指定的 URL 列出镜像，默认为 %s。\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1724,7 +1673,7 @@ msgid ""
 msgstr ""
 "  --version      - 使用指定发行版本，默认版本是所安装的 mandrake 发行包。\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1733,80 +1682,59 @@ msgstr ""
 "  --arch         - 使用指定的架构，默认是所安装的 mandrake 发行版本的软件包\n"
 "                   架构。\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr "  --virtual      - 创建常为最新的虚拟介质，只允许 file:// 协议。\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - 直接清除软件包头缓存。\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - 强迫生成 hdlist 文件。\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"未知的选项“%s”\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "无法添加 cooker 发行版的更新\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "正在获取 %s 处的镜像..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"使用 --distrib 不需要提供 <hdlist的相对路径>"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "使用 --distrib 不需要提供 <hdlist的相对路径>"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "无法更新介质“%s”\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<hdlist相对路径>找不到\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<hdlist相对路径>找不到\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"“with”找不到网络介质\n"
+msgid "`with' missing for network media\n"
+msgstr "“with”找不到网络介质\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质“%s”\n"
@@ -1825,6 +1753,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - 选择所有介质。\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"未知的选项“%s”\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1839,7 +1776,7 @@ msgstr ""
 "找不到要删除的项\n"
 "(%s中的一个)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1848,27 +1785,27 @@ msgstr ""
 "用法: urpmi.update [选项] <名称> ...\n"
 "其中 <名称> 是要删除的介质名...\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - 只使用更新介质。\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - 强制更新 gpg 密钥。\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 选择所有不可移动的介质。\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1877,7 +1814,7 @@ msgstr ""
 "找不到要升级的项\n"
 "(%s 中之一)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1893,38 +1830,38 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - 列出可用的软件包。\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - 列出可用的介质。\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - 列出可用的介质及其 URL。\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "  --dump-config  - 以 urpmi.addmedia 参数的格式导出配置。\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - 如果使用了 --parallel，列出所有可用的节点。\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - 列出可用的并行处理别名。\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1933,13 +1870,13 @@ msgstr ""
 "  --headers      - 从 urpmi 数据库提取软件包的头信息\n"
 "                   用 stdout 输出(root 专用)。\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      - 下载前给出所有的源文件包(root 专用)。\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -1947,69 +1884,121 @@ msgid ""
 msgstr ""
 "  --use-distrib  - 配置 urpmi 实时从发行树中抓取。这将允许查询发行版。\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - 打印全部更新日志。\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - 扩展软件包依赖性查询。\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - 如果更新的版本已经安装，就删除软件包。\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - 要删除的软件包的完整输出。\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - 逆序搜索所需的软件包。\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - 以人类可读的格式打印有用信息。\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - 打印组名。\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 和名称一起打印版本和发行号。\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - 列出软件包中的文件。\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  需要在命令行给出名称或 rpm 文件。\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: 未知选项“-%s”，请用--help 检查用法\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 仅能和 --parallel 一起使用"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "未知 webfetch“%s”!!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "复制失败: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "没有 wget\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget 失败: 退出代码 %d 或信号 %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "没有 curl\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl 失败: 退出代码 %d 或信号 %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "没有 rsync\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync 失败: 退出代码 %d 或信号 %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "没有 ssh\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: 未知选项“-%s”，请用--help 检查用法\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: 未知选项“-%s”，用--help 检查用法\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr "我将另外安装下列软件包(%d MB)，以满足相关性要求"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "使用 --distrib 不需要提供 <hdlist的相对路径>"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<hdlist相对路径>找不到\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "“with”找不到网络介质\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: 未知选项“-%s”，请用--help 检查用法\n"