sync with code

1 files changed, 377 insertions, 328 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5dd5483d..5d9d4884 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-01 16:35+0800\n"
+"POT-Creation-Date: 2006-06-30 14:05+0200\n"
 "PO-Revision-Date: 2006-04-01 16:41+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -26,16 +26,16 @@ msgstr ""
 msgid "RPM installation"
 msgstr "RPM 安装"
 
-#: ../gurpmi:43
+#: ../gurpmi:53
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "错误：找不到文件 %s，将取消操作"
 
-#: ../gurpmi:44 ../gurpmi2:127 ../gurpmi2:150
+#: ../gurpmi:54 ../gurpmi2:146 ../gurpmi2:169
 msgid "_Ok"
 msgstr "确定(_O)"
 
-#: ../gurpmi:64
+#: ../gurpmi:74
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -56,7 +56,7 @@ msgstr ""
 "\n"
 "您想要执行什么操作?"
 
-#: ../gurpmi:72 ../gurpmi:83
+#: ../gurpmi:82 ../gurpmi:93
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -71,7 +71,7 @@ msgstr ""
 "\n"
 "继续吗?"
 
-#: ../gurpmi:78
+#: ../gurpmi:88
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -87,28 +87,28 @@ msgstr ""
 "您也可以选择只是保存相应的软件包。您要进行什么操作?"
 
 #. - buttons
-#: ../gurpmi:96
+#: ../gurpmi:106
 msgid "_Install"
 msgstr "安装(_I)"
 
-#: ../gurpmi:97
+#: ../gurpmi:107
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../gurpmi:98 ../gurpmi2:127
+#: ../gurpmi:108 ../gurpmi2:146
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../gurpmi:106
+#: ../gurpmi:116
 msgid "Choose location to save file"
 msgstr "选择保存文件的位置"
 
-#: ../gurpmi.pm:76
+#: ../gurpmi.pm:77
 #, c-format
 msgid "Unknown option %s"
 msgstr "未知的选项 %s"
 
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:87
 msgid "No packages specified"
 msgstr "未指定软件包"
 
@@ -131,27 +131,35 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:123
+#: ../gurpmi2:102 ../urpmi:602
+msgid "Ok"
+msgstr "确定"
+
+#: ../gurpmi2:102
+msgid "Warning"
+msgstr ""
+
+#: ../gurpmi2:142
 msgid " (to upgrade)"
 msgstr "(升级)"
 
-#: ../gurpmi2:124
+#: ../gurpmi2:143
 msgid " (to install)"
 msgstr "(安装)"
 
-#: ../gurpmi2:127
+#: ../gurpmi2:146
 msgid "Package choice"
 msgstr "软件包选择"
 
-#: ../gurpmi2:128 ../urpmi:414
+#: ../gurpmi2:147 ../urpmi:430
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../gurpmi2:151
+#: ../gurpmi2:170
 msgid "_Abort"
 msgstr "中止(_A)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:190
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -162,7 +170,7 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:185
+#: ../gurpmi2:204
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -172,25 +180,25 @@ msgstr ""
 "为了满足依赖性要求，将另外安装以下%d个软件包:\n"
 "%s\n"
 
-#: ../gurpmi2:192
+#: ../gurpmi2:211
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../gurpmi2:194 ../urpmi:569
+#: ../gurpmi2:213 ../urpmi:585
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi2:207 ../urpmi:579
+#: ../gurpmi2:226 ../urpmi:595
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请将标签为“%s”的介质插入到设备 [%s]"
 
-#: ../gurpmi2:236
+#: ../gurpmi2:255
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../gurpmi2:251
+#: ../gurpmi2:270
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -205,7 +213,7 @@ msgstr ""
 "您想要继续安装吗?"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:258 ../gurpmi2:314 ../urpmi:651 ../urpmi:782
+#: ../gurpmi2:277 ../gurpmi2:336 ../urpmi:667 ../urpmi:798
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -217,34 +225,34 @@ msgstr ""
 "您可能需要更新您的 urpmi 数据库"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:265 ../urpme:128 ../urpmi:698
+#: ../gurpmi2:284 ../urpme:133 ../urpmi:714
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:272 ../urpm.pm:2916
+#: ../gurpmi2:291 ../urpm.pm:2919
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../gurpmi2:274
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:300 ../urpmi:663 ../urpmi:721 ../urpmi:741 ../urpmi:759
+#: ../gurpmi2:322 ../urpmi:679 ../urpmi:757 ../urpmi:775
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../gurpmi2:309
+#: ../gurpmi2:331
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:317 ../urpmi:799
+#: ../gurpmi2:339 ../urpmi:815
 msgid "The package(s) are already installed"
 msgstr "软件包已经安装"
 
-#: ../gurpmi2:319
+#: ../gurpmi2:341
 msgid "Installation finished"
 msgstr "安装完成"
 
@@ -275,7 +283,7 @@ msgid "                    defaults to %s.\n"
 msgstr "                    默认为 %s。\n"
 
 #. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:242
+#: ../rurpmi:11 ../urpmi:249
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
 
@@ -283,156 +291,156 @@ msgstr "只允许超级用户安装软件包"
 msgid "Running urpmi in restricted mode..."
 msgstr "正在以限制模式运行 urpmi..."
 
-#: ../urpm.pm:72
+#: ../urpm.pm:73
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm.pm:101
+#: ../urpm.pm:102
 #, c-format
 msgid "%s is not available, falling back on %s"
 msgstr "%s 不可用，默认回到 %s"
 
-#: ../urpm.pm:109
+#: ../urpm.pm:110
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 
-#: ../urpm.pm:125
+#: ../urpm.pm:126
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
 
-#: ../urpm.pm:222
+#: ../urpm.pm:223
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "介质“%s”试图使用已经用过的 hdlist，介质被忽略"
 
-#: ../urpm.pm:223
+#: ../urpm.pm:224
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "介质“%s”试图打开已经用过的列表，介质被忽略"
 
-#: ../urpm.pm:236 ../urpm.pm:1313 ../urpm.pm:1323
+#: ../urpm.pm:237 ../urpm.pm:1318 ../urpm.pm:1328
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
 
 #. list file exists but isn't readable
 #. report error only if no result found, list files are only readable by root
-#: ../urpm.pm:239 ../urpm.pm:2521
+#: ../urpm.pm:240 ../urpm.pm:2526
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:267
+#: ../urpm.pm:268
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "试图覆盖已有介质“%s”，正跳过"
 
-#: ../urpm.pm:278
+#: ../urpm.pm:279
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr "虚拟介质“%s”不应在 hdlist 或列表文件中定义，介质被忽略"
 
-#: ../urpm.pm:283
+#: ../urpm.pm:284
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "虚拟介质“%s”应该有清楚的 URL，介质被忽略"
 
-#: ../urpm.pm:292
+#: ../urpm.pm:293
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "找不到“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm.pm:299
+#: ../urpm.pm:300
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "找不到“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:323
+#: ../urpm.pm:324
 #, c-format
 msgid "inconsistent list file for \"%s\", medium ignored"
 msgstr "“%s”的列表文件不连贯，介质被忽略"
 
-#: ../urpm.pm:333
+#: ../urpm.pm:334
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "无法检查“%s”的列表文件，介质被忽略"
 
 #. - return value is suitable for an hash.
-#: ../urpm.pm:373
+#: ../urpm.pm:374
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "可移动介质“%s”的挂载点太多"
 
-#: ../urpm.pm:374
+#: ../urpm.pm:375
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "将可移动设备认作“%s”"
 
-#: ../urpm.pm:377
+#: ../urpm.pm:378
 #, c-format
 msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
 msgstr "介质“%s”是一个 ISO 映像，将会被实时挂载"
 
-#: ../urpm.pm:380
+#: ../urpm.pm:381
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
 
-#: ../urpm.pm:385 ../urpm.pm:388
+#: ../urpm.pm:386 ../urpm.pm:389
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "无法获取可移动介质“%s”的路径名称"
 
-#: ../urpm.pm:414
+#: ../urpm.pm:415
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件[%s]"
 
-#: ../urpm.pm:424
+#: ../urpm.pm:425
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "写入配置文件[%s]"
 
-#: ../urpm.pm:452
+#: ../urpm.pm:453
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "无法与发行模式一起使用并行模式"
 
-#: ../urpm.pm:462
+#: ../urpm.pm:463
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "无法处理文件[%2$s]中的“%1$s”"
 
-#: ../urpm.pm:474
+#: ../urpm.pm:475
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "正在检查文件[%s]中的并行处理"
 
-#: ../urpm.pm:485
+#: ../urpm.pm:486
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "找到结点的并行处理: %s"
 
-#: ../urpm.pm:489
+#: ../urpm.pm:490
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "并行模式时使用关联介质: %s"
 
-#: ../urpm.pm:493
+#: ../urpm.pm:494
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "无法使用并行选项“%s”"
 
-#: ../urpm.pm:501
+#: ../urpm.pm:502
 #, c-format
 msgid "there doesn't seem to be devices in the chroot in \"%s\""
 msgstr "“%s”的 chroot 中似乎没有设备"
 
-#: ../urpm.pm:507
+#: ../urpm.pm:508
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
@@ -449,143 +457,135 @@ msgstr ""
 #. - (However links need to be managed. see bug #12391.)
 #. - as previously done, just read synthesis file here, this is enough.
 #. - read default synthesis (we have to make sure nothing get out of depslist).
-#: ../urpm.pm:571 ../urpm.pm:597 ../urpm.pm:1085 ../urpm.pm:1096
-#: ../urpm.pm:1168 ../urpm.pm:1185 ../urpm.pm:1240 ../urpm.pm:1296
-#: ../urpm.pm:1506 ../urpm.pm:1626 ../urpm.pm:1743 ../urpm.pm:1749
-#: ../urpm.pm:1852 ../urpm.pm:1938 ../urpm.pm:1942
+#: ../urpm.pm:572 ../urpm.pm:598 ../urpm.pm:1090 ../urpm.pm:1101
+#: ../urpm.pm:1173 ../urpm.pm:1190 ../urpm.pm:1245 ../urpm.pm:1301
+#: ../urpm.pm:1511 ../urpm.pm:1631 ../urpm.pm:1748 ../urpm.pm:1754
+#: ../urpm.pm:1857 ../urpm.pm:1943 ../urpm.pm:1947
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm.pm:575 ../urpm.pm:590 ../urpm.pm:603 ../urpm.pm:1088
-#: ../urpm.pm:1099 ../urpm.pm:1174 ../urpm.pm:1180 ../urpm.pm:1245
-#: ../urpm.pm:1300 ../urpm.pm:1510 ../urpm.pm:1630 ../urpm.pm:1737
-#: ../urpm.pm:1755 ../urpm.pm:1948
+#: ../urpm.pm:576 ../urpm.pm:591 ../urpm.pm:604 ../urpm.pm:1093
+#: ../urpm.pm:1104 ../urpm.pm:1179 ../urpm.pm:1185 ../urpm.pm:1250
+#: ../urpm.pm:1305 ../urpm.pm:1515 ../urpm.pm:1635 ../urpm.pm:1742
+#: ../urpm.pm:1760 ../urpm.pm:1953
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "正在检查 hdlist 文件 [%s]"
 
-#: ../urpm.pm:585 ../urpm.pm:1092
+#: ../urpm.pm:586 ../urpm.pm:1097
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "虚拟介质“%s”不是本地的，介质被忽略"
 
-#: ../urpm.pm:615
+#: ../urpm.pm:616
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "搜索开始：%s 结束：%s"
 
 #. - this is almost a fatal error, ignore it by default?
-#: ../urpm.pm:620 ../urpm.pm:1106 ../urpm.pm:1193 ../urpm.pm:1249
-#: ../urpm.pm:1634
+#: ../urpm.pm:621 ../urpm.pm:1111 ../urpm.pm:1198 ../urpm.pm:1254
+#: ../urpm.pm:1639
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
 
-#: ../urpm.pm:627 ../urpm.pm:1890
+#: ../urpm.pm:628 ../urpm.pm:1895
 msgid "performing second pass to compute dependencies\n"
 msgstr "正在执行第二遍依赖关系的计算\n"
 
-#: ../urpm.pm:643
+#: ../urpm.pm:644
 #, c-format
 msgid "skipping package %s"
 msgstr "跳过软件包 %s"
 
-#: ../urpm.pm:656
+#: ../urpm.pm:657
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "将安装而非升级软件包 %s"
 
 #. - beware this can be a child process or the main process now...
 #. - open in read/write mode unless testing installation.
-#: ../urpm.pm:667 ../urpm.pm:2329 ../urpm.pm:2390 ../urpm.pm:2579
-#: ../urpm.pm:2982 ../urpm.pm:3109
+#: ../urpm.pm:668 ../urpm.pm:2334 ../urpm.pm:2395 ../urpm.pm:2584
+#: ../urpm.pm:2986 ../urpm.pm:3113
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:708
+#: ../urpm.pm:709
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已存在"
 
-#: ../urpm.pm:715
+#: ../urpm.pm:716
 msgid "virtual medium needs to be local"
 msgstr "虚拟介质必须是本地的"
 
-#: ../urpm.pm:740
+#: ../urpm.pm:741
 #, c-format
 msgid "added medium %s"
 msgstr "已添加介质 %s"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:784
 msgid "unable to access first installation medium"
 msgstr "无法访问介质的首次安装"
 
-#: ../urpm.pm:790
-msgid "copying hdlists file..."
-msgstr "正在复制 hdlists 文件..."
-
-#: ../urpm.pm:792 ../urpm.pm:1209 ../urpm.pm:1266
-msgid "...copying done"
-msgstr "...复制完成"
-
-#: ../urpm.pm:793 ../urpm.pm:1210 ../urpm.pm:1341 ../urpm.pm:1404
-#: ../urpm.pm:1572 ../urpm.pm:1579
-msgid "...copying failed"
-msgstr "...复制失败"
-
-#: ../urpm.pm:796 ../urpm.pm:821 ../urpm.pm:860
-msgid "unable to access first installation medium (no hdlists file found)"
-msgstr "无法访问首次安装介质(未发现 hdlists 文件)"
+#: ../urpm.pm:786
+msgid "this url seems to not contains any distrib"
+msgstr ""
 
-#: ../urpm.pm:803
-msgid "retrieving hdlists file..."
+#: ../urpm.pm:796
+#, fuzzy
+msgid "retrieving media.cfg file..."
 msgstr "正在获取 hdlists 文件..."
 
-#: ../urpm.pm:815 ../urpm.pm:1616 ../urpm.pm:2117 ../urpm.pm:2837
+#: ../urpm.pm:808 ../urpm.pm:1621 ../urpm.pm:2122 ../urpm.pm:2840
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:817 ../urpm.pm:1600 ../urpm.pm:2121 ../urpm.pm:2839
+#: ../urpm.pm:810 ../urpm.pm:1605 ../urpm.pm:2126 ../urpm.pm:2842
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../urpm.pm:841
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "hdlists 文件中的 hdlist 描述“%s”无效"
+#: ../urpm.pm:813
+#, fuzzy
+msgid "unable to parse media.cfg"
+msgstr "无法打开 rpmdb"
+
+#: ../urpm.pm:815
+msgid "unable to access first installation medium (no hdlists file found)"
+msgstr "无法访问首次安装介质(未发现 hdlists 文件)"
 
-#: ../urpm.pm:897
+#: ../urpm.pm:902
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
 #. - several elements in found and/or foundi lists.
-#: ../urpm.pm:899
+#: ../urpm.pm:904
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm.pm:915
+#: ../urpm.pm:920
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm.pm:966
+#: ../urpm.pm:971
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在从介质“%s”重新配置 urpmi"
 
-#: ../urpm.pm:995
+#: ../urpm.pm:1000
 msgid "...reconfiguration failed"
 msgstr "...重新配置失败"
 
-#: ../urpm.pm:1002
+#: ../urpm.pm:1007
 msgid "reconfiguration done"
 msgstr "重新配置完成"
 
-#: ../urpm.pm:1146
+#: ../urpm.pm:1151
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -595,242 +595,251 @@ msgstr ""
 "无法访问介质“%s”，\n"
 "这可能是因为您在创建介质时是手动装载的目录。"
 
-#: ../urpm.pm:1197
+#: ../urpm.pm:1202
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件，介质被忽略"
 
-#: ../urpm.pm:1207
+#: ../urpm.pm:1212
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm.pm:1262
+#: ../urpm.pm:1214 ../urpm.pm:1271
+msgid "...copying done"
+msgstr "...复制完成"
+
+#: ../urpm.pm:1215 ../urpm.pm:1346 ../urpm.pm:1409 ../urpm.pm:1577
+#: ../urpm.pm:1584
+msgid "...copying failed"
+msgstr "...复制失败"
+
+#: ../urpm.pm:1267
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1276
+#: ../urpm.pm:1281
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm.pm:1281
+#: ../urpm.pm:1286
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
 
-#: ../urpm.pm:1283
+#: ../urpm.pm:1288
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "复制[%s]失败(md5sum 不匹配)"
 
-#: ../urpm.pm:1304 ../urpm.pm:1514 ../urpm.pm:1855
+#: ../urpm.pm:1309 ../urpm.pm:1519 ../urpm.pm:1860
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm.pm:1362
+#: ../urpm.pm:1367
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "正在从[%s]读取 rpm 文件"
 
-#: ../urpm.pm:1377
+#: ../urpm.pm:1382
 msgid "no rpms read"
 msgstr "没有读到 rpm"
 
-#: ../urpm.pm:1387
+#: ../urpm.pm:1392
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "无法从[%s]读取 rpm 文件: %s"
 
-#: ../urpm.pm:1392
+#: ../urpm.pm:1397
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 中未发现 rpm 文件"
 
 #. - try to probe for possible with_hdlist parameter, unless
 #. - it is already defined (and valid).
-#: ../urpm.pm:1529
+#: ../urpm.pm:1534
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1557
+#: ../urpm.pm:1562
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "发现探测的 hdlist(或综合文件) 为 %s"
 
-#: ../urpm.pm:1607
+#: ../urpm.pm:1612
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1609
+#: ../urpm.pm:1614
 msgid "...retrieving failed: md5sum mismatch"
 msgstr "...获取失败: md5sum 不匹配"
 
-#: ../urpm.pm:1707
+#: ../urpm.pm:1712
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "获取源 hdlist(或综合文件) 失败"
 
-#: ../urpm.pm:1714
+#: ../urpm.pm:1719
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "介质“%s”未发现 hdlist 文件"
 
-#: ../urpm.pm:1725 ../urpm.pm:1779
+#: ../urpm.pm:1730 ../urpm.pm:1784
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "文件[%s]已经在相同的介质“%s”中使用"
 
-#: ../urpm.pm:1765
+#: ../urpm.pm:1770
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法处理“%s”的 hdlist 文件"
 
-#: ../urpm.pm:1804
+#: ../urpm.pm:1809
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入“%s”的列表文件"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1817
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "正在写入介质“%s”的列表文件"
 
-#: ../urpm.pm:1814
+#: ../urpm.pm:1819
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "“%s”的列表文件中没有写入内容"
 
-#: ../urpm.pm:1829
+#: ../urpm.pm:1834
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm.pm:1836
+#: ../urpm.pm:1841
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
 
-#: ../urpm.pm:1839
+#: ../urpm.pm:1844
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm.pm:1904
+#: ../urpm.pm:1909
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "正在从介质“%s”读取头"
 
-#: ../urpm.pm:1909
+#: ../urpm.pm:1914
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "正在创建 hdlist [%s]"
 
 #. - XXX this happens when building a synthesis for a local media from RPMs... why ?
-#: ../urpm.pm:1924 ../urpm.pm:1960
+#: ../urpm.pm:1929 ../urpm.pm:1965
 #, c-format
 msgid ""
 "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
 "corrupted."
 msgstr "无法创建介质“%s”的综合文件。您的 hdlist 文件可能已经损坏。"
 
-#: ../urpm.pm:1928 ../urpm.pm:1964 ../urpmi:370
+#: ../urpm.pm:1933 ../urpm.pm:1969 ../urpmi:386
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "创建介质“%s”的 hdlist 综合文件"
 
-#: ../urpm.pm:1987
+#: ../urpm.pm:1992
 #, c-format
 msgid "found %d headers in cache"
 msgstr "缓存中找到了 %d 个头"
 
-#: ../urpm.pm:1991
+#: ../urpm.pm:1996
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "删除缓存中的 %d 个过时头"
 
-#: ../urpm.pm:2012
+#: ../urpm.pm:2017
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "声称名称文件出错：依赖关系 %d 未找到"
 
-#: ../urpm.pm:2017
+#: ../urpm.pm:2022
 #, c-format
 msgid "Error generating names file: Can't write to file (%s)"
 msgstr "声称名称文件失败：无法写入文件(%s)"
 
-#: ../urpm.pm:2053
+#: ../urpm.pm:2058
 #, c-format
 msgid "mounting %s"
 msgstr "正在装载 %s"
 
-#: ../urpm.pm:2077
+#: ../urpm.pm:2082
 #, c-format
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
-#: ../urpm.pm:2102
+#: ../urpm.pm:2107
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:2108
+#: ../urpm.pm:2113
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:2126
+#: ../urpm.pm:2131
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:2131
+#: ../urpm.pm:2136
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "无法处理 spec 文件 %s [%s]"
 
-#: ../urpm.pm:2141
+#: ../urpm.pm:2146
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:2143
+#: ../urpm.pm:2148
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "RPM 的架构不兼容[%s]"
 
-#: ../urpm.pm:2147
+#: ../urpm.pm:2152
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:2257
+#: ../urpm.pm:2262
 #, c-format
 msgid "no package named %s"
 msgstr "没有叫做 %s 的软件包"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm.pm:2259 ../urpme:101
+#: ../urpm.pm:2264 ../urpme:106
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm.pm:2452 ../urpm.pm:2498 ../urpm.pm:2530
+#: ../urpm.pm:2457 ../urpm.pm:2503 ../urpm.pm:2535
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "有多个文件名都为“%s”的 rpm 软件包"
 
-#: ../urpm.pm:2512
+#: ../urpm.pm:2517
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "无法正确处理[%s]为值“%s”"
 
-#: ../urpm.pm:2522
+#: ../urpm.pm:2527
 msgid "(retry as root?)"
 msgstr "(以 root 身份重试?)"
 
-#: ../urpm.pm:2546
+#: ../urpm.pm:2551
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -839,291 +848,295 @@ msgstr ""
 "介质“%s”使用了无效的列表文件:\n"
 "  介质可能不是最新，正在尝试使用其它方式"
 
-#: ../urpm.pm:2550
+#: ../urpm.pm:2555
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "介质“%s”没有定义任何 rpm 文件的位置"
 
-#: ../urpm.pm:2562
+#: ../urpm.pm:2567
 #, c-format
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm.pm:2613 ../urpm.pm:2627 ../urpm.pm:2647 ../urpm.pm:2661
+#: ../urpm.pm:2618 ../urpm.pm:2632 ../urpm.pm:2651 ../urpm.pm:2665
 msgid "urpmi database locked"
 msgstr "urpmi 数据库已锁定"
 
-#: ../urpm.pm:2713 ../urpm.pm:2718 ../urpm.pm:2744
+#: ../urpm.pm:2716 ../urpm.pm:2721 ../urpm.pm:2747
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "介质“%s”未选中"
 
 #. - fallback to use other method for retrieving the file later.
-#: ../urpm.pm:2740
+#: ../urpm.pm:2743
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
 
 #. - we have a removable device that is not removable, well...
-#: ../urpm.pm:2748
+#: ../urpm.pm:2751
 #, c-format
 msgid "inconsistent medium \"%s\" marked removable but not really"
 msgstr "非连贯介质“%s”标为可移动但实际不是"
 
-#: ../urpm.pm:2760
+#: ../urpm.pm:2763
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质“%s”"
 
-#: ../urpm.pm:2815
+#: ../urpm.pm:2818
 #, c-format
 msgid "malformed URL: [%s]"
 msgstr "URL 格式错误: [%s]"
 
-#: ../urpm.pm:2822
+#: ../urpm.pm:2825
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm.pm:2921
+#: ../urpm.pm:2925
 msgid "[repackaging]"
 msgstr "[重新打包]"
 
-#: ../urpm.pm:2954
+#: ../urpm.pm:2958
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "使用进程 %d 执行交易"
 
-#: ../urpm.pm:2987
+#: ../urpm.pm:2991
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm.pm:2990
+#: ../urpm.pm:2994
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm.pm:2998
+#: ../urpm.pm:3002
 #, c-format
 msgid "removing package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:3000
+#: ../urpm.pm:3004
 #, c-format
 msgid "unable to remove package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:3012
+#: ../urpm.pm:3016
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
 
-#: ../urpm.pm:3018
+#: ../urpm.pm:3022
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
 
-#: ../urpm.pm:3021
+#: ../urpm.pm:3025
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm.pm:3071
+#: ../urpm.pm:3075
 #, c-format
 msgid "More information on package %s"
 msgstr "关于软件包 %s 的更多信息"
 
-#: ../urpm.pm:3252 ../urpm.pm:3290
+#: ../urpm.pm:3256 ../urpm.pm:3294
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm.pm:3253 ../urpm.pm:3288
+#: ../urpm.pm:3257 ../urpm.pm:3292
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm.pm:3259
+#: ../urpm.pm:3263
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm.pm:3260
+#: ../urpm.pm:3264
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm.pm:3283
+#: ../urpm.pm:3287
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm.pm:3294
+#: ../urpm.pm:3298
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
 
-#: ../urpm.pm:3295
+#: ../urpm.pm:3299
 msgid "unrequested"
 msgstr "未请求"
 
-#: ../urpm.pm:3314
+#: ../urpm.pm:3318
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "无效的签名(%s)"
 
-#: ../urpm.pm:3347
+#: ../urpm.pm:3351
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "无效的密钥 ID(%s)"
 
-#: ../urpm.pm:3349
+#: ../urpm.pm:3353
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "缺少签名(%s)"
 
-#: ../urpm.pm:3408
+#: ../urpm.pm:3412
 msgid "examining MD5SUM file"
 msgstr "正在检查 MD5SUM 文件"
 
-#: ../urpm.pm:3418
+#: ../urpm.pm:3422
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告：%s 的 md5 校验和未在 MD5SUM 文件中找到"
 
-#: ../urpm.pm:3429
+#: ../urpm.pm:3433
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:3459
+#: ../urpm.pm:3463
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "运行于限制模式运行时，禁止执行此操作"
 
-#: ../urpm/args.pm:106 ../urpm/args.pm:115
+#: ../urpm/args.pm:108 ../urpm/args.pm:117
 msgid "bad proxy declaration on command line\n"
 msgstr "命令的代理声明无效\n"
 
-#: ../urpm/args.pm:230
+#: ../urpm/args.pm:234
 msgid "You need to be root to use --use-distrib"
 msgstr "你必须是 root 才能使用 --use-distrib 命令"
 
-#: ../urpm/args.pm:262
+#: ../urpm/args.pm:266
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
+#: ../urpm/args.pm:415
+msgid "Too many arguments\n"
+msgstr ""
+
 #. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../urpm/msg.pm:46 ../urpme:32 ../urpmi:452 ../urpmi:470 ../urpmi:508
-#: ../urpmi:558 ../urpmi:641 ../urpmi:727
+#: ../urpm/msg.pm:48 ../urpme:32 ../urpmi:468 ../urpmi:486 ../urpmi:524
+#: ../urpmi:574 ../urpmi:657 ../urpmi:743
 msgid "Nn"
 msgstr "nN否"
 
 #. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:47 ../urpme:34 ../urpmi:453 ../urpmi:471 ../urpmi:509
-#: ../urpmi:559 ../urpmi:642 ../urpmi:728
+#: ../urpm/msg.pm:49 ../urpme:34 ../urpmi:469 ../urpmi:487 ../urpmi:525
+#: ../urpmi:575 ../urpmi:658 ../urpmi:744 ../urpmi.addmedia:131
 msgid "Yy"
 msgstr "yY是"
 
-#: ../urpm/msg.pm:92
+#: ../urpm/msg.pm:94
 msgid "Sorry, bad choice, try again\n"
 msgstr "对不起，选择无效，请再试一次\n"
 
-#: ../urpm/parallel_ka_run.pm:27 ../urpm/parallel_ka_run.pm:121
-#: ../urpm/parallel_ka_run.pm:215
+#: ../urpm/parallel_ka_run.pm:29 ../urpm/parallel_ka_run.pm:123
+#: ../urpm/parallel_ka_run.pm:217
 msgid "mput failed, maybe a node is unreacheable"
 msgstr "mput 失败，可能节点无法连接"
 
-#: ../urpm/parallel_ka_run.pm:64
+#: ../urpm/parallel_ka_run.pm:66
 #, c-format
 msgid "node %s has an old version of urpme, please upgrade"
 msgstr "节点 %s 的 urpme 版本太旧，请升级"
 
-#: ../urpm/parallel_ka_run.pm:88 ../urpm/parallel_ka_run.pm:200
-#: ../urpm/parallel_ka_run.pm:230
+#: ../urpm/parallel_ka_run.pm:90 ../urpm/parallel_ka_run.pm:202
+#: ../urpm/parallel_ka_run.pm:232
 msgid "rshp failed, maybe a node is unreacheable"
 msgstr "rshp 失败，可能节点无法连接"
 
-#: ../urpm/parallel_ka_run.pm:97 ../urpm/parallel_ssh.pm:102
+#: ../urpm/parallel_ka_run.pm:99 ../urpm/parallel_ssh.pm:104
 #, c-format
 msgid "on node %s"
 msgstr "于节点 %s"
 
 #. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:119
+#: ../urpm/parallel_ka_run.pm:121
 msgid "Propagating synthesis to nodes..."
 msgstr "正在将综合文件传播到节点..."
 
 #. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:170
+#: ../urpm/parallel_ka_run.pm:172
 msgid "Resolving dependencies on nodes..."
 msgstr "正在解决节点上的依赖关系..."
 
-#: ../urpm/parallel_ka_run.pm:213
+#: ../urpm/parallel_ka_run.pm:215
 msgid "Distributing files to nodes..."
 msgstr "正在将文件分发到节点..."
 
-#: ../urpm/parallel_ka_run.pm:220
+#: ../urpm/parallel_ka_run.pm:222
 msgid "Verifying if install is possible on nodes..."
 msgstr "正在验证安装是否可以在节点上进行..."
 
-#: ../urpm/parallel_ka_run.pm:234 ../urpm/parallel_ssh.pm:249
+#: ../urpm/parallel_ka_run.pm:236 ../urpm/parallel_ssh.pm:251
 #, c-format
 msgid "Installation failed on node %s"
 msgstr "节点 %s 安装失败"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:239 ../urpm/parallel_ssh.pm:254 ../urpmi:796
+#: ../urpm/parallel_ka_run.pm:241 ../urpm/parallel_ssh.pm:256 ../urpmi:812
 msgid "Installation is possible"
 msgstr "可以安装"
 
 #. - continue installation.
-#: ../urpm/parallel_ka_run.pm:244
+#: ../urpm/parallel_ka_run.pm:246
 msgid "Installing packages on nodes..."
 msgstr "正在节点上安装软件包..."
 
-#: ../urpm/parallel_ssh.pm:28 ../urpm/parallel_ssh.pm:126
-#: ../urpm/parallel_ssh.pm:230
+#: ../urpm/parallel_ssh.pm:30 ../urpm/parallel_ssh.pm:128
+#: ../urpm/parallel_ssh.pm:232
 #, c-format
 msgid "scp failed on host %s (%d)"
 msgstr "主机 %s scp 失败(%d)"
 
-#: ../urpm/parallel_ssh.pm:124
+#: ../urpm/parallel_ssh.pm:126
 #, c-format
 msgid "Propagating synthesis to %s..."
 msgstr "正在将综合文件传播到 %s..."
 
-#: ../urpm/parallel_ssh.pm:177
+#: ../urpm/parallel_ssh.pm:179
 #, c-format
 msgid "Resolving dependencies on %s..."
 msgstr "正在解决 %s 上的依赖关系..."
 
-#: ../urpm/parallel_ssh.pm:207
+#: ../urpm/parallel_ssh.pm:209
 #, c-format
 msgid "host %s does not have a good version of urpmi (%d)"
 msgstr "主机 %s 上的 urpmi 版本不对(%d)"
 
-#: ../urpm/parallel_ssh.pm:223
+#: ../urpm/parallel_ssh.pm:225
 #, c-format
 msgid "Distributing files to %s..."
 msgstr "正在将文件分发给 %s..."
 
-#: ../urpm/parallel_ssh.pm:237
+#: ../urpm/parallel_ssh.pm:239
 #, c-format
 msgid "Verifying if install is possible on %s..."
 msgstr "正在验证安装是否可以在 %s 上进行..."
 
-#: ../urpm/parallel_ssh.pm:261
+#: ../urpm/parallel_ssh.pm:263
 #, c-format
 msgid "Performing install on %s..."
 msgstr "正在 %s 上执行安装..."
 
-#: ../urpm/parallel_ssh.pm:274
+#: ../urpm/parallel_ssh.pm:276
 #, c-format
 msgid "Installing %s on %s..."
 msgstr "正在 %2$s 上安装 %1$s..."
 
-#: ../urpm/parallel_ssh.pm:275
+#: ../urpm/parallel_ssh.pm:277
 #, c-format
 msgid "Preparing install on %s..."
 msgstr "正在准备在 %s 上安装..."
@@ -1186,7 +1199,7 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:52 ../urpmi:145 ../urpmi.addmedia:70 ../urpmi.removemedia:59
+#: ../urpme:52 ../urpmi:145 ../urpmi.addmedia:72 ../urpmi.removemedia:59
 #: ../urpmi.update:49 ../urpmq:91
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 详细的提示。\n"
@@ -1199,47 +1212,47 @@ msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 msgid "Only superuser is allowed to remove packages"
 msgstr "只允许超级用户删除软件包"
 
-#: ../urpme:95
+#: ../urpme:100
 msgid "unknown package"
 msgstr "未知的软件包"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:95
+#: ../urpme:100
 msgid "unknown packages"
 msgstr "未知的软件包"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:107 ../urpmi:488
+#: ../urpme:112 ../urpmi:504
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpme:110
+#: ../urpme:115
 msgid "Nothing to remove"
 msgstr "不需要删除任何东西。"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:115
+#: ../urpme:120
 msgid "Checking to remove the following packages"
 msgstr "检查删除下列软件包"
 
-#: ../urpme:122
+#: ../urpme:127
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "为满足相关性要求，需要删除下列%d个软件包(%d MB)"
 
-#: ../urpme:124 ../urpmi:510 ../urpmi:643
+#: ../urpme:129 ../urpmi:526 ../urpmi:659 ../urpmi.addmedia:134
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
 
-#: ../urpme:124
+#: ../urpme:129
 #, c-format
 msgid "Remove %d packages?"
 msgstr "删除 %d 个软件包吗?"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:148
+#: ../urpme:153
 msgid "Removal failed"
 msgstr "删除失败"
 
@@ -1306,158 +1319,163 @@ msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - 忽略各种情况下的冲突。\n"
 
 #: ../urpmf:46
+#, fuzzy
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - 忽略各种情况下的冲突。\n"
+
+#: ../urpmf:47
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<字符串>     - 更改字段分隔符(默认为“:”)。\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 msgid "Pattern expressions:\n"
 msgstr "模式表达式：\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr "  文本           - 任何文本都将被处理为正则表达式，除非使用了 -l。\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - 二元 AND 操作符。\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - 二元 OR 操作符。\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - 一元 NOT。\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - 左右括号。\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 msgid "List of tags:\n"
 msgstr "标记清单:\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - 指定类似 printf 的输出格式\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   例如:“%%name:%%files”\n"
 
-#: ../urpmf:57
+#: ../urpmf:58
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - 体系\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - 编译主机\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - 编译时间\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - 配置文件\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - conflict 标签\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 msgid "  --description  - package description\n"
 msgstr "  --description  - 软件包描述\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - 发行版\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - 周期\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 msgid "  --filename     - filename of the package\n"
 msgstr "  --fiename      - 软件包文件名\n"
 
-#: ../urpmf:66
+#: ../urpmf:67
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - 列出软件包中包含的文件\n"
 
-#: ../urpmf:67
+#: ../urpmf:68
 msgid "  --group        - group\n"
 msgstr "  --group        - 分组\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
 msgid "  --name         - package name\n"
 msgstr "  --name         - 软件包名称\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - obsolets 标签\n"
 
-#: ../urpmf:70
+#: ../urpmf:71
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - 打包者\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - provides 标签\n"
 
-#: ../urpmf:72
+#: ../urpmf:73
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - requires 标签\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
 msgid "  --size         - installed size\n"
 msgstr "  --size         - 安装大小\n"
 
-#: ../urpmf:74
+#: ../urpmf:75
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - 源 rpm 名称\n"
 
-#: ../urpmf:75
+#: ../urpmf:76
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - 摘要\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - 提供者\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - 软件包所在介质\n"
 
-#: ../urpmf:79 ../urpmq:80
+#: ../urpmf:80 ../urpmq:80
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
 
-#: ../urpmf:131
+#: ../urpmf:132
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式不对：您只能使用一个多值标签"
 
-#: ../urpmf:173 ../urpmi:231 ../urpmq:126
+#: ../urpmf:174 ../urpmi:238 ../urpmq:126
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
 
-#: ../urpmf:219
+#: ../urpmf:220
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
 msgstr "注意：由于没有介质使用 hdlists 搜索，urpmf 无法返回任何结果\n"
 
-#: ../urpmf:220
+#: ../urpmf:221
 msgid "You may want to use --name to search for package names.\n"
 msgstr "您可能想要使用 --name 来搜索软件包名称。\n"
 
@@ -1670,7 +1688,7 @@ msgid ""
 msgstr ""
 "  --more-choices - 如果找到了多个软件包，则提供多个选择而不是默认选择。\n"
 
-#: ../urpmi:138 ../urpmi.addmedia:64 ../urpmi.update:42
+#: ../urpmi:138 ../urpmi.addmedia:66 ../urpmi.update:42
 msgid "  --norebuild    - don't try to rebuild hdlist if not readable.\n"
 msgstr "  --norebuild    - 如果 hdlist 不可读的话，不尝试重新创建。\n"
 
@@ -1694,7 +1712,7 @@ msgstr "  -p             - 允许在 provides 字段中查找软件包。\n"
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 字段中查找软件包。\n"
 
-#: ../urpmi:144 ../urpmi.addmedia:69 ../urpmi.removemedia:58
+#: ../urpmi:144 ../urpmi.addmedia:71 ../urpmi.removemedia:58
 #: ../urpmi.update:48
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安静模式。\n"
@@ -1703,32 +1721,38 @@ msgstr "  -q             - 安静模式。\n"
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:197
+#: ../urpmi:177
+msgid ""
+"Error: To generate a bug report, specify the usual command-line arguments\n"
+"along with --bug.\n"
+msgstr ""
+
+#: ../urpmi:204
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "您无法使用 --install-src 安装二进制 RPM 文件"
 
-#: ../urpmi:220
+#: ../urpmi:227
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:221
+#: ../urpmi:228
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:224 ../urpmi:380
+#: ../urpmi:231 ../urpmi:396
 msgid "Copying failed"
 msgstr "复制失败"
 
-#: ../urpmi:230
+#: ../urpmi:237
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "环境目录 %s 不存在"
 
-#: ../urpmi:248
+#: ../urpmi:255
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1738,16 +1762,16 @@ msgstr ""
 "请使用 --allow-force 强制操作。"
 
 #. - For translators : there are several media here
-#: ../urpmi:332
+#: ../urpmi:345
 msgid "Updating media...\n"
 msgstr "正在更新介质...\n"
 
-#: ../urpmi:417
+#: ../urpmi:433
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:447
+#: ../urpmi:463
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -1757,7 +1781,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本：\n"
 "%s"
 
-#: ../urpmi:455 ../urpmi:473
+#: ../urpmi:471 ../urpmi:489
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1765,11 +1789,11 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:455 ../urpmi:473 ../urpmi:560
+#: ../urpmi:471 ../urpmi:489 ../urpmi:576 ../urpmi.addmedia:134
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
 
-#: ../urpmi:466
+#: ../urpmi:482
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -1778,7 +1802,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:496
+#: ../urpmi:512
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1788,7 +1812,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:501
+#: ../urpmi:517
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1797,25 +1821,25 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:503
+#: ../urpmi:519
 msgid "(test only, removal will not be actually done)"
 msgstr "(只是测试，删除将不会实际发生)"
 
-#: ../urpmi:539 ../urpmi:551
+#: ../urpmi:555 ../urpmi:567
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
 msgstr "为了满足依赖性要求，将另外安装以下软件包"
 
-#: ../urpmi:540 ../urpmi:552
+#: ../urpmi:556 ../urpmi:568
 msgid "To satisfy dependencies, the following package is going to be installed"
 msgstr "为了满足依赖关系，将安装下列软件包"
 
-#: ../urpmi:541
+#: ../urpmi:557
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr "(%d 个软件包，%d MB)"
 
-#: ../urpmi:547
+#: ../urpmi:563
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1824,70 +1848,72 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi:554
+#: ../urpmi:570
 msgid "(test only, installation will not be actually done)"
 msgstr "(只是测试，安装将不会实际发生)"
 
-#: ../urpmi:556
+#: ../urpmi:572
 #, c-format
 msgid "Proceed with the installation of the %d packages? (%d MB)"
 msgstr "继续安装 %d 个软件包吗？(%d MB)"
 
-#: ../urpmi:580
+#: ../urpmi:596
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:586
+#: ../urpmi:602
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:586
-msgid "Ok"
-msgstr "确定"
-
-#: ../urpmi:633
+#: ../urpmi:649
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpmi:634
+#: ../urpmi:650
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpmi:682
+#: ../urpmi:698
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
 #. - there's a common prefix, simplify message
-#: ../urpmi:693
+#: ../urpmi:709
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在从 %2$s 安装 %1$s"
 
-#: ../urpmi:695
+#: ../urpmi:711
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpmi:729
+#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpmi:737
+#, fuzzy
+msgid "Installation failed:"
+msgstr "安装失败"
+
+#: ../urpmi:745
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpmi:747
+#: ../urpmi:763
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
 
-#: ../urpmi:787
+#: ../urpmi:803
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 安装交易失败"
 
-#: ../urpmi:803
+#: ../urpmi:819
 #, c-format
 msgid "The following package names were assumed: %s"
 msgstr "假定下列软件包名称: %s"
 
-#: ../urpmi:820
+#: ../urpmi:836
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
 
@@ -1896,6 +1922,7 @@ msgstr "重新启动 urpmi"
 #. Translator: neither the ``with''.
 #. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:35
+#, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -1904,7 +1931,7 @@ msgid ""
 "hdlist>\n"
 "       ftp://<host>/<path> with <relative filename of hdlist>\n"
 "       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
+"       removable://<path> with <relative filename of hdlist>\n"
 "\n"
 "and [options] are from\n"
 msgstr ""
@@ -1943,70 +1970,86 @@ msgid ""
 msgstr "  --distrib      - 自动从安装介质创建全部介质。\n"
 
 #: ../urpmi.addmedia:59
+msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
+msgstr ""
+
+#: ../urpmi.addmedia:60
+#, fuzzy
+msgid "  --all-media    - with --distrib, add every listed media\n"
+msgstr "  --list-media   - 列出可用的介质。\n"
+
+#: ../urpmi.addmedia:61
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr "  --from         - 使用指定的 URL 列出镜像，默认为 %s。\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr "  --virtual      - 创建常为最新的虚拟介质，只允许 file:// 协议。\n"
 
-#: ../urpmi.addmedia:63 ../urpmi.update:40
+#: ../urpmi.addmedia:65 ../urpmi.update:40
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - 不导入所添加介质的密钥\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:68
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - 在配置中添加介质，但不进行更新。\n"
 
-#: ../urpmi.addmedia:67 ../urpmi.removemedia:56 ../urpmi.update:46
+#: ../urpmi.addmedia:69 ../urpmi.removemedia:56 ../urpmi.update:46
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - 直接清除软件包头缓存。\n"
 
-#: ../urpmi.addmedia:68 ../urpmi.update:47
+#: ../urpmi.addmedia:70 ../urpmi.update:47
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - 强迫生成 hdlist 文件。\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "无法更新介质“%s”\n"
 
-#: ../urpmi.addmedia:113
+#: ../urpmi.addmedia:115
 msgid "Only superuser is allowed to add media"
 msgstr "只允许超级用户添加介质"
 
-#: ../urpmi.addmedia:116
+#: ../urpmi.addmedia:118
 #, c-format
 msgid "Will create config file [%s]"
 msgstr "将创建配置文件[%s]"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:119
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "无法创建配置文件[%s]"
 
-#: ../urpmi.addmedia:124
+#: ../urpmi.addmedia:126
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "使用 --distrib 不需要提供 <hdlist 的相对路径>"
 
-#: ../urpmi.addmedia:145
+#: ../urpmi.addmedia:134
+#, c-format
+msgid ""
+"\n"
+"Do you want to add media '%s'"
+msgstr ""
+
+#: ../urpmi.addmedia:163
 msgid "<relative path of hdlist> missing\n"
 msgstr "<hdlist 相对路径>找不到\n"
 
-#: ../urpmi.addmedia:147
+#: ../urpmi.addmedia:165
 msgid "`with' missing for network media\n"
 msgstr "“with”找不到网络介质\n"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:187
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质“%s”\n"
@@ -2392,3 +2435,9 @@ msgstr "没有找到文件列表\n"
 #: ../urpmq:413
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
+
+#~ msgid "copying hdlists file..."
+#~ msgstr "正在复制 hdlists 文件..."
+
+#~ msgid "invalid hdlist description \"%s\" in hdlists file"
+#~ msgstr "hdlists 文件中的 hdlist 描述“%s”无效"