Synced translations with template

1 files changed, 487 insertions, 480 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 63bda76a..59791082 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-10-07 19:04+0200\n"
+"POT-Creation-Date: 2008-10-28 15:12+0100\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."
@@ -23,22 +23,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:31 ../gurpmi2:74
+#: ../gurpmi:32
 #, c-format
 msgid "RPM installation"
 msgstr "RPM 安装"
 
-#: ../gurpmi:45
+#: ../gurpmi:46
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "错误: 找不到文件 %s，将取消操作"
 
-#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
+#: ../gurpmi:47 ../gurpmi2:186 ../gurpmi2:210
 #, c-format
 msgid "_Ok"
 msgstr "确定(_O)"
 
-#: ../gurpmi:66
+#: ../gurpmi:67
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -59,7 +59,7 @@ msgstr ""
 "\n"
 "您想要执行什么操作?"
 
-#: ../gurpmi:74 ../gurpmi:85
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -74,7 +74,7 @@ msgstr ""
 "\n"
 "继续吗?"
 
-#: ../gurpmi:80
+#: ../gurpmi:81
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -89,22 +89,22 @@ msgstr ""
 "\n"
 "您也可以选择只是保存相应的软件包。您要进行什么操作?"
 
-#: ../gurpmi:98
+#: ../gurpmi:99
 #, c-format
 msgid "_Install"
 msgstr "安装(_I)"
 
-#: ../gurpmi:99
+#: ../gurpmi:100
 #, c-format
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../gurpmi:100 ../gurpmi2:174
+#: ../gurpmi:101 ../gurpmi2:186
 #, c-format
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../gurpmi:108
+#: ../gurpmi:109
 #, c-format
 msgid "Choose location to save file"
 msgstr "选择保存文件的位置"
@@ -202,12 +202,12 @@ msgstr "  --searchmedia  - 只使用给定介质来搜索所请求的软件包�
 msgid "No packages specified"
 msgstr "未指定软件包"
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Please wait..."
 msgstr "请稍候..."
 
-#: ../gurpmi2:62
+#: ../gurpmi2:63
 #, c-format
 msgid "Must be root"
 msgstr "必须是 root"
@@ -238,42 +238,42 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:134
+#: ../gurpmi2:146
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:134 ../urpmi:625
+#: ../gurpmi2:146 ../urpmi:612
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:182
 #, c-format
 msgid " (to upgrade)"
 msgstr "(升级)"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:183
 #, c-format
 msgid " (to install)"
 msgstr "(安装)"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:186
 #, c-format
 msgid "Package choice"
 msgstr "软件包选择"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:187
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../gurpmi2:199
+#: ../gurpmi2:211
 #, c-format
 msgid "_Abort"
 msgstr "中止(_A)"
 
-#: ../gurpmi2:221
+#: ../gurpmi2:234
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -284,55 +284,62 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:240 ../urpmi:592
+#: ../gurpmi2:253 ../urpmi:579
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:241 ../urpmi:593
+#: ../gurpmi2:254 ../urpmi:580
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:243
+#: ../gurpmi2:256
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d 个软件包，%d MB)"
 
-#: ../gurpmi2:257 ../urpm/main_loop.pm:49
+#: ../gurpmi2:264 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi2:265 ../urpm/install.pm:81
+#: ../gurpmi2:296 ../urpm/install.pm:80
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:620
+#: ../gurpmi2:319 ../urpmi:607
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "请插入介质“%s”"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:333
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../gurpmi2:323
+#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
+#: ../urpm/media.pm:1442
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...获取失败: %s"
+
+#: ../gurpmi2:361
 #, c-format
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:331 ../urpm/main_loop.pm:114
+#: ../gurpmi2:369 ../urpm/main_loop.pm:120
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -343,28 +350,27 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
-#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
+#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
 #, c-format
 msgid "Installation failed:"
 msgstr "安装失败: "
 
-#: ../gurpmi2:342
+#: ../gurpmi2:380
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "软件包已经安装"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:382
 #, c-format
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../gurpmi2:345 ../urpme:167
+#: ../gurpmi2:383 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:353 ../urpmi:687
+#: ../gurpmi2:391 ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
@@ -438,58 +444,52 @@ msgstr "环境目录 %s 不存在"
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
 
-#: ../urpm.pm:305
+#: ../urpm.pm:302
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:316
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:325
+#: ../urpm.pm:322
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../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:335
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:337
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "无法处理 spec 文件 %s [%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:345
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:350
+#: ../urpm.pm:347
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "RPM 的架构不兼容[%s]"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:351
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:441
+#: ../urpm.pm:438
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "运行于限制模式运行时，禁止执行此操作"
@@ -529,22 +529,22 @@ msgstr "没有要关闭的表达式"
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "默认情况下，urpmf 使用正则表达式。您应该使用选项“--literal”"
 
-#: ../urpm/args.pm:471
+#: ../urpm/args.pm:472
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目录不存在"
 
-#: ../urpm/args.pm:494
+#: ../urpm/args.pm:495
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "没有 %2$s 无法使用 %1$s"
 
-#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
+#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "无法和 %2$s 一起使用 %1$s"
 
-#: ../urpm/args.pm:508
+#: ../urpm/args.pm:509
 #, c-format
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
@@ -636,82 +636,87 @@ msgstr "%s 失败: 退出信号为 %d"
 msgid "%s failed: exited with %d"
 msgstr "%s 失败: 退出代码为 %d"
 
-#: ../urpm/download.pm:296
+#: ../urpm/download.pm:301
 #, c-format
 msgid "copy failed"
 msgstr "复制失败"
 
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:307
 #, c-format
 msgid "wget is missing\n"
 msgstr "缺少 wget\n"
 
-#: ../urpm/download.pm:369
+#: ../urpm/download.pm:374
 #, c-format
 msgid "curl is missing\n"
 msgstr "缺少 curl\n"
 
-#: ../urpm/download.pm:494
+#: ../urpm/download.pm:499
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl 失败: 下载已取消\n"
 
-#: ../urpm/download.pm:533
+#: ../urpm/download.pm:538
 #, c-format
 msgid "rsync is missing\n"
 msgstr "缺少 rsync\n"
 
-#: ../urpm/download.pm:601
+#: ../urpm/download.pm:606
 #, c-format
 msgid "ssh is missing\n"
 msgstr "缺少 ssh\n"
 
-#: ../urpm/download.pm:620
+#: ../urpm/download.pm:625
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "缺少 prozilla\n"
 
-#: ../urpm/download.pm:636
+#: ../urpm/download.pm:641
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "无法执行 prozilla\n"
 
-#: ../urpm/download.pm:646
+#: ../urpm/download.pm:651
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "缺少 aria2\n"
 
-#: ../urpm/download.pm:761
+#: ../urpm/download.pm:694
+#, c-format
+msgid "Failed to download %s"
+msgstr ""
+
+#: ../urpm/download.pm:788
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
 
-#: ../urpm/download.pm:763
+#: ../urpm/download.pm:789
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 已完成，速度为 %s"
 
-#: ../urpm/download.pm:828
+#: ../urpm/download.pm:862
 #, c-format
 msgid "retrieving %s"
 msgstr "正在获取 %s"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:869
 #, c-format
 msgid "retrieved %s"
 msgstr "已获取 %s"
 
-#: ../urpm/download.pm:899
+#: ../urpm/download.pm:933
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm/download.pm:909
+#: ../urpm/download.pm:945
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 
-#: ../urpm/download.pm:930
+#: ../urpm/download.pm:962
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
@@ -731,58 +736,58 @@ msgstr "未找到软件包 %s。"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm/install.pm:88
+#: ../urpm/install.pm:86
 #, c-format
 msgid "[repackaging]"
 msgstr "[重新打包]"
 
-#: ../urpm/install.pm:169
+#: ../urpm/install.pm:167
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm/install.pm:172
+#: ../urpm/install.pm:170
 #, c-format
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
 
-#: ../urpm/install.pm:208
+#: ../urpm/install.pm:206
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:209
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "正在从 %2$s 删除错误的 rpm(%1$s)"
 
-#: ../urpm/install.pm:212 ../urpm/install.pm:269
+#: ../urpm/install.pm:210 ../urpm/install.pm:267
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "删除 %s 失败: %s"
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:248
 #, c-format
 msgid "Removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:251
+#: ../urpm/install.pm:249
 #, c-format
 msgid "removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:267
+#: ../urpm/install.pm:265
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "正在从 %2$s 删除已安装的 rpm(%1$s)"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:273
 #, c-format
 msgid "More information on package %s"
 msgstr "关于软件包 %s 的更多信息"
@@ -827,18 +832,23 @@ msgstr "中止"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s 数据库已锁定(其它程序正在使用它)"
 
-#: ../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
+#: ../urpm/main_loop.pm:108
+#, c-format
+msgid "Retry?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
+#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
-#, c-format
-msgid "Try to go on anyway? (y/N) "
+#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
+#, fuzzy, c-format
+msgid "Try to go on anyway?"
 msgstr "仍然继续吗? (y/N)"
 
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:130
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -847,57 +857,57 @@ msgstr ""
 "安装失败，rpm 有问题:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:142
+#: ../urpm/main_loop.pm:148
 #, c-format
 msgid "The following package has bad signature"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpm/main_loop.pm:143
+#: ../urpm/main_loop.pm:149
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpm/main_loop.pm:144
+#: ../urpm/main_loop.pm:150
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:167
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "删除已安装的 rpm(%s)"
 
-#: ../urpm/main_loop.pm:181
+#: ../urpm/main_loop.pm:187
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#: ../urpm/main_loop.pm:196
+#: ../urpm/main_loop.pm:202
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在从 %2$s 安装 %1$s"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:204
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpm/main_loop.pm:234
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+#: ../urpm/main_loop.pm:242
+#, fuzzy, c-format
+msgid "Try installation without checking dependencies?"
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpm/main_loop.pm:252
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
+#: ../urpm/main_loop.pm:249
+#, fuzzy, c-format
+msgid "Try harder to install (--force)?"
 msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
 
-#: ../urpm/main_loop.pm:302
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages are up to date"
 msgstr "软件包已为最新"
 
-#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
@@ -1101,7 +1111,7 @@ msgstr "复制 [%s] 失败(文件太小了)"
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "正在计算所获取的源综合文件的 md5sum"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "获取[%s]失败(md5sum 不匹配)"
@@ -1141,32 +1151,32 @@ msgstr "介质“%s”未发现元数据"
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "正在获取“%s”的源综合文件..."
 
-#: ../urpm/media.pm:1527
+#: ../urpm/media.pm:1541
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1553
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
 
-#: ../urpm/media.pm:1543
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm/media.pm:1579
+#: ../urpm/media.pm:1598
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "介质“%s”未发现综合文件"
 
-#: ../urpm/media.pm:1612
+#: ../urpm/media.pm:1631
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "已更新介质“%s”"
 
-#: ../urpm/media.pm:1732
+#: ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "获取[%s]失败"
@@ -1181,94 +1191,99 @@ msgstr "正在重试连接镜像 %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "无法从镜像列表 %s 里找到一个镜像"
 
-#: ../urpm/mirrors.pm:215
+#: ../urpm/mirrors.pm:218
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "找到地理位置较近的 %s %.2f %.2f，从时区 %s"
 
-#: ../urpm/mirrors.pm:260
+#: ../urpm/mirrors.pm:263
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "从 %s 中获得镜像列表"
 
-#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
+#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
 #, 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:553 ../urpmi:648 ../urpmi:654
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "yY是"
 
-#: ../urpm/msg.pm:121
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr "(是(y)/否(N))[否]"
+
+#: ../urpm/msg.pm:139
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "对不起，选择无效，请再试一次\n"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Package"
 msgstr "软件包"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Version"
 msgstr "版本"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Release"
 msgstr "释放"
 
-#: ../urpm/msg.pm:152
+#: ../urpm/msg.pm:170
 #, c-format
 msgid "Arch"
 msgstr "架构"
 
-#: ../urpm/msg.pm:161
+#: ../urpm/msg.pm:179
 #, c-format
 msgid "(suggested)"
 msgstr "(建议安装)"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "medium \"%s\""
 msgstr "介质“%s”"
 
-#: ../urpm/msg.pm:176
+#: ../urpm/msg.pm:194
 #, c-format
 msgid "command line"
 msgstr "命令行"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:190
+#: ../urpm/msg.pm:208
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
+#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:310
+#: ../urpm/orphans.pm:311
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1350,291 +1365,6 @@ 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: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:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1651,7 +1381,7 @@ msgstr "urpmi 已经重新启动，优先的软件包列表进行了如下更改
 msgid "No package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm/select.pm:172 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
@@ -1661,47 +1391,47 @@ msgstr "下列软件包里有 %s: %s"
 msgid "You should use \"-a\" to use all of them"
 msgstr "您应该使用“-a”来全部使用"
 
-#: ../urpm/select.pm:295
+#: ../urpm/select.pm:294
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "在 urpmi 数据库中找到软件包 %s，但全部都未安装"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:537
 #, c-format
 msgid "Package %s is already installed"
 msgstr "软件包 %s 已经安装"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "软件包 %s 已经安装"
 
-#: ../urpm/select.pm:557 ../urpm/select.pm:641
+#: ../urpm/select.pm:556 ../urpm/select.pm:640
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm/select.pm:558
+#: ../urpm/select.pm:557
 #, c-format
 msgid "due to already installed %s"
 msgstr "原因是已经安装 %s"
 
-#: ../urpm/select.pm:559 ../urpm/select.pm:639
+#: ../urpm/select.pm:558 ../urpm/select.pm:638
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:564
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:565
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:606
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1710,7 +1440,7 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpm/select.pm:608
+#: ../urpm/select.pm:607
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1719,12 +1449,12 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpm/select.pm:635
+#: ../urpm/select.pm:634
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm/select.pm:645
+#: ../urpm/select.pm:644
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
@@ -1815,6 +1545,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"
@@ -1844,81 +1580,354 @@ msgstr "  --verbose, -v  - 详细提示。\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 
-#: ../urpme:73
+#: ../urpme:75
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "只允许超级用户删除软件包"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown packages"
 msgstr "未知的软件包"
 
-#: ../urpme:106
+#: ../urpme:108
 #, c-format
 msgid "unknown package"
 msgstr "未知的软件包"
 
-#: ../urpme:121
+#: ../urpme:123
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "删除下列软件包将会破坏您的系统:"
 
-#: ../urpme:126
+#: ../urpme:128
 #, c-format
 msgid "Nothing to remove"
 msgstr "不需要删除任何东西。"
 
-#: ../urpme:143
+#: ../urpme:145
 #, c-format
 msgid "No orphans to remove"
 msgstr "没有可删除的孤立软件包"
 
-#: ../urpme:149
+#: ../urpme:151
 #, 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:154
+#: ../urpme:156
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(孤立的软件包)"
 
-#: ../urpme:161
+#: ../urpme:163
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
-#, c-format
-msgid " (y/N) "
-msgstr "(是(y)/否(N))[否]"
-
-#: ../urpme:166
+#: ../urpme:168
 #, c-format
 msgid "testing removal of %s"
 msgstr "测试删除 %s"
 
-#: ../urpme:181
+#: ../urpme:185
 #, c-format
 msgid "Removal failed"
 msgstr "删除失败"
 
-#: ../urpme:183
+#: ../urpme:187
 #, c-format
 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"
@@ -2250,48 +2259,43 @@ msgstr ""
 "错误: %s 似乎是以只读方式挂载的。\n"
 "请使用 --allow-force 强制操作。"
 
-#: ../urpmi:349
-#, c-format
-msgid "Updating media...\n"
-msgstr "正在更新介质...\n"
-
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:436
+#: ../urpmi:423
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (即将升级)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:425
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (即将升级)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:429
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (即将安装)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:431
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (即将安装)"
 
-#: ../urpmi:450
+#: ../urpmi:437
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "为满足“%s”的依赖关系，需要安装下列软件包之一："
 
-#: ../urpmi:453
+#: ../urpmi:440
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:495
+#: ../urpmi:482
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2301,7 +2305,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:497
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2311,7 +2315,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:503 ../urpmi:518
+#: ../urpmi:490 ../urpmi:505
 #, c-format
 msgid ""
 "\n"
@@ -2320,12 +2324,12 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
+#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
 
-#: ../urpmi:512
+#: ../urpmi:499
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2334,7 +2338,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:513
+#: ../urpmi:500
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2343,12 +2347,12 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:530
+#: ../urpmi:517
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpmi:538
+#: ../urpmi:525
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2358,7 +2362,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:527
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2368,12 +2372,12 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:548
+#: ../urpmi:535
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(只是测试，删除将不会实际发生)"
 
-#: ../urpmi:568
+#: ../urpmi:555
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2383,44 +2387,44 @@ msgstr ""
 "您必须首先用 --buildrequires 调用 urpmi，以便安装下列依赖关系：\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:566
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "下列孤立软件包将被删除。"
 
-#: ../urpmi:595
+#: ../urpmi:582
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(只是测试，安装将不会实际发生)"
 
-#: ../urpmi:601
+#: ../urpmi:588
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "将会使用 %s 的额外磁盘空间。"
 
-#: ../urpmi:602
+#: ../urpmi:589
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "将会释放 %s 的磁盘空间。"
 
-#: ../urpmi:603
+#: ../urpmi:590
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "将会获取 %s 的软件包。"
 
-#: ../urpmi:604
+#: ../urpmi:591
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "继续安装 %d 个软件包吗？"
 
-#: ../urpmi:625
+#: ../urpmi:612
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:633
+#: ../urpmi:620
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "挂载后按 Enter..."
@@ -2863,12 +2867,12 @@ msgstr "  -ff            - 强迫更新综合文件。\n"
 msgid "Only superuser is allowed to update media"
 msgstr "只允许超级用户更新介质"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:82
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
 
-#: ../urpmi.update:87
+#: ../urpmi.update:91
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2877,17 +2881,17 @@ msgstr ""
 "找不到要升级的项\n"
 "(%s 中之一)\n"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:106
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "ignoring media %s"
 msgstr "忽略介质 %s"
 
-#: ../urpmi.update:103
+#: ../urpmi.update:107
 #, c-format
 msgid "enabling media %s"
 msgstr "启用介质 %s"
@@ -3150,6 +3154,9 @@ msgstr "由于介质“%s”没有 xml 信息，软件包 %s 无法返回任何�
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
 
+#~ msgid "Updating media...\n"
+#~ msgstr "正在更新介质...\n"
+
 #~ msgid "examining %s file"
 #~ msgstr "正在检查 %s 文件"