sync with code

1 files changed, 726 insertions, 458 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index b235a34d..2ffc4098 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: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
 "PO-Revision-Date: 2006-08-10 22:36+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -22,7 +22,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
 msgid "RPM installation"
 msgstr "RPM 安装"
 
@@ -31,7 +32,8 @@ msgstr "RPM 安装"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "错误：找不到文件 %s，将取消操作"
 
-#: ../gurpmi:45 ../gurpmi2:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
 msgid "_Ok"
 msgstr "确定(_O)"
 
@@ -86,20 +88,23 @@ msgstr ""
 "\n"
 "您也可以选择只是保存相应的软件包。您要进行什么操作?"
 
-#. - buttons
 #: ../gurpmi:97
+#, c-format
 msgid "_Install"
 msgstr "安装(_I)"
 
 #: ../gurpmi:98
+#, c-format
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #: ../gurpmi:107
+#, c-format
 msgid "Choose location to save file"
 msgstr "选择保存文件的位置"
 
@@ -109,18 +114,21 @@ msgid "Unknown option %s"
 msgstr "未知的选项 %s"
 
 #: ../gurpmi.pm:89
+#, c-format
 msgid "No packages specified"
 msgstr "未指定软件包"
 
 #: ../gurpmi2:43
+#, c-format
 msgid "Please wait..."
 msgstr "请稍候..."
 
 #: ../gurpmi2:52
+#, c-format
 msgid "Must be root"
 msgstr "必须是 root"
 
-#: ../gurpmi2:86
+#: ../gurpmi2:87
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -131,35 +139,42 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "确定"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "确定"
+
+#: ../gurpmi2:148
+#, c-format
 msgid " (to upgrade)"
 msgstr "(升级)"
 
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
 msgid " (to install)"
 msgstr "(安装)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
 msgid "Package choice"
 msgstr "软件包选择"
 
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
 msgid "_Abort"
 msgstr "中止(_A)"
 
-#: ../gurpmi2:194
+#: ../gurpmi2:196
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -170,7 +185,7 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:208
+#: ../gurpmi2:210
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -180,25 +195,27 @@ msgstr ""
 "为了满足依赖性要求，将另外安装以下%d个软件包:\n"
 "%s\n"
 
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请将标签为“%s”的介质插入到设备 [%s]"
 
-#: ../gurpmi2:254
+#: ../gurpmi2:256
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../gurpmi2:269
+#: ../gurpmi2:271
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -212,8 +229,7 @@ msgstr ""
 "\n"
 "您想要继续安装吗?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -224,35 +240,38 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../gurpmi2:293
+#: ../gurpmi2:295
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
 msgid "The package(s) are already installed"
 msgstr "软件包已经安装"
 
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
 msgid "Installation finished"
 msgstr "安装完成"
 
@@ -266,19 +285,22 @@ msgstr ""
 "[选项]的格式为\n"
 
 #: ../rpm-find-leaves:16
+#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - 打印帮助信息。\n"
 
 #: ../rpm-find-leaves:17
+#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "   --root <路径>  - 使用给定的根而不是 /\n"
 
 #: ../rpm-find-leaves:18
+#, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
 msgstr "   -g [组]        - 限制结果为给定组。\n"
 
 #: ../rpm-find-leaves:19
-#, fuzzy
+#, fuzzy, c-format
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - 打印组名。\n"
 
@@ -287,210 +309,127 @@ msgstr "  -g             - 打印组名。\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    默认为 %s。\n"
 
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
 
 #: ../rurpmi:18
+#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "正在以限制模式运行 urpmi..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:92
+#: ../urpm.pm:112
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:128
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:114
+#: ../urpm.pm:134
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:119
+#: ../urpm.pm:139
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:144
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:129
+#: ../urpm.pm:149
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "无法处理 spec 文件 %s [%s]"
 
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:141
+#: ../urpm.pm:161
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "RPM 的架构不兼容[%s]"
 
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "运行于限制模式运行时，禁止执行此操作"
 
-#: ../urpm/args.pm:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令的代理声明无效\n"
 
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
-#, fuzzy
+#: ../urpm/args.pm:133
+#, fuzzy, c-format
 msgid "chroot directory doesn't exist"
 msgstr "环境目录 %s 不存在"
 
 #: ../urpm/args.pm:242
+#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr "你必须是 root 才能使用 --use-distrib 命令"
 
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:432
+#: ../urpm/args.pm:426
+#, c-format
+msgid "Can't use %s with %s"
+msgstr ""
+
+#: ../urpm/args.pm:440
+#, c-format
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
 
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#, c-format
 msgid "Nn"
 msgstr "nN否"
 
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#, c-format
 msgid "Yy"
 msgstr "yY是"
 
-#: ../urpm/msg.pm:98
+#: ../urpm/msg.pm:104
+#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "对不起，选择无效，请再试一次\n"
 
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "mput 失败，可能节点无法连接"
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr "节点 %s 的 urpme 版本太旧，请升级"
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "rshp 失败，可能节点无法连接"
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr "于节点 %s"
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr "正在将综合文件传播到节点..."
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr "正在解决节点上的依赖关系..."
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr "正在将文件分发到节点..."
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr "正在验证安装是否可以在节点上进行..."
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "节点 %s 安装失败"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "可以安装"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "正在节点上安装软件包..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr "主机 %s scp 失败(%d)"
-
-#: ../urpm/parallel_ssh.pm:130
-#, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "正在将综合文件传播到 %s..."
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr "正在解决 %s 上的依赖关系..."
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr "主机 %s 上的 urpmi 版本不对(%d)"
-
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "正在将文件分发给 %s..."
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr "正在验证安装是否可以在 %s 上进行..."
-
-#: ../urpm/parallel_ssh.pm:267
-#, c-format
-msgid "Performing install on %s..."
-msgstr "正在 %s 上执行安装..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, c-format
-msgid "Installing %s on %s..."
-msgstr "正在 %2$s 上安装 %1$s..."
-
-#: ../urpm/parallel_ssh.pm:282
-#, c-format
-msgid "Preparing install on %s..."
-msgstr "正在准备在 %s 上安装..."
-
 #: ../urpme:39
 #, c-format
 msgid ""
@@ -507,41 +446,56 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
 
 #: ../urpme:45
+#, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自动选中软件包。\n"
 
 #: ../urpme:46
+#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 验证删除是否可以正确进行。\n"
 
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
 
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
-#: ../urpme:49 ../urpmi:148
+#: ../urpme:49 ../urpmi:146
+#, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - 在删除之前重新对文件打包\n"
 
 #: ../urpme:50
+#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
 
-#: ../urpme:51
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
+
+#: ../urpme:52
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - 不执行软件包脚本。\n"
 
-#: ../urpme:52
+#: ../urpme:53
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
@@ -549,76 +503,79 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
-#, fuzzy
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, fuzzy, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - 试图查找并使用综合文件。\n"
 
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
-#, fuzzy
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, fuzzy, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - 试图查找并使用 hdlist 文件。\n"
 
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - 详细的提示。\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - 详细提示。\n"
 
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "只允许超级用户删除软件包"
 
 #: ../urpme:106
-msgid "unknown package"
+#, c-format
+msgid "unknown packages"
 msgstr "未知的软件包"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
 #: ../urpme:106
-msgid "unknown packages"
+#, c-format
+msgid "unknown package"
 msgstr "未知的软件包"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
 #: ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
 msgid "Nothing to remove"
 msgstr "不需要删除任何东西。"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
 msgid "Checking to remove the following packages"
 msgstr "检查删除下列软件包"
 
-#: ../urpme:133
+#: ../urpme:132
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "为满足相关性要求，需要删除下列%d个软件包(%d MB)"
 
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr "(是(y)/否(N))[否]"
-
-#: ../urpme:135
+#: ../urpme:134
 #, c-format
 msgid "Remove %d packages?"
 msgstr "删除 %d 个软件包吗?"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr "(是(y)/否(N))[否]"
+
+#: ../urpme:156
+#, c-format
 msgid "Removal failed"
 msgstr "删除失败"
 
@@ -639,212 +596,260 @@ msgstr ""
 "用法:\n"
 
 #: ../urpmf:36
+#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 打印此工具的版本号。\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
-#: ../urpmf:38 ../urpmi:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
 
 #: ../urpmf:39
+#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr "  --literal, -l  - 不匹配模式，参数为字面字符串。\n"
 
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n"
 
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 不打印相同行。\n"
 
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质。\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - 详细提示。\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - 忽略各种情况下的冲突。\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
+#, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - 在模式中遵从大小写(默认值)。\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<字符串>     - 更改字段分隔符(默认为“:”)。\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
 msgid "Pattern expressions:\n"
 msgstr "模式表达式：\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr "  文本           - 任何文本都将被处理为正则表达式，除非使用了 -l。\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - 二元 AND 操作符。\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - 二元 OR 操作符。\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - 一元 NOT。\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - 左右括号。\n"
 
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
 msgid "List of tags:\n"
 msgstr "标记清单:\n"
 
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - 指定类似 printf 的输出格式\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   例如:“%%name:%%files”\n"
 
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - 体系\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - 编译主机\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - 编译时间\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - 配置文件\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - conflict 标签\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - 软件包描述\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - 发行版\n"
 
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - 周期\n"
 
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --fiename      - 软件包文件名\n"
 
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - 列出软件包中包含的文件\n"
 
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - 分组\n"
 
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - 软件包名称\n"
 
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - obsolets 标签\n"
 
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - 打包者\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - provides 标签\n"
 
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - requires 标签\n"
 
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - 安装大小\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - 源 rpm 名称\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - 摘要\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - 提供者\n"
 
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - 软件包所在介质\n"
 
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
 
-#: ../urpmf:136
+#: ../urpmf:137
+#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式不对：您只能使用一个多值标签"
 
-#: ../urpmf:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
 
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
 msgstr "注意：由于没有介质使用 hdlists 搜索，urpmf 无法返回任何结果\n"
 
-#: ../urpmf:226
+#: ../urpmf:227
+#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "您可能想要使用 --name 来搜索软件包名称。\n"
 
-#: ../urpmi:83
+#: ../urpmi:79
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -860,40 +865,61 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr "  --searchmedia  - 只使用给定介质来搜索所请求的软件包。\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr "  --auto         - 非交互模式，对全部问题假定默认回答。\n"
 
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
 
-#: ../urpmi:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid "  --auto-update  - update media then upgrade the system.\n"
+msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "    --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - 强制更新 gpg 密钥。\n"
+
+#: ../urpmi:96
+#, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
 
-#: ../urpmi:98
+#: ../urpmi:97
+#, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - 不安装软件包(只下载)。\n"
 
-#: ../urpmi:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
 msgstr ""
 "  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -903,48 +929,57 @@ msgstr ""
 "  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
 "                   较小的交易。默认为 %d。\n"
 
-#: ../urpmi:104
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 小交易长度，默认为 %d。\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - 利用模糊查询。\n"
 
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src, -s       - 下一个软件包是源程序包。\n"
 
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
 
-#: ../urpmi:108
+#: ../urpmi:107
+#, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "   --clean       - 首先删除缓存中的 rpm。\n"
 
-#: ../urpmi:109
+#: ../urpmi:108
+#, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
 
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr "  --allow-nodeps - 允许要求用户不经过依赖性检验就安装软件包。\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr "  --allow-force  - 允许提示用户安装软件包而不检查依赖性和完整性。\n"
 
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
 
 #: ../urpmi:117
+#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -952,41 +987,48 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpmi，特别用于在 --root 选项\n"
 "                   下安装 chroot。\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 用 wget 取远程文件。\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 用 crul 取远程文件。\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
-#, fuzzy
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --curl         - 用 crul 取远程文件。\n"
 
 #: ../urpmi:124
+#, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - 给 curl 传递额外的选项\n"
 
 #: ../urpmi:125
+#, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- 给 rsync 传递额外的选项\n"
 
 #: ../urpmi:126
+#, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - 给 wget 传递额外的选项\n"
 
 #: ../urpmi:127
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --curl-options - 给 curl 传递额外的选项\n"
 
 #: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
+#, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 降低下载速度。\n"
 
 #: ../urpmi:129
+#, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -994,7 +1036,8 @@ msgstr ""
 "  --resume       - 续传未下载完成的文件\n"
 "                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1002,7 +1045,8 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1011,6 +1055,7 @@ msgstr ""
 "                   密码(格式如 <用户: 密码>)。\n"
 
 #: ../urpmi:135
+#, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1019,6 +1064,7 @@ msgstr ""
 "                   下一个参数指定输出目录。\n"
 
 #: ../urpmi:138
+#, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
@@ -1027,115 +1073,125 @@ msgstr ""
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
 #: ../urpmi:140
+#, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
 #: ../urpmi:141
+#, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
 #: ../urpmi:142
+#, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - 排除文档文件。\n"
 
 #: ../urpmi:143
+#, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - 安装前不检查磁盘空间。\n"
 
 #: ../urpmi:144
+#, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 允许安装体系不匹配的 RPM。\n"
 
 #: ../urpmi:145
+#, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - 不执行软件包脚本。\n"
 
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - 强制更新 gpg 密钥。\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安装要跳过的软件包。\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
 "  --more-choices - 如果找到了多个软件包，则提供多个选择而不是默认选择。\n"
 
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - 不锁定 rpm 数据库。\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
+#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 更新只限于相同体系的软件包。\n"
 
-#: ../urpmi:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在 provides 字段中查找软件包。\n"
 
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 字段中查找软件包。\n"
 
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid "  -q             - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  -q             - 安静模式。\n"
 
-#: ../urpmi:159
+#: ../urpmi:157
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:188
+#: ../urpmi:186
+#, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:195
+#: ../urpmi:193
+#, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr "出错：要生成错误报告，请在指定命令行参数时多加 --bug。\n"
 
-#: ../urpmi:222
+#: ../urpmi:220
+#, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "您无法使用 --install-src 安装二进制 RPM 文件"
 
-#: ../urpmi:245
+#: ../urpmi:243
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:246
+#: ../urpmi:244
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
 msgid "Copying failed"
 msgstr "复制失败"
 
-#: ../urpmi:255
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "环境目录 %s 不存在"
 
-#: ../urpmi:273
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1144,51 +1200,57 @@ msgstr ""
 "错误：%s 似乎是以只读方式挂载的。\n"
 "请使用 --allow-force 强制操作。"
 
-#. - For translators : there are several media here
 #: ../urpmi:364
+#, c-format
 msgid "Updating media...\n"
 msgstr "正在更新介质...\n"
 
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "(升级)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "(升级)"
 
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "(安装)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "(安装)"
 
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, c-format
 msgid ""
+"The following package cannot be installed because it depends on packages\n"
+"that are older than the installed ones:\n"
+"%s"
+msgid_plural ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本：\n"
+"%s"
+msgstr[1] ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本：\n"
 "%s"
 
-#: ../urpmi:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1196,57 +1258,78 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
 
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"某些要求的软件包无法安装:\n"
+"%s"
+msgstr[1] ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, c-format
 msgid ""
+"The installation cannot continue because the following package\n"
+"has to be removed for others to be upgraded:\n"
+"%s\n"
+msgid_plural ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
+"%s\n"
+msgstr[1] ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, c-format
 msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgid_plural ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
+msgstr[0] ""
+"要升级其它软件包，需要先删除下列软件包:\n"
+"%s"
+msgstr[1] ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(只是测试，删除将不会实际发生)"
 
-#: ../urpmi:572 ../urpmi:584
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr "为了满足依赖性要求，将另外安装以下软件包"
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] "为了满足依赖性要求，将另外安装以下软件包"
+msgstr[1] "为了满足依赖性要求，将另外安装以下软件包"
 
-#: ../urpmi:573 ../urpmi:585
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "为了满足依赖关系，将安装下列软件包"
-
-#: ../urpmi:574
+#: ../urpmi:580
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr "(%d 个软件包，%d MB)"
 
-#: ../urpmi:580
+#: ../urpmi:586
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1255,89 +1338,106 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(只是测试，安装将不会实际发生)"
 
-#: ../urpmi:589
-#, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr "继续安装 %d 个软件包吗？(%d MB)"
+#: ../urpmi:594
+#, fuzzy, c-format
+msgid "Proceed with the installation of 1 package? (%2$d MB)"
+msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgstr[0] "继续安装 %d 个软件包吗？(%d MB)"
+msgstr[1] "继续安装 %d 个软件包吗？(%d MB)"
 
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "下列软件包的签名有错误"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "下列软件包的签名有错误"
+msgstr[1] "下列软件包的签名有错误"
 
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpmi:708
+#: ../urpmi:715
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在从 %2$s 安装 %1$s"
 
-#: ../urpmi:723
+#: ../urpmi:731
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
+#: ../urpmi:756
+#, c-format
 msgid "Installation failed:"
 msgstr "安装失败："
 
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpmi:771
+#: ../urpmi:780
+#, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
 
-#: ../urpmi:810
+#: ../urpmi:819
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 安装交易失败"
 
-#: ../urpmi:824
+#: ../urpmi:828
+#, c-format
+msgid "Installation is possible"
+msgstr "可以安装"
+
+#: ../urpmi:833
+#, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:840
 #, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "软件包已经安装"
+msgid "Package %s is already installed"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "软件包已经安装"
+msgstr[1] "软件包已经安装"
 
-#: ../urpmi:828
+#: ../urpmi:843
 #, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "软件包已经安装"
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "软件包已经安装"
+msgstr[1] "软件包已经安装"
 
-#: ../urpmi:847
+#: ../urpmi:863
+#, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
 
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -1360,90 +1460,122 @@ msgstr ""
 "而 [options] 可以来自\n"
 
 #: ../urpmi.addmedia:54
+#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - 创建一个更新介质。\n"
 
 #: ../urpmi.addmedia:55
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#, fuzzy, c-format
+msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - 试图查找并使用综合文件。\n"
 
-#: ../urpmi.addmedia:56
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid "  --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - 试图查找并使用 hdlist 文件。\n"
 
 #: ../urpmi.addmedia:57
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr "  --no-probe     - 不试图查找任何综合文件或 hdlist 文件。\n"
+#, c-format
+msgid "  --probe-rpms   - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
 
 #: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
+msgstr "  --no-probe     - 不试图查找任何综合文件或 hdlist 文件。\n"
+
+#: ../urpmi.addmedia:61
+#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - 自动从安装介质创建全部介质。\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr "  --interactive  - 对于 --distrib，请求每个介质的确认\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:64
+#, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - 对于 --distrib，添加列出的每个介质\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr "  --from         - 使用指定的 URL 列出镜像，默认为 %s。\n"
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr "  --virtual      - 创建常为最新的虚拟介质，只允许 file:// 协议。\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - 不导入所添加介质的密钥\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - 在配置中添加介质，但不进行更新。\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - 直接清除软件包头缓存。\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - 强迫生成 hdlist 文件。\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - 安静模式。\n"
 
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - 详细的提示。\n"
+
+#: ../urpmi.addmedia:86
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "无法更新介质“%s”\n"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "只允许超级用户添加介质"
 
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
 msgstr "将创建配置文件[%s]"
 
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "无法创建配置文件[%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "使用 --distrib 不需要提供 <hdlist 的相对路径>"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
 #, c-format
 msgid ""
 "\n"
@@ -1452,16 +1584,17 @@ msgstr ""
 "\n"
 "您是否想要添加介质“%s”"
 
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<hdlist 相对路径>找不到\n"
 
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "“with”找不到网络介质\n"
+#: ../urpmi.addmedia:169
+#, c-format
+msgid "Can't use %s with remote medium"
+msgstr ""
 
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质“%s”\n"
@@ -1483,144 +1616,153 @@ msgstr ""
 "用法:\n"
 
 #: ../urpmi.recover:34
+#, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr "  --checkpoint   - 设定重新打包立即开始\n"
 
 #: ../urpmi.recover:35
+#, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - 不在检查点上清除重新打包目录\n"
 
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr "  --list         - 列出自所提供日期/时长参数之后的交易\n"
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:38
+#, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-all     - 列出 rpmdb 中的全部交易(较长)\n"
 
-#: ../urpmi.recover:38
+#: ../urpmi.recover:39
+#, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-safe    - 列出自检查点之后的交易\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr "  --rollback     - 回滚到指定的日期或回滚指定数量的交易\n"
 
-#: ../urpmi.recover:41
+#: ../urpmi.recover:42
+#, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --disable      - 关闭软件包重新打包\n"
 
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
 #, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr "无效的日期或时长 [%s]\n"
 
-#: ../urpmi.recover:64
+#: ../urpmi.recover:65
+#, c-format
 msgid "Repackage directory not defined\n"
 msgstr "重新打包目录未定义\n"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "无法写入重新打包目录 [%s]\n"
 
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "正在清理重新打包目录 [%s]...\n"
 
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
 #, c-format
 msgid "%d files removed\n"
 msgstr "删除了 %d 个文件\n"
 
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr "冲突的命令行参数[%s]\n"
 
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr "您不能同时指定 --checkpoint 和 --rollback\n"
 
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr "您不能同时指定 --checkpoint 和 --list\n"
 
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr "您不能同时指定 --rollback 和 --list\n"
 
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
 msgid "You can't specify --disable along with another option"
 msgstr "您不能将 --disable 与其它选项一起使用"
 
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr "自 %s 后无交易\n"
 
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
 msgid "You must be superuser to do this"
 msgstr "您必须是超级用户才能执行此操作"
 
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "正在写入 rpm 宏文件[%s]...\n"
 
-#: ../urpmi.recover:184
+#: ../urpmi.recover:185
+#, c-format
 msgid "No rollback date found\n"
 msgstr "未找到回滚日期\n"
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr "回滚至 %s...\n"
 
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
 msgid "Disabling repackaging\n"
 msgstr "禁止重新打包\n"
 
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 "用法: urpmi.removemedia [-a] <名称> ...\n"
 "其中 <名称> 是要删除的介质名。\n"
 
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - 选择所有介质。\n"
 
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - 介质名称使用模糊匹配。\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"未知的选项“%s”\n"
-
-#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "只允许超级用户删除介质"
 
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "没有可删除的(用 urpmi.addmedia 增加介质)\n"
 
-#: ../urpmi.removemedia:83
+#: ../urpmi.removemedia:84
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -1630,6 +1772,7 @@ msgstr ""
 "(%s中的一个)\n"
 
 #: ../urpmi.update:30
+#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -1638,30 +1781,46 @@ msgstr ""
 "其中 <名称> 是要删除的介质名...\n"
 
 #: ../urpmi.update:41
+#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - 只使用更新介质。\n"
 
+#: ../urpmi.update:43
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - 强制更新 gpg 密钥。\n"
+
 #: ../urpmi.update:44
+#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore       - 不更新，将介质标为忽略。\n"
 
 #: ../urpmi.update:45
+#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - 不更新，将介质标为启用。\n"
 
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 选择所有不可移动的介质。\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - 强迫生成 hdlist 文件。\n"
+
+#: ../urpmi.update:70
+#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "只允许超级用户更新介质"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:96
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1670,21 +1829,21 @@ msgstr ""
 "找不到要升级的项\n"
 "(%s 中之一)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:100
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
 
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "启用介质 %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "ignoring media %s"
 msgstr "忽略介质 %s"
 
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "启用介质 %s"
+
 #: ../urpmq:42
 #, c-format
 msgid ""
@@ -1702,148 +1861,257 @@ msgstr ""
 "用法:\n"
 
 #: ../urpmq:50
+#, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
 msgstr "  --searchmedia  - 只使用给定介质来搜索请求(或更新的)的软件包。\n"
 
 #: ../urpmq:55
+#, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - 利用模糊查询(和 -y 一样)。\n"
 
 #: ../urpmq:58
+#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - 列出可用的软件包。\n"
 
 #: ../urpmq:59
+#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - 列出可用的介质。\n"
 
 #: ../urpmq:60
+#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - 列出可用的介质及其 URL。\n"
 
 #: ../urpmq:61
+#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - 如果使用了 --parallel，列出所有可用的节点。\n"
 
 #: ../urpmq:62
+#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - 列出可用的并行处理别名。\n"
 
 #: ../urpmq:63
+#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "  --dump-config  - 以 urpmi.addmedia 参数的格式导出配置。\n"
 
 #: ../urpmq:64
+#, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下一个软件包是源程序包(和 -s 一样)。\n"
 
 #: ../urpmq:65
+#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      - 下载前给出所有的源文件包(root 专用)。\n"
 
 #: ../urpmq:67
+#, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 允许查询架构不匹配的 RPM。\n"
 
-#: ../urpmq:69
+#: ../urpmq:71
+#, 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:81
+#: ../urpmq:83
+#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - 打印更新日志。\n"
 
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - 打印摘要。\n"
 
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - 要删除的软件包的完整输出。\n"
 
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - 扩展软件包依赖性查询。\n"
 
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - 打印组名。\n"
 
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - 以人类可读的格式打印有用信息。\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - 列出软件包中的文件。\n"
 
-#: ../urpmq:90
+#: ../urpmq:93
+#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr "  -P             - 不搜索提供中的软件包(默认)。\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - 允许在提供的项目中寻找软件包。\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 和名称一起打印版本和发行号。\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
+#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - 逆序搜索需要软件包的软件包。\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
+#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr "  -RR            - 扩展逆序搜索(包括虚拟软件包)。\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
+#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
+#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - 如果更新的版本已经安装，就删除软件包。\n"
 
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
 
-#: ../urpmq:99
+#: ../urpmq:101
+#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - 类似于 -y，但强制不区分大小写匹配。\n"
 
-#: ../urpmq:100
+#: ../urpmq:102
+#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  需要在命令行给出名称或 rpm 文件。\n"
 
-#: ../urpmq:176
+#: ../urpmq:177
+#, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 仅能和 --parallel 一起使用"
 
-#: ../urpmq:332
+#: ../urpmq:333
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "跳过介质 %s：无 hdlist"
 
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
 msgid "No filelist found\n"
 msgstr "没有找到文件列表\n"
 
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
 
+#~ msgid "mput failed, maybe a node is unreacheable"
+#~ msgstr "mput 失败，可能节点无法连接"
+
+#~ msgid "node %s has an old version of urpme, please upgrade"
+#~ msgstr "节点 %s 的 urpme 版本太旧，请升级"
+
+#~ msgid "rshp failed, maybe a node is unreacheable"
+#~ msgstr "rshp 失败，可能节点无法连接"
+
+#~ msgid "on node %s"
+#~ msgstr "于节点 %s"
+
+#~ msgid "Propagating synthesis to nodes..."
+#~ msgstr "正在将综合文件传播到节点..."
+
+#~ msgid "Resolving dependencies on nodes..."
+#~ msgstr "正在解决节点上的依赖关系..."
+
+#~ msgid "Distributing files to nodes..."
+#~ msgstr "正在将文件分发到节点..."
+
+#~ msgid "Verifying if install is possible on nodes..."
+#~ msgstr "正在验证安装是否可以在节点上进行..."
+
+#~ msgid "Installation failed on node %s"
+#~ msgstr "节点 %s 安装失败"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "正在节点上安装软件包..."
+
+#~ msgid "scp failed on host %s (%d)"
+#~ msgstr "主机 %s scp 失败(%d)"
+
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "正在将综合文件传播到 %s..."
+
+#~ msgid "Resolving dependencies on %s..."
+#~ msgstr "正在解决 %s 上的依赖关系..."
+
+#~ msgid "host %s does not have a good version of urpmi (%d)"
+#~ msgstr "主机 %s 上的 urpmi 版本不对(%d)"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "正在将文件分发给 %s..."
+
+#~ msgid "Verifying if install is possible on %s..."
+#~ msgstr "正在验证安装是否可以在 %s 上进行..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "正在 %s 上执行安装..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "正在 %2$s 上安装 %1$s..."
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "正在准备在 %s 上安装..."
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "为了满足依赖关系，将安装下列软件包"
+
+#~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr "  --probe-synthesis - 试图查找并使用综合文件。\n"
+
+#~ msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr "  --probe-hdlist - 试图查找并使用 hdlist 文件。\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "“with”找不到网络介质\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "未知的选项“%s”\n"
+
 #~ msgid "unknown protocol defined for %s"
 #~ msgstr "%s 中定义了未知的协议"