From 4c194f63135e59afd0bac3985f0729364f67c4db Mon Sep 17 00:00:00 2001
From: Funda Wang <fwang@mandriva.org>
Date: Fri, 3 Oct 2008 14:36:35 +0000
Subject: update zh_CN translation

---
 po/zh_CN.po | 1045 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 520 insertions(+), 525 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 333892dc..cfa1bc0a 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-09-23 18:55+0200\n"
 "PO-Revision-Date: 2008-03-30 14:22+0800\n"
 "Last-Translator: 汤诗语 <shiyu@mandriva.org>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -130,9 +130,8 @@ msgstr ""
 msgid "Options:"
 msgstr "选项："
 
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
@@ -165,7 +164,7 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
@@ -229,7 +228,7 @@ msgstr ""
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:624
 #, c-format
 msgid "Ok"
 msgstr "确定"
@@ -270,13 +269,13 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:241 ../urpmi:591
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:242 ../urpmi:592
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -298,7 +297,7 @@ msgstr "软件包安装..."
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:266 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
@@ -308,7 +307,7 @@ msgstr "正在准备..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:287 ../urpmi:619
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "请插入介质“%s”"
@@ -323,7 +322,7 @@ msgstr "正在下载软件包“%s”..."
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:332 ../urpm/main_loop.pm:114
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -334,8 +333,8 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:338 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
 #, c-format
 msgid "Installation failed:"
 msgstr "安装失败: "
@@ -355,7 +354,7 @@ msgstr "安装完成"
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:354 ../urpmi:686
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
@@ -394,7 +393,7 @@ msgstr "                    默认为 %s。\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -f              - 输出 rpm 的完整名称(NVRA)。\n"
 
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:268
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
@@ -404,134 +403,143 @@ msgstr "只允许超级用户安装软件包"
 msgid "Running urpmi in restricted mode..."
 msgstr "正在以限制模式运行 urpmi..."
 
-#: ../urpm.pm:111
+#: ../urpm.pm:112
 #, c-format
 msgid "fail to create directory %s"
 msgstr "创建目录 %s 失败"
 
-#: ../urpm.pm:112
+#: ../urpm.pm:113
 #, c-format
 msgid "invalid owner for directory %s"
 msgstr "目录 %s 的所有者无效"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:125
 #, c-format
 msgid "Can not download packages into %s"
 msgstr "无法将软件包下载到 %s"
 
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "环境目录 %s 不存在"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "在 %s 使用指定环境\n"
+
+#: ../urpm.pm:305
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:288
+#: ../urpm.pm:319
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:294
+#: ../urpm.pm:325
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../urpm.pm:304
+#: ../urpm.pm:335
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:309
+#: ../urpm.pm:340
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "无法处理 spec 文件 %s [%s]"
 
-#: ../urpm.pm:317
+#: ../urpm.pm:348
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:350
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "RPM 的架构不兼容[%s]"
 
-#: ../urpm.pm:323
+#: ../urpm.pm:354
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:410
+#: ../urpm.pm:441
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "运行于限制模式运行时，禁止执行此操作"
 
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令行声明的代理服务器无效\n"
 
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:305
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s"
 msgstr "意外表达式 %s"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:383
 #, c-format
 msgid "missing expression before %s"
 msgstr "%s 前缺少表达式"
 
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:389
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "意外表达式 %s(建议：使用 -a 或 -o?)"
 
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:393
 #, c-format
 msgid "no expression to close"
 msgstr "没有要关闭的表达式"
 
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:402
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "默认情况下，urpmf 使用正则表达式。您应该使用选项“--literal”"
 
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:470
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目录不存在"
 
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:493
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "没有 %2$s 无法使用 %1$s"
 
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:496 ../urpm/args.pm:499 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "无法和 %2$s 一起使用 %1$s"
 
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:507
 #, c-format
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
 
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:258
 #, c-format
 msgid "Copying failed"
 msgstr "复制失败"
@@ -578,122 +586,122 @@ msgstr "介质“%s”定义了两次，正在退出"
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件[%s]"
 
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s 不可用，默认回到 %s"
+
+#: ../urpm/download.pm:157
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
 msgstr "无法读取代理服务器设置(没有足够的权限读取 %s)"
 
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "请输入访问代理服务器所需的认证信息\n"
 
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
 #, c-format
 msgid "User name:"
 msgstr "用户名:"
 
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
 #, c-format
 msgid "Password:"
 msgstr "密码:"
 
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
 msgstr "未知的 webfetch“%s”!!!\n"
 
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
 #, c-format
 msgid "%s failed: exited with signal %d"
 msgstr "%s 失败: 退出信号为 %d"
 
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
 #, c-format
 msgid "%s failed: exited with %d"
 msgstr "%s 失败: 退出代码为 %d"
 
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
 #, c-format
 msgid "copy failed"
 msgstr "复制失败"
 
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
 #, c-format
 msgid "wget is missing\n"
 msgstr "缺少 wget\n"
 
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
 #, c-format
 msgid "curl is missing\n"
 msgstr "缺少 curl\n"
 
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl 失败: 下载已取消\n"
 
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
 #, c-format
 msgid "rsync is missing\n"
 msgstr "缺少 rsync\n"
 
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
 #, c-format
 msgid "ssh is missing\n"
 msgstr "缺少 ssh\n"
 
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "缺少 prozilla\n"
 
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "无法执行 prozilla\n"
 
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "缺少 aria2\n"
 
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
 
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 已完成，速度为 %s"
 
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
 #, c-format
 msgid "retrieving %s"
 msgstr "正在获取 %s"
 
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
 #, c-format
 msgid "retrieved %s"
 msgstr "已获取 %s"
 
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s 不可用，默认回到 %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
@@ -713,58 +721,58 @@ msgstr "未找到软件包 %s。"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
 #, c-format
 msgid "[repackaging]"
 msgstr "[重新打包]"
 
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:168
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:171
 #, c-format
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:194
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
 
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:207
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:210
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "正在从 %2$s 删除错误的 rpm(%1$s)"
 
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:211 ../urpm/install.pm:268
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "删除 %s 失败: %s"
 
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:249
 #, c-format
 msgid "Removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:250
 #, c-format
 msgid "removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:266
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "正在从 %2$s 删除已安装的 rpm(%1$s)"
 
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:274
 #, c-format
 msgid "More information on package %s"
 msgstr "关于软件包 %s 的更多信息"
@@ -809,18 +817,18 @@ msgstr "中止"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s 数据库已锁定(其它程序正在使用它)"
 
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
 #, c-format
 msgid "Try to go on anyway? (y/N) "
 msgstr "仍然继续吗? (y/N)"
 
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -829,73 +837,63 @@ msgstr ""
 "安装失败，rpm 有问题:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
 #, c-format
 msgid "The following package has bad signature"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "删除已安装的 rpm(%s)"
 
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在从 %2$s 安装 %1$s"
 
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
 
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
 #, c-format
 msgid "Packages are up to date"
 msgstr "软件包已为最新"
 
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
 
 #: ../urpm/md5sum.pm:26
 #, c-format
-msgid "examining %s file"
-msgstr "正在检查 %s 文件"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "无效的 MD5SUM 文件"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告: %s 的 md5 校验和未在 MD5SUM 文件中找到"
 
@@ -968,228 +966,228 @@ msgstr "将安装而非升级软件包 %s"
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已存在"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
 #, c-format
 msgid "(ignored by default)"
 msgstr "(默认忽略)"
 
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "在远程介质“%2$s”之前添加介质“%1$s”"
 
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "添加介质“%s”"
 
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
 #, c-format
 msgid "directory %s does not exist"
 msgstr "目录 %s 不存在"
 
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "此位置似乎不包含任何发行版"
 
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "无法分析 media.cfg"
 
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "无法访问发行版介质(未发现 media.cfg 文件)"
 
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "跳过不兼容的介质“%s”(原因是 %s)"
 
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "正在获取 media.cfg 文件..."
 
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在从介质“%s”重新配置 urpmi"
 
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...重新配置失败"
 
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新配置完成"
 
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "生成命名文件出错：依赖关系 %d 未找到"
 
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "介质“%s”已为最新"
 
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "正在复制介质“%2$s”的 [%1$s]..."
 
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
 #, c-format
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
 #, c-format
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "正在计算所获取的源综合文件的 md5sum"
 
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "获取[%s]失败(md5sum 不匹配)"
 
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "在 %s 上 genhdlist2 失败"
 
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
 #, c-format
 msgid "comparing %s and %s"
 msgstr "比较 %s 和 %s"
 
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "介质“%2$s”的 hdlist 文件 %1$s 无效"
 
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "正在复制“%s”的 MD5SUM..."
 
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "无效的 MD5SUM 文件(从 %s 下载)"
 
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
 #, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "正在获取“%s”的源综合文件..."
+msgid "no metadata found for medium \"%s\""
+msgstr "介质“%s”未发现元数据"
 
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1475
 #, c-format
-msgid "found probed synthesis as %s"
-msgstr "发现探测的综合文件 为 %s"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "介质“%s”未发现综合文件"
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "正在获取“%s”的源综合文件..."
 
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
 
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "介质“%s”未发现综合文件"
+
+#: ../urpm/media.pm:1612
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "已更新介质“%s”"
 
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "获取[%s]失败"
 
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
 #, c-format
 msgid "trying again with mirror %s"
 msgstr "正在重试连接镜像 %s"
 
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
 #, c-format
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "无法从镜像列表 %s 里找到一个镜像"
 
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "找到地理位置较近的 %s %.2f %.2f，从时区 %s"
 
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "从 %s 中获得镜像列表"
 
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:501 ../urpmi:516 ../urpmi:611
 #, c-format
 msgid "Nn"
 msgstr "nN否"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:552 ../urpmi:647 ../urpmi:653
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
@@ -1260,7 +1258,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1268,8 +1266,7 @@ msgid ""
 msgid_plural ""
 "The following packages are now orphans, use \"urpme --auto-orphans\" to "
 "remove them."
-msgstr[0] ""
-"下列软件包现在是孤立的了，请使用“urpme --auto-orphans”删除它们。"
+msgstr[0] "下列软件包现在是孤立的了，请使用“urpme --auto-orphans”删除它们。"
 
 #: ../urpm/parallel.pm:14
 #, c-format
@@ -1326,7 +1323,7 @@ msgstr "主机 %s cp 失败 (%d)"
 msgid ""
 "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
 "code: %d)"
-msgstr "主机 %2$s %1$s 失败(可能 urpmi 版本不对?)(退出码: %d)"
+msgstr "主机 %2$s %1$s 失败(可能 urpmi 版本不对?)(退出码: %3$d)"
 
 #: ../urpm/removable.pm:32
 #, c-format
@@ -1343,368 +1340,96 @@ msgstr "正在装载 %s"
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
-#: ../urpm/search.pm:29 ../urpmf:29
-#, c-format
-msgid ""
-"urpmf version %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage: urpmf [options] pattern-expression\n"
-msgstr ""
-"urpmf 版本 %s\n"
-"版权 (C) 2002-2006 Mandriva。\n"
-"这是自由软件，可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
-
-#: ../urpm/search.pm:36 ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - 打印此工具的版本号。\n"
-
-#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
-
-#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
-
-#: ../urpm/search.pm:39 ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr "  --literal, -l  - 不匹配模式，参数为字面字符串。\n"
-
-#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
-#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
-#: ../urpmi.update:48 ../urpmq:70
-#, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --urpmi-root   - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
-
-#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n"
-
-#: ../urpm/search.pm:43 ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - 使用给定的路径访问介质\n"
-
-#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
-
-#: ../urpm/search.pm:45 ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - 不打印相同行。\n"
-
-#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - 只使用升级介质。\n"
-
-#: ../urpm/search.pm:47 ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - 详细提示。\n"
-
-#: ../urpm/search.pm:48 ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - 忽略各种情况下的冲突。\n"
-
-#: ../urpm/search.pm:49 ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -I             - 在模式中遵从大小写(默认值)。\n"
-
-#: ../urpm/search.pm:50 ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<字符串>     - 更改字段分隔符(默认为“:”)。\n"
-
-#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "模式表达式: \n"
-
-#: ../urpm/search.pm:52 ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr "  文本           - 任何文本都将被处理为正则表达式，除非使用了 -l。\n"
-
-#: ../urpm/search.pm:53 ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
-
-#: ../urpm/search.pm:54 ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - 二元 AND 操作符。\n"
-
-#: ../urpm/search.pm:55 ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - 二元 OR 操作符。\n"
-
-#: ../urpm/search.pm:56 ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - 一元 NOT。\n"
-
-#: ../urpm/search.pm:57 ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - 左右括号。\n"
-
-#: ../urpm/search.pm:58 ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "标记清单:\n"
-
-#: ../urpm/search.pm:59 ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - 指定类似 printf 的输出格式\n"
-
-#: ../urpm/search.pm:60 ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   例如:“%%name:%%files”\n"
-
-#: ../urpm/search.pm:61 ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - 体系\n"
-
-#: ../urpm/search.pm:62 ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - 编译主机\n"
-
-#: ../urpm/search.pm:63 ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - 编译时间\n"
-
-#: ../urpm/search.pm:64 ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - 配置文件\n"
-
-#: ../urpm/search.pm:65 ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - conflict 标签\n"
-
-#: ../urpm/search.pm:66 ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - 软件包描述\n"
-
-#: ../urpm/search.pm:67 ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - 发行版\n"
-
-#: ../urpm/search.pm:68 ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - 周期\n"
-
-#: ../urpm/search.pm:69 ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --fiename      - 软件包文件名\n"
-
-#: ../urpm/search.pm:70 ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - 列出软件包中包含的文件\n"
-
-#: ../urpm/search.pm:71 ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - 分组\n"
-
-#: ../urpm/search.pm:72 ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - 许可协议\n"
-
-#: ../urpm/search.pm:73 ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - 软件包名称\n"
-
-#: ../urpm/search.pm:74 ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - obsolets 标签\n"
-
-#: ../urpm/search.pm:75 ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - 打包者\n"
-
-#: ../urpm/search.pm:76 ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - provides 标签\n"
-
-#: ../urpm/search.pm:77 ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - requires 标签\n"
-
-#: ../urpm/search.pm:78 ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - 安装大小\n"
-
-#: ../urpm/search.pm:79 ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - 源 rpm 名称\n"
-
-#: ../urpm/search.pm:80 ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - suggests 标签\n"
-
-#: ../urpm/search.pm:81 ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - 摘要\n"
-
-#: ../urpm/search.pm:82 ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url\n"
-
-#: ../urpm/search.pm:83 ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - 提供者\n"
-
-#: ../urpm/search.pm:84 ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - 软件包所在介质\n"
-
-#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
-
-#: ../urpm/search.pm:197 ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "格式不对: 您只能使用一个多值标签"
-
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "在 %s 使用指定环境\n"
-
-#: ../urpm/search.pm:290 ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "介质“%s”的 hdlist 不可用"
-
-#: ../urpm/search.pm:297 ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "介质“%s”的综合文件不可用"
-
-#: ../urpm/search.pm:304 ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "介质“%s”没有可用的 xml-info"
-
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
 msgstr "urpmi 已经重新启动，而优先的软件包列表未更新"
 
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
 #, c-format
 msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr "urpmi 已经重新启动，优先的软件包列表进行了如下更改：%s vs %s"
 
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
 #, c-format
 msgid "No package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
 #, c-format
 msgid "You should use \"-a\" to use all of them"
 msgstr "您应该使用“-a”来全部使用"
 
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "在 urpmi 数据库中找到软件包 %s，但全部都未安装"
 
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Package %s is already installed"
 msgstr "软件包 %s 已经安装"
 
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "软件包 %s 已经安装"
 
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
 #, c-format
 msgid "due to already installed %s"
 msgstr "原因是已经安装 %s"
 
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:607
+#, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"要升级其它软件包，需要先删除下列软件包:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"要升级其它软件包，需要先删除下列软件包:\n"
+"%s"
+
+#: ../urpm/select.pm:635
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
@@ -1724,27 +1449,27 @@ msgstr "无效的密钥 ID(%s)"
 msgid "Missing signature (%s)"
 msgstr "缺少签名(%s)"
 
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
 #, c-format
 msgid "system"
 msgstr "系统"
 
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
 #, c-format
 msgid "You should restart %s for %s"
 msgstr "为了 %2$s，您应该重新启动 %1$s"
 
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
 #, c-format
 msgid "Can't write file"
 msgstr "无法写入文件"
 
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
 #, c-format
 msgid "Can't open file"
 msgstr "无法打开文件"
 
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
 #, c-format
 msgid "Can't move file %s to %s"
 msgstr "无法将文件 %s 移动到 %s"
@@ -1795,6 +1520,12 @@ msgstr "  --repackage    - 在删除之前重新对文件打包\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
 
+#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --urpmi-root   - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
+
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1874,7 +1605,7 @@ msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:553 ../urpmi:648 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
@@ -1894,11 +1625,289 @@ msgstr "删除失败"
 msgid "Removal is possible"
 msgstr "可以删除"
 
+#: ../urpmf:29
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage: urpmf [options] pattern-expression\n"
+msgstr ""
+"urpmf 版本 %s\n"
+"版权 (C) 2002-2006 Mandriva。\n"
+"这是自由软件，可以依照 GNU GPL 重新发布。\n"
+"\n"
+"用法:\n"
+
+#: ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - 打印此工具的版本号。\n"
+
+#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
+
+#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr "  --literal, -l  - 不匹配模式，参数为字面字符串。\n"
+
+#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - 使用给定的路径访问介质\n"
+
+#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - 不打印相同行。\n"
+
+#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - 只使用升级介质。\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - 详细提示。\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - 忽略各种情况下的冲突。\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -I             - 在模式中遵从大小写(默认值)。\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<字符串>     - 更改字段分隔符(默认为“:”)。\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "模式表达式: \n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr "  文本           - 任何文本都将被处理为正则表达式，除非使用了 -l。\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - 二元 AND 操作符。\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - 二元 OR 操作符。\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - 一元 NOT。\n"
+
+#: ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - 左右括号。\n"
+
+#: ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "标记清单:\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - 指定类似 printf 的输出格式\n"
+
+#: ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   例如:“%%name:%%files”\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - 体系\n"
+
+#: ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - 编译主机\n"
+
+#: ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - 编译时间\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - 配置文件\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - conflict 标签\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - 软件包描述\n"
+
+#: ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - 发行版\n"
+
+#: ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - 周期\n"
+
+#: ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --fiename      - 软件包文件名\n"
+
+#: ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - 列出软件包中包含的文件\n"
+
+#: ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - 分组\n"
+
+#: ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - 许可协议\n"
+
+#: ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - 软件包名称\n"
+
+#: ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - obsolets 标签\n"
+
+#: ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - 打包者\n"
+
+#: ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - provides 标签\n"
+
+#: ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - requires 标签\n"
+
+#: ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - 安装大小\n"
+
+#: ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - 源 rpm 名称\n"
+
+#: ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - suggests 标签\n"
+
+#: ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - 摘要\n"
+
+#: ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - url\n"
+
+#: ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - 提供者\n"
+
+#: ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - 软件包所在介质\n"
+
+#: ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
+
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "未终止的表达式(%s)"
 
+#: ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "格式不对: 您只能使用一个多值标签"
+
+#: ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "介质“%s”的 hdlist 不可用"
+
+#: ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "介质“%s”的综合文件不可用"
+
+#: ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "介质“%s”没有可用的 xml-info"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2216,12 +2225,7 @@ msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "环境目录 %s 不存在"
-
-#: ../urpmi:287
+#: ../urpmi:274
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2230,48 +2234,48 @@ msgstr ""
 "错误: %s 似乎是以只读方式挂载的。\n"
 "请使用 --allow-force 强制操作。"
 
-#: ../urpmi:361
+#: ../urpmi:348
 #, c-format
 msgid "Updating media...\n"
 msgstr "正在更新介质...\n"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:435
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (即将升级)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (即将升级)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:441
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (即将安装)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:443
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (即将安装)"
 
-#: ../urpmi:462
+#: ../urpmi:449
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "为满足“%s”的依赖关系，需要安装下列软件包之一："
 
-#: ../urpmi:465
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:507
+#: ../urpmi:494
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2281,7 +2285,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:509
+#: ../urpmi:496
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2291,7 +2295,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:502 ../urpmi:517
 #, c-format
 msgid ""
 "\n"
@@ -2300,12 +2304,12 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:503 ../urpmi:518 ../urpmi:612 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
 
-#: ../urpmi:524
+#: ../urpmi:511
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2314,7 +2318,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:525
+#: ../urpmi:512
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2323,12 +2327,12 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:542
+#: ../urpmi:529
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpmi:551
+#: ../urpmi:537
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2338,7 +2342,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:553
+#: ../urpmi:539
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2348,30 +2352,12 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"要升级其它软件包，需要先删除下列软件包:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"要升级其它软件包，需要先删除下列软件包:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:547
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(只是测试，删除将不会实际发生)"
 
-#: ../urpmi:583
+#: ../urpmi:567
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2381,44 +2367,44 @@ msgstr ""
 "您必须首先用 --buildrequires 调用 urpmi，以便安装下列依赖关系：\n"
 "%s\n"
 
-#: ../urpmi:594
+#: ../urpmi:578
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "下列孤立软件包将被删除。"
 
-#: ../urpmi:610
+#: ../urpmi:594
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(只是测试，安装将不会实际发生)"
 
-#: ../urpmi:616
+#: ../urpmi:600
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "将会使用 %s 的额外磁盘空间。"
 
-#: ../urpmi:617
+#: ../urpmi:601
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "将会释放 %s 的磁盘空间。"
 
-#: ../urpmi:618
+#: ../urpmi:602
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "将会获取 %s 的软件包。"
 
-#: ../urpmi:619
+#: ../urpmi:603
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "继续安装 %d 个软件包吗？"
 
-#: ../urpmi:640
+#: ../urpmi:624
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:648
+#: ../urpmi:632
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "挂载后按 Enter..."
@@ -3147,3 +3133,12 @@ msgstr "由于介质“%s”没有 xml 信息，软件包 %s 无法返回任何
 #, c-format
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
+
+#~ msgid "examining %s file"
+#~ msgstr "正在检查 %s 文件"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "无效的 MD5SUM 文件"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "发现探测的综合文件 为 %s"
-- 
cgit v1.2.1