sync with code

1 files changed, 163 insertions, 164 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 12087dad..78275abd 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: 2011-09-17 21:04+0200\n"
+"POT-Creation-Date: 2012-01-28 12:59+0100\n"
 "PO-Revision-Date: 2008-03-30 14:22+0800\n"
 "Last-Translator: 汤诗语 <shiyu@mandriva.org>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -110,7 +110,7 @@ msgstr "取消(_C)"
 msgid "Choose location to save file"
 msgstr "选择保存文件的位置"
 
-#: ../gurpmi.pm:39 ../urpmi:76
+#: ../gurpmi.pm:39 ../urpmi:75
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -131,32 +131,32 @@ msgstr ""
 msgid "Options:"
 msgstr "选项："
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:81 ../urpmi.addmedia:55
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:55
 #: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
 
-#: ../gurpmi.pm:47 ../urpmi:88
+#: ../gurpmi.pm:47 ../urpmi:87
 #, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr "  --auto         - 非交互模式，对全部问题假定默认回答。\n"
 
-#: ../gurpmi.pm:48 ../urpmi:89 ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:88 ../urpmq:52
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
 
-#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:112 ../urpmq:68
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:111 ../urpmq:68
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
 
-#: ../gurpmi.pm:50 ../urpmi:143
+#: ../gurpmi.pm:50 ../urpmi:142
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -165,34 +165,34 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:82 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
-#: ../gurpmi.pm:53 ../urpmi:160
+#: ../gurpmi.pm:53 ../urpmi:159
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在 provides 字段中查找软件包。\n"
 
-#: ../gurpmi.pm:54 ../urpmi:161
+#: ../gurpmi.pm:54 ../urpmi:160
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 字段中查找软件包。\n"
 
-#: ../gurpmi.pm:55 ../urpmi:119 ../urpmq:71
+#: ../gurpmi.pm:55 ../urpmi:118 ../urpmq:71
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
 
-#: ../gurpmi.pm:56 ../urpmi:145
+#: ../gurpmi.pm:56 ../urpmi:144
 #, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
-#: ../gurpmi.pm:57 ../urpmi:85
+#: ../gurpmi.pm:57 ../urpmi:84
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
@@ -244,7 +244,7 @@ msgstr ""
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:146 ../urpmi:651
+#: ../gurpmi2:146 ../urpmi:650
 #, c-format
 msgid "Ok"
 msgstr "确定"
@@ -285,13 +285,13 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:267 ../urpmi:616
+#: ../gurpmi2:267 ../urpmi:615
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:268 ../urpmi:617
+#: ../gurpmi2:268 ../urpmi:616
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -318,7 +318,7 @@ msgstr "正在准备..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:334 ../urpmi:646
+#: ../gurpmi2:334 ../urpmi:645
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "请插入介质“%s”"
@@ -328,7 +328,7 @@ msgstr "请插入介质“%s”"
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../gurpmi2:360 ../urpm.pm:335 ../urpm/download.pm:830
+#: ../gurpmi2:360 ../urpm.pm:331 ../urpm/download.pm:830
 #: ../urpm/get_pkgs.pm:262 ../urpm/media.pm:981 ../urpm/media.pm:1493
 #: ../urpm/media.pm:1644
 #, c-format
@@ -351,7 +351,7 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi2:399 ../urpm/main_loop.pm:291 ../urpm/main_loop.pm:334
+#: ../gurpmi2:399 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
 #, c-format
 msgid "Installation failed:"
 msgstr "安装失败: "
@@ -371,7 +371,7 @@ msgstr "安装完成"
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:415 ../urpmi:717
+#: ../gurpmi2:415 ../urpmi:714
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
@@ -410,7 +410,7 @@ msgstr "                    默认为 %s。\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -f              - 输出 rpm 的完整名称(NVRA)。\n"
 
-#: ../rurpmi:11 ../urpmi:285
+#: ../rurpmi:11 ../urpmi:284
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
@@ -420,77 +420,77 @@ msgstr "只允许超级用户安装软件包"
 msgid "Running urpmi in restricted mode..."
 msgstr "正在以限制模式运行 urpmi..."
 
-#: ../urpm.pm:107
+#: ../urpm.pm:103
 #, c-format
 msgid "fail to create directory %s"
 msgstr "创建目录 %s 失败"
 
-#: ../urpm.pm:108
+#: ../urpm.pm:104
 #, c-format
 msgid "invalid owner for directory %s"
 msgstr "目录 %s 的所有者无效"
 
-#: ../urpm.pm:132
+#: ../urpm.pm:128
 #, c-format
 msgid "Can not download packages into %s"
 msgstr "无法将软件包下载到 %s"
 
-#: ../urpm.pm:147
+#: ../urpm.pm:143
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "环境目录 %s 不存在"
 
-#: ../urpm.pm:148 ../urpmf:248 ../urpmq:167
+#: ../urpm.pm:144 ../urpmf:248 ../urpmq:167
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
 
-#: ../urpm.pm:310
+#: ../urpm.pm:306
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:324
+#: ../urpm.pm:320
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:330
+#: ../urpm.pm:326
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:332 ../urpm/get_pkgs.pm:260
+#: ../urpm.pm:328 ../urpm/get_pkgs.pm:260
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:340
+#: ../urpm.pm:336
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:345
+#: ../urpm.pm:341
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "无法处理 spec 文件 %s [%s]"
 
-#: ../urpm.pm:353
+#: ../urpm.pm:349
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:355
+#: ../urpm.pm:351
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "RPM 的架构不兼容[%s]"
 
-#: ../urpm.pm:359
+#: ../urpm.pm:355
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:447
+#: ../urpm.pm:443
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "运行于限制模式运行时，禁止执行此操作"
@@ -500,57 +500,57 @@ msgstr "运行于限制模式运行时，禁止执行此操作"
 msgid "bad proxy declaration on command line\n"
 msgstr "命令行声明的代理服务器无效\n"
 
-#: ../urpm/args.pm:307
+#: ../urpm/args.pm:306
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:388
 #, c-format
 msgid "unexpected expression %s"
 msgstr "意外表达式 %s"
 
-#: ../urpm/args.pm:390
+#: ../urpm/args.pm:389
 #, c-format
 msgid "missing expression before %s"
 msgstr "%s 前缺少表达式"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "意外表达式 %s(建议：使用 -a 或 -o?)"
 
-#: ../urpm/args.pm:400
+#: ../urpm/args.pm:399
 #, c-format
 msgid "no expression to close"
 msgstr "没有要关闭的表达式"
 
-#: ../urpm/args.pm:409
+#: ../urpm/args.pm:408
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "默认情况下，urpmf 使用正则表达式。您应该使用选项“--literal”"
 
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:482
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目录不存在"
 
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:505
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "没有 %2$s 无法使用 %1$s"
 
-#: ../urpm/args.pm:504 ../urpm/args.pm:507 ../urpmq:159
+#: ../urpm/args.pm:508 ../urpm/args.pm:511 ../urpmq:159
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "无法和 %2$s 一起使用 %1$s"
 
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:519
 #, c-format
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
 
-#: ../urpm/bug_report.pm:55 ../urpmi:275
+#: ../urpm/bug_report.pm:55 ../urpmi:274
 #, c-format
 msgid "Copying failed"
 msgstr "复制失败"
@@ -717,7 +717,7 @@ msgstr "已获取 %s"
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm/download.pm:965
+#: ../urpm/download.pm:967
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
@@ -786,7 +786,7 @@ msgstr ""
 "\t"
 
 #: ../urpm/dudf.pm:360 ../urpm/msg.pm:76 ../urpmi:512 ../urpmi:528
-#: ../urpmi:636
+#: ../urpmi:635
 #, c-format
 msgid "Nn"
 msgstr "nN否"
@@ -808,7 +808,7 @@ msgstr ""
 msgid "Do you want to upload a DUDF report to Mandriva?"
 msgstr "您是否想要将 DUDF 报告上传到 Mandriva 吗?"
 
-#: ../urpm/dudf.pm:363 ../urpmi:515 ../urpmi:531 ../urpmi:637
+#: ../urpm/dudf.pm:363 ../urpmi:515 ../urpmi:531 ../urpmi:636
 #: ../urpmi.addmedia:136
 #, c-format
 msgid " (Y/n) "
@@ -924,25 +924,25 @@ msgstr "未定义基础"
 msgid "Cannot connect to ldap uri:"
 msgstr "无法连接到 ldap uri:"
 
-#: ../urpm/lock.pm:75
+#: ../urpm/lock.pm:68
 #, c-format
-msgid "%s database is locked. Waiting..."
-msgstr "%s 数据库已锁定。等候中..."
+msgid "%s database is locked, process %d is already using it"
+msgstr "%s 数据库已锁定，进程 %d 正在使用它"
 
-#: ../urpm/lock.pm:76
+#: ../urpm/lock.pm:70
 #, c-format
-msgid "aborting"
-msgstr "中止"
+msgid "%s database is locked (another program is already using it)"
+msgstr "%s 数据库已锁定(其它程序正在使用它)"
 
-#: ../urpm/lock.pm:83
+#: ../urpm/lock.pm:84
 #, c-format
-msgid "%s database is locked, process %d is already using it"
-msgstr "%s 数据库已锁定，进程 %d 正在使用它"
+msgid "%s database is locked. Waiting..."
+msgstr "%s 数据库已锁定。等候中..."
 
 #: ../urpm/lock.pm:85
 #, c-format
-msgid "%s database is locked (another program is already using it)"
-msgstr "%s 数据库已锁定(其它程序正在使用它)"
+msgid "aborting"
+msgstr "中止"
 
 #: ../urpm/main_loop.pm:79
 #, c-format
@@ -982,68 +982,68 @@ msgstr ""
 "您的文件系统中没有足够空间可用来下载全部软件包(需要 %s，但只有 %s)。\n"
 "您确定想要继续吗?"
 
-#: ../urpm/main_loop.pm:172 ../urpm/main_loop.pm:212 ../urpm/main_loop.pm:293
-#: ../urpm/main_loop.pm:300
+#: ../urpm/main_loop.pm:173 ../urpm/main_loop.pm:213 ../urpm/main_loop.pm:294
+#: ../urpm/main_loop.pm:301
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../urpm/main_loop.pm:173
+#: ../urpm/main_loop.pm:174
 #, c-format
 msgid "Try to continue anyway?"
 msgstr "仍然继续吗? "
 
-#: ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:198
 #, c-format
 msgid "The following package has bad signature"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:199
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpm/main_loop.pm:199
+#: ../urpm/main_loop.pm:200
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpm/main_loop.pm:216
+#: ../urpm/main_loop.pm:217
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "删除已安装的 rpm(%s)"
 
-#: ../urpm/main_loop.pm:236
+#: ../urpm/main_loop.pm:237
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#: ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:252
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在从 %2$s 安装 %1$s"
 
-#: ../urpm/main_loop.pm:253
+#: ../urpm/main_loop.pm:254
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpm/main_loop.pm:294
+#: ../urpm/main_loop.pm:295
 #, c-format
 msgid "Try installation without checking dependencies?"
 msgstr "尝试忽略相关性检查而安装吗?"
 
-#: ../urpm/main_loop.pm:301
+#: ../urpm/main_loop.pm:302
 #, c-format
 msgid "Try harder to install (--force)?"
 msgstr "尝试强制安装吗(使用 --force)?"
 
-#: ../urpm/main_loop.pm:344
+#: ../urpm/main_loop.pm:345
 #, c-format
 msgid "Packages are up to date"
 msgstr "软件包已为最新"
 
-#: ../urpm/main_loop.pm:355 ../urpm/parallel.pm:299
+#: ../urpm/main_loop.pm:356 ../urpm/parallel.pm:299
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
@@ -1332,19 +1332,18 @@ msgstr "正在重试连接镜像 %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "无法从镜像列表 %s 里找到一个镜像"
 
-#: ../urpm/mirrors.pm:234
+#: ../urpm/mirrors.pm:240
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "找到地理位置较近的 %s %.2f %.2f，从时区 %s"
 
-#: ../urpm/mirrors.pm:279
+#: ../urpm/mirrors.pm:285
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "从 %s 中获得镜像列表"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:566 ../urpmi:674 ../urpmi:684
-#: ../urpmi.addmedia:133
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi.addmedia:133
 #, c-format
 msgid "Yy"
 msgstr "yY是"
@@ -1424,7 +1423,7 @@ msgstr "TB"
 msgid "Marking %s as manually installed, it won't be auto-orphaned"
 msgstr "将 %s 标记为手动安装，该软件包不会被标为自动孤立"
 
-#: ../urpm/orphans.pm:449
+#: ../urpm/orphans.pm:448
 #, fuzzy, c-format
 msgid ""
 "The following package:\n"
@@ -1436,13 +1435,13 @@ msgid_plural ""
 "are now orphaned."
 msgstr[0] "需要下列软件包之一:"
 
-#: ../urpm/orphans.pm:452
+#: ../urpm/orphans.pm:451
 #, fuzzy, c-format
 msgid "You may wish to remove it."
 msgid_plural "You may wish to remove them."
 msgstr[0] "没有可删除的孤立软件包"
 
-#: ../urpm/orphans.pm:461
+#: ../urpm/orphans.pm:460
 #, c-format
 msgid ""
 "The following package:\n"
@@ -1701,12 +1700,12 @@ msgstr "  --auto-orphans - 删除孤立软件包\n"
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 验证删除是否可以正确进行。\n"
 
-#: ../urpme:51 ../urpmi:118 ../urpmq:70
+#: ../urpme:51 ../urpmi:117 ../urpmq:70
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
-#: ../urpme:52 ../urpmi:152
+#: ../urpme:52 ../urpmi:151
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - 在删除之前重新对文件打包\n"
@@ -1716,13 +1715,13 @@ msgstr "  --repackage    - 在删除之前重新对文件打包\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:120 ../urpmi.addmedia:73
+#: ../urpme:54 ../urpmf:40 ../urpmi:119 ../urpmi.addmedia:73
 #: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:72
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr "  --urpmi-root   - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
 
-#: ../urpme:55 ../urpmi:110
+#: ../urpme:55 ../urpmi:109
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr "  --justdb       - 只使用 rpm 数据库，不更新文件系统。\n"
@@ -1741,7 +1740,7 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:59 ../urpmi:163 ../urpmq:91
+#: ../urpme:59 ../urpmi:162 ../urpmq:91
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - 详细提示。\n"
@@ -1837,12 +1836,12 @@ msgstr ""
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 打印此工具的版本号。\n"
 
-#: ../urpmf:37 ../urpmi:142 ../urpmq:82
+#: ../urpmf:37 ../urpmi:141 ../urpmq:82
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
-#: ../urpmf:38 ../urpmi:83 ../urpmq:49
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
@@ -1853,7 +1852,7 @@ msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr "  --literal, -l  - 不匹配模式，参数为字面字符串。\n"
 
-#: ../urpmf:42 ../urpmi:86 ../urpmq:50
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1864,7 +1863,7 @@ msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - 使用给定的路径访问介质\n"
 
-#: ../urpmf:44 ../urpmi:87 ../urpmq:51
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
@@ -1874,7 +1873,7 @@ msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 不打印相同行。\n"
 
-#: ../urpmf:46 ../urpmi:84 ../urpmq:46
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质。\n"
@@ -2099,44 +2098,44 @@ msgstr "介质“%s”的综合文件不可用"
 msgid "no xml-info available for medium \"%s\""
 msgstr "介质“%s”没有可用的 xml-info"
 
-#: ../urpmi:90
+#: ../urpmi:89
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
 msgstr "  --auto-update  - 更新介质后再升级系统。\n"
 
-#: ../urpmi:91
+#: ../urpmi:90
 #, c-format
 msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "    --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "    --force-key    - force update of gpg key.\n"
 msgstr "    --force-key    - 强制更新 gpg 密钥。\n"
 
-#: ../urpmi:93
+#: ../urpmi:92
 #, c-format
 msgid "  --auto-orphans - remove orphans without asking\n"
 msgstr "  --auto-orphans - 不询问直接删除孤立软件包\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:56
 #, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
 msgstr "  --no-suggests  - 不自动选择“推荐的”软件包。\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - 不安装软件包(只下载)。\n"
 
-#: ../urpmi:97 ../urpmq:58
+#: ../urpmi:96 ../urpmq:58
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -2144,7 +2143,7 @@ msgid ""
 msgstr ""
 "  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -2154,62 +2153,62 @@ msgstr ""
 "  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
 "                   较小的交易。默认为 %d。\n"
 
-#: ../urpmi:103
+#: ../urpmi:102
 #, 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 "  --buildrequires - install the buildrequires of the packages\n"
 msgstr "  --buildrequires - 安装软件包构建需求\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 ""
 "  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr "  --replacepkgs  - 强制安装已经安装过的软件包。\n"
 
-#: ../urpmi:113
+#: ../urpmi:112
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr "  --allow-nodeps - 允许要求用户不经过依赖性检验就安装软件包。\n"
 
-#: ../urpmi:115
+#: ../urpmi:114
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr "  --allow-force  - 允许提示用户安装软件包而不检查依赖性和完整性。\n"
 
-#: ../urpmi:117
+#: ../urpmi:116
 #, c-format
 msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
 msgstr "  --allow-suggests - 自动选择“推荐的”软件包。\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -2218,19 +2217,19 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpmi，特别用于在 --root 选项\n"
 "                   下安装 chroot。\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:37
+#: ../urpmi:122 ../urpmi.addmedia:60 ../urpmi.update:37
 #, c-format
 msgid "  --metalink     - generate and use a local metalink.\n"
 msgstr "  --metalink     - 生成并使用本地 metallink。\n"
 
-#: ../urpmi:124
+#: ../urpmi:123
 #, c-format
 msgid ""
 "  --download-all - download all needed packages before trying to install "
 "them\n"
 msgstr "  --download-all - 在试图安装之前下载所需的全部软件包\n"
 
-#: ../urpmi:125
+#: ../urpmi:124
 #, c-format
 msgid ""
 "  --downloader   - program to use to retrieve distant files. \n"
@@ -2239,37 +2238,37 @@ msgstr ""
 "  --downloader   - 用于重新获取远程文件的程序。\n"
 "                   已知程序：%s\n"
 
-#: ../urpmi:128
+#: ../urpmi:127
 #, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - 给 curl 传递额外的选项\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- 给 rsync 传递额外的选项\n"
 
-#: ../urpmi:130
+#: ../urpmi:129
 #, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - 给 wget 传递额外的选项\n"
 
-#: ../urpmi:131
+#: ../urpmi:130
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --prozilla-options - 给 prozilla 传递额外的选项\n"
 
-#: ../urpmi:132
+#: ../urpmi:131
 #, c-format
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr "  --aria2-options - 给 aria2 传递额外的选项\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:61 ../urpmi.update:38
+#: ../urpmi:132 ../urpmi.addmedia:61 ../urpmi.update:38
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 降低下载速度。\n"
 
-#: ../urpmi:134
+#: ../urpmi:133
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -2278,7 +2277,7 @@ msgstr ""
 "  --resume       - 续传未下载完成的文件\n"
 "                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmi:136 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:135 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -2287,7 +2286,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:138 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:80
+#: ../urpmi:137 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:80
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2296,7 +2295,7 @@ msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
 "                   密码(格式如 <用户: 密码>)。\n"
 
-#: ../urpmi:140
+#: ../urpmi:139
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -2305,47 +2304,47 @@ msgstr ""
 "  --bug          - 输出故障报告\n"
 "                   下一个参数指定输出目录。\n"
 
-#: ../urpmi:146
+#: ../urpmi:145
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
-#: ../urpmi:147
+#: ../urpmi:146
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - 排除文档文件。\n"
 
-#: ../urpmi:148
+#: ../urpmi:147
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - 安装前不检查磁盘空间。\n"
 
-#: ../urpmi:149
+#: ../urpmi:148
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 允许安装体系不匹配的 RPM。\n"
 
-#: ../urpmi:150
+#: ../urpmi:149
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - 不执行软件包脚本。\n"
 
-#: ../urpmi:151
+#: ../urpmi:150
 #, c-format
 msgid "  --replacefiles - ignore file conflicts\n"
 msgstr "  --replacefiles - 忽略文件冲突\n"
 
-#: ../urpmi:153
+#: ../urpmi:152
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安装要跳过的软件包。\n"
 
-#: ../urpmi:154
+#: ../urpmi:153
 #, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr "  --prefer       - 首选的软件包\n"
 
-#: ../urpmi:155
+#: ../urpmi:154
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -2353,82 +2352,82 @@ msgid ""
 msgstr ""
 "  --more-choices - 如果找到了多个软件包，则提供多个选择而不是默认选择。\n"
 
-#: ../urpmi:157
+#: ../urpmi:156
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - 不锁定 rpm 数据库。\n"
 
-#: ../urpmi:158
+#: ../urpmi:157
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 更新只限于相同体系的软件包。\n"
 
-#: ../urpmi:159 ../urpmq:99
+#: ../urpmi:158 ../urpmq:99
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:162
+#: ../urpmi:161
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - 安静模式。\n"
 
-#: ../urpmi:164
+#: ../urpmi:163
 #, c-format
 msgid "  --debug        - very verbose mode.\n"
 msgstr "  --debug        - 非常详细模式。\n"
 
-#: ../urpmi:165
+#: ../urpmi:164
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:199
+#: ../urpmi:198
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "错误: 无法在使用软件包列表时使用 --auto-select。\n"
 
-#: ../urpmi:206
+#: ../urpmi:205
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr "错误: 要生成错误报告，请在指定命令行参数时多加 --bug。\n"
 
-#: ../urpmi:236
+#: ../urpmi:235
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "您无法使用 --install-src 安装二进制 RPM 文件"
 
-#: ../urpmi:237
+#: ../urpmi:236
 #, c-format
 msgid "You can't install spec files"
 msgstr "您不能安装 spec 文件"
 
-#: ../urpmi:244
+#: ../urpmi:243
 #, c-format
 msgid "defaulting to --buildrequires"
 msgstr "正在设置默认为 --buildrequires"
 
-#: ../urpmi:249
+#: ../urpmi:248
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr "请使用 --buildrequires 或 --install-src，默认为 --buildrequires"
 
-#: ../urpmi:269
+#: ../urpmi:268
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:270
+#: ../urpmi:269
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:291
+#: ../urpmi:290
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2550,7 +2549,7 @@ msgstr ""
 msgid "(test only, removal will not be actually done)"
 msgstr "(只是测试，删除将不会实际发生)"
 
-#: ../urpmi:581
+#: ../urpmi:580
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2560,44 +2559,44 @@ msgstr ""
 "您必须首先用 --buildrequires 调用 urpmi，以便安装下列依赖关系：\n"
 "%s\n"
 
-#: ../urpmi:591
+#: ../urpmi:590
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "下列孤立软件包将被删除。"
 
-#: ../urpmi:619
+#: ../urpmi:618
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(只是测试，安装将不会实际发生)"
 
-#: ../urpmi:625
+#: ../urpmi:624
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "将会使用 %s 的额外磁盘空间。"
 
-#: ../urpmi:626
+#: ../urpmi:625
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "将会释放 %s 的磁盘空间。"
 
-#: ../urpmi:627
+#: ../urpmi:626
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "将会获取 %s 的软件包。"
 
-#: ../urpmi:628
+#: ../urpmi:627
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "继续安装 %d 个软件包吗？"
 
-#: ../urpmi:651
+#: ../urpmi:650
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:659
+#: ../urpmi:658
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "挂载后按 Enter..."
@@ -3015,8 +3014,8 @@ msgid "  --probe-rpms   - do not use synthesis, use rpm files directly\n"
 msgstr "  --probe-rpms   - 不使用综合文件，直接使用 rpm 文件\n"
 
 #: ../urpmi.update:50
-#, c-format
-msgid "  -a             - select all non-removable media.\n"
+#, fuzzy, c-format
+msgid "  -a             - select all enabled non-removable media.\n"
 msgstr "  -a             - 选择所有不可移动的介质。\n"
 
 #: ../urpmi.update:51
@@ -3330,13 +3329,13 @@ msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
 
 #: ../gurpmi.desktop.in.h:1
-msgid "Graphical front end to install RPM files"
-msgstr "图形化安装 RPM 软件包"
-
-#: ../gurpmi.desktop.in.h:2
 msgid "Software Installer"
 msgstr "软件安装程序"
 
+#: ../gurpmi.desktop.in.h:2
+msgid "Graphical front end to install RPM files"
+msgstr "图形化安装 RPM 软件包"
+
 #~ msgid ""
 #~ "  --sources      - give all source packages before downloading (root "
 #~ "only).\n"