sync with code

1 files changed, 580 insertions, 542 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8d1064ab..8e0be972 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: 2007-09-13 22:24+0800\n"
+"POT-Creation-Date: 2008-01-23 18:41+0100\n"
 "PO-Revision-Date: 2007-08-22 16:02+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -33,7 +33,7 @@ msgstr "RPM 安装"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "错误: 找不到文件 %s，将取消操作"
 
-#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
 #, c-format
 msgid "_Ok"
 msgstr "确定(_O)"
@@ -99,7 +99,7 @@ msgstr "安装(_I)"
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../gurpmi:99 ../gurpmi2:154
+#: ../gurpmi:99 ../gurpmi2:152
 #, c-format
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -140,42 +140,42 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:113
+#: ../gurpmi2:114
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:113 ../urpmi:624
+#: ../gurpmi2:114 ../urpmi:625
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:148
 #, c-format
 msgid " (to upgrade)"
 msgstr "(升级)"
 
-#: ../gurpmi2:151
+#: ../gurpmi2:149
 #, c-format
 msgid " (to install)"
 msgstr "(安装)"
 
-#: ../gurpmi2:154
+#: ../gurpmi2:152
 #, c-format
 msgid "Package choice"
 msgstr "软件包选择"
 
-#: ../gurpmi2:155
+#: ../gurpmi2:153
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../gurpmi2:178
+#: ../gurpmi2:176
 #, c-format
 msgid "_Abort"
 msgstr "中止(_A)"
 
-#: ../gurpmi2:198
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -186,60 +186,60 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:217 ../urpmi:590
+#: ../gurpmi2:215 ../urpmi:591
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:218 ../urpmi:591
+#: ../gurpmi2:216 ../urpmi:592
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:220
+#: ../gurpmi2:218
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d 个软件包，%d MB)"
 
-#: ../gurpmi2:226
+#: ../gurpmi2:224
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../gurpmi2:228 ../urpm/main_loop.pm:48
+#: ../gurpmi2:226 ../urpm/main_loop.pm:48
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi2:242 ../urpm/install.pm:81
+#: ../gurpmi2:240 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../gurpmi2:246
+#: ../gurpmi2:244
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:262 ../urpmi:618
+#: ../gurpmi2:260 ../urpmi:619
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请将标签为“%s”的介质插入到设备 [%s]"
 
-#: ../gurpmi2:273
+#: ../gurpmi2:271
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../gurpmi2:291
+#: ../gurpmi2:289
 #, c-format
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:298 ../urpm/main_loop.pm:253
+#: ../gurpmi2:296 ../urpm/main_loop.pm:258
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -250,23 +250,23 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi2:304 ../urpm/main_loop.pm:191 ../urpm/main_loop.pm:209
-#: ../urpm/main_loop.pm:227
+#: ../gurpmi2:302 ../urpm/main_loop.pm:196 ../urpm/main_loop.pm:214
+#: ../urpm/main_loop.pm:232
 #, c-format
 msgid "Installation failed:"
 msgstr "安装失败: "
 
-#: ../gurpmi2:309
+#: ../gurpmi2:307
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "软件包已经安装"
 
-#: ../gurpmi2:311
+#: ../gurpmi2:309
 #, c-format
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../gurpmi2:312 ../urpme:134
+#: ../gurpmi2:310 ../urpme:132
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
@@ -297,13 +297,13 @@ msgstr "   -g [组]        - 限制结果为给定组。\n"
 
 #: ../rpm-find-leaves:19
 #, c-format
-msgid "   -f             - output rpm full name (NVRA)\n"
-msgstr "  -f              - 输出 rpm 的完整名称(NVRA)。\n"
+msgid "                    defaults to %s.\n"
+msgstr "                    默认为 %s。\n"
 
 #: ../rpm-find-leaves:20
 #, c-format
-msgid "                    defaults to %s.\n"
-msgstr "                    默认为 %s。\n"
+msgid "   -f             - output rpm full name (NVRA)\n"
+msgstr "  -f              - 输出 rpm 的完整名称(NVRA)。\n"
 
 #: ../rurpmi:11 ../urpmi:267
 #, c-format
@@ -315,103 +315,108 @@ msgstr "只允许超级用户安装软件包"
 msgid "Running urpmi in restricted mode..."
 msgstr "正在以限制模式运行 urpmi..."
 
+#: ../urpm.pm:108
+#, fuzzy, c-format
+msgid "fail to create directory %s"
+msgstr "无法写入重新打包目录 [%s]\n"
+
 #: ../urpm.pm:109
+#, fuzzy, c-format
+msgid "invalid owner for directory %s"
+msgstr "无效的日期或时长 [%s]\n"
+
+#: ../urpm.pm:207
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:128
-#, c-format
-msgid "found %d rpm headers in cache, removing %d obsolete headers"
-msgstr "在缓存中找到了 %d 个 rpm 头，删除了 %d 个过期头"
-
-#: ../urpm.pm:144
+#: ../urpm.pm:221
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:150
+#: ../urpm.pm:227
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:152 ../urpm/get_pkgs.pm:135
+#: ../urpm.pm:229 ../urpm/get_pkgs.pm:158
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:155 ../urpm/download.pm:612 ../urpm/get_pkgs.pm:137
-#: ../urpm/media.pm:744 ../urpm/media.pm:1269 ../urpm/media.pm:1491
+#: ../urpm.pm:232 ../urpm/download.pm:685 ../urpm/get_pkgs.pm:160
+#: ../urpm/media.pm:654 ../urpm/media.pm:1080 ../urpm/media.pm:1254
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../urpm.pm:160
+#: ../urpm.pm:237
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:165
+#: ../urpm.pm:242
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "无法处理 spec 文件 %s [%s]"
 
-#: ../urpm.pm:173
+#: ../urpm.pm:250
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:175
+#: ../urpm.pm:252
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "RPM 的架构不兼容[%s]"
 
-#: ../urpm.pm:179
+#: ../urpm.pm:256
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:277
+#: ../urpm.pm:354
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "运行于限制模式运行时，禁止执行此操作"
 
-#: ../urpm/args.pm:121 ../urpm/args.pm:130
+#: ../urpm/args.pm:130 ../urpm/args.pm:139
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令行声明的代理服务器无效\n"
 
-#: ../urpm/args.pm:267
+#: ../urpm/args.pm:280
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
-#: ../urpm/args.pm:411
+#: ../urpm/args.pm:352
+#, c-format
+msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
+msgstr ""
+
+#: ../urpm/args.pm:418
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目录不存在"
 
-#: ../urpm/args.pm:428
+#: ../urpm/args.pm:437
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "没有 %2$s 无法使用 %1$s"
 
-#: ../urpm/args.pm:431 ../urpm/args.pm:434
+#: ../urpm/args.pm:440 ../urpm/args.pm:443
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "无法和 %2$s 一起使用 %1$s"
 
-#: ../urpm/args.pm:448
+#: ../urpm/args.pm:451
 #, c-format
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
 
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1151
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "创建介质“%s”的 hdlist 综合文件"
-
-#: ../urpm/bug_report.pm:51 ../urpmi:247
+#: ../urpm/bug_report.pm:48 ../urpmi:245
 #, c-format
 msgid "Copying failed"
 msgstr "复制失败"
@@ -421,17 +426,17 @@ msgstr "复制失败"
 msgid "syntax error in config file at line %s"
 msgstr "配置文件第 %s 行语法有错"
 
-#: ../urpm/cfg.pm:112
+#: ../urpm/cfg.pm:114
 #, c-format
 msgid "unable to read config file [%s]"
 msgstr "无法读取配置文件[%s]"
 
-#: ../urpm/cfg.pm:138
+#: ../urpm/cfg.pm:140
 #, c-format
 msgid "medium `%s' is defined twice, aborting"
 msgstr "介质“%s”定义了两次，正在退出"
 
-#: ../urpm/cfg.pm:244 ../urpm/media.pm:450
+#: ../urpm/cfg.pm:248 ../urpm/media.pm:386
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件[%s]"
@@ -451,97 +456,102 @@ msgstr "用户名:"
 msgid "Password:"
 msgstr "密码:"
 
-#: ../urpm/download.pm:185
+#: ../urpm/download.pm:195
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
 msgstr "未知的 webfetch“%s”!!!\n"
 
-#: ../urpm/download.pm:194
+#: ../urpm/download.pm:204
 #, c-format
 msgid "%s failed: exited with signal %d"
 msgstr "%s 失败: 退出信号为 %d"
 
-#: ../urpm/download.pm:195
+#: ../urpm/download.pm:205
 #, c-format
 msgid "%s failed: exited with %d"
 msgstr "%s 失败: 退出代码为 %d"
 
-#: ../urpm/download.pm:219
+#: ../urpm/download.pm:229
 #, c-format
 msgid "copy failed"
 msgstr "复制失败"
 
-#: ../urpm/download.pm:225
+#: ../urpm/download.pm:235
 #, c-format
 msgid "wget is missing\n"
 msgstr "缺少 wget\n"
 
-#: ../urpm/download.pm:290
+#: ../urpm/download.pm:300
 #, c-format
 msgid "curl is missing\n"
 msgstr "缺少 curl\n"
 
-#: ../urpm/download.pm:415
+#: ../urpm/download.pm:425
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl 失败: 下载已取消\n"
 
-#: ../urpm/download.pm:454
+#: ../urpm/download.pm:464
 #, c-format
 msgid "rsync is missing\n"
 msgstr "缺少 rsync\n"
 
-#: ../urpm/download.pm:520
+#: ../urpm/download.pm:530
 #, c-format
 msgid "ssh is missing\n"
 msgstr "缺少 ssh\n"
 
-#: ../urpm/download.pm:539
+#: ../urpm/download.pm:549
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "缺少 prozilla\n"
 
-#: ../urpm/download.pm:555
+#: ../urpm/download.pm:565
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "无法执行 prozilla\n"
 
-#: ../urpm/download.pm:602
+#: ../urpm/download.pm:573
+#, fuzzy, c-format
+msgid "aria2 is missing\n"
+msgstr "缺少 prozilla\n"
+
+#: ../urpm/download.pm:675
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
 
-#: ../urpm/download.pm:604
+#: ../urpm/download.pm:677
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 已完成，速度为 %s"
 
-#: ../urpm/download.pm:661
+#: ../urpm/download.pm:734
 #, c-format
 msgid "retrieving %s"
 msgstr "正在获取 %s"
 
-#: ../urpm/download.pm:665
+#: ../urpm/download.pm:738
 #, c-format
 msgid "retrieved %s"
 msgstr "已获取 %s"
 
-#: ../urpm/download.pm:678
+#: ../urpm/download.pm:751
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm/download.pm:697
+#: ../urpm/download.pm:771
 #, c-format
 msgid "%s is not available, falling back on %s"
 msgstr "%s 不可用，默认回到 %s"
 
-#: ../urpm/download.pm:701
+#: ../urpm/download.pm:775
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 
-#: ../urpm/download.pm:722
+#: ../urpm/download.pm:796
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
@@ -551,22 +561,22 @@ msgstr "无法处理协议: %s"
 msgid "cleaning %s and %s"
 msgstr "清除 %s 和 %s"
 
-#: ../urpm/get_pkgs.pm:88
+#: ../urpm/get_pkgs.pm:101
 #, c-format
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm/get_pkgs.pm:121
+#: ../urpm/get_pkgs.pm:134
 #, c-format
 msgid "malformed URL: [%s]"
 msgstr "URL 格式错误: [%s]"
 
-#: ../urpm/get_pkgs.pm:126
+#: ../urpm/get_pkgs.pm:147
 #, c-format
 msgid "sorry, you can't use --install-src to install remote .src.rpm files"
 msgstr "抱歉，您无法用 --install-src 安装远程 .src.rpm 文件"
 
-#: ../urpm/get_pkgs.pm:132
+#: ../urpm/get_pkgs.pm:154
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
@@ -672,195 +682,148 @@ msgstr "下列软件包的签名有错误"
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpm/main_loop.pm:125 ../urpm/main_loop.pm:198 ../urpm/main_loop.pm:216
+#: ../urpm/main_loop.pm:125 ../urpm/main_loop.pm:203 ../urpm/main_loop.pm:221
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:129
+#, fuzzy, c-format
+msgid "removing installed rpms (%s)"
+msgstr "正在从 %2$s 删除已安装的 rpm(%1$s)"
+
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#: ../urpm/main_loop.pm:159
+#: ../urpm/main_loop.pm:164
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在从 %2$s 安装 %1$s"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:166
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpm/main_loop.pm:217
+#: ../urpm/main_loop.pm:222
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
 
-#: ../urpm/main_loop.pm:259
+#: ../urpm/main_loop.pm:264
 #, c-format
 msgid "%d installation transaction failed"
 msgid_plural "%d installation transactions failed"
 msgstr[0] "%d 安装交易失败"
 
-#: ../urpm/main_loop.pm:270
+#: ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpm/main_loop.pm:275
+#: ../urpm/main_loop.pm:280
 #, c-format
 msgid "Packages are up to date"
 msgstr "软件包已为最新"
 
-#: ../urpm/main_loop.pm:283
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Package %s is already installed"
 msgstr "软件包 %s 已经安装"
 
-#: ../urpm/main_loop.pm:284
+#: ../urpm/main_loop.pm:289
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "软件包 %s 已经安装"
 
-#: ../urpm/main_loop.pm:287
+#: ../urpm/main_loop.pm:292
 #, c-format
 msgid "Package %s can not be installed"
 msgstr "软件包 %s 无法安装"
 
-#: ../urpm/main_loop.pm:288
+#: ../urpm/main_loop.pm:293
 #, c-format
 msgid "Packages %s can not be installed"
 msgstr "软件包 %s 无法安装"
 
-#: ../urpm/md5sum.pm:23
+#: ../urpm/md5sum.pm:20
 #, c-format
 msgid "examining %s file"
 msgstr "正在检查 %s 文件"
 
-#: ../urpm/md5sum.pm:25
+#: ../urpm/md5sum.pm:22
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告: %s 的 md5 校验和未在 MD5SUM 文件中找到"
 
-#: ../urpm/md5sum.pm:45
-#, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
-msgstr "正在计算已有源 hdlist(或综合文件)[%s]的 md5sum"
-
-#: ../urpm/media.pm:172
-#, c-format
-msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
-msgstr "虚拟介质“%s”不应在 hdlist 或列表文件中定义，介质被忽略"
-
-#: ../urpm/media.pm:176
+#: ../urpm/media.pm:159
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "虚拟介质“%s”应该有清楚的 URL，介质被忽略"
 
-#: ../urpm/media.pm:184
-#, c-format
-msgid "invalid hdlist name"
-msgstr "无效的 hdlist 名称"
-
-#: ../urpm/media.pm:191
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "找不到“%s”的列表文件，介质被忽略"
-
-#: ../urpm/media.pm:204
-#, c-format
-msgid "\"synthesis\" should not be set (medium \"%s\")"
-msgstr "不应设置“synthesis”(介质“%s”)"
-
-#: ../urpm/media.pm:207
-#, c-format
-msgid "\"synthesis\" should be set (medium \"%s\")"
-msgstr "应该设置“synthesis”(介质“%s”)"
-
-#: ../urpm/media.pm:210 ../urpm/media.pm:1429 ../urpm/media.pm:1517
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
-
-#: ../urpm/media.pm:216
-#, c-format
-msgid "unable to access list file of \"%s\""
-msgstr "无法访问“%s”的列表文件"
-
-#: ../urpm/media.pm:220
+#: ../urpm/media.pm:161
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的列表文件，介质被忽略"
 
-#: ../urpm/media.pm:230
-#, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "介质“%s”试图使用已经用过的 hdlist，介质被忽略"
-
-#: ../urpm/media.pm:231
-#, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "介质“%s”试图打开已经用过的列表，介质被忽略"
+#: ../urpm/media.pm:164
+#, fuzzy, c-format
+msgid "unable to access synthesis file of \"%s\", medium ignored"
+msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm/media.pm:256
+#: ../urpm/media.pm:190
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "试图覆盖已有介质“%s”，正跳过"
 
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:350
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "可移动介质“%s”的挂载点太多"
 
-#: ../urpm/media.pm:400
+#: ../urpm/media.pm:351
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "将可移动设备认作“%s”"
 
-#: ../urpm/media.pm:403
+#: ../urpm/media.pm:354
 #, c-format
 msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
 msgstr "介质“%s”是一个 ISO 映像，将会被实时挂载"
 
-#: ../urpm/media.pm:406
+#: ../urpm/media.pm:357
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
 
-#: ../urpm/media.pm:411 ../urpm/media.pm:414
+#: ../urpm/media.pm:362 ../urpm/media.pm:365
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "无法获取可移动介质“%s”的路径名称"
 
-#: ../urpm/media.pm:429
-#, c-format
-msgid "wrote %s"
-msgstr "写入 %s"
-
-#: ../urpm/media.pm:452
+#: ../urpm/media.pm:388
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "写入配置文件[%s]"
 
-#: ../urpm/media.pm:497
+#: ../urpm/media.pm:430
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "无法与发行模式一起使用并行模式"
 
-#: ../urpm/media.pm:505
+#: ../urpm/media.pm:438
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "并行模式时使用关联介质: %s"
 
-#: ../urpm/media.pm:521
+#: ../urpm/media.pm:454
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -869,224 +832,177 @@ msgstr ""
 "--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update, --use-"
 "distrib 或 --parallel 一起使用"
 
-#: ../urpm/media.pm:588
-#, c-format
-msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
-msgstr "注意: 介质“%s”没有 hdlist，无法返回任何结果"
-
-#: ../urpm/media.pm:597
+#: ../urpm/media.pm:515
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "搜索开始: %s 结束: %s"
 
-#: ../urpm/media.pm:603 ../urpm/media.pm:1815
-#, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "正在执行第二遍依赖关系的计算\n"
-
-#: ../urpm/media.pm:619
+#: ../urpm/media.pm:530
 #, c-format
 msgid "skipping package %s"
 msgstr "跳过软件包 %s"
 
-#: ../urpm/media.pm:635
+#: ../urpm/media.pm:546
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "将安装而非升级软件包 %s"
 
-#: ../urpm/media.pm:660
+#: ../urpm/media.pm:571
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已存在"
 
-#: ../urpm/media.pm:675
+#: ../urpm/media.pm:586
 #, c-format
 msgid "virtual medium needs to be local"
 msgstr "虚拟介质必须是本地的"
 
-#: ../urpm/media.pm:689
+#: ../urpm/media.pm:598
 #, c-format
 msgid "(ignored by default)"
 msgstr "(默认忽略)"
 
-#: ../urpm/media.pm:695
+#: ../urpm/media.pm:604
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "在远程介质“%2$s”之前添加介质“%1$s”"
 
-#: ../urpm/media.pm:701
+#: ../urpm/media.pm:610
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "添加介质“%s”"
 
-#: ../urpm/media.pm:727
+#: ../urpm/media.pm:637
 #, c-format
 msgid "unable to mount the distribution medium"
 msgstr "无法挂载发行版介质"
 
-#: ../urpm/media.pm:730
+#: ../urpm/media.pm:640
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "此位置似乎不包含任何发行版"
 
-#: ../urpm/media.pm:737
+#: ../urpm/media.pm:647
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "正在获取 media.cfg 文件..."
 
-#: ../urpm/media.pm:742
+#: ../urpm/media.pm:652
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "无法分析 media.cfg"
 
-#: ../urpm/media.pm:745
+#: ../urpm/media.pm:655
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "无法访问发行版介质(未发现 media.cfg 文件)"
 
-#: ../urpm/media.pm:763
+#: ../urpm/media.pm:673
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "跳过不兼容的介质“%s”(原因是 %s)"
 
-#: ../urpm/media.pm:836
+#: ../urpm/media.pm:749
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm/media.pm:839
+#: ../urpm/media.pm:752
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm/media.pm:859
+#: ../urpm/media.pm:772
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm/media.pm:950
+#: ../urpm/media.pm:837
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在从介质“%s”重新配置 urpmi"
 
-#: ../urpm/media.pm:988
+#: ../urpm/media.pm:875
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...重新配置失败"
 
-#: ../urpm/media.pm:994
+#: ../urpm/media.pm:881
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新配置完成"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:908
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "生成名称文件出错: 依赖关系 %d 未找到"
 
-#: ../urpm/media.pm:1046
+#: ../urpm/media.pm:912
 #, c-format
 msgid "Error generating names file: Can't write to file (%s)"
 msgstr "生成名称文件失败: 无法写入文件(%s)"
 
-#: ../urpm/media.pm:1081
+#: ../urpm/media.pm:922
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "介质“%s”已为最新"
 
-#: ../urpm/media.pm:1101
-#, c-format
-msgid "examining hdlist file [%s]"
-msgstr "正在检查 hdlist 文件 [%s]"
-
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:939
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm/media.pm:1128
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "正在创建 hdlist [%s]"
-
-#: ../urpm/media.pm:1147
-#, c-format
-msgid ""
-"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
-"corrupted."
-msgstr "无法创建介质“%s”的综合文件。您的 hdlist 文件可能已经损坏。"
-
-#: ../urpm/media.pm:1166
+#: ../urpm/media.pm:959
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm/media.pm:1177 ../urpm/media.pm:1242
+#: ../urpm/media.pm:972 ../urpm/media.pm:1053
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "正在复制介质“%2$s”的 [%1$s]..."
 
-#: ../urpm/media.pm:1179 ../urpm/media.pm:1217 ../urpm/media.pm:1504
+#: ../urpm/media.pm:974 ../urpm/media.pm:1028 ../urpm/media.pm:1270
 #, c-format
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm/media.pm:1213
+#: ../urpm/media.pm:1024
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm/media.pm:1215 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1026 ../urpm/media.pm:1057
 #, c-format
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm/media.pm:1248
+#: ../urpm/media.pm:1059
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm/media.pm:1281
-#, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
-
-#: ../urpm/media.pm:1283
-#, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "复制[%s]失败(md5sum 不匹配)"
-
-#: ../urpm/media.pm:1295
-#, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+#: ../urpm/media.pm:1091
+#, fuzzy, c-format
+msgid "computing md5sum of retrieved source synthesis"
 msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm/media.pm:1297
-#, c-format
-msgid "...retrieving failed: md5sum mismatch"
-msgstr "...获取失败: md5sum 不匹配"
-
-#: ../urpm/media.pm:1312
-#, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s] 中未发现 rpm 文件"
-
-#: ../urpm/media.pm:1319
-#, c-format
-msgid "reading rpm files from [%s]"
-msgstr "正在从[%s]读取 rpm 文件"
+#: ../urpm/media.pm:1093 ../urpm/media.pm:1526
+#, fuzzy, c-format
+msgid "retrieval of [%s] failed (md5sum mismatch)"
+msgstr "复制[%s]失败(md5sum 不匹配)"
 
-#: ../urpm/media.pm:1334
-#, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "无法从[%s]读取 rpm 文件: %s"
+#: ../urpm/media.pm:1108
+#, fuzzy, c-format
+msgid "genhdlist2 failed on %s"
+msgstr "正在检查 hdlist 文件 [%s]"
 
-#: ../urpm/media.pm:1344
-#, c-format
-msgid "no rpms read"
-msgstr "没有读到 rpm"
+#: ../urpm/media.pm:1118
+#, fuzzy, c-format
+msgid "comparing %s and %s"
+msgstr "清除 %s 和 %s"
 
-#: ../urpm/media.pm:1374
+#: ../urpm/media.pm:1138
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -1096,74 +1012,69 @@ msgstr ""
 "无法访问介质“%s”，\n"
 "这可能是因为您在创建介质时是手动装载的目录。"
 
-#: ../urpm/media.pm:1387
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "介质“%2$s”的 hdlist 文件 %1$s 无效"
 
-#: ../urpm/media.pm:1467
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+#: ../urpm/media.pm:1175
+#, fuzzy, c-format
+msgid "copying MD5SUM file of \"%s\"..."
+msgstr "正在复制“%s”的描述文件..."
+
+#: ../urpm/media.pm:1229
+#, fuzzy, c-format
+msgid "retrieving source synthesis of \"%s\"..."
 msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm/media.pm:1483
-#, c-format
-msgid "found probed hdlist (or synthesis) as %s"
+#: ../urpm/media.pm:1246
+#, fuzzy, c-format
+msgid "found probed synthesis as %s"
 msgstr "发现探测的 hdlist(或综合文件) 为 %s"
 
-#: ../urpm/media.pm:1490 ../urpm/media.pm:1624
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
+#: ../urpm/media.pm:1253 ../urpm/media.pm:1364
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
 msgstr "介质“%s”未发现 hdlist 文件"
 
-#: ../urpm/media.pm:1542
+#: ../urpm/media.pm:1304
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm/media.pm:1554
+#: ../urpm/media.pm:1316
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
 
-#: ../urpm/media.pm:1557
+#: ../urpm/media.pm:1320
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm/media.pm:1575
-#, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "正在写入介质“%s”的列表文件"
+#: ../urpm/media.pm:1373
+#, fuzzy, c-format
+msgid "unable to parse synthesis file of \"%s\""
+msgstr "无法处理“%s”的 hdlist 文件"
 
-#: ../urpm/media.pm:1633 ../urpm/media.pm:1663
+#: ../urpm/media.pm:1409
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "已更新介质“%s”"
 
-#: ../urpm/media.pm:1650
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "无法处理“%s”的 hdlist 文件"
-
-#: ../urpm/media.pm:1656
+#: ../urpm/media.pm:1520
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "读取介质“%s”的综合文件出现问题"
-
-#: ../urpm/media.pm:1721
-#, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "正在从介质“%s”读取头"
+msgid "retrieval of [%s] failed"
+msgstr ""
 
-#: ../urpm/msg.pm:62 ../urpmi:508 ../urpmi:524 ../urpmi:609
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:521 ../urpmi:610
 #, c-format
 msgid "Nn"
 msgstr "nN否"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:509 ../urpmi:525 ../urpmi:564
-#: ../urpmi:610 ../urpmi:640 ../urpmi:646 ../urpmi.addmedia:128
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:522 ../urpmi:561
+#: ../urpmi:611 ../urpmi:641 ../urpmi:647 ../urpmi.addmedia:122
 #, c-format
 msgid "Yy"
 msgstr "yY是"
@@ -1294,47 +1205,47 @@ msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr "urpmi 已经重新启动，优先的软件包列表进行了如下更改：%s vs %s"
 
-#: ../urpm/select.pm:160
+#: ../urpm/select.pm:184
 #, c-format
 msgid "No package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm/select.pm:162 ../urpme:109
+#: ../urpm/select.pm:186 ../urpme:107
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm/select.pm:480 ../urpm/select.pm:523
+#: ../urpm/select.pm:495 ../urpm/select.pm:538
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm/select.pm:481
+#: ../urpm/select.pm:496
 #, c-format
 msgid "due to already installed %s"
 msgstr "原因是已经安装 %s"
 
-#: ../urpm/select.pm:482 ../urpm/select.pm:521
+#: ../urpm/select.pm:497 ../urpm/select.pm:536
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm/select.pm:488
+#: ../urpm/select.pm:503
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm/select.pm:489
+#: ../urpm/select.pm:504
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm/select.pm:517
+#: ../urpm/select.pm:532
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm/select.pm:527
+#: ../urpm/select.pm:542
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
@@ -1354,12 +1265,12 @@ msgstr "无效的密钥 ID(%s)"
 msgid "Missing signature (%s)"
 msgstr "缺少签名(%s)"
 
-#: ../urpm/sys.pm:216
+#: ../urpm/sys.pm:221
 #, c-format
 msgid "Can't write file"
 msgstr "无法写入文件"
 
-#: ../urpm/sys.pm:216
+#: ../urpm/sys.pm:221
 #, c-format
 msgid "Can't open file"
 msgstr "无法打开文件"
@@ -1380,7 +1291,7 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpme:45 ../urpmf:35 ../urpmi:79 ../urpmi.addmedia:44
+#: ../urpme:45 ../urpmf:35 ../urpmi:74 ../urpmi.addmedia:45
 #: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
@@ -1396,18 +1307,18 @@ msgstr "  --auto         - 自动选中软件包。\n"
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 验证删除是否可以正确进行。\n"
 
-#: ../urpme:48 ../urpmi:106 ../urpmq:64
+#: ../urpme:48 ../urpmi:103 ../urpmq:64
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
 
-#: ../urpme:49 ../urpmi:111 ../urpmq:66
+#: ../urpme:49 ../urpmi:108 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
-#: ../urpme:50 ../urpmi:143
+#: ../urpme:50 ../urpmi:139
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - 在删除之前重新对文件打包\n"
@@ -1417,7 +1328,7 @@ msgstr "  --repackage    - 在删除之前重新对文件打包\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
 
-#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpme:52 ../urpmf:40 ../urpmi:110 ../urpmi.addmedia:60
 #: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
@@ -1437,75 +1348,65 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:56 ../urpmi:116 ../urpmq:71
-#, c-format
-msgid "    --probe-synthesis - use synthesis file.\n"
-msgstr "    --probe-synthesis - 使用综合文件。\n"
-
-#: ../urpme:57 ../urpmi:117 ../urpmq:72
-#, c-format
-msgid "    --probe-hdlist - use hdlist file.\n"
-msgstr "    --probe-hdlist - 使用 hdlist 文件。\n"
-
-#: ../urpme:58 ../urpmi:154 ../urpmq:83
+#: ../urpme:56 ../urpmi:150 ../urpmq:83
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - 详细提示。\n"
 
-#: ../urpme:59
+#: ../urpme:57
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 
-#: ../urpme:73
+#: ../urpme:70
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "只允许超级用户删除软件包"
 
-#: ../urpme:103
+#: ../urpme:100
 #, c-format
 msgid "unknown packages"
 msgstr "未知的软件包"
 
-#: ../urpme:103
+#: ../urpme:100
 #, c-format
 msgid "unknown package"
 msgstr "未知的软件包"
 
-#: ../urpme:115 ../urpmi:538
+#: ../urpme:113 ../urpmi:535
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpme:117
+#: ../urpme:115
 #, c-format
 msgid "Nothing to remove"
 msgstr "不需要删除任何东西。"
 
-#: ../urpme:122
+#: ../urpme:120
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "检查删除下列软件包"
 
-#: ../urpme:126
+#: ../urpme:124
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
 "To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] "为满足相关性要求，需要删除下列%d个软件包"
 
-#: ../urpme:130
+#: ../urpme:128
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../urpme:130 ../urpmi:565 ../urpmi:641 ../urpmi.addmedia:131
+#: ../urpme:128 ../urpmi:562 ../urpmi:642 ../urpmi.addmedia:125
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
 
-#: ../urpme:152
+#: ../urpme:150
 #, c-format
 msgid "Removal failed"
 msgstr "删除失败"
@@ -1531,12 +1432,12 @@ msgstr ""
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 打印此工具的版本号。\n"
 
-#: ../urpmf:37 ../urpmi:134 ../urpmq:80
+#: ../urpmf:37 ../urpmi:130 ../urpmq:78
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
-#: ../urpmf:38 ../urpmi:81 ../urpmq:49
+#: ../urpmf:38 ../urpmi:76 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
@@ -1547,12 +1448,12 @@ msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr "  --literal, -l  - 不匹配模式，参数为字面字符串。\n"
 
-#: ../urpmf:41 ../urpmi:80 ../urpmq:47
+#: ../urpmf:41 ../urpmi:75 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:42 ../urpmi:84 ../urpmq:50
+#: ../urpmf:42 ../urpmi:79 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1563,7 +1464,7 @@ msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - 使用给定的路径访问介质\n"
 
-#: ../urpmf:44 ../urpmi:85 ../urpmq:51
+#: ../urpmf:44 ../urpmi:80 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
@@ -1573,7 +1474,7 @@ msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 不打印相同行。\n"
 
-#: ../urpmf:46 ../urpmi:82 ../urpmq:46
+#: ../urpmf:46 ../urpmi:77 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质。\n"
@@ -1768,34 +1669,37 @@ msgstr "  --vendor       - 提供者\n"
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - 软件包所在介质\n"
 
-#: ../urpmf:85 ../urpmq:92
+#: ../urpmf:85 ../urpmq:93
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
 
-#: ../urpmf:142
+#: ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式不对: 您只能使用一个多值标签"
 
-#: ../urpmf:190 ../urpmi:254 ../urpmq:135
+#: ../urpmf:248 ../urpmi:252 ../urpmq:135
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
 
-#: ../urpmf:229
-#, c-format
-msgid ""
-"Note: since no media searched uses hdlists, urpmf was unable to return any "
-"result\n"
-msgstr "注意: 由于没有介质使用 hdlists 搜索，urpmf 无法返回任何结果\n"
+#: ../urpmf:292
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "介质“%s”未发现 hdlist 文件"
 
-#: ../urpmf:230
-#, c-format
-msgid "You may want to use --name to search for package names.\n"
-msgstr "您可能想要使用 --name 来搜索软件包名称。\n"
+#: ../urpmf:299
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "创建介质“%s”的 hdlist 综合文件"
 
-#: ../urpmi:74
+#: ../urpmf:306
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "正在写入介质“%s”的列表文件"
+
+#: ../urpmi:69
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1811,53 +1715,53 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmi:83
+#: ../urpmi:78
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr "  --searchmedia  - 只使用给定介质来搜索所请求的软件包。\n"
 
-#: ../urpmi:86
+#: ../urpmi:81
 #, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr "  --auto         - 非交互模式，对全部问题假定默认回答。\n"
 
-#: ../urpmi:87 ../urpmq:52
+#: ../urpmi:82 ../urpmq:52
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
 
-#: ../urpmi:88
+#: ../urpmi:83
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
 msgstr "  --auto-update  - 更新介质后再升级系统。\n"
 
-#: ../urpmi:89
+#: ../urpmi:84
 #, c-format
 msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "    --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi:90
+#: ../urpmi:85
 #, c-format
 msgid "    --force-key    - force update of gpg key.\n"
 msgstr "    --force-key    - 强制更新 gpg 密钥。\n"
 
-#: ../urpmi:91
+#: ../urpmi:86
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
 
-#: ../urpmi:92
+#: ../urpmi:87
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - 不安装软件包(只下载)。\n"
 
-#: ../urpmi:93 ../urpmq:54
+#: ../urpmi:88 ../urpmq:54
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1865,7 +1769,7 @@ msgid ""
 msgstr ""
 "  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
 
-#: ../urpmi:95
+#: ../urpmi:90
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1875,67 +1779,67 @@ msgstr ""
 "  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
 "                   较小的交易。默认为 %d。\n"
 
-#: ../urpmi:98
+#: ../urpmi:94
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 小交易长度，默认为 %d。\n"
 
-#: ../urpmi:99
+#: ../urpmi:96
 #, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - 利用模糊查询。\n"
 
-#: ../urpmi:100
-#, c-format
-msgid "  --src, -s      - next package is a source package.\n"
-msgstr "  --src, -s       - 下一个软件包是源程序包。\n"
+#: ../urpmi:97
+#, fuzzy, c-format
+msgid "  --buildrequires - install the buildrequires of the packages\n"
+msgstr "  --requires     - requires 标签\n"
 
-#: ../urpmi:101
+#: ../urpmi:98
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
 
-#: ../urpmi:102
+#: ../urpmi:99
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "   --clean       - 首先删除缓存中的 rpm。\n"
 
-#: ../urpmi:103
+#: ../urpmi:100
 #, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
 
-#: ../urpmi:104
+#: ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr "  --justdb       - 只使用 rpm 数据库，不更新文件系统。\n"
 
-#: ../urpmi:105
+#: ../urpmi:102
 #, c-format
 msgid ""
 "  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr "  --replacepkgs  - 强制安装已经安装过的软件包。\n"
 
-#: ../urpmi:107
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr "  --allow-nodeps - 允许要求用户不经过依赖性检验就安装软件包。\n"
 
-#: ../urpmi:109
+#: ../urpmi:106
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr "  --allow-force  - 允许提示用户安装软件包而不检查依赖性和完整性。\n"
 
-#: ../urpmi:112 ../urpmq:67
+#: ../urpmi:109 ../urpmq:67
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
 
-#: ../urpmi:114
+#: ../urpmi:111
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1944,47 +1848,44 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpmi，特别用于在 --root 选项\n"
 "                   下安装 chroot。\n"
 
-#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
-#, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - 用 wget 取远程文件。\n"
-
-#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
-#, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - 用 crul 取远程文件。\n"
-
-#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
+#: ../urpmi:113
 #, c-format
-msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
-msgstr "  --prizlla      - 用 prozilla 取远程文件。\n"
+msgid ""
+"  --downloader   - program to use to retrieve distant files. \n"
+"                   known programs: %s\n"
+msgstr ""
 
-#: ../urpmi:121
+#: ../urpmi:116
 #, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - 给 curl 传递额外的选项\n"
 
-#: ../urpmi:122
+#: ../urpmi:117
 #, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- 给 rsync 传递额外的选项\n"
 
-#: ../urpmi:123
+#: ../urpmi:118
 #, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - 给 wget 传递额外的选项\n"
 
-#: ../urpmi:124
+#: ../urpmi:119
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --prozilla-options - 给 prozilla 传递额外的选项\n"
 
-#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:120
+#, fuzzy, c-format
+msgid "  --aria2-options - additional options to pass to aria2\n"
+msgstr "  --prozilla-options - 给 prozilla 传递额外的选项\n"
+
+#: ../urpmi:121 ../urpmi.addmedia:49 ../urpmi.update:36
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 降低下载速度。\n"
 
-#: ../urpmi:126
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1993,7 +1894,7 @@ msgstr ""
 "  --resume       - 续传未下载完成的文件\n"
 "                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:124 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:74
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -2002,7 +1903,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:126 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2011,7 +1912,7 @@ msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
 "                   密码(格式如 <用户: 密码>)。\n"
 
-#: ../urpmi:132
+#: ../urpmi:128
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -2020,7 +1921,7 @@ msgstr ""
 "  --bug          - 输出故障报告\n"
 "                   下一个参数指定输出目录。\n"
 
-#: ../urpmi:135
+#: ../urpmi:131
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -2029,49 +1930,49 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../urpmi:137
+#: ../urpmi:133
 #, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
-#: ../urpmi:138
+#: ../urpmi:134
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
-#: ../urpmi:139
+#: ../urpmi:135
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - 排除文档文件。\n"
 
-#: ../urpmi:140
+#: ../urpmi:136
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - 安装前不检查磁盘空间。\n"
 
-#: ../urpmi:141
+#: ../urpmi:137
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 允许安装体系不匹配的 RPM。\n"
 
-#: ../urpmi:142
+#: ../urpmi:138
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - 不执行软件包脚本。\n"
 
-#: ../urpmi:144
+#: ../urpmi:140
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安装要跳过的软件包。\n"
 
-#: ../urpmi:145
+#: ../urpmi:141
 #, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr "  --prefer       - 首选的软件包\n"
 
-#: ../urpmi:146
+#: ../urpmi:142
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -2079,71 +1980,77 @@ msgid ""
 msgstr ""
 "  --more-choices - 如果找到了多个软件包，则提供多个选择而不是默认选择。\n"
 
-#: ../urpmi:148
+#: ../urpmi:144
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - 不锁定 rpm 数据库。\n"
 
-#: ../urpmi:149
+#: ../urpmi:145
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 更新只限于相同体系的软件包。\n"
 
-#: ../urpmi:150 ../urpmq:89
+#: ../urpmi:146 ../urpmq:91
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:151
+#: ../urpmi:147
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在 provides 字段中查找软件包。\n"
 
-#: ../urpmi:152
+#: ../urpmi:148
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 字段中查找软件包。\n"
 
-#: ../urpmi:153
+#: ../urpmi:149
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - 安静模式。\n"
 
-#: ../urpmi:155
+#: ../urpmi:151
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:184
+#: ../urpmi:179
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "错误: 无法在使用软件包列表时使用 --auto-select。\n"
 
-#: ../urpmi:191
+#: ../urpmi:186
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr "错误: 要生成错误报告，请在指定命令行参数时多加 --bug。\n"
 
-#: ../urpmi:218
+#: ../urpmi:213
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "您无法使用 --install-src 安装二进制 RPM 文件"
 
-#: ../urpmi:241
+#: ../urpmi:219
+#, c-format
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+
+#: ../urpmi:239
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:242
+#: ../urpmi:240
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:253
+#: ../urpmi:251
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "环境目录 %s 不存在"
@@ -2163,42 +2070,42 @@ msgid "Updating media...\n"
 msgstr "正在更新介质...\n"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:443
+#: ../urpmi:440
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (即将升级)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:445
+#: ../urpmi:442
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (即将升级)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:449
+#: ../urpmi:446
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (即将安装)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:451
+#: ../urpmi:448
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (即将安装)"
 
-#: ../urpmi:457
+#: ../urpmi:454
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "为满足“%s”的依赖关系，需要安装下列软件包之一："
 
-#: ../urpmi:460
+#: ../urpmi:457
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:501
+#: ../urpmi:498
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2208,7 +2115,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:503
+#: ../urpmi:500
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2218,7 +2125,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:510 ../urpmi:526
+#: ../urpmi:507 ../urpmi:523
 #, c-format
 msgid ""
 "\n"
@@ -2227,12 +2134,12 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:511 ../urpmi:527 ../urpmi:611 ../urpmi.addmedia:131
+#: ../urpmi:508 ../urpmi:524 ../urpmi:612 ../urpmi.addmedia:125
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
 
-#: ../urpmi:519
+#: ../urpmi:516
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2241,7 +2148,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:520
+#: ../urpmi:517
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2250,7 +2157,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:547
+#: ../urpmi:544
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2260,7 +2167,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:549
+#: ../urpmi:546
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2270,7 +2177,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:556
+#: ../urpmi:553
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -2279,7 +2186,7 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:557
+#: ../urpmi:554
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -2288,59 +2195,60 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:559
+#: ../urpmi:556
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(只是测试，删除将不会实际发生)"
 
-#: ../urpmi:585
-#, c-format
+#: ../urpmi:577
+#, fuzzy, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
 "%s\n"
 msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi:593
+#: ../urpmi:594
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(只是测试，安装将不会实际发生)"
 
-#: ../urpmi:599
+#: ../urpmi:600
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "将会使用 %s 的额外磁盘空间。"
 
-#: ../urpmi:600
+#: ../urpmi:601
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "将会释放 %s 的磁盘空间。"
 
-#: ../urpmi:601
+#: ../urpmi:602
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "继续安装 %d 个软件包吗？"
 
-#: ../urpmi:619
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:624
+#: ../urpmi:625
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:663
+#: ../urpmi:664
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
 
 #. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
 #. -PO: neither the ``with''.  Only what is between <brackets> can be translated.
-#: ../urpmi.addmedia:35
+#: ../urpmi.addmedia:36
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
@@ -2363,123 +2271,141 @@ msgstr ""
 "\n"
 "而 [options] 可以来自\n"
 
-#: ../urpmi.addmedia:53
+#: ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:71
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - 创建一个更新介质。\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - 用 wget 取远程文件。\n"
+
+#: ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:72
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - 用 crul 取远程文件。\n"
+
+#: ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:73
+#, c-format
+msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
+msgstr "  --prizlla      - 用 prozilla 取远程文件。\n"
 
 #: ../urpmi.addmedia:54
 #, c-format
-msgid "  --probe-synthesis - use synthesis file.\n"
-msgstr "  --probe-synthesis - 使用综合文件。\n"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - 创建一个更新介质。\n"
 
 #: ../urpmi.addmedia:55
 #, c-format
-msgid "  --probe-hdlist - use hdlist file.\n"
-msgstr "  --probe-hdlist - 使用 hdlist 文件。\n"
+msgid ""
+"  --xml-info     - use the specific policy for downloading xml info files\n"
+"                   one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:56
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgid "  --probe-synthesis - use synthesis file.\n"
+msgstr "  --probe-synthesis - 使用综合文件。\n"
+
+#: ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - 使用 rpm 文件(而不是综合文件/hdlist。\n"
 
-#: ../urpmi.addmedia:57
-#, c-format
-msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - 不试图查找任何综合文件或 hdlist 文件。\n"
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - 自动从安装介质创建全部介质。\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr "  --interactive  - 对于 --distrib，请求每个介质的确认\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:64
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - 对于 --distrib，添加列出的每个介质\n"
 
-#: ../urpmi.addmedia:63
+#: ../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:65
+#: ../urpmi.addmedia:67
 #, 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:67 ../urpmi.update:42
+#: ../urpmi.addmedia:69 ../urpmi.update:42
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - 不导入所添加介质的密钥\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - 在配置中添加介质，但不进行更新。\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:42 ../urpmi.update:49
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - 直接清除软件包头缓存。\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.removemedia:44 ../urpmi.update:51
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:52
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安静模式。\n"
 
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:45 ../urpmi.update:52
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:53
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 详细的提示。\n"
 
-#: ../urpmi.addmedia:82
+#: ../urpmi.addmedia:94
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "无法更新介质“%s”\n"
+msgid "known xml-info policies are %s"
+msgstr ""
 
-#: ../urpmi.addmedia:109
+#: ../urpmi.addmedia:102
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "无效的 <url> (如果是本地目录，必须是绝对路径)"
 
-#: ../urpmi.addmedia:112
+#: ../urpmi.addmedia:105
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "只允许超级用户添加介质"
 
-#: ../urpmi.addmedia:115
+#: ../urpmi.addmedia:108
 #, c-format
 msgid "creating config file [%s]"
 msgstr "创建配置文件[%s]"
 
-#: ../urpmi.addmedia:116
+#: ../urpmi.addmedia:109
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "无法创建配置文件[%s]"
 
-#: ../urpmi.addmedia:123
-#, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
+#: ../urpmi.addmedia:117
+#, fuzzy, c-format
+msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "使用 --distrib 不需要提供 <hdlist 的相对路径>"
 
-#: ../urpmi.addmedia:131
+#: ../urpmi.addmedia:125
 #, c-format
 msgid ""
 "\n"
@@ -2488,21 +2414,16 @@ msgstr ""
 "\n"
 "您是否想要添加介质“%s”"
 
-#: ../urpmi.addmedia:161
-#, c-format
-msgid "<relative path of hdlist> missing\n"
+#: ../urpmi.addmedia:150
+#, fuzzy, c-format
+msgid "<relative path of synthesis> missing\n"
 msgstr "<hdlist 相对路径>找不到\n"
 
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:153
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "远程介质无法使用 %s"
 
-#: ../urpmi.addmedia:187
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "无法创建介质“%s”\n"
-
 #: ../urpmi.recover:28
 #, c-format
 msgid ""
@@ -2657,17 +2578,17 @@ msgstr "  -a             - 选择所有介质。\n"
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - 介质名称使用模糊匹配。\n"
 
-#: ../urpmi.removemedia:63
+#: ../urpmi.removemedia:60
 #, c-format
 msgid "Only superuser is allowed to remove media"
 msgstr "只允许超级用户删除介质"
 
-#: ../urpmi.removemedia:76
+#: ../urpmi.removemedia:73
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "没有可删除的(用 urpmi.addmedia 增加介质)\n"
 
-#: ../urpmi.removemedia:82
+#: ../urpmi.removemedia:79
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -2706,9 +2627,8 @@ msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - 不更新，将介质标为启用。\n"
 
 #: ../urpmi.update:47
-#, c-format
-msgid ""
-"  --probe-rpms   - do not use synthesis/hdlist, use rpm files directly\n"
+#, fuzzy, c-format
+msgid "  --probe-rpms   - do not use synthesis, use rpm files directly\n"
 msgstr "  --probe-rpms   - 不使用综合文件或 hdlist 文件，直接使用 rpm 文件\n"
 
 #: ../urpmi.update:48
@@ -2717,21 +2637,26 @@ msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 选择所有不可移动的介质。\n"
 
 #: ../urpmi.update:50
-#, c-format
-msgid "  -f             - force updating synthesis/hdlist\n"
+#, fuzzy, c-format
+msgid "  -f             - force updating synthesis\n"
 msgstr "  -f             - 强迫更新综合文件/hdlist 文件。\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:51
+#, fuzzy, c-format
+msgid "  -ff            - really force updating synthesis\n"
+msgstr "  -f             - 强迫更新综合文件/hdlist 文件。\n"
+
+#: ../urpmi.update:68
 #, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "只允许超级用户更新介质"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:76
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:94
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2740,17 +2665,17 @@ msgstr ""
 "找不到要升级的项\n"
 "(%s 中之一)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:98
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:99
 #, c-format
 msgid "ignoring media %s"
 msgstr "忽略介质 %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:99
 #, c-format
 msgid "enabling media %s"
 msgstr "启用介质 %s"
@@ -2837,22 +2762,39 @@ msgid ""
 "                   This permit to querying a distro.\n"
 msgstr "  --use-distrib  - 从发行版树中实时配置 urpmi。这将允许查询发行版。\n"
 
-#: ../urpmq:81
+#: ../urpmq:79
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - 打印更新日志。\n"
 
+#: ../urpmq:80
+#, fuzzy, c-format
+msgid "  --provides     - print provides.\n"
+msgstr "  --provides     - provides 标签\n"
+
+#: ../urpmq:81
+#, fuzzy, c-format
+msgid "  --sourcerpm    - print sourcerpm.\n"
+msgstr "  --sourcerpm    - 源 rpm 名称\n"
+
 #: ../urpmq:82
 #, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - 打印摘要。\n"
 
 #: ../urpmq:84
+#, fuzzy, c-format
+msgid ""
+"  --requires-recursive, -d\n"
+"                   - query package dependencies.\n"
+msgstr "  -d             - 扩展软件包依赖性查询。\n"
+
+#: ../urpmq:86
 #, c-format
 msgid "  --whatrequires - reverse search to what requires package.\n"
 msgstr "  --whatrequires - 逆序搜索需要软件包的软件包。\n"
 
-#: ../urpmq:85
+#: ../urpmq:87
 #, c-format
 msgid ""
 "  --whatrequires-recursive\n"
@@ -2861,7 +2803,7 @@ msgstr ""
 "  --whatrequires-recursive\n"
 "                   - 扩展逆序搜索(包括虚拟软件包)。\n"
 
-#: ../urpmq:87
+#: ../urpmq:89
 #, c-format
 msgid ""
 "  --whatprovides, -p\n"
@@ -2870,64 +2812,59 @@ msgstr ""
 "  --whatprovides, -p\n"
 "                   - 允许在 provides 中寻找软件包。\n"
 
-#: ../urpmq:90
+#: ../urpmq:92
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - 要删除的软件包的完整输出。\n"
 
-#: ../urpmq:91
-#, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - 扩展软件包依赖性查询。\n"
-
-#: ../urpmq:93
+#: ../urpmq:94
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - 打印组名。\n"
 
-#: ../urpmq:94
+#: ../urpmq:95
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - 以人类可读的格式打印有用信息。\n"
 
-#: ../urpmq:95
+#: ../urpmq:96
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - 列出软件包中的文件。\n"
 
-#: ../urpmq:96
+#: ../urpmq:97
 #, c-format
 msgid "  -m             - equivalent to -du\n"
 msgstr "  -m             - 与 -du 等价。\n"
 
-#: ../urpmq:97
+#: ../urpmq:98
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 和名称一起打印版本和发行号。\n"
 
-#: ../urpmq:98
+#: ../urpmq:99
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
 
-#: ../urpmq:99
+#: ../urpmq:100
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - 如果更新的版本已经安装，就删除软件包。\n"
 
-#: ../urpmq:100
+#: ../urpmq:101
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
 
-#: ../urpmq:101
+#: ../urpmq:102
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - 类似于 -y，但强制不区分大小写匹配。\n"
 
-#: ../urpmq:102
+#: ../urpmq:103
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  需要在命令行给出名称或 rpm 文件。\n"
@@ -2937,32 +2874,133 @@ msgstr "  需要在命令行给出名称或 rpm 文件。\n"
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 仅能和 --parallel 一起使用"
 
-#: ../urpmq:359
-#, c-format
-msgid "no hdlist for medium \"%s\", only partial result for package %s"
+#: ../urpmq:355
+#, fuzzy, c-format
+msgid "no xml info for medium \"%s\", only partial result for package %s"
 msgstr "由于介质“%s”没有 hdlist，软件包 %s 只返回部分结果"
 
-#: ../urpmq:360
-#, c-format
-msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+#: ../urpmq:356
+#, fuzzy, c-format
+msgid "no xml info for medium \"%s\", only partial result for packages %s"
 msgstr "由于介质“%s”没有 hdlists，软件包 %s 只返回部分结果"
 
-#: ../urpmq:363
-#, c-format
-msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
+#: ../urpmq:359
+#, fuzzy, c-format
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr "由于介质“%s”没有 hdlists，软件包 %s 无法返回任何结果"
 
-#: ../urpmq:364
-#, c-format
+#: ../urpmq:360
+#, fuzzy, c-format
 msgid ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
+"no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr "由于介质“%s”没有 hdlists，软件包 %s 无法返回任何结果"
 
-#: ../urpmq:425
+#: ../urpmq:424
 #, c-format
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
 
+#~ msgid "found %d rpm headers in cache, removing %d obsolete headers"
+#~ msgstr "在缓存中找到了 %d 个 rpm 头，删除了 %d 个过期头"
+
+#~ msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
+#~ msgstr "正在计算已有源 hdlist(或综合文件)[%s]的 md5sum"
+
+#~ msgid ""
+#~ "virtual medium \"%s\" should not have defined hdlist or list file, medium "
+#~ "ignored"
+#~ msgstr "虚拟介质“%s”不应在 hdlist 或列表文件中定义，介质被忽略"
+
+#~ msgid "invalid hdlist name"
+#~ msgstr "无效的 hdlist 名称"
+
+#~ msgid "unable to find list file for \"%s\", medium ignored"
+#~ msgstr "找不到“%s”的列表文件，介质被忽略"
+
+#~ msgid "\"synthesis\" should not be set (medium \"%s\")"
+#~ msgstr "不应设置“synthesis”(介质“%s”)"
+
+#~ msgid "\"synthesis\" should be set (medium \"%s\")"
+#~ msgstr "应该设置“synthesis”(介质“%s”)"
+
+#~ msgid "unable to access list file of \"%s\""
+#~ msgstr "无法访问“%s”的列表文件"
+
+#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+#~ msgstr "介质“%s”试图使用已经用过的 hdlist，介质被忽略"
+
+#~ msgid "medium \"%s\" trying to use an already used list, medium ignored"
+#~ msgstr "介质“%s”试图打开已经用过的列表，介质被忽略"
+
+#~ msgid "wrote %s"
+#~ msgstr "写入 %s"
+
+#~ msgid ""
+#~ "Note: no hdlist for medium \"%s\", unable to return any result for it"
+#~ msgstr "注意: 介质“%s”没有 hdlist，无法返回任何结果"
+
+#~ msgid "performing second pass to compute dependencies\n"
+#~ msgstr "正在执行第二遍依赖关系的计算\n"
+
+#~ msgid "building hdlist [%s]"
+#~ msgstr "正在创建 hdlist [%s]"
+
+#~ msgid ""
+#~ "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
+#~ "corrupted."
+#~ msgstr "无法创建介质“%s”的综合文件。您的 hdlist 文件可能已经损坏。"
+
+#~ msgid "problem reading hdlist or synthesis file of medium \"%s\""
+#~ msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
+
+#~ msgid "computing md5sum of copied source hdlist (or synthesis)"
+#~ msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
+
+#~ msgid "...retrieving failed: md5sum mismatch"
+#~ msgstr "...获取失败: md5sum 不匹配"
+
+#~ msgid "no rpm files found from [%s]"
+#~ msgstr "[%s] 中未发现 rpm 文件"
+
+#~ msgid "reading rpm files from [%s]"
+#~ msgstr "正在从[%s]读取 rpm 文件"
+
+#~ msgid "unable to read rpm files from [%s]: %s"
+#~ msgstr "无法从[%s]读取 rpm 文件: %s"
+
+#~ msgid "no rpms read"
+#~ msgstr "没有读到 rpm"
+
+#~ msgid "reading headers from medium \"%s\""
+#~ msgstr "正在从介质“%s”读取头"
+
+#~ msgid "    --probe-synthesis - use synthesis file.\n"
+#~ msgstr "    --probe-synthesis - 使用综合文件。\n"
+
+#~ msgid "    --probe-hdlist - use hdlist file.\n"
+#~ msgstr "    --probe-hdlist - 使用 hdlist 文件。\n"
+
+#~ msgid ""
+#~ "Note: since no media searched uses hdlists, urpmf was unable to return "
+#~ "any result\n"
+#~ msgstr "注意: 由于没有介质使用 hdlists 搜索，urpmf 无法返回任何结果\n"
+
+#~ msgid "You may want to use --name to search for package names.\n"
+#~ msgstr "您可能想要使用 --name 来搜索软件包名称。\n"
+
+#~ msgid "  --src, -s      - next package is a source package.\n"
+#~ msgstr "  --src, -s       - 下一个软件包是源程序包。\n"
+
+#~ msgid "  --probe-hdlist - use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - 使用 hdlist 文件。\n"
+
+#~ msgid "unable to update medium \"%s\"\n"
+#~ msgstr "无法更新介质“%s”\n"
+
+#~ msgid "unable to create medium \"%s\"\n"
+#~ msgstr "无法创建介质“%s”\n"
+
 #~ msgid "there are multiple packages with the same rpm filename \"%s\""
 #~ msgstr "有多个文件名都为“%s”的 rpm 软件包"