Merge messages; add new French messages, and fix some.

1 files changed, 133 insertions, 128 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index df5847e7..942d6db0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-15 17:56+0800\n"
+"POT-Creation-Date: 2005-06-29 18:17+0200\n"
 "PO-Revision-Date: 2005-06-19 09:44+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@linux-mandrake."
@@ -54,22 +54,22 @@ msgstr ""
 "自动安装软件包...\n"
 "您要求安装软件包 %s\n"
 
-#: ../_irpm:33 ../urpme:29 ../urpmi:478
+#: ../_irpm:33 ../urpme:31 ../urpmi:494
 #, c-format
 msgid "Is this OK?"
 msgstr "这样好了吗?"
 
-#: ../_irpm:35
+#: ../_irpm:35 ../urpmi:525
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../_irpm:36
+#: ../_irpm:36 ../urpmi:525
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../_irpm:44 ../urpmi:384 ../urpmi:402 ../urpmi:482
+#: ../_irpm:44 ../urpmi:400 ../urpmi:418 ../urpmi:498
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
@@ -196,7 +196,7 @@ msgstr "软件包选择"
 msgid "_Ok"
 msgstr "确定(_O)"
 
-#: ../gurpmi2:120 ../urpmi:349
+#: ../gurpmi2:120 ../urpmi:360
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
@@ -232,12 +232,12 @@ msgstr ""
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../gurpmi2:186 ../urpmi:491 ../urpmq:308
+#: ../gurpmi2:186 ../urpmi:507 ../urpmq:308
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi2:200 ../urpmi:502
+#: ../gurpmi2:200 ../urpmi:518
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请将标签为“%s”的介质插入到设备 [%s]"
@@ -261,7 +261,7 @@ msgstr ""
 "\n"
 "您想要继续安装吗?"
 
-#: ../gurpmi2:250 ../gurpmi2:299 ../urpmi:573 ../urpmi:689
+#: ../gurpmi2:250 ../gurpmi2:299 ../urpmi:588 ../urpmi:704
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -272,7 +272,7 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi2:257 ../urpme:116 ../urpmi:616
+#: ../gurpmi2:257 ../urpme:118 ../urpmi:631
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
@@ -287,7 +287,7 @@ msgstr "正在准备..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:285 ../urpmi:583 ../urpmi:634 ../urpmi:652 ../urpmi:668
+#: ../gurpmi2:285 ../urpmi:598 ../urpmi:649 ../urpmi:667 ../urpmi:683
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
@@ -297,7 +297,7 @@ msgstr "安装失败"
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:302 ../urpmi:705
+#: ../gurpmi2:302 ../urpmi:720
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "软件包已经安装"
@@ -612,7 +612,7 @@ msgstr "试图选择不存在的介质“%s”"
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm.pm:864 ../urpmi.update:94
+#: ../urpm.pm:864 ../urpmi.update:97
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
@@ -796,7 +796,7 @@ msgid ""
 "corrupted."
 msgstr "无法创建介质“%s”的综合文件。您的 hdlist 文件可能已经损坏。"
 
-#: ../urpm.pm:1915 ../urpm.pm:1950 ../urpmi:306
+#: ../urpm.pm:1915 ../urpm.pm:1950 ../urpmi:317
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "创建介质“%s”的 hdlist 综合文件"
@@ -856,7 +856,7 @@ msgstr "搜索"
 msgid "no package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm.pm:2220 ../urpme:92
+#: ../urpm.pm:2220 ../urpme:94
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
@@ -1031,12 +1031,17 @@ msgstr "正在检查 MD5SUM 文件"
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告：%s 的 md5 校验和未在 MD5SUM 文件中找到"
 
+#: ../urpm.pm:3375
+#, c-format
+msgid "This operation is forbidden while running in restricted mode"
+msgstr ""
+
 #: ../urpm/args.pm:93 ../urpm/args.pm:102
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令的代理声明无效\n"
 
-#: ../urpm/args.pm:237
+#: ../urpm/args.pm:242
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
@@ -1046,7 +1051,7 @@ msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 msgid "Sorry, bad choice, try again\n"
 msgstr "对不起，选择无效，请再试一次\n"
 
-#: ../urpme:36
+#: ../urpme:38
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -1062,39 +1067,39 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpme:41 ../urpmf:32 ../urpmi:78 ../urpmi.addmedia:43
-#: ../urpmi.removemedia:45 ../urpmi.update:30 ../urpmq:43
+#: ../urpme:43 ../urpmf:32 ../urpmi:79 ../urpmi.addmedia:43
+#: ../urpmi.removemedia:48 ../urpmi.update:30 ../urpmq:43
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
 
-#: ../urpme:42 ../urpmi:85
+#: ../urpme:44 ../urpmi:86
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自动选中软件包。\n"
 
-#: ../urpme:43
+#: ../urpme:45
 #, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 验证删除是否可以正确进行。\n"
 
-#: ../urpme:44 ../urpmi:100 ../urpmq:64
+#: ../urpme:46 ../urpmi:101 ../urpmq:64
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
 
-#: ../urpme:45 ../urpmi:105 ../urpmq:65
+#: ../urpme:47 ../urpmi:106 ../urpmq:65
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
-#: ../urpme:46
+#: ../urpme:48
 #, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
 
-#: ../urpme:47
+#: ../urpme:49
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1103,59 +1108,59 @@ msgstr ""
 "  --use-distrib  - 配置 urpmi 实时从发行树中抓取，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:49 ../urpmi:138 ../urpmi.addmedia:74 ../urpmi.removemedia:50
+#: ../urpme:51 ../urpmi:139 ../urpmi.addmedia:74 ../urpmi.removemedia:53
 #: ../urpmi.update:48 ../urpmq:92
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 详细的提示。\n"
 
-#: ../urpme:50
+#: ../urpme:52
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 
-#: ../urpme:66
+#: ../urpme:68
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "只允许超级用户删除软件包"
 
-#: ../urpme:87
+#: ../urpme:89
 #, c-format
 msgid "unknown packages"
 msgstr "未知的软件包"
 
-#: ../urpme:87
+#: ../urpme:89
 #, c-format
 msgid "unknown package"
 msgstr "未知的软件包"
 
-#: ../urpme:97 ../urpmi:417
+#: ../urpme:99 ../urpmi:433
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpme:100
+#: ../urpme:102
 #, c-format
 msgid "Nothing to remove"
 msgstr "不需要删除任何东西。"
 
-#: ../urpme:104
+#: ../urpme:106
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "检查删除下列软件包"
 
-#: ../urpme:111
+#: ../urpme:113
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "为满足相关性要求，需要删除下列%d个软件包(%d MB)"
 
-#: ../urpme:113 ../urpmi:436 ../urpmi:566
+#: ../urpme:115 ../urpmi:452 ../urpmi:581
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
 
-#: ../urpme:120
+#: ../urpme:122
 #, c-format
 msgid "Removing failed"
 msgstr "删除失败"
@@ -1176,22 +1181,22 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmf:33 ../urpmi:79 ../urpmq:44
+#: ../urpmf:33 ../urpmi:80 ../urpmq:44
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质。\n"
 
-#: ../urpmf:34 ../urpmi:80 ../urpmq:45
+#: ../urpmf:34 ../urpmi:81 ../urpmq:45
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:47
+#: ../urpmf:35 ../urpmi:83 ../urpmq:47
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:36 ../urpmi:83 ../urpmq:48
+#: ../urpmf:36 ../urpmi:84 ../urpmq:48
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1302,7 +1307,7 @@ msgstr "  --conflicts    - 打印标签 conflicts: 所有的冲突。\n"
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    - 打印标签 obsoletes: 所有的废除。\n"
 
-#: ../urpmf:58 ../urpmi:120 ../urpmq:74
+#: ../urpmf:58 ../urpmi:121 ../urpmq:74
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1361,7 +1366,7 @@ msgstr ""
 "召回是:\n"
 "%s\n"
 
-#: ../urpmf:124 ../urpmi:201 ../urpmq:116
+#: ../urpmf:124 ../urpmi:212 ../urpmq:116
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
@@ -1378,7 +1383,7 @@ msgstr "注意：由于没有介质使用 hdlists 搜索，urpmf 无法返回任
 msgid "You may want to use --name to search for package names.\n"
 msgstr "您可能想要使用 --name 来搜索软件包名称。\n"
 
-#: ../urpmi:73
+#: ../urpmi:74
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1394,37 +1399,37 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmi:81 ../urpmq:46
+#: ../urpmi:82 ../urpmq:46
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
 msgstr "  --searchmedia  - 只使用给定介质来搜索请求(或更新的)的软件包。\n"
 
-#: ../urpmi:84
+#: ../urpmi:85
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 
-#: ../urpmi:86 ../urpmq:50
+#: ../urpmi:87 ../urpmq:50
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
 
-#: ../urpmi:87
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
 
-#: ../urpmi:88
+#: ../urpmi:89
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - 不安装软件包(只下载)。\n"
 
-#: ../urpmi:89 ../urpmq:52
+#: ../urpmi:90 ../urpmq:52
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1432,7 +1437,7 @@ msgid ""
 msgstr ""
 "  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
 
-#: ../urpmi:91
+#: ../urpmi:92
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1442,56 +1447,56 @@ msgstr ""
 "  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
 "                   较小的交易。默认为 %d。\n"
 
-#: ../urpmi:94
+#: ../urpmi:95
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 小交易长度，默认为 %d。\n"
 
-#: ../urpmi:95 ../urpmq:51
+#: ../urpmi:96 ../urpmq:51
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - 利用模糊查询(和 -y 一样)。\n"
 
-#: ../urpmi:96 ../urpmq:60
+#: ../urpmi:97 ../urpmq:60
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下一个软件包是源程序包(和 -s 一样)。\n"
 
-#: ../urpmi:97
+#: ../urpmi:98
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
 
-#: ../urpmi:98
+#: ../urpmi:99
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "   --clean       - 首先删除缓存中的 rpm。\n"
 
-#: ../urpmi:99
+#: ../urpmi:100
 #, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
 
-#: ../urpmi:101
+#: ../urpmi:102
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr "  --allow-nodeps - 允许要求用户不经过依赖性检验就安装软件包。\n"
 
-#: ../urpmi:103
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr "  --allow-force  - 允许提示用户安装软件包而不检查依赖性和完整性。\n"
 
-#: ../urpmi:106
+#: ../urpmi:107
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
 
-#: ../urpmi:107
+#: ../urpmi:108
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1500,22 +1505,22 @@ msgstr ""
 "  --use-distrib  - 配置 urpmi 实时从发行树中抓取，特别用于在 --root 选项\n"
 "                   下安装 chroot。\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:44 ../urpmi.update:31 ../urpmq:68
+#: ../urpmi:110 ../urpmi.addmedia:44 ../urpmi.update:31 ../urpmq:68
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 用 wget 取远程文件。\n"
 
-#: ../urpmi:110 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:69
+#: ../urpmi:111 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:69
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 用 crul 取远程文件。\n"
 
-#: ../urpmi:111 ../urpmi.addmedia:46 ../urpmi.update:33
+#: ../urpmi:112 ../urpmi.addmedia:46 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 降低下载速度。\n"
 
-#: ../urpmi:112
+#: ../urpmi:113
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1524,7 +1529,7 @@ msgstr ""
 "  --resume       - 续传未下载完成的文件\n"
 "                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:70
+#: ../urpmi:115 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:70
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1533,7 +1538,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:116 ../urpmi.addmedia:49 ../urpmi.update:36 ../urpmq:72
+#: ../urpmi:117 ../urpmi.addmedia:49 ../urpmi.update:36 ../urpmq:72
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1542,7 +1547,7 @@ msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
 "                   密码(格式如 <用户: 密码>)。\n"
 
-#: ../urpmi:118
+#: ../urpmi:119
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1551,7 +1556,7 @@ msgstr ""
 "  --bug          - 输出故障报告\n"
 "                   下一个参数指定输出目录。\n"
 
-#: ../urpmi:122
+#: ../urpmi:123
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1560,28 +1565,28 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署。\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../urpmi:124
+#: ../urpmi:125
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
-#: ../urpmi:125
+#: ../urpmi:126
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
-#: ../urpmi:126
+#: ../urpmi:127
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - 排除文档文件。\n"
 
-#: ../urpmi:127
+#: ../urpmi:128
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安装要跳过的软件包。\n"
 
-#: ../urpmi:128
+#: ../urpmi:129
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -1589,80 +1594,80 @@ msgid ""
 msgstr ""
 "  --more-choices - 如果找到了多个软件包，则提供多个选择而不是默认选择。\n"
 
-#: ../urpmi:130 ../urpmi.addmedia:68 ../urpmi.update:41
+#: ../urpmi:131 ../urpmi.addmedia:68 ../urpmi.update:41
 #, c-format
 msgid "  --norebuild    - don't try to rebuild hdlist if not readable.\n"
 msgstr "  --norebuild    - 如果 hdlist 不可读的话，不尝试重新创建。\n"
 
-#: ../urpmi:131
+#: ../urpmi:132
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 更新只限于相同体系的软件包。\n"
 
-#: ../urpmi:132 ../urpmq:78
+#: ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:133
+#: ../urpmi:134
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在提供的项目中寻找软件包。\n"
 
-#: ../urpmi:134
+#: ../urpmi:135
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不搜索提供标签中的软件包。\n"
 
-#: ../urpmi:135 ../urpmq:93
+#: ../urpmi:136 ../urpmq:93
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
 
-#: ../urpmi:136 ../urpmq:90
+#: ../urpmi:137 ../urpmq:90
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
 
-#: ../urpmi:137 ../urpmi.addmedia:73 ../urpmi.removemedia:49
+#: ../urpmi:138 ../urpmi.addmedia:73 ../urpmi.removemedia:52
 #: ../urpmi.update:47
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安静模式。\n"
 
-#: ../urpmi:139
+#: ../urpmi:140
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:182
+#: ../urpmi:183
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "对二进制 rpm 文件使用 --install-src 将会达到什么效果"
 
-#: ../urpmi:191
+#: ../urpmi:202
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:192
+#: ../urpmi:203
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:195 ../urpmi:316
+#: ../urpmi:206 ../urpmi:327
 #, c-format
 msgid "Copying failed"
 msgstr "复制失败"
 
-#: ../urpmi:212
+#: ../urpmi:223
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
 
-#: ../urpmi:221
+#: ../urpmi:232
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1671,12 +1676,12 @@ msgstr ""
 "错误：%s 似乎是以只读方式挂载的。\n"
 "请使用 --allow-force 强制操作。"
 
-#: ../urpmi:351
+#: ../urpmi:362
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:376
+#: ../urpmi:392
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -1686,7 +1691,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本：\n"
 "%s"
 
-#: ../urpmi:384 ../urpmi:402
+#: ../urpmi:400 ../urpmi:418
 #, c-format
 msgid ""
 "\n"
@@ -1695,7 +1700,7 @@ msgstr ""
 "\n"
 "继续吗?"
 
-#: ../urpmi:395
+#: ../urpmi:411
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1704,7 +1709,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:425
+#: ../urpmi:441
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1714,7 +1719,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:430
+#: ../urpmi:446
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1723,21 +1728,21 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:465 ../urpmi:476
+#: ../urpmi:481 ../urpmi:492
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be installed "
 "(%d MB)"
 msgstr "为了满足依赖性要求，将另外安装以下%d个软件包(%d MB)"
 
-#: ../urpmi:466 ../urpmi:477
+#: ../urpmi:482 ../urpmi:493
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed (%d "
 "MB)"
 msgstr "为了满足依赖性要求，将另外安装下列软件包(%d MB)"
 
-#: ../urpmi:472
+#: ../urpmi:488
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1746,57 +1751,57 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi:503
+#: ../urpmi:519
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:557
+#: ../urpmi:572
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpmi:558
+#: ../urpmi:573
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpmi:600
+#: ../urpmi:615
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#: ../urpmi:611
+#: ../urpmi:626
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在从 %2$s 安装 %1$s"
 
-#: ../urpmi:613
+#: ../urpmi:628
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpmi:641
+#: ../urpmi:656
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpmi:657
+#: ../urpmi:672
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "尝试更激烈的安装方式吗?(使用 --force)(是(y)/否(N))[否] "
 
-#: ../urpmi:694
+#: ../urpmi:709
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 安装交易失败"
 
-#: ../urpmi:702
+#: ../urpmi:717
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpmi:721
+#: ../urpmi:736
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
@@ -1903,7 +1908,7 @@ msgstr "  --nopubkey     - 不导入所添加介质的密钥\n"
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - 在配置中添加介质，但不进行更新。\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.removemedia:47 ../urpmi.update:45
+#: ../urpmi.addmedia:71 ../urpmi.removemedia:50 ../urpmi.update:45
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - 直接清除软件包头缓存。\n"
@@ -1918,42 +1923,42 @@ msgstr "  -f             - 强迫生成 hdlist 文件。\n"
 msgid "unable to update medium \"%s\"\n"
 msgstr "无法更新介质“%s”\n"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:117
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "只允许超级用户添加介质"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "Will create config file [%s]"
 msgstr "将创建配置文件[%s]"
 
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:121
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "无法创建配置文件[%s]"
 
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "使用 --distrib 不需要提供 <hdlist的相对路径>"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:138
 #, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<hdlist 相对路径>找不到\n"
 
-#: ../urpmi.addmedia:137
+#: ../urpmi.addmedia:140
 #, c-format
 msgid "`with' missing for network media\n"
 msgstr "“with”找不到网络介质\n"
 
-#: ../urpmi.addmedia:153
+#: ../urpmi.addmedia:156
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质“%s”\n"
 
-#: ../urpmi.removemedia:43
+#: ../urpmi.removemedia:46
 #, c-format
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -1962,17 +1967,17 @@ msgstr ""
 "用法: urpmi.removemedia [-a] <名称> ...\n"
 "其中 <名称> 是要删除的介质名。\n"
 
-#: ../urpmi.removemedia:46
+#: ../urpmi.removemedia:49
 #, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - 选择所有介质。\n"
 
-#: ../urpmi.removemedia:48
+#: ../urpmi.removemedia:51
 #, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - 介质名称使用模糊匹配。\n"
 
-#: ../urpmi.removemedia:51
+#: ../urpmi.removemedia:54
 #, c-format
 msgid ""
 "\n"
@@ -1981,17 +1986,17 @@ msgstr ""
 "\n"
 "未知的选项“%s”\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:63
 #, c-format
 msgid "Only superuser is allowed to remove media"
 msgstr "只允许超级用户删除介质"
 
-#: ../urpmi.removemedia:70
+#: ../urpmi.removemedia:73
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "没有可删除的(用 urpmi.addmedia 增加介质)\n"
 
-#: ../urpmi.removemedia:72
+#: ../urpmi.removemedia:75
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -2034,17 +2039,17 @@ msgstr "  --no-ignore    - 不更新，将介质标为启用。\n"
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 选择所有不可移动的介质。\n"
 
-#: ../urpmi.update:64
+#: ../urpmi.update:67
 #, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "只允许超级用户更新介质"
 
-#: ../urpmi.update:72
+#: ../urpmi.update:75
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
 
-#: ../urpmi.update:90
+#: ../urpmi.update:93
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2053,12 +2058,12 @@ msgstr ""
 "找不到要升级的项\n"
 "(%s 中之一)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:98
 #, c-format
 msgid "ignoring media %s"
 msgstr "忽略介质 %s"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:98
 #, c-format
 msgid "enabling media %s"
 msgstr "启用介质 %s"