sync with code

1 files changed, 338 insertions, 344 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index adb0f139..2c9f5147 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: 2012-09-01 01:15+0200\n"
+"POT-Creation-Date: 2012-09-01 19:38+0200\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,59 +110,37 @@ msgstr "取消(_C)"
 msgid "Choose location to save file"
 msgstr "选择保存文件的位置"
 
-#: ../gurpmi.pm:39 ../urpmi:66
-#, c-format
-msgid ""
-"%s version %s\n"
-"%s\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"%s 版本 %s\n"
-"%s\n"
-"这是自由软件，可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
-
-#: ../gurpmi.pm:44 ../urpme:47 ../urpme:48 ../urpmf:35 ../urpmf:36 ../urpmi:72
-#: ../urpmi:73 ../urpmi.recover:34 ../urpmq:46 ../urpmq:47
-#, c-format
-msgid "Copyright (C) %s by %s"
-msgstr "版权 (C) %s %s"
-
-#: ../gurpmi.pm:46
+#: ../gurpmi.pm:41
 #, c-format
 msgid "Options:"
 msgstr "选项："
 
-#: ../gurpmi.pm:47 ../urpme:49 ../urpmf:38 ../urpmi:74 ../urpmi.addmedia:55
-#: ../urpmi.recover:35 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../gurpmi.pm:42 ../urpme:42 ../urpmf:30 ../urpmi:67 ../urpmi.addmedia:55
+#: ../urpmi.recover:29 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:41
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
 
-#: ../gurpmi.pm:48 ../urpmi:81
+#: ../gurpmi.pm:43 ../urpmi:74
 #, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr "  --auto         - 非交互模式，对全部问题假定默认回答。\n"
 
-#: ../gurpmi.pm:49 ../urpmi:82 ../urpmq:55
+#: ../gurpmi.pm:44 ../urpmi:75 ../urpmq:48
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
 
-#: ../gurpmi.pm:50 ../urpme:53 ../urpmi:105 ../urpmq:71
+#: ../gurpmi.pm:45 ../urpme:46 ../urpmi:98 ../urpmq:64
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
 
-#: ../gurpmi.pm:51 ../urpmi:136
+#: ../gurpmi.pm:46 ../urpmi:129
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -171,40 +149,40 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../gurpmi.pm:53 ../urpmf:44 ../urpmi:75 ../urpmq:50
+#: ../gurpmi.pm:48 ../urpmf:36 ../urpmi:68 ../urpmq:43
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
-#: ../gurpmi.pm:54 ../urpmi:153
+#: ../gurpmi.pm:49 ../urpmi:146
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在 provides 字段中查找软件包。\n"
 
-#: ../gurpmi.pm:55 ../urpmi:154
+#: ../gurpmi.pm:50 ../urpmi:147
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 字段中查找软件包。\n"
 
-#: ../gurpmi.pm:56 ../urpmi:112 ../urpmq:74
+#: ../gurpmi.pm:51 ../urpmi:105 ../urpmq:67
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
 
-#: ../gurpmi.pm:57 ../urpmi:138
+#: ../gurpmi.pm:52 ../urpmi:131
 #, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
-#: ../gurpmi.pm:58 ../urpmi:78
+#: ../gurpmi.pm:53 ../urpmi:71
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr "  --searchmedia  - 只使用给定介质来搜索所请求的软件包。\n"
 
-#: ../gurpmi.pm:101
+#: ../gurpmi.pm:96
 #, c-format
 msgid "No packages specified"
 msgstr "未指定软件包"
@@ -234,7 +212,7 @@ msgstr "软件包安装"
 msgid "Preparing packages installation..."
 msgstr "准备安装软件包..."
 
-#: ../gurpmi2:113 ../urpmi:512
+#: ../gurpmi2:113 ../urpmi:505
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -300,13 +278,13 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:277 ../urpmi:612
+#: ../gurpmi2:277 ../urpmi:605
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:278 ../urpmi:613
+#: ../gurpmi2:278 ../urpmi:606
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -333,7 +311,7 @@ msgstr "正在准备..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:344 ../urpmi:640
+#: ../gurpmi2:344 ../urpmi:633
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "请插入介质“%s”"
@@ -384,12 +362,12 @@ msgstr "软件包已经安装"
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../gurpmi2:419 ../urpme:172
+#: ../gurpmi2:419 ../urpme:165
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:430 ../urpmi:698
+#: ../gurpmi2:430 ../urpmi:691
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
@@ -428,7 +406,7 @@ msgstr "                    默认为 %s。\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -f              - 输出 rpm 的完整名称(NVRA)。\n"
 
-#: ../rurpmi:11 ../urpmi:272
+#: ../rurpmi:11 ../urpmi:265
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
@@ -463,7 +441,7 @@ msgstr "无法将软件包下载到 %s"
 msgid "Environment directory %s does not exist"
 msgstr "环境目录 %s 不存在"
 
-#: ../urpm.pm:151 ../urpmf:251 ../urpmq:170
+#: ../urpm.pm:151 ../urpmf:243 ../urpmq:163
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
@@ -563,7 +541,7 @@ msgstr "chroot 目录不存在"
 msgid "Can't use %s without %s"
 msgstr "没有 %2$s 无法使用 %1$s"
 
-#: ../urpm/args.pm:504 ../urpm/args.pm:507 ../urpmq:162
+#: ../urpm/args.pm:504 ../urpm/args.pm:507 ../urpmq:155
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "无法和 %2$s 一起使用 %1$s"
@@ -573,7 +551,28 @@ msgstr "无法和 %2$s 一起使用 %1$s"
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
 
-#: ../urpm/bug_report.pm:67 ../urpmi:262
+#: ../urpm/args.pm:523
+#, c-format
+msgid ""
+"%s version %s\n"
+"%s\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"%s 版本 %s\n"
+"%s\n"
+"这是自由软件，可以依照 GNU GPL 重新发布。\n"
+"\n"
+"用法:\n"
+
+#: ../urpm/args.pm:529
+#, c-format
+msgid "Copyright (C) %s by %s"
+msgstr "版权 (C) %s %s"
+
+#: ../urpm/bug_report.pm:67 ../urpmi:255
 #, c-format
 msgid "Copying failed"
 msgstr "复制失败"
@@ -1260,7 +1259,7 @@ msgstr "找到地理位置较近的 %s %.2f %.2f，从时区 %s"
 msgid "getting mirror list from %s"
 msgstr "从 %s 中获得镜像列表"
 
-#: ../urpm/msg.pm:76 ../urpmi:498 ../urpmi:516 ../urpmi:632
+#: ../urpm/msg.pm:76 ../urpmi:491 ../urpmi:509 ../urpmi:625
 #, c-format
 msgid "Nn"
 msgstr "nN否"
@@ -1271,7 +1270,7 @@ msgstr "nN否"
 msgid "Yy"
 msgstr "yY是"
 
-#: ../urpm/msg.pm:107 ../urpme:166 ../urpmi.addmedia:136
+#: ../urpm/msg.pm:107 ../urpme:159 ../urpmi.addmedia:136
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
@@ -1469,7 +1468,7 @@ msgstr "urpmi 已经重新启动，优先的软件包列表进行了如下更改
 msgid "No package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm/select.pm:219 ../urpme:120
+#: ../urpm/select.pm:219 ../urpme:113
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
@@ -1612,69 +1611,53 @@ msgstr "无法打开文件"
 msgid "Can't move file %s to %s"
 msgstr "无法将文件 %s 移动到 %s"
 
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"%s\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmf 版本 %s\n"
-"%s\n"
-"这是自由软件，可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
-
-#: ../urpme:50
+#: ../urpme:43
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自动选中软件包。\n"
 
-#: ../urpme:51
+#: ../urpme:44
 #, c-format
 msgid "  --auto-orphans - remove orphans\n"
 msgstr "  --auto-orphans - 删除孤立软件包\n"
 
-#: ../urpme:52
+#: ../urpme:45
 #, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 验证删除是否可以正确进行。\n"
 
-#: ../urpme:54 ../urpmi:111 ../urpmq:73
+#: ../urpme:47 ../urpmi:104 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
-#: ../urpme:55 ../urpmi:145
+#: ../urpme:48 ../urpmi:138
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - 在删除之前重新对文件打包\n"
 
-#: ../urpme:56
+#: ../urpme:49
 #, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
 
-#: ../urpme:57 ../urpmf:43 ../urpmi:113 ../urpmi.addmedia:73
-#: ../urpmi.recover:38 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:75
+#: ../urpme:50 ../urpmf:35 ../urpmi:106 ../urpmi.addmedia:73
+#: ../urpmi.recover:32 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:68
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr "  --urpmi-root   - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
 
-#: ../urpme:58 ../urpmi:103
+#: ../urpme:51 ../urpmi:96
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr "  --justdb       - 只使用 rpm 数据库，不更新文件系统。\n"
 
-#: ../urpme:59
+#: ../urpme:52
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - 不执行软件包脚本。\n"
 
-#: ../urpme:60
+#: ../urpme:53
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1683,402 +1666,386 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:62 ../urpmi:156 ../urpmq:94
+#: ../urpme:55 ../urpmi:149 ../urpmq:87
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - 详细提示。\n"
 
-#: ../urpme:63
+#: ../urpme:56
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 
-#: ../urpme:78
+#: ../urpme:71
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "只允许超级用户删除软件包"
 
-#: ../urpme:111
+#: ../urpme:104
 #, c-format
 msgid "unknown packages"
 msgstr "未知的软件包"
 
-#: ../urpme:111
+#: ../urpme:104
 #, c-format
 msgid "unknown package"
 msgstr "未知的软件包"
 
-#: ../urpme:126
+#: ../urpme:119
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "删除下列软件包将会破坏您的系统:"
 
-#: ../urpme:131
+#: ../urpme:124
 #, c-format
 msgid "Nothing to remove"
 msgstr "不需要删除任何东西。"
 
-#: ../urpme:148
+#: ../urpme:141
 #, c-format
 msgid "No orphans to remove"
 msgstr "没有可删除的孤立软件包"
 
-#: ../urpme:154
+#: ../urpme:147
 #, 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:159
+#: ../urpme:152
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(孤立的软件包)"
 
-#: ../urpme:166
+#: ../urpme:159
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../urpme:171
+#: ../urpme:164
 #, c-format
 msgid "testing removal of %s"
 msgstr "测试删除 %s"
 
-#: ../urpme:188
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "删除失败"
 
-#: ../urpme:190
+#: ../urpme:183
 #, c-format
 msgid "Removal is possible"
 msgstr "可以删除"
 
-#: ../urpmf:29
-#, fuzzy, c-format
-msgid ""
-"urpmf version %s\n"
-"%s\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage: urpmf [options] pattern-expression\n"
-msgstr ""
-"urpmf 版本 %s\n"
-"版权 (C) 2002-2006 Mandriva。\n"
-"这是自由软件，可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
-
-#: ../urpmf:39
+#: ../urpmf:31
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 打印此工具的版本号。\n"
 
-#: ../urpmf:40 ../urpmi:135 ../urpmq:85
+#: ../urpmf:32 ../urpmi:128 ../urpmq:78
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
-#: ../urpmf:41 ../urpmi:76 ../urpmq:52
+#: ../urpmf:33 ../urpmi:69 ../urpmq:45
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:42
+#: ../urpmf:34
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr "  --literal, -l  - 不匹配模式，参数为字面字符串。\n"
 
-#: ../urpmf:45 ../urpmi:79 ../urpmq:53
+#: ../urpmf:37 ../urpmi:72 ../urpmq:46
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n"
 
-#: ../urpmf:46
+#: ../urpmf:38
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - 使用给定的路径访问介质\n"
 
-#: ../urpmf:47 ../urpmi:80 ../urpmq:54
+#: ../urpmf:39 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 
-#: ../urpmf:48
+#: ../urpmf:40
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 不打印相同行。\n"
 
-#: ../urpmf:49 ../urpmi:77 ../urpmq:49
+#: ../urpmf:41 ../urpmi:70 ../urpmq:42
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质。\n"
 
-#: ../urpmf:50
+#: ../urpmf:42
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - 详细提示。\n"
 
-#: ../urpmf:51
+#: ../urpmf:43
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - 忽略各种情况下的冲突。\n"
 
-#: ../urpmf:52
+#: ../urpmf:44
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - 在模式中遵从大小写(默认值)。\n"
 
-#: ../urpmf:53
+#: ../urpmf:45
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<字符串>     - 更改字段分隔符(默认为“:”)。\n"
 
-#: ../urpmf:54
+#: ../urpmf:46
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "模式表达式: \n"
 
-#: ../urpmf:55
+#: ../urpmf:47
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr "  文本           - 任何文本都将被处理为正则表达式，除非使用了 -l。\n"
 
-#: ../urpmf:56
+#: ../urpmf:48
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
 
-#: ../urpmf:57
+#: ../urpmf:49
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - 二元 AND 操作符。\n"
 
-#: ../urpmf:58
+#: ../urpmf:50
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - 二元 OR 操作符。\n"
 
-#: ../urpmf:59
+#: ../urpmf:51
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - 一元 NOT。\n"
 
-#: ../urpmf:60
+#: ../urpmf:52
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - 左右括号。\n"
 
-#: ../urpmf:61
+#: ../urpmf:53
 #, c-format
 msgid "List of tags:\n"
 msgstr "标记清单:\n"
 
-#: ../urpmf:62
+#: ../urpmf:54
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - 指定类似 printf 的输出格式\n"
 
-#: ../urpmf:63
+#: ../urpmf:55
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   例如:“%%name:%%files”\n"
 
-#: ../urpmf:64
+#: ../urpmf:56
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - 体系\n"
 
-#: ../urpmf:65
+#: ../urpmf:57
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - 编译主机\n"
 
-#: ../urpmf:66
+#: ../urpmf:58
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - 编译时间\n"
 
-#: ../urpmf:67
+#: ../urpmf:59
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - 配置文件\n"
 
-#: ../urpmf:68
+#: ../urpmf:60
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - conflict 标签\n"
 
-#: ../urpmf:69
+#: ../urpmf:61
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - 软件包描述\n"
 
-#: ../urpmf:70
+#: ../urpmf:62
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - 发行版\n"
 
-#: ../urpmf:71
+#: ../urpmf:63
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - 周期\n"
 
-#: ../urpmf:72
+#: ../urpmf:64
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --fiename      - 软件包文件名\n"
 
-#: ../urpmf:73
+#: ../urpmf:65
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - 列出软件包中包含的文件\n"
 
-#: ../urpmf:74
+#: ../urpmf:66
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - 分组\n"
 
-#: ../urpmf:75
+#: ../urpmf:67
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - 许可协议\n"
 
-#: ../urpmf:76
+#: ../urpmf:68
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - 软件包名称\n"
 
-#: ../urpmf:77
+#: ../urpmf:69
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - obsolets 标签\n"
 
-#: ../urpmf:78
+#: ../urpmf:70
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - 打包者\n"
 
-#: ../urpmf:79
+#: ../urpmf:71
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - provides 标签\n"
 
-#: ../urpmf:80
+#: ../urpmf:72
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - requires 标签\n"
 
-#: ../urpmf:81
+#: ../urpmf:73
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - 安装大小\n"
 
-#: ../urpmf:82
+#: ../urpmf:74
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - 源 rpm 名称\n"
 
-#: ../urpmf:83
+#: ../urpmf:75
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - suggests 标签\n"
 
-#: ../urpmf:84
+#: ../urpmf:76
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - 摘要\n"
 
-#: ../urpmf:85
+#: ../urpmf:77
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:86
+#: ../urpmf:78
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - 提供者\n"
 
-#: ../urpmf:87
+#: ../urpmf:79
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - 软件包所在介质\n"
 
-#: ../urpmf:88 ../urpmq:104
+#: ../urpmf:80 ../urpmq:97
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
 
-#: ../urpmf:156
+#: ../urpmf:148
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "未终止的表达式(%s)"
 
-#: ../urpmf:201
+#: ../urpmf:193
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式不对: 您只能使用一个多值标签"
 
-#: ../urpmf:294
+#: ../urpmf:286
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "介质“%s”的 hdlist 不可用"
 
-#: ../urpmf:301
+#: ../urpmf:293
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "介质“%s”的综合文件不可用"
 
-#: ../urpmf:310
+#: ../urpmf:302
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "介质“%s”没有可用的 xml-info"
 
-#: ../urpmi:83
+#: ../urpmi:76
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
 msgstr "  --auto-update  - 更新介质后再升级系统。\n"
 
-#: ../urpmi:84
+#: ../urpmi:77
 #, c-format
 msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "    --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi:85
+#: ../urpmi:78
 #, c-format
 msgid "    --force-key    - force update of gpg key.\n"
 msgstr "    --force-key    - 强制更新 gpg 密钥。\n"
 
-#: ../urpmi:86
+#: ../urpmi:79
 #, c-format
 msgid "  --auto-orphans - remove orphans without asking\n"
 msgstr "  --auto-orphans - 不询问直接删除孤立软件包\n"
 
-#: ../urpmi:87 ../urpmq:59
+#: ../urpmi:80 ../urpmq:52
 #, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
 msgstr "  --no-suggests  - 不自动选择“推荐的”软件包。\n"
 
-#: ../urpmi:88
+#: ../urpmi:81
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
 
-#: ../urpmi:89
+#: ../urpmi:82
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - 不安装软件包(只下载)。\n"
 
-#: ../urpmi:90 ../urpmq:61
+#: ../urpmi:83 ../urpmq:54
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -2086,7 +2053,7 @@ msgid ""
 msgstr ""
 "  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
 
-#: ../urpmi:92
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -2096,62 +2063,62 @@ msgstr ""
 "  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
 "                   较小的交易。默认为 %d。\n"
 
-#: ../urpmi:96
+#: ../urpmi:89
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 小交易长度，默认为 %d。\n"
 
-#: ../urpmi:98
+#: ../urpmi:91
 #, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - 利用模糊查询。\n"
 
-#: ../urpmi:99
+#: ../urpmi:92
 #, c-format
 msgid "  --buildrequires - install the buildrequires of the packages\n"
 msgstr "  --buildrequires - 安装软件包构建需求\n"
 
-#: ../urpmi:100
+#: ../urpmi:93
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
 
-#: ../urpmi:101
+#: ../urpmi:94
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "   --clean       - 首先删除缓存中的 rpm。\n"
 
-#: ../urpmi:102
+#: ../urpmi:95
 #, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
 
-#: ../urpmi:104
+#: ../urpmi:97
 #, c-format
 msgid ""
 "  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr "  --replacepkgs  - 强制安装已经安装过的软件包。\n"
 
-#: ../urpmi:106
+#: ../urpmi:99
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr "  --allow-nodeps - 允许要求用户不经过依赖性检验就安装软件包。\n"
 
-#: ../urpmi:108
+#: ../urpmi:101
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr "  --allow-force  - 允许提示用户安装软件包而不检查依赖性和完整性。\n"
 
-#: ../urpmi:110
+#: ../urpmi:103
 #, c-format
 msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
 msgstr "  --allow-suggests - 自动选择“推荐的”软件包。\n"
 
-#: ../urpmi:114
+#: ../urpmi:107
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -2160,19 +2127,19 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpmi，特别用于在 --root 选项\n"
 "                   下安装 chroot。\n"
 
-#: ../urpmi:116 ../urpmi.addmedia:60 ../urpmi.update:37
+#: ../urpmi:109 ../urpmi.addmedia:60 ../urpmi.update:37
 #, c-format
 msgid "  --metalink     - generate and use a local metalink.\n"
 msgstr "  --metalink     - 生成并使用本地 metallink。\n"
 
-#: ../urpmi:117
+#: ../urpmi:110
 #, c-format
 msgid ""
 "  --download-all - download all needed packages before trying to install "
 "them\n"
 msgstr "  --download-all - 在试图安装之前下载所需的全部软件包\n"
 
-#: ../urpmi:118
+#: ../urpmi:111
 #, c-format
 msgid ""
 "  --downloader   - program to use to retrieve distant files. \n"
@@ -2181,37 +2148,37 @@ msgstr ""
 "  --downloader   - 用于重新获取远程文件的程序。\n"
 "                   已知程序：%s\n"
 
-#: ../urpmi:121
+#: ../urpmi:114
 #, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - 给 curl 传递额外的选项\n"
 
-#: ../urpmi:122
+#: ../urpmi:115
 #, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- 给 rsync 传递额外的选项\n"
 
-#: ../urpmi:123
+#: ../urpmi:116
 #, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - 给 wget 传递额外的选项\n"
 
-#: ../urpmi:124
+#: ../urpmi:117
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --prozilla-options - 给 prozilla 传递额外的选项\n"
 
-#: ../urpmi:125
+#: ../urpmi:118
 #, c-format
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr "  --aria2-options - 给 aria2 传递额外的选项\n"
 
-#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:38
+#: ../urpmi:119 ../urpmi.addmedia:61 ../urpmi.update:38
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 降低下载速度。\n"
 
-#: ../urpmi:127
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -2220,7 +2187,7 @@ msgstr ""
 "  --resume       - 续传未下载完成的文件\n"
 "                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmi:129 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:122 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:74
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -2229,7 +2196,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:83
+#: ../urpmi:124 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2238,7 +2205,7 @@ msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
 "                   密码(格式如 <用户: 密码>)。\n"
 
-#: ../urpmi:133
+#: ../urpmi:126
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -2247,47 +2214,47 @@ msgstr ""
 "  --bug          - 输出故障报告\n"
 "                   下一个参数指定输出目录。\n"
 
-#: ../urpmi:139
+#: ../urpmi:132
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
-#: ../urpmi:140
+#: ../urpmi:133
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - 排除文档文件。\n"
 
-#: ../urpmi:141
+#: ../urpmi:134
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - 安装前不检查磁盘空间。\n"
 
-#: ../urpmi:142
+#: ../urpmi:135
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 允许安装体系不匹配的 RPM。\n"
 
-#: ../urpmi:143
+#: ../urpmi:136
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - 不执行软件包脚本。\n"
 
-#: ../urpmi:144
+#: ../urpmi:137
 #, c-format
 msgid "  --replacefiles - ignore file conflicts\n"
 msgstr "  --replacefiles - 忽略文件冲突\n"
 
-#: ../urpmi:146
+#: ../urpmi:139
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安装要跳过的软件包。\n"
 
-#: ../urpmi:147
+#: ../urpmi:140
 #, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr "  --prefer       - 首选的软件包\n"
 
-#: ../urpmi:148
+#: ../urpmi:141
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -2295,82 +2262,82 @@ msgid ""
 msgstr ""
 "  --more-choices - 如果找到了多个软件包，则提供多个选择而不是默认选择。\n"
 
-#: ../urpmi:150
+#: ../urpmi:143
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - 不锁定 rpm 数据库。\n"
 
-#: ../urpmi:151
+#: ../urpmi:144
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 更新只限于相同体系的软件包。\n"
 
-#: ../urpmi:152 ../urpmq:102
+#: ../urpmi:145 ../urpmq:95
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:155
+#: ../urpmi:148
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - 安静模式。\n"
 
-#: ../urpmi:157
+#: ../urpmi:150
 #, c-format
 msgid "  --debug        - very verbose mode.\n"
 msgstr "  --debug        - 非常详细模式。\n"
 
-#: ../urpmi:158
+#: ../urpmi:151
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:186
+#: ../urpmi:179
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "错误: 无法在使用软件包列表时使用 --auto-select。\n"
 
-#: ../urpmi:193
+#: ../urpmi:186
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr "错误: 要生成错误报告，请在指定命令行参数时多加 --bug。\n"
 
-#: ../urpmi:223
+#: ../urpmi:216
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "您无法使用 --install-src 安装二进制 RPM 文件"
 
-#: ../urpmi:224
+#: ../urpmi:217
 #, c-format
 msgid "You can't install spec files"
 msgstr "您不能安装 spec 文件"
 
-#: ../urpmi:231
+#: ../urpmi:224
 #, c-format
 msgid "defaulting to --buildrequires"
 msgstr "正在设置默认为 --buildrequires"
 
-#: ../urpmi:236
+#: ../urpmi:229
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr "请使用 --buildrequires 或 --install-src，默认为 --buildrequires"
 
-#: ../urpmi:256
+#: ../urpmi:249
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:257
+#: ../urpmi:250
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:278
+#: ../urpmi:271
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2380,42 +2347,42 @@ msgstr ""
 "请使用 --allow-force 强制操作。"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:432
+#: ../urpmi:425
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (即将升级)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:434
+#: ../urpmi:427
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (即将升级)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:438
+#: ../urpmi:431
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (即将安装)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:440
+#: ../urpmi:433
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (即将安装)"
 
-#: ../urpmi:446
+#: ../urpmi:439
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "为满足“%s”的依赖关系，需要安装下列软件包之一："
 
-#: ../urpmi:449
+#: ../urpmi:442
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:491
+#: ../urpmi:484
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2425,7 +2392,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:493
+#: ../urpmi:486
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2435,7 +2402,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:499 ../urpmi:517
+#: ../urpmi:492 ../urpmi:510
 #, c-format
 msgid ""
 "\n"
@@ -2444,12 +2411,12 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:500 ../urpmi:518 ../urpmi:633 ../urpmi.addmedia:136
+#: ../urpmi:493 ../urpmi:511 ../urpmi:626 ../urpmi.addmedia:136
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
 
-#: ../urpmi:511
+#: ../urpmi:504
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2458,12 +2425,12 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:532
+#: ../urpmi:525
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpmi:540
+#: ../urpmi:533
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2473,7 +2440,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:542
+#: ../urpmi:535
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2483,12 +2450,12 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:550
+#: ../urpmi:543
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(只是测试，删除将不会实际发生)"
 
-#: ../urpmi:569
+#: ../urpmi:562
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2498,44 +2465,44 @@ msgstr ""
 "您必须首先用 --buildrequires 调用 urpmi，以便安装下列依赖关系：\n"
 "%s\n"
 
-#: ../urpmi:579
+#: ../urpmi:572
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "下列孤立软件包将被删除。"
 
-#: ../urpmi:603
+#: ../urpmi:596
 #, c-format
 msgid "WARNING: %s option is in use. Some strange problems may happen"
 msgstr ""
 
-#: ../urpmi:615
+#: ../urpmi:608
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(只是测试，安装将不会实际发生)"
 
-#: ../urpmi:621
+#: ../urpmi:614
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "将会使用 %s 的额外磁盘空间。"
 
-#: ../urpmi:622
+#: ../urpmi:615
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "将会释放 %s 的磁盘空间。"
 
-#: ../urpmi:623
+#: ../urpmi:616
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "将会获取 %s 的软件包。"
 
-#: ../urpmi:624
+#: ../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:646
+#: ../urpmi:639
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "挂载后按 Enter..."
@@ -2584,17 +2551,17 @@ msgstr ""
 "\n"
 "而 [选项] 可以来自\n"
 
-#: ../urpmi.addmedia:56 ../urpmi.update:33 ../urpmq:78
+#: ../urpmi.addmedia:56 ../urpmi.update:33 ../urpmq:71
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 用 wget 取远程文件。\n"
 
-#: ../urpmi.addmedia:57 ../urpmi.update:34 ../urpmq:79
+#: ../urpmi.addmedia:57 ../urpmi.update:34 ../urpmq:72
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 用 crul 取远程文件。\n"
 
-#: ../urpmi.addmedia:58 ../urpmi.update:35 ../urpmq:80
+#: ../urpmi.addmedia:58 ../urpmi.update:35 ../urpmq:73
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prizlla      - 用 prozilla 取远程文件。\n"
@@ -2745,137 +2712,121 @@ msgstr "<综合文件的相对路径>找不到\n"
 msgid "Can't use %s with remote medium"
 msgstr "远程介质无法使用 %s"
 
-#: ../urpmi.recover:28
-#, fuzzy, c-format
-msgid ""
-"urpmi.recover version %s\n"
-"%s\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmq 版本 %s\n"
-"版权 (C) 2000-2006 Mandriva。\n"
-"这是自由软件，可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
-
-#: ../urpmi.recover:36
+#: ../urpmi.recover:30
 #, c-format
 msgid "  --checkpoint   - set repackaging start now\n"
 msgstr "  --checkpoint   - 设定重新打包立即开始\n"
 
-#: ../urpmi.recover:37
+#: ../urpmi.recover:31
 #, fuzzy, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
 
-#: ../urpmi.recover:39
+#: ../urpmi.recover:33
 #, c-format
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr "  --list         - 列出自所提供日期/时长参数之后的交易\n"
 
-#: ../urpmi.recover:40
+#: ../urpmi.recover:34
 #, fuzzy, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
 msgstr "  --list-url     - 列出可用的介质及其 URL。\n"
 
-#: ../urpmi.recover:41
+#: ../urpmi.recover:35
 #, c-format
 msgid "  --list-safe    - list transactions since checkpoint\n"
 msgstr "  --list-safe    - 列出自检查点之后的交易\n"
 
-#: ../urpmi.recover:42
+#: ../urpmi.recover:36
 #, c-format
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr "  --rollback     - 回滚到指定的日期或回滚指定数量的交易\n"
 
-#: ../urpmi.recover:44
+#: ../urpmi.recover:38
 #, fuzzy, c-format
 msgid "  --disable      - turn off repackaging\n"
 msgstr "  --fiename      - 软件包文件名\n"
 
-#: ../urpmi.recover:59
+#: ../urpmi.recover:53
 #, fuzzy, c-format
 msgid "Invalid date or duration [%s]\n"
 msgstr "目录 %s 的所有者无效"
 
-#: ../urpmi.recover:67
+#: ../urpmi.recover:61
 #, fuzzy, c-format
 msgid "Repackage directory not defined\n"
 msgstr "未找到软件包 %s。"
 
-#: ../urpmi.recover:70
+#: ../urpmi.recover:64
 #, fuzzy, c-format
 msgid "Can't write to repackage directory [%s]\n"
 msgstr "创建目录 %s 失败"
 
-#: ../urpmi.recover:72
+#: ../urpmi.recover:66
 #, fuzzy, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
 msgstr "创建目录 %s 失败"
 
-#: ../urpmi.recover:74
+#: ../urpmi.recover:68
 #, c-format
 msgid "%d file removed\n"
 msgid_plural "%d files removed\n"
 msgstr[0] "删除了 %d 个文件\n"
 
-#: ../urpmi.recover:84
+#: ../urpmi.recover:78
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
 msgstr "冲突的命令行参数[%s]\n"
 
-#: ../urpmi.recover:86
+#: ../urpmi.recover:80
 #, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
 msgstr "您不能同时指定 --checkpoint 和 --rollback\n"
 
-#: ../urpmi.recover:88
+#: ../urpmi.recover:82
 #, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
 msgstr "您不能同时指定 --checkpoint 和 --list\n"
 
-#: ../urpmi.recover:90
+#: ../urpmi.recover:84
 #, c-format
 msgid "You can't specify --rollback and --list at the same time\n"
 msgstr "您不能同时指定 --rollback 和 --list\n"
 
-#: ../urpmi.recover:92
+#: ../urpmi.recover:86
 #, c-format
 msgid "You can't specify --disable along with another option"
 msgstr "您不能将 --disable 与其它选项一起使用"
 
-#: ../urpmi.recover:117
+#: ../urpmi.recover:111
 #, c-format
 msgid "No transaction found since %s\n"
 msgstr "自 %s 后无交易\n"
 
-#: ../urpmi.recover:132
+#: ../urpmi.recover:126
 #, c-format
 msgid "You must be superuser to do this"
 msgstr "您必须是超级用户才能执行此操作"
 
-#: ../urpmi.recover:145 ../urpmi.recover:211
+#: ../urpmi.recover:139 ../urpmi.recover:205
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpmi.recover:187
+#: ../urpmi.recover:181
 #, fuzzy, c-format
 msgid "No rollback date found\n"
 msgstr "没有找到更新日志\n"
 
-#: ../urpmi.recover:190
+#: ../urpmi.recover:184
 #, c-format
 msgid "Rollback until %s...\n"
 msgstr "回滚至 %s...\n"
 
-#: ../urpmi.recover:197
+#: ../urpmi.recover:191
 #, fuzzy, c-format
 msgid "Disabling repackaging\n"
 msgstr "[重新打包]"
@@ -3001,35 +2952,19 @@ msgstr "忽略介质 %s"
 msgid "enabling media %s"
 msgstr "启用介质 %s"
 
-#: ../urpmq:40
-#, fuzzy, c-format
-msgid ""
-"urpmq version %s\n"
-"%s\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmq 版本 %s\n"
-"版权 (C) 2000-2006 Mandriva。\n"
-"这是自由软件，可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
-
-#: ../urpmq:51
+#: ../urpmq:44
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
 msgstr "  --searchmedia  - 只使用给定介质来搜索请求(或更新的)的软件包。\n"
 
-#: ../urpmq:56
+#: ../urpmq:49
 #, c-format
 msgid "  --auto-orphans - list orphans\n"
 msgstr "  --auto-orphans - 列出孤立软件包\n"
 
-#: ../urpmq:57
+#: ../urpmq:50
 #, c-format
 msgid ""
 "  --not-available\n"
@@ -3038,105 +2973,105 @@ msgstr ""
 "  --not-available\n"
 "                 - 列出已安装但却不在任何介质中的软件包。\n"
 
-#: ../urpmq:60
+#: ../urpmq:53
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - 利用模糊查询(和 -y 一样)。\n"
 
-#: ../urpmq:63
+#: ../urpmq:56
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - 列出可用的软件包。\n"
 
-#: ../urpmq:64
+#: ../urpmq:57
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - 列出可用的介质。\n"
 
-#: ../urpmq:65
+#: ../urpmq:58
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - 列出可用的介质及其 URL。\n"
 
-#: ../urpmq:66
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - 如果使用了 --parallel，列出所有可用的节点。\n"
 
-#: ../urpmq:67
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - 列出可用的并行处理别名。\n"
 
-#: ../urpmq:68
+#: ../urpmq:61
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "  --dump-config  - 以 urpmi.addmedia 参数的格式导出配置。\n"
 
-#: ../urpmq:69
+#: ../urpmq:62
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下一个软件包是源程序包(和 -s 一样)。\n"
 
-#: ../urpmq:70
+#: ../urpmq:63
 #, fuzzy, c-format
 msgid "  --sources      - print source URLs of selected packages\n"
 msgstr "  --sourcerpm    - 打印源 rpm 名称。\n"
 
-#: ../urpmq:72
+#: ../urpmq:65
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 允许查询架构不匹配的 RPM。\n"
 
-#: ../urpmq:76
+#: ../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:86
+#: ../urpmq:79
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - 打印更新日志。\n"
 
-#: ../urpmq:87
+#: ../urpmq:80
 #, c-format
 msgid "  --conflicts    - print conflicts.\n"
 msgstr "  --conflicts    - 打印 conflict 标签。\n"
 
-#: ../urpmq:88
+#: ../urpmq:81
 #, c-format
 msgid "  --obsoletes    - print obsoletes.\n"
 msgstr "  --obsoletes    - 打印 obsolets 标签。\n"
 
-#: ../urpmq:89
+#: ../urpmq:82
 #, c-format
 msgid "  --provides     - print provides.\n"
 msgstr "  --provides     - 打印 provides。\n"
 
-#: ../urpmq:90
+#: ../urpmq:83
 #, c-format
 msgid "  --requires     - print requires.\n"
 msgstr "  --requires     - 打印 requires 标签。\n"
 
-#: ../urpmq:91
+#: ../urpmq:84
 #, c-format
 msgid "  --suggests     - print suggests.\n"
 msgstr "  --suggests     - 打印 suggests 标签。\n"
 
-#: ../urpmq:92
+#: ../urpmq:85
 #, c-format
 msgid "  --sourcerpm    - print sourcerpm.\n"
 msgstr "  --sourcerpm    - 打印源 rpm 名称。\n"
 
-#: ../urpmq:93
+#: ../urpmq:86
 #, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - 打印摘要。\n"
 
-#: ../urpmq:95
+#: ../urpmq:88
 #, c-format
 msgid ""
 "  --requires-recursive, -d\n"
@@ -3145,12 +3080,12 @@ msgstr ""
 "  --requires-recursive, -d\n"
 "                   - 查询软件包依赖关系。\n"
 
-#: ../urpmq:97
+#: ../urpmq:90
 #, c-format
 msgid "  --whatrequires - reverse search to what requires package.\n"
 msgstr "  --whatrequires - 逆序搜索需要软件包的软件包。\n"
 
-#: ../urpmq:98
+#: ../urpmq:91
 #, c-format
 msgid ""
 "  --whatrequires-recursive\n"
@@ -3159,7 +3094,7 @@ msgstr ""
 "  --whatrequires-recursive\n"
 "                   - 扩展逆序搜索(包括虚拟软件包)。\n"
 
-#: ../urpmq:100
+#: ../urpmq:93
 #, c-format
 msgid ""
 "  --whatprovides, -p\n"
@@ -3168,101 +3103,101 @@ msgstr ""
 "  --whatprovides, -p\n"
 "                   - 允许在 provides 中寻找软件包。\n"
 
-#: ../urpmq:103
+#: ../urpmq:96
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - 要删除的软件包的完整输出。\n"
 
-#: ../urpmq:105
+#: ../urpmq:98
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - 打印组名。\n"
 
-#: ../urpmq:106
+#: ../urpmq:99
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - 以人类可读的格式打印有用信息。\n"
 
-#: ../urpmq:107
+#: ../urpmq:100
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - 列出软件包中的文件。\n"
 
-#: ../urpmq:108
+#: ../urpmq:101
 #, c-format
 msgid "  -m             - equivalent to -du\n"
 msgstr "  -m             - 与 -du 等价。\n"
 
-#: ../urpmq:109
+#: ../urpmq:102
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 和名称一起打印版本和发行号。\n"
 
-#: ../urpmq:110
+#: ../urpmq:103
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
 
-#: ../urpmq:111
+#: ../urpmq:104
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - 如果更新的版本已经安装，就删除软件包。\n"
 
-#: ../urpmq:112
+#: ../urpmq:105
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
 
-#: ../urpmq:113
+#: ../urpmq:106
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - 类似于 -y，但强制不区分大小写匹配。\n"
 
-#: ../urpmq:114
+#: ../urpmq:107
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  需要在命令行给出名称或 rpm 文件。\n"
 
-#: ../urpmq:161
+#: ../urpmq:154
 #, c-format
 msgid "usage: \"urpmq --auto-orphans\" with no argument"
 msgstr "用法:“urpmq --auto-orphans”不带参数"
 
-#: ../urpmq:214
+#: ../urpmq:207
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 仅能和 --parallel 一起使用"
 
-#: ../urpmq:238
+#: ../urpmq:231
 #, c-format
 msgid "use -l to list files"
 msgstr "使用 -l 可列出文件"
 
-#: ../urpmq:423
+#: ../urpmq:416
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
 msgstr "由于介质“%s”没有 xml 信息，软件包 %s 只返回部分结果"
 
-#: ../urpmq:424
+#: ../urpmq:417
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
 msgstr "由于介质“%s”没有 xml 信息，软件包 %s 只返回部分结果"
 
-#: ../urpmq:427
+#: ../urpmq:420
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr "由于介质“%s”没有 xml 信息，软件包 %s 无法返回任何结果"
 
-#: ../urpmq:428
+#: ../urpmq:421
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr "由于介质“%s”没有 xml 信息，软件包 %s 无法返回任何结果"
 
-#: ../urpmq:495
+#: ../urpmq:488
 #, c-format
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
@@ -3276,6 +3211,65 @@ msgid "Graphical front end to install RPM files"
 msgstr "图形化安装 RPM 软件包"
 
 #~ msgid ""
+#~ "urpme version %s\n"
+#~ "%s\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "urpmf 版本 %s\n"
+#~ "%s\n"
+#~ "这是自由软件，可以依照 GNU GPL 重新发布。\n"
+#~ "\n"
+#~ "用法:\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "urpmf version %s\n"
+#~ "%s\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage: urpmf [options] pattern-expression\n"
+#~ msgstr ""
+#~ "urpmf 版本 %s\n"
+#~ "版权 (C) 2002-2006 Mandriva。\n"
+#~ "这是自由软件，可以依照 GNU GPL 重新发布。\n"
+#~ "\n"
+#~ "用法:\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "urpmi.recover version %s\n"
+#~ "%s\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "urpmq 版本 %s\n"
+#~ "版权 (C) 2000-2006 Mandriva。\n"
+#~ "这是自由软件，可以依照 GNU GPL 重新发布。\n"
+#~ "\n"
+#~ "用法:\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "urpmq version %s\n"
+#~ "%s\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "urpmq 版本 %s\n"
+#~ "版权 (C) 2000-2006 Mandriva。\n"
+#~ "这是自由软件，可以依照 GNU GPL 重新发布。\n"
+#~ "\n"
+#~ "用法:\n"
+
+#~ msgid ""
 #~ "Installation failed, some files are missing:\n"
 #~ "%s\n"
 #~ "You may want to update your urpmi database"