Updated POT file

1 files changed, 252 insertions, 234 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index f6296bc4..c6cff748 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-07 14:44+0200\n"
+"POT-Creation-Date: 2007-09-13 22:24+0800\n"
 "PO-Revision-Date: 2007-08-22 16:02+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -145,7 +145,7 @@ msgstr ""
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:113 ../urpmi:639
+#: ../gurpmi2:113 ../urpmi:624
 #, c-format
 msgid "Ok"
 msgstr "确定"
@@ -186,13 +186,13 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:217 ../urpmi:590
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:218 ../urpmi:603
+#: ../gurpmi2:218 ../urpmi:591
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -209,12 +209,12 @@ msgstr[0] "(%d 个软件包，%d MB)"
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../gurpmi2:228 ../urpm/main_loop.pm:47
+#: ../gurpmi2:228 ../urpm/main_loop.pm:48
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi2:242 ../urpm/install.pm:84
+#: ../gurpmi2:242 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
@@ -224,7 +224,7 @@ msgstr "正在准备..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:262 ../urpmi:633
+#: ../gurpmi2:262 ../urpmi:618
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请将标签为“%s”的介质插入到设备 [%s]"
@@ -239,7 +239,7 @@ msgstr "正在下载软件包“%s”..."
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:298 ../urpm/main_loop.pm:245
+#: ../gurpmi2:298 ../urpm/main_loop.pm:253
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -250,8 +250,8 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi2:304 ../urpm/main_loop.pm:183 ../urpm/main_loop.pm:201
-#: ../urpm/main_loop.pm:219
+#: ../gurpmi2:304 ../urpm/main_loop.pm:191 ../urpm/main_loop.pm:209
+#: ../urpm/main_loop.pm:227
 #, c-format
 msgid "Installation failed:"
 msgstr "安装失败: "
@@ -266,7 +266,7 @@ msgstr "软件包已经安装"
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../gurpmi2:312 ../urpme:135
+#: ../gurpmi2:312 ../urpme:134
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
@@ -305,7 +305,7 @@ msgstr "  -f              - 输出 rpm 的完整名称(NVRA)。\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    默认为 %s。\n"
 
-#: ../rurpmi:11 ../urpmi:268
+#: ../rurpmi:11 ../urpmi:267
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
@@ -335,12 +335,12 @@ msgstr "无效的 rpm 文件名[%s]"
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:152 ../urpm/get_pkgs.pm:188
+#: ../urpm.pm:152 ../urpm/get_pkgs.pm:135
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:155 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm.pm:155 ../urpm/download.pm:612 ../urpm/get_pkgs.pm:137
 #: ../urpm/media.pm:744 ../urpm/media.pm:1269 ../urpm/media.pm:1491
 #, c-format
 msgid "...retrieving failed: %s"
@@ -381,27 +381,27 @@ msgstr "运行于限制模式运行时，禁止执行此操作"
 msgid "bad proxy declaration on command line\n"
 msgstr "命令行声明的代理服务器无效\n"
 
-#: ../urpm/args.pm:269
+#: ../urpm/args.pm:267
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
-#: ../urpm/args.pm:413
+#: ../urpm/args.pm:411
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目录不存在"
 
-#: ../urpm/args.pm:430
+#: ../urpm/args.pm:428
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "没有 %2$s 无法使用 %1$s"
 
-#: ../urpm/args.pm:433 ../urpm/args.pm:436
+#: ../urpm/args.pm:431 ../urpm/args.pm:434
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "无法和 %2$s 一起使用 %1$s"
 
-#: ../urpm/args.pm:450
+#: ../urpm/args.pm:448
 #, c-format
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
@@ -411,7 +411,7 @@ msgstr "参数太多\n"
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "创建介质“%s”的 hdlist 综合文件"
 
-#: ../urpm/bug_report.pm:51 ../urpmi:248
+#: ../urpm/bug_report.pm:51 ../urpmi:247
 #, c-format
 msgid "Copying failed"
 msgstr "复制失败"
@@ -491,162 +491,128 @@ msgstr "curl 失败: 下载已取消\n"
 msgid "rsync is missing\n"
 msgstr "缺少 rsync\n"
 
-#: ../urpm/download.pm:518
+#: ../urpm/download.pm:520
 #, c-format
 msgid "ssh is missing\n"
 msgstr "缺少 ssh\n"
 
-#: ../urpm/download.pm:537
+#: ../urpm/download.pm:539
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "缺少 prozilla\n"
 
-#: ../urpm/download.pm:553
+#: ../urpm/download.pm:555
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "无法执行 prozilla\n"
 
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:602
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
 
-#: ../urpm/download.pm:602
+#: ../urpm/download.pm:604
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 已完成，速度为 %s"
 
-#: ../urpm/download.pm:659
+#: ../urpm/download.pm:661
 #, c-format
 msgid "retrieving %s"
 msgstr "正在获取 %s"
 
-#: ../urpm/download.pm:663
+#: ../urpm/download.pm:665
 #, c-format
 msgid "retrieved %s"
 msgstr "已获取 %s"
 
-#: ../urpm/download.pm:676
+#: ../urpm/download.pm:678
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm/download.pm:695
+#: ../urpm/download.pm:697
 #, c-format
 msgid "%s is not available, falling back on %s"
 msgstr "%s 不可用，默认回到 %s"
 
-#: ../urpm/download.pm:699
+#: ../urpm/download.pm:701
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 
-#: ../urpm/download.pm:720
+#: ../urpm/download.pm:722
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
 
-#: ../urpm/get_pkgs.pm:41
+#: ../urpm/get_pkgs.pm:15
 #, c-format
 msgid "cleaning %s and %s"
 msgstr "清除 %s 和 %s"
 
-#: ../urpm/get_pkgs.pm:56 ../urpm/get_pkgs.pm:79 ../urpm/get_pkgs.pm:110
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "有多个文件名都为“%s”的 rpm 软件包"
-
-#: ../urpm/get_pkgs.pm:93
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "无法正确处理[%s]为值“%s”"
-
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
-#, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "无法访问“%s”的列表文件，介质被忽略"
-
-#: ../urpm/get_pkgs.pm:101
-#, c-format
-msgid "(retry as root?)"
-msgstr "(以 root 身份重试?)"
-
-#: ../urpm/get_pkgs.pm:126
-#, c-format
-msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
-msgstr ""
-"介质“%s”使用了无效的列表文件:\n"
-"  介质可能不是最新，正在尝试使用其它方式"
-
-#: ../urpm/get_pkgs.pm:130
-#, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "介质“%s”没有定义任何 rpm 文件的位置"
-
-#: ../urpm/get_pkgs.pm:142
+#: ../urpm/get_pkgs.pm:88
 #, c-format
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm/get_pkgs.pm:174
+#: ../urpm/get_pkgs.pm:121
 #, c-format
 msgid "malformed URL: [%s]"
 msgstr "URL 格式错误: [%s]"
 
-#: ../urpm/get_pkgs.pm:179
+#: ../urpm/get_pkgs.pm:126
 #, c-format
 msgid "sorry, you can't use --install-src to install remote .src.rpm files"
 msgstr "抱歉，您无法用 --install-src 安装远程 .src.rpm 文件"
 
-#: ../urpm/get_pkgs.pm:185
+#: ../urpm/get_pkgs.pm:132
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm/install.pm:91
+#: ../urpm/install.pm:88
 #, c-format
 msgid "[repackaging]"
 msgstr "[重新打包]"
 
-#: ../urpm/install.pm:157
+#: ../urpm/install.pm:154
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm/install.pm:160
+#: ../urpm/install.pm:157
 #, c-format
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm/install.pm:182
+#: ../urpm/install.pm:179
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
 
-#: ../urpm/install.pm:193
+#: ../urpm/install.pm:190
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm/install.pm:230
+#: ../urpm/install.pm:227
 #, c-format
 msgid "Removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:231
+#: ../urpm/install.pm:228
 #, c-format
 msgid "removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:246
+#: ../urpm/install.pm:243
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "正在从 %2$s 删除已安装的 rpm(%1$s)"
 
-#: ../urpm/install.pm:252
+#: ../urpm/install.pm:249
 #, c-format
 msgid "More information on package %s"
 msgstr "关于软件包 %s 的更多信息"
@@ -691,83 +657,83 @@ msgstr "中止"
 msgid "%s database locked"
 msgstr "%s 数据库已锁定"
 
-#: ../urpm/main_loop.pm:102
+#: ../urpm/main_loop.pm:110
 #, c-format
 msgid "The following package has bad signature"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpm/main_loop.pm:103
+#: ../urpm/main_loop.pm:111
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpm/main_loop.pm:104
+#: ../urpm/main_loop.pm:112
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpm/main_loop.pm:117 ../urpm/main_loop.pm:190 ../urpm/main_loop.pm:208
+#: ../urpm/main_loop.pm:125 ../urpm/main_loop.pm:198 ../urpm/main_loop.pm:216
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../urpm/main_loop.pm:136
+#: ../urpm/main_loop.pm:144
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#: ../urpm/main_loop.pm:151
+#: ../urpm/main_loop.pm:159
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在从 %2$s 安装 %1$s"
 
-#: ../urpm/main_loop.pm:153
+#: ../urpm/main_loop.pm:161
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpm/main_loop.pm:191
+#: ../urpm/main_loop.pm:199
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpm/main_loop.pm:209
+#: ../urpm/main_loop.pm:217
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
 
-#: ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:259
 #, c-format
 msgid "%d installation transaction failed"
 msgid_plural "%d installation transactions failed"
 msgstr[0] "%d 安装交易失败"
 
-#: ../urpm/main_loop.pm:262
+#: ../urpm/main_loop.pm:270
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpm/main_loop.pm:267
+#: ../urpm/main_loop.pm:275
 #, c-format
 msgid "Packages are up to date"
 msgstr "软件包已为最新"
 
-#: ../urpm/main_loop.pm:275
+#: ../urpm/main_loop.pm:283
 #, c-format
 msgid "Package %s is already installed"
 msgstr "软件包 %s 已经安装"
 
-#: ../urpm/main_loop.pm:276
+#: ../urpm/main_loop.pm:284
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "软件包 %s 已经安装"
 
-#: ../urpm/main_loop.pm:279
+#: ../urpm/main_loop.pm:287
 #, c-format
 msgid "Package %s can not be installed"
 msgstr "软件包 %s 无法安装"
 
-#: ../urpm/main_loop.pm:280
+#: ../urpm/main_loop.pm:288
 #, c-format
 msgid "Packages %s can not be installed"
 msgstr "软件包 %s 无法安装"
@@ -829,6 +795,11 @@ msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
 msgid "unable to access list file of \"%s\""
 msgstr "无法访问“%s”的列表文件"
 
+#: ../urpm/media.pm:220
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "无法访问“%s”的列表文件，介质被忽略"
+
 #: ../urpm/media.pm:230
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
@@ -1185,44 +1156,79 @@ msgstr "读取介质“%s”的综合文件出现问题"
 msgid "reading headers from medium \"%s\""
 msgstr "正在从介质“%s”读取头"
 
-#: ../urpm/msg.pm:62 ../urpmi:503 ../urpmi:523 ../urpmi:624
+#: ../urpm/msg.pm:62 ../urpmi:508 ../urpmi:524 ../urpmi:609
 #, c-format
 msgid "Nn"
 msgstr "nN否"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:504 ../urpmi:524 ../urpmi:567
-#: ../urpmi:625 ../urpmi:655 ../urpmi:661 ../urpmi.addmedia:128
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:509 ../urpmi:525 ../urpmi:564
+#: ../urpmi:610 ../urpmi:640 ../urpmi:646 ../urpmi.addmedia:128
 #, c-format
 msgid "Yy"
 msgstr "yY是"
 
-#: ../urpm/msg.pm:112
+#: ../urpm/msg.pm:120
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "对不起，选择无效，请再试一次\n"
 
-#: ../urpm/msg.pm:132
+#: ../urpm/msg.pm:151
+#, c-format
+msgid "Package"
+msgstr "软件包"
+
+#: ../urpm/msg.pm:151
+#, c-format
+msgid "Version"
+msgstr "版本"
+
+#: ../urpm/msg.pm:151
+#, c-format
+msgid "Release"
+msgstr "释放"
+
+#: ../urpm/msg.pm:151
+#, c-format
+msgid "Arch"
+msgstr "架构"
+
+#: ../urpm/msg.pm:160
+#, c-format
+msgid "(suggested)"
+msgstr "(建议安装)"
+
+#: ../urpm/msg.pm:175
+#, c-format
+msgid "medium \"%s\""
+msgstr "介质“%s”"
+
+#: ../urpm/msg.pm:175
+#, c-format
+msgid "command line"
+msgstr "命令行"
+
+#: ../urpm/msg.pm:189
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:132
+#: ../urpm/msg.pm:189
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:132
+#: ../urpm/msg.pm:189
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:132
+#: ../urpm/msg.pm:189
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:132 ../urpm/msg.pm:141
+#: ../urpm/msg.pm:189 ../urpm/msg.pm:198
 #, c-format
 msgid "TB"
 msgstr "TB"
@@ -1293,51 +1299,46 @@ msgstr "urpmi 已经重新启动，优先的软件包列表进行了如下更改
 msgid "No package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm/select.pm:162 ../urpme:110
+#: ../urpm/select.pm:162 ../urpme:109
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm/select.pm:477 ../urpm/select.pm:520
+#: ../urpm/select.pm:480 ../urpm/select.pm:523
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm/select.pm:478
+#: ../urpm/select.pm:481
 #, c-format
 msgid "due to already installed %s"
 msgstr "原因是已经安装 %s"
 
-#: ../urpm/select.pm:479 ../urpm/select.pm:518
+#: ../urpm/select.pm:482 ../urpm/select.pm:521
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm/select.pm:485
+#: ../urpm/select.pm:488
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm/select.pm:486
+#: ../urpm/select.pm:489
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm/select.pm:514
+#: ../urpm/select.pm:517
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm/select.pm:524
+#: ../urpm/select.pm:527
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
 
-#: ../urpm/select.pm:526
-#, c-format
-msgid "unrequested"
-msgstr "未请求"
-
 #: ../urpm/signature.pm:29
 #, c-format
 msgid "Invalid signature (%s)"
@@ -1379,7 +1380,7 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpme:45 ../urpmf:35 ../urpmi:79 ../urpmi.addmedia:44
 #: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
@@ -1395,18 +1396,18 @@ msgstr "  --auto         - 自动选中软件包。\n"
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 验证删除是否可以正确进行。\n"
 
-#: ../urpme:48 ../urpmi:107 ../urpmq:64
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
 
-#: ../urpme:49 ../urpmi:112 ../urpmq:66
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
-#: ../urpme:50 ../urpmi:144
+#: ../urpme:50 ../urpmi:143
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - 在删除之前重新对文件打包\n"
@@ -1416,7 +1417,7 @@ msgstr "  --repackage    - 在删除之前重新对文件打包\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
 
-#: ../urpme:52 ../urpmf:40 ../urpmi:114 ../urpmi.addmedia:58
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
 #: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
@@ -1436,17 +1437,17 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:56 ../urpmi:117 ../urpmq:71
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
 #, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "    --probe-synthesis - 使用综合文件。\n"
 
-#: ../urpme:57 ../urpmi:118 ../urpmq:72
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
 #, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "    --probe-hdlist - 使用 hdlist 文件。\n"
 
-#: ../urpme:58 ../urpmi:155 ../urpmq:83
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - 详细提示。\n"
@@ -1461,50 +1462,50 @@ msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 msgid "Only superuser is allowed to remove packages"
 msgstr "只允许超级用户删除软件包"
 
-#: ../urpme:104
+#: ../urpme:103
 #, c-format
 msgid "unknown packages"
 msgstr "未知的软件包"
 
-#: ../urpme:104
+#: ../urpme:103
 #, c-format
 msgid "unknown package"
 msgstr "未知的软件包"
 
-#: ../urpme:116 ../urpmi:541
+#: ../urpme:115 ../urpmi:538
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpme:118
+#: ../urpme:117
 #, c-format
 msgid "Nothing to remove"
 msgstr "不需要删除任何东西。"
 
-#: ../urpme:123
+#: ../urpme:122
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "检查删除下列软件包"
 
-#: ../urpme:127
+#: ../urpme:126
 #, 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:131
+#: ../urpme:130
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../urpme:131 ../urpmi:568 ../urpmi:656 ../urpmi.addmedia:131
+#: ../urpme:130 ../urpmi:565 ../urpmi:641 ../urpmi.addmedia:131
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
 
-#: ../urpme:153
+#: ../urpme:152
 #, c-format
 msgid "Removal failed"
 msgstr "删除失败"
@@ -1530,12 +1531,12 @@ msgstr ""
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 打印此工具的版本号。\n"
 
-#: ../urpmf:37 ../urpmi:135 ../urpmq:80
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
-#: ../urpmf:38 ../urpmi:82 ../urpmq:49
+#: ../urpmf:38 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
@@ -1546,12 +1547,12 @@ msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr "  --literal, -l  - 不匹配模式，参数为字面字符串。\n"
 
-#: ../urpmf:41 ../urpmi:81 ../urpmq:47
+#: ../urpmf:41 ../urpmi:80 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:42 ../urpmi:85 ../urpmq:50
+#: ../urpmf:42 ../urpmi:84 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1562,7 +1563,7 @@ msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - 使用给定的路径访问介质\n"
 
-#: ../urpmf:44 ../urpmi:86 ../urpmq:51
+#: ../urpmf:44 ../urpmi:85 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
@@ -1572,7 +1573,7 @@ msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 不打印相同行。\n"
 
-#: ../urpmf:46 ../urpmi:83 ../urpmq:46
+#: ../urpmf:46 ../urpmi:82 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质。\n"
@@ -1777,7 +1778,7 @@ msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式不对: 您只能使用一个多值标签"
 
-#: ../urpmf:190 ../urpmi:255 ../urpmq:135
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
@@ -1794,7 +1795,7 @@ msgstr "注意: 由于没有介质使用 hdlists 搜索，urpmf 无法返回任�
 msgid "You may want to use --name to search for package names.\n"
 msgstr "您可能想要使用 --name 来搜索软件包名称。\n"
 
-#: ../urpmi:75
+#: ../urpmi:74
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1810,53 +1811,53 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmi:84
+#: ../urpmi:83
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr "  --searchmedia  - 只使用给定介质来搜索所请求的软件包。\n"
 
-#: ../urpmi:87
+#: ../urpmi:86
 #, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr "  --auto         - 非交互模式，对全部问题假定默认回答。\n"
 
-#: ../urpmi:88 ../urpmq:52
+#: ../urpmi:87 ../urpmq:52
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
 msgstr "  --auto-update  - 更新介质后再升级系统。\n"
 
-#: ../urpmi:90
+#: ../urpmi:89
 #, c-format
 msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "    --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi:91
+#: ../urpmi:90
 #, c-format
 msgid "    --force-key    - force update of gpg key.\n"
 msgstr "    --force-key    - 强制更新 gpg 密钥。\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
 
-#: ../urpmi:93
+#: ../urpmi:92
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - 不安装软件包(只下载)。\n"
 
-#: ../urpmi:94 ../urpmq:54
+#: ../urpmi:93 ../urpmq:54
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1864,7 +1865,7 @@ msgid ""
 msgstr ""
 "  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1874,67 +1875,67 @@ msgstr ""
 "  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
 "                   较小的交易。默认为 %d。\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 小交易长度，默认为 %d。\n"
 
-#: ../urpmi:100
+#: ../urpmi:99
 #, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - 利用模糊查询。\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src, -s       - 下一个软件包是源程序包。\n"
 
-#: ../urpmi:102
+#: ../urpmi:101
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
 
-#: ../urpmi:103
+#: ../urpmi:102
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "   --clean       - 首先删除缓存中的 rpm。\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr "  --justdb       - 只使用 rpm 数据库，不更新文件系统。\n"
 
-#: ../urpmi:106
+#: ../urpmi:105
 #, c-format
 msgid ""
 "  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr "  --replacepkgs  - 强制安装已经安装过的软件包。\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr "  --allow-nodeps - 允许要求用户不经过依赖性检验就安装软件包。\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr "  --allow-force  - 允许提示用户安装软件包而不检查依赖性和完整性。\n"
 
-#: ../urpmi:113 ../urpmq:67
+#: ../urpmi:112 ../urpmq:67
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
 
-#: ../urpmi:115
+#: ../urpmi:114
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1943,47 +1944,47 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpmi，特别用于在 --root 选项\n"
 "                   下安装 chroot。\n"
 
-#: ../urpmi:119 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 用 wget 取远程文件。\n"
 
-#: ../urpmi:120 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 用 crul 取远程文件。\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prizlla      - 用 prozilla 取远程文件。\n"
 
-#: ../urpmi:122
+#: ../urpmi:121
 #, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - 给 curl 传递额外的选项\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- 给 rsync 传递额外的选项\n"
 
-#: ../urpmi:124
+#: ../urpmi:123
 #, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - 给 wget 传递额外的选项\n"
 
-#: ../urpmi:125
+#: ../urpmi:124
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --prozilla-options - 给 prozilla 传递额外的选项\n"
 
-#: ../urpmi:126 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 降低下载速度。\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1992,7 +1993,7 @@ msgstr ""
 "  --resume       - 续传未下载完成的文件\n"
 "                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmi:129 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -2001,7 +2002,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2010,7 +2011,7 @@ msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
 "                   密码(格式如 <用户: 密码>)。\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -2019,7 +2020,7 @@ msgstr ""
 "  --bug          - 输出故障报告\n"
 "                   下一个参数指定输出目录。\n"
 
-#: ../urpmi:136
+#: ../urpmi:135
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -2028,49 +2029,49 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../urpmi:138
+#: ../urpmi:137
 #, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
-#: ../urpmi:139
+#: ../urpmi:138
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
-#: ../urpmi:140
+#: ../urpmi:139
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - 排除文档文件。\n"
 
-#: ../urpmi:141
+#: ../urpmi:140
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - 安装前不检查磁盘空间。\n"
 
-#: ../urpmi:142
+#: ../urpmi:141
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 允许安装体系不匹配的 RPM。\n"
 
-#: ../urpmi:143
+#: ../urpmi:142
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - 不执行软件包脚本。\n"
 
-#: ../urpmi:145
+#: ../urpmi:144
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安装要跳过的软件包。\n"
 
-#: ../urpmi:146
+#: ../urpmi:145
 #, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr "  --prefer       - 首选的软件包\n"
 
-#: ../urpmi:147
+#: ../urpmi:146
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -2078,76 +2079,76 @@ msgid ""
 msgstr ""
 "  --more-choices - 如果找到了多个软件包，则提供多个选择而不是默认选择。\n"
 
-#: ../urpmi:149
+#: ../urpmi:148
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - 不锁定 rpm 数据库。\n"
 
-#: ../urpmi:150
+#: ../urpmi:149
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 更新只限于相同体系的软件包。\n"
 
-#: ../urpmi:151 ../urpmq:89
+#: ../urpmi:150 ../urpmq:89
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:152
+#: ../urpmi:151
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在 provides 字段中查找软件包。\n"
 
-#: ../urpmi:153
+#: ../urpmi:152
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 字段中查找软件包。\n"
 
-#: ../urpmi:154
+#: ../urpmi:153
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - 安静模式。\n"
 
-#: ../urpmi:156
+#: ../urpmi:155
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:185
+#: ../urpmi:184
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "错误: 无法在使用软件包列表时使用 --auto-select。\n"
 
-#: ../urpmi:192
+#: ../urpmi:191
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr "错误: 要生成错误报告，请在指定命令行参数时多加 --bug。\n"
 
-#: ../urpmi:219
+#: ../urpmi:218
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "您无法使用 --install-src 安装二进制 RPM 文件"
 
-#: ../urpmi:242
+#: ../urpmi:241
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:243
+#: ../urpmi:242
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:254
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "环境目录 %s 不存在"
 
-#: ../urpmi:274
+#: ../urpmi:273
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2156,48 +2157,48 @@ msgstr ""
 "错误: %s 似乎是以只读方式挂载的。\n"
 "请使用 --allow-force 强制操作。"
 
-#: ../urpmi:362
+#: ../urpmi:361
 #, c-format
 msgid "Updating media...\n"
 msgstr "正在更新介质...\n"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:443
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (即将升级)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:445
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (即将升级)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:444
+#: ../urpmi:449
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (即将安装)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:446
+#: ../urpmi:451
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (即将安装)"
 
-#: ../urpmi:452
+#: ../urpmi:457
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "为满足“%s”的依赖关系，需要删除下列软件包之一："
 
-#: ../urpmi:455
+#: ../urpmi:460
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:496
+#: ../urpmi:501
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2207,7 +2208,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:498
+#: ../urpmi:503
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2217,7 +2218,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:506 ../urpmi:526
+#: ../urpmi:510 ../urpmi:526
 #, c-format
 msgid ""
 "\n"
@@ -2226,12 +2227,12 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:506 ../urpmi:526 ../urpmi:626 ../urpmi.addmedia:131
+#: ../urpmi:511 ../urpmi:527 ../urpmi:611 ../urpmi.addmedia:131
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
 
-#: ../urpmi:518
+#: ../urpmi:519
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2240,7 +2241,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:519
+#: ../urpmi:520
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2249,7 +2250,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:550
+#: ../urpmi:547
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2259,7 +2260,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:552
+#: ../urpmi:549
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2269,7 +2270,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:559
+#: ../urpmi:556
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -2278,7 +2279,7 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:560
+#: ../urpmi:557
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -2287,17 +2288,12 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:562
+#: ../urpmi:559
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(只是测试，删除将不会实际发生)"
 
-#: ../urpmi:592
-#, c-format
-msgid "(suggested)"
-msgstr "(建议安装)"
-
-#: ../urpmi:599
+#: ../urpmi:585
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -2306,38 +2302,38 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi:605
+#: ../urpmi:593
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(只是测试，安装将不会实际发生)"
 
-#: ../urpmi:614
+#: ../urpmi:599
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "将会使用 %s 的额外磁盘空间。"
 
-#: ../urpmi:615
+#: ../urpmi:600
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "将会释放 %s 的磁盘空间。"
 
-#: ../urpmi:616
+#: ../urpmi:601
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "继续安装 %d 个软件包吗？"
 
-#: ../urpmi:634
+#: ../urpmi:619
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:639
+#: ../urpmi:624
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:678
+#: ../urpmi:663
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
@@ -2492,17 +2488,17 @@ msgstr ""
 "\n"
 "您是否想要添加介质“%s”"
 
-#: ../urpmi.addmedia:162
+#: ../urpmi.addmedia:161
 #, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<hdlist 相对路径>找不到\n"
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:164
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "远程介质无法使用 %s"
 
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:187
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质“%s”\n"
@@ -2966,3 +2962,25 @@ msgstr "由于介质“%s”没有 hdlists，软件包 %s 无法返回任何结�
 #, c-format
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
+
+#~ msgid "there are multiple packages with the same rpm filename \"%s\""
+#~ msgstr "有多个文件名都为“%s”的 rpm 软件包"
+
+#~ msgid "unable to correctly parse [%s] on value \"%s\""
+#~ msgstr "无法正确处理[%s]为值“%s”"
+
+#~ msgid "(retry as root?)"
+#~ msgstr "(以 root 身份重试?)"
+
+#~ msgid ""
+#~ "medium \"%s\" uses an invalid list file:\n"
+#~ "  mirror is probably not up-to-date, trying to use alternate method"
+#~ msgstr ""
+#~ "介质“%s”使用了无效的列表文件:\n"
+#~ "  介质可能不是最新，正在尝试使用其它方式"
+
+#~ msgid "medium \"%s\" does not define any location for rpm files"
+#~ msgstr "介质“%s”没有定义任何 rpm 文件的位置"
+
+#~ msgid "unrequested"
+#~ msgstr "未请求"