Updated POT file

1 files changed, 470 insertions, 403 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9dc31de5..741ff651 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-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
 "PO-Revision-Date: 2007-07-01 14:24+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
 #, c-format
 msgid "RPM installation"
 msgstr "RPM 安装"
@@ -33,7 +33,7 @@ msgstr "RPM 安装"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "错误: 找不到文件 %s，将取消操作"
 
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
 #, c-format
 msgid "_Ok"
 msgstr "确定(_O)"
@@ -99,7 +99,7 @@ msgstr "安装(_I)"
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
 #, c-format
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -119,17 +119,17 @@ msgstr "未知的选项 %s"
 msgid "No packages specified"
 msgstr "未指定软件包"
 
-#: ../gurpmi2:44
+#: ../gurpmi2:45
 #, c-format
 msgid "Please wait..."
 msgstr "请稍候..."
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Must be root"
 msgstr "必须是 root"
 
-#: ../gurpmi2:88
+#: ../gurpmi2:89
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -140,42 +140,42 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:112
+#: ../gurpmi2:113
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../gurpmi2:149
+#: ../gurpmi2:150
 #, c-format
 msgid " (to upgrade)"
 msgstr "(升级)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:151
 #, c-format
 msgid " (to install)"
 msgstr "(安装)"
 
-#: ../gurpmi2:153
+#: ../gurpmi2:154
 #, c-format
 msgid "Package choice"
 msgstr "软件包选择"
 
-#: ../gurpmi2:154
+#: ../gurpmi2:155
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../gurpmi2:177
+#: ../gurpmi2:178
 #, c-format
 msgid "_Abort"
 msgstr "中止(_A)"
 
-#: ../gurpmi2:197
+#: ../gurpmi2:198
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -186,59 +186,60 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d 个软件包，%d MB)"
 
-#: ../gurpmi2:225
+#: ../gurpmi2:226
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "正在准备..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "正在安装软件包“%s”(%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请将标签为“%s”的介质插入到设备 [%s]"
 
-#: ../gurpmi2:264
+#: ../gurpmi2:273
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../gurpmi2:279
+#: ../gurpmi2:291
 #, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"下列软件包的签名出现问题:\n"
-"\n"
-"%s\n"
-"\n"
-"您想要继续安装吗?"
+msgid "_Done"
+msgstr "完成(_D)"
 
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -249,41 +250,27 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "正在删除 %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "正在准备..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "正在安装软件包“%s”(%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "完成(_D)"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
 #, c-format
 msgid "Installation failed:"
 msgstr "安装失败: "
 
-#: ../gurpmi2:344
+#: ../gurpmi2:309
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "软件包已经安装"
 
-#: ../gurpmi2:346
+#: ../gurpmi2:311
 #, c-format
 msgid "Installation finished"
 msgstr "安装完成"
 
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "正在删除 %s"
+
 #: ../rpm-find-leaves:14
 #, c-format
 msgid ""
@@ -318,7 +305,7 @@ msgstr "  -f              - 输出 rpm 的完整名称(NVRA)。\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    默认为 %s。\n"
 
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
@@ -328,98 +315,98 @@ msgstr "只允许超级用户安装软件包"
 msgid "Running urpmi in restricted mode..."
 msgstr "正在以限制模式运行 urpmi..."
 
-#: ../urpm.pm:91
+#: ../urpm.pm:104
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:110
+#: ../urpm.pm:123
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr "在缓存中找到了 %d 个 rpm 头，删除了 %d 个过期头"
 
-#: ../urpm.pm:126
+#: ../urpm.pm:139
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:132
+#: ../urpm.pm:145
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../urpm.pm:142
+#: ../urpm.pm:155
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:147
+#: ../urpm.pm:160
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "无法处理 spec 文件 %s [%s]"
 
-#: ../urpm.pm:157
+#: ../urpm.pm:170
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:159
+#: ../urpm.pm:172
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "RPM 的架构不兼容[%s]"
 
-#: ../urpm.pm:163
+#: ../urpm.pm:176
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:259
+#: ../urpm.pm:274
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "运行于限制模式运行时，禁止执行此操作"
 
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令行声明的代理服务器无效\n"
 
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "chroot 目录不存在"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "chroot 目录不存在"
+
+#: ../urpm/args.pm:424
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "没有 %2$s 无法使用 %1$s"
 
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "无法和 %2$s 一起使用 %1$s"
 
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
 #, c-format
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
 
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "创建介质“%s”的 hdlist 综合文件"
@@ -608,7 +595,12 @@ msgstr "未找到软件包 %s。"
 msgid "malformed URL: [%s]"
 msgstr "URL 格式错误: [%s]"
 
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
@@ -618,43 +610,48 @@ msgstr "正在从介质“%s”上获取 rpm 文件..."
 msgid "[repackaging]"
 msgstr "[重新打包]"
 
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
 #, c-format
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
 
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
 
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "删除软件包 %s"
+
+#: ../urpm/install.pm:211
 #, c-format
 msgid "removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "正在从 %2$s 删除已安装的 rpm(%1$s)"
 
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
 #, c-format
 msgid "More information on package %s"
 msgstr "关于软件包 %s 的更多信息"
@@ -684,11 +681,102 @@ msgstr "未定义基础"
 msgid "Cannot connect to ldap uri:"
 msgstr "无法连接到 ldap uri:"
 
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "%s 数据库已锁定"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "警告"
+
+#: ../urpm/lock.pm:65
 #, c-format
 msgid "%s database locked"
 msgstr "%s 数据库已锁定"
 
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "下列软件包的签名有错误"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "下列软件包的签名有错误"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "您想继续安装吗?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "安装失败"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "正在分发 %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "正在从 %2$s 安装 %1$s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "正在安装 %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d 安装交易失败"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "可以安装"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "软件包已为最新"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "软件包 %s 已经安装"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "软件包 %s 已经安装"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "软件包 %s 无法安装"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "软件包 %s 无法安装"
+
 #: ../urpm/md5sum.pm:23
 #, c-format
 msgid "examining %s file"
@@ -736,7 +824,7 @@ msgstr "不应设置“synthesis”(介质“%s”)"
 msgid "\"synthesis\" should be set (medium \"%s\")"
 msgstr "应该设置“synthesis”(介质“%s”)"
 
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
@@ -825,7 +913,7 @@ msgstr "注意: 介质“%s”没有 hdlist，无法返回任何结果"
 msgid "Search start: %s end: %s"
 msgstr "搜索开始: %s 结束: %s"
 
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "正在执行第二遍依赖关系的计算\n"
@@ -890,144 +978,149 @@ msgstr "无法分析 media.cfg"
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "无法访问发行版介质(未发现 media.cfg 文件)"
 
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在从介质“%s”重新配置 urpmi"
 
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...重新配置失败"
 
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新配置完成"
 
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "生成名称文件出错: 依赖关系 %d 未找到"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
 #, c-format
 msgid "Error generating names file: Can't write to file (%s)"
 msgstr "生成名称文件失败: 无法写入文件(%s)"
 
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "介质“%s”已为最新"
 
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "正在检查 hdlist 文件 [%s]"
 
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "正在创建 hdlist [%s]"
 
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
 #, c-format
 msgid ""
 "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
 "corrupted."
 msgstr "无法创建介质“%s”的综合文件。您的 hdlist 文件可能已经损坏。"
 
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
 
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "正在复制介质“%2$s”的 [%1$s]..."
 
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
 #, c-format
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
 #, c-format
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
 
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "复制[%s]失败(md5sum 不匹配)"
 
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
 #, c-format
 msgid "...retrieving failed: md5sum mismatch"
 msgstr "...获取失败: md5sum 不匹配"
 
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 中未发现 rpm 文件"
 
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "正在从[%s]读取 rpm 文件"
 
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "无法从[%s]读取 rpm 文件: %s"
 
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
 #, c-format
 msgid "no rpms read"
 msgstr "没有读到 rpm"
 
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -1037,74 +1130,74 @@ msgstr ""
 "无法访问介质“%s”，\n"
 "这可能是因为您在创建介质时是手动装载的目录。"
 
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "介质“%2$s”的 hdlist 文件 %1$s 无效"
 
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "发现探测的 hdlist(或综合文件) 为 %s"
 
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "介质“%s”未发现 hdlist 文件"
 
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
 
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "正在写入介质“%s”的列表文件"
 
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "已更新介质“%s”"
 
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法处理“%s”的 hdlist 文件"
 
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "正在从介质“%s”读取头"
 
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
 #, 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:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
 #, c-format
 msgid "Yy"
 msgstr "yY是"
@@ -1164,47 +1257,52 @@ msgstr "非连贯介质“%s”标为可移动但实际不是"
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质“%s”"
 
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
 #, c-format
 msgid "No package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "软件包 %s 已经安装"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
 
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
 #, c-format
 msgid "unrequested"
 msgstr "未请求"
@@ -1224,6 +1322,16 @@ msgstr "无效的密钥 ID(%s)"
 msgid "Missing signature (%s)"
 msgstr "缺少签名(%s)"
 
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "无法创建配置文件[%s]"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "复制失败"
+
 #: ../urpme:40
 #, c-format
 msgid ""
@@ -1240,8 +1348,8 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
@@ -1256,18 +1364,18 @@ msgstr "  --auto         - 自动选中软件包。\n"
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 验证删除是否可以正确进行。\n"
 
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../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:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - 在删除之前重新对文件打包\n"
@@ -1277,8 +1385,8 @@ msgstr "  --repackage    - 在删除之前重新对文件打包\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
 
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../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"
 msgstr "  --urpmi-root   - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
@@ -1297,17 +1405,17 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
 #, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "    --probe-synthesis - 使用综合文件。\n"
 
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
 #, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "    --probe-hdlist - 使用 hdlist 文件。\n"
 
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - 详细提示。\n"
@@ -1317,60 +1425,60 @@ msgstr "  --verbose, -v  - 详细提示。\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 
-#: ../urpme:76
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "只允许超级用户删除软件包"
 
-#: ../urpme:107
+#: ../urpme:104
 #, c-format
 msgid "unknown packages"
 msgstr "未知的软件包"
 
-#: ../urpme:107
+#: ../urpme:104
 #, c-format
 msgid "unknown package"
 msgstr "未知的软件包"
 
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpme:121
+#: ../urpme:118
 #, c-format
 msgid "Nothing to remove"
 msgstr "不需要删除任何东西。"
 
-#: ../urpme:126
+#: ../urpme:123
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "检查删除下列软件包"
 
-#: ../urpme:134
+#: ../urpme:131
 #, 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:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
 #, c-format
 msgid " (%d MB)"
 msgstr "(%d MB)"
 
-#: ../urpme:138
+#: ../urpme:135
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
 
-#: ../urpme:160
+#: ../urpme:157
 #, c-format
 msgid "Removal failed"
 msgstr "删除失败"
@@ -1396,12 +1504,12 @@ msgstr ""
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 打印此工具的版本号。\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
@@ -1412,12 +1520,12 @@ msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr "  --literal, -l  - 不匹配模式，参数为字面字符串。\n"
 
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1428,7 +1536,7 @@ msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - 使用给定的路径访问介质\n"
 
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
@@ -1438,7 +1546,7 @@ msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 不打印相同行。\n"
 
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质。\n"
@@ -1569,88 +1677,98 @@ msgid "  --group        - group\n"
 msgstr "  --group        - 分组\n"
 
 #: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - 软件包名称\n"
+
+#: ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - 软件包名称\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - obsolets 标签\n"
 
-#: ../urpmf:74
+#: ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - 打包者\n"
 
-#: ../urpmf:75
+#: ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - provides 标签\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - requires 标签\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - 安装大小\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - 源 rpm 名称\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    - obsolets 标签\n"
+
+#: ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - 摘要\n"
 
-#: ../urpmf:80
+#: ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:81
+#: ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - 提供者\n"
 
-#: ../urpmf:82
+#: ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - 软件包所在介质\n"
 
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
 
-#: ../urpmf:140
+#: ../urpmf:142
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式不对: 您只能使用一个多值标签"
 
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
 
-#: ../urpmf:227
+#: ../urpmf:229
 #, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
 msgstr "注意: 由于没有介质使用 hdlists 搜索，urpmf 无法返回任何结果\n"
 
-#: ../urpmf:228
+#: ../urpmf:230
 #, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "您可能想要使用 --name 来搜索软件包名称。\n"
 
-#: ../urpmi:79
+#: ../urpmi:75
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1666,53 +1784,53 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmi:88
+#: ../urpmi:84
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr "  --searchmedia  - 只使用给定介质来搜索所请求的软件包。\n"
 
-#: ../urpmi:91
+#: ../urpmi:87
 #, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr "  --auto         - 非交互模式，对全部问题假定默认回答。\n"
 
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
 
-#: ../urpmi:93
+#: ../urpmi:89
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
 msgstr "  --auto-update  - 更新介质后再升级系统。\n"
 
-#: ../urpmi:94
+#: ../urpmi:90
 #, c-format
 msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "    --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
 #, c-format
 msgid "    --force-key    - force update of gpg key.\n"
 msgstr "    --force-key    - 强制更新 gpg 密钥。\n"
 
-#: ../urpmi:96
+#: ../urpmi:92
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - 不安装软件包(只下载)。\n"
 
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1720,7 +1838,7 @@ msgid ""
 msgstr ""
 "  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
 
-#: ../urpmi:100
+#: ../urpmi:96
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1730,56 +1848,62 @@ msgstr ""
 "  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
 "                   较小的交易。默认为 %d。\n"
 
-#: ../urpmi:103
+#: ../urpmi:99
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 小交易长度，默认为 %d。\n"
 
-#: ../urpmi:104
+#: ../urpmi:100
 #, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - 利用模糊查询。\n"
 
-#: ../urpmi:105
+#: ../urpmi:101
 #, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src, -s       - 下一个软件包是源程序包。\n"
 
-#: ../urpmi:106
+#: ../urpmi:102
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
 
-#: ../urpmi:107
+#: ../urpmi:103
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "   --clean       - 首先删除缓存中的 rpm。\n"
 
-#: ../urpmi:108
+#: ../urpmi:104
 #, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
 
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr "  --allow-nodeps - 允许要求用户不经过依赖性检验就安装软件包。\n"
 
-#: ../urpmi:112
+#: ../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:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
 
-#: ../urpmi:117
+#: ../urpmi:114
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1788,47 +1912,47 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpmi，特别用于在 --root 选项\n"
 "                   下安装 chroot。\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../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:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../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:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../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:124
+#: ../urpmi:121
 #, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - 给 curl 传递额外的选项\n"
 
-#: ../urpmi:125
+#: ../urpmi:122
 #, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- 给 rsync 传递额外的选项\n"
 
-#: ../urpmi:126
+#: ../urpmi:123
 #, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - 给 wget 传递额外的选项\n"
 
-#: ../urpmi:127
+#: ../urpmi:124
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --prozilla-options - 给 prozilla 传递额外的选项\n"
 
-#: ../urpmi:128 ../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:129
+#: ../urpmi:126
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1837,7 +1961,7 @@ msgstr ""
 "  --resume       - 续传未下载完成的文件\n"
 "                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1846,7 +1970,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1855,7 +1979,7 @@ msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
 "                   密码(格式如 <用户: 密码>)。\n"
 
-#: ../urpmi:135
+#: ../urpmi:132
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1864,7 +1988,7 @@ msgstr ""
 "  --bug          - 输出故障报告\n"
 "                   下一个参数指定输出目录。\n"
 
-#: ../urpmi:138
+#: ../urpmi:135
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1873,44 +1997,49 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../urpmi:140
+#: ../urpmi:137
 #, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
-#: ../urpmi:141
+#: ../urpmi:138
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
-#: ../urpmi:142
+#: ../urpmi:139
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - 排除文档文件。\n"
 
-#: ../urpmi:143
+#: ../urpmi:140
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - 安装前不检查磁盘空间。\n"
 
-#: ../urpmi:144
+#: ../urpmi:141
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 允许安装体系不匹配的 RPM。\n"
 
-#: ../urpmi:145
+#: ../urpmi:142
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - 不执行软件包脚本。\n"
 
-#: ../urpmi:147
+#: ../urpmi:144
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安装要跳过的软件包。\n"
 
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid "  --prefer       - packages which should be preferred\n"
+msgstr "  --skip         - 安装要跳过的软件包。\n"
+
+#: ../urpmi:146
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -1918,66 +2047,66 @@ msgid ""
 msgstr ""
 "  --more-choices - 如果找到了多个软件包，则提供多个选择而不是默认选择。\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - 不锁定 rpm 数据库。\n"
 
-#: ../urpmi:151
+#: ../urpmi:149
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 更新只限于相同体系的软件包。\n"
 
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在 provides 字段中查找软件包。\n"
 
-#: ../urpmi:154
+#: ../urpmi:152
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 字段中查找软件包。\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - 安静模式。\n"
 
-#: ../urpmi:157
+#: ../urpmi:155
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:186
+#: ../urpmi:184
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "错误: 无法在使用软件包列表时使用 --auto-select。\n"
 
-#: ../urpmi:193
+#: ../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:220
+#: ../urpmi:218
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "您无法使用 --install-src 安装二进制 RPM 文件"
 
-#: ../urpmi:243
+#: ../urpmi:241
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:244
+#: ../urpmi:242
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
@@ -1987,7 +2116,7 @@ msgstr "无法创建故障报告的目录 [%s]"
 msgid "Environment directory %s does not exist"
 msgstr "环境目录 %s 不存在"
 
-#: ../urpmi:271
+#: ../urpmi:273
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1996,46 +2125,48 @@ msgstr ""
 "错误: %s 似乎是以只读方式挂载的。\n"
 "请使用 --allow-force 强制操作。"
 
-#: ../urpmi:362
+#: ../urpmi:361
 #, c-format
 msgid "Updating media...\n"
 msgstr "正在更新介质...\n"
 
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (即将升级)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (即将升级)"
 
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (即将安装)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (即将安装)"
 
-#: ../urpmi:447
+#: ../urpmi:454
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "为满足“%s”的依赖关系，需要删除下列软件包之一："
 
-#: ../urpmi:450
+#: ../urpmi:457
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:481
+#: ../urpmi:498
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2045,7 +2176,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:483
+#: ../urpmi:500
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2055,7 +2186,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
 #, c-format
 msgid ""
 "\n"
@@ -2064,12 +2195,12 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
 
-#: ../urpmi:503
+#: ../urpmi:520
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2078,7 +2209,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:504
+#: ../urpmi:521
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2087,7 +2218,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:535
+#: ../urpmi:552
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2097,7 +2228,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:537
+#: ../urpmi:554
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2107,7 +2238,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:544
+#: ../urpmi:561
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -2116,7 +2247,7 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:545
+#: ../urpmi:562
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -2125,12 +2256,17 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:547
+#: ../urpmi:564
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(只是测试，删除将不会实际发生)"
 
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -2139,109 +2275,28 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi:595
+#: ../urpmi:615
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(只是测试，安装将不会实际发生)"
 
-#: ../urpmi:597
+#: ../urpmi:617
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "继续安装 %d 个软件包吗？"
 
-#: ../urpmi:623
+#: ../urpmi:632
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:628
+#: ../urpmi:637
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "下列软件包的签名有错误"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "下列软件包的签名有错误"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "您想继续安装吗?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "安装失败"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "正在分发 %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "正在从 %2$s 安装 %1$s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "正在安装 %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "%d 安装交易失败"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "可以安装"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "软件包已为最新"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "软件包 %s 已经安装"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "软件包 %s 已经安装"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "软件包 %s 无法安装"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "软件包 %s 无法安装"
-
-#: ../urpmi:862
+#: ../urpmi:676
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
@@ -2362,32 +2417,32 @@ msgstr "  -v             - 详细的提示。\n"
 msgid "unable to update medium \"%s\"\n"
 msgstr "无法更新介质“%s”\n"
 
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "无效的 <url> (如果是本地目录，必须是绝对路径)"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "只允许超级用户添加介质"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "creating config file [%s]"
 msgstr "创建配置文件[%s]"
 
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "无法创建配置文件[%s]"
 
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
 #, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "使用 --distrib 不需要提供 <hdlist 的相对路径>"
 
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
 #, c-format
 msgid ""
 "\n"
@@ -2396,17 +2451,17 @@ msgstr ""
 "\n"
 "您是否想要添加介质“%s”"
 
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
 #, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<hdlist 相对路径>找不到\n"
 
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "远程介质无法使用 %s"
 
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质“%s”\n"
@@ -2565,17 +2620,17 @@ msgstr "  -a             - 选择所有介质。\n"
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - 介质名称使用模糊匹配。\n"
 
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
 #, c-format
 msgid "Only superuser is allowed to remove media"
 msgstr "只允许超级用户删除介质"
 
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "没有可删除的(用 urpmi.addmedia 增加介质)\n"
 
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -2629,17 +2684,17 @@ msgstr "  -a             - 选择所有不可移动的介质。\n"
 msgid "  -f             - force updating synthesis/hdlist\n"
 msgstr "  -f             - 强迫更新综合文件/hdlist 文件。\n"
 
-#: ../urpmi.update:71
+#: ../urpmi.update:69
 #, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "只允许超级用户更新介质"
 
-#: ../urpmi.update:79
+#: ../urpmi.update:77
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
 
-#: ../urpmi.update:97
+#: ../urpmi.update:95
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2648,22 +2703,22 @@ msgstr ""
 "找不到要升级的项\n"
 "(%s 中之一)\n"
 
-#: ../urpmi.update:101
+#: ../urpmi.update:99
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:100
 #, c-format
 msgid "ignoring media %s"
 msgstr "忽略介质 %s"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:100
 #, c-format
 msgid "enabling media %s"
 msgstr "启用介质 %s"
 
-#: ../urpmq:43
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -2679,88 +2734,88 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmq:51
+#: ../urpmq:48
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
 msgstr "  --searchmedia  - 只使用给定介质来搜索请求(或更新的)的软件包。\n"
 
-#: ../urpmq:56
+#: ../urpmq:53
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - 利用模糊查询(和 -y 一样)。\n"
 
-#: ../urpmq:59
+#: ../urpmq:56
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - 列出可用的软件包。\n"
 
-#: ../urpmq:60
+#: ../urpmq:57
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - 列出可用的介质。\n"
 
-#: ../urpmq:61
+#: ../urpmq:58
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - 列出可用的介质及其 URL。\n"
 
-#: ../urpmq:62
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - 如果使用了 --parallel，列出所有可用的节点。\n"
 
-#: ../urpmq:63
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - 列出可用的并行处理别名。\n"
 
-#: ../urpmq:64
+#: ../urpmq:61
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "  --dump-config  - 以 urpmi.addmedia 参数的格式导出配置。\n"
 
-#: ../urpmq:65
+#: ../urpmq:62
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下一个软件包是源程序包(和 -s 一样)。\n"
 
-#: ../urpmq:66
+#: ../urpmq:63
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      - 下载前给出所有的源文件包(root 专用)。\n"
 
-#: ../urpmq:68
+#: ../urpmq:65
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 允许查询架构不匹配的 RPM。\n"
 
-#: ../urpmq:72
+#: ../urpmq:69
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr "  --use-distrib  - 从发行版树中实时配置 urpmi。这将允许查询发行版。\n"
 
-#: ../urpmq:84
+#: ../urpmq:81
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - 打印更新日志。\n"
 
-#: ../urpmq:85
+#: ../urpmq:82
 #, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - 打印摘要。\n"
 
-#: ../urpmq:87
+#: ../urpmq:84
 #, c-format
 msgid "  --whatrequires - reverse search to what requires package.\n"
 msgstr "  --whatrequires - 逆序搜索需要软件包的软件包。\n"
 
-#: ../urpmq:88
+#: ../urpmq:85
 #, c-format
 msgid ""
 "  --whatrequires-recursive\n"
@@ -2769,7 +2824,7 @@ msgstr ""
 "  --whatrequires-recursive\n"
 "                   - 扩展逆序搜索(包括虚拟软件包)。\n"
 
-#: ../urpmq:90
+#: ../urpmq:87
 #, c-format
 msgid ""
 "  --whatprovides, -p\n"
@@ -2778,99 +2833,111 @@ msgstr ""
 "  --whatprovides, -p\n"
 "                   - 允许在 provides 中寻找软件包。\n"
 
-#: ../urpmq:93
+#: ../urpmq:90
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - 要删除的软件包的完整输出。\n"
 
-#: ../urpmq:94
+#: ../urpmq:91
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - 扩展软件包依赖性查询。\n"
 
-#: ../urpmq:96
+#: ../urpmq:93
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - 打印组名。\n"
 
-#: ../urpmq:97
+#: ../urpmq:94
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - 以人类可读的格式打印有用信息。\n"
 
-#: ../urpmq:98
+#: ../urpmq:95
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - 列出软件包中的文件。\n"
 
-#: ../urpmq:99
+#: ../urpmq:96
 #, c-format
 msgid "  -m             - equivalent to -du\n"
 msgstr "  -m             - 与 -du 等价。\n"
 
-#: ../urpmq:100
+#: ../urpmq:97
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 和名称一起打印版本和发行号。\n"
 
-#: ../urpmq:101
+#: ../urpmq:98
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
 
-#: ../urpmq:102
+#: ../urpmq:99
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - 如果更新的版本已经安装，就删除软件包。\n"
 
-#: ../urpmq:103
+#: ../urpmq:100
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
 
-#: ../urpmq:104
+#: ../urpmq:101
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - 类似于 -y，但强制不区分大小写匹配。\n"
 
-#: ../urpmq:105
+#: ../urpmq:102
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  需要在命令行给出名称或 rpm 文件。\n"
 
-#: ../urpmq:181
+#: ../urpmq:180
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 仅能和 --parallel 一起使用"
 
-#: ../urpmq:362
+#: ../urpmq:359
 #, c-format
 msgid "no hdlist for medium \"%s\", only partial result for package %s"
 msgstr "由于介质“%s”没有 hdlist，软件包 %s 只返回部分结果"
 
-#: ../urpmq:363
+#: ../urpmq:360
 #, c-format
 msgid "no hdlist for medium \"%s\", only partial result for packages %s"
 msgstr "由于介质“%s”没有 hdlists，软件包 %s 只返回部分结果"
 
-#: ../urpmq:366
+#: ../urpmq:363
 #, c-format
 msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
 msgstr "由于介质“%s”没有 hdlists，软件包 %s 无法返回任何结果"
 
-#: ../urpmq:367
+#: ../urpmq:364
 #, c-format
 msgid ""
 "no hdlist for medium \"%s\", unable to return any result for packages %s"
 msgstr "由于介质“%s”没有 hdlists，软件包 %s 无法返回任何结果"
 
-#: ../urpmq:428
+#: ../urpmq:425
 #, c-format
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
 
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "下列软件包的签名出现问题:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "您想要继续安装吗?"
+
 #~ msgid "You need to be root to use --use-distrib"
 #~ msgstr "你必须是 root 才能使用 --use-distrib 命令"