From 80127e099e187cc61e45b01f7e5cb690f7f1f96c Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@mandriva.com>
Date: Tue, 13 Oct 2009 17:00:41 +0000
Subject: update po files

---
 po/zh_CN.po | 403 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 213 insertions(+), 190 deletions(-)

(limited to 'po/zh_CN.po')

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 080ac0fd..1cfcec1f 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: 2009-08-17 17:47+0200\n"
+"POT-Creation-Date: 2009-10-13 18:51+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."
@@ -155,7 +155,7 @@ msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
 
-#: ../gurpmi.pm:50 ../urpmi:142
+#: ../gurpmi.pm:50 ../urpmi:143
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -169,12 +169,12 @@ msgstr ""
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
-#: ../gurpmi.pm:53 ../urpmi:159
+#: ../gurpmi.pm:53 ../urpmi:160
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在 provides 字段中查找软件包。\n"
 
-#: ../gurpmi.pm:54 ../urpmi:160
+#: ../gurpmi.pm:54 ../urpmi:161
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 字段中查找软件包。\n"
@@ -184,7 +184,7 @@ msgstr "  -P             - 不在 provides 字段中查找软件包。\n"
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
 
-#: ../gurpmi.pm:56 ../urpmi:144
+#: ../gurpmi.pm:56 ../urpmi:145
 #, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
@@ -243,7 +243,7 @@ msgstr ""
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:146 ../urpmi:648
+#: ../gurpmi2:146 ../urpmi:649
 #, c-format
 msgid "Ok"
 msgstr "确定"
@@ -284,13 +284,13 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:267 ../urpmi:613
+#: ../gurpmi2:267 ../urpmi:614
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:268 ../urpmi:614
+#: ../gurpmi2:268 ../urpmi:615
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -317,7 +317,7 @@ msgstr "正在准备..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:334 ../urpmi:643
+#: ../gurpmi2:334 ../urpmi:644
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "请插入介质“%s”"
@@ -327,9 +327,9 @@ msgstr "请插入介质“%s”"
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../gurpmi2:360 ../urpm.pm:329 ../urpm/download.pm:821
-#: ../urpm/get_pkgs.pm:236 ../urpm/media.pm:912 ../urpm/media.pm:1414
-#: ../urpm/media.pm:1565
+#: ../gurpmi2:360 ../urpm.pm:329 ../urpm/download.pm:822
+#: ../urpm/get_pkgs.pm:257 ../urpm/media.pm:913 ../urpm/media.pm:1413
+#: ../urpm/media.pm:1564
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
@@ -350,7 +350,7 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi2:399 ../urpm/main_loop.pm:253 ../urpm/main_loop.pm:296
+#: ../gurpmi2:399 ../urpm/main_loop.pm:278 ../urpm/main_loop.pm:321
 #, c-format
 msgid "Installation failed:"
 msgstr "安装失败: "
@@ -370,7 +370,7 @@ msgstr "安装完成"
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:415 ../urpmi:710
+#: ../gurpmi2:415 ../urpmi:711
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
@@ -409,7 +409,7 @@ msgstr "                    默认为 %s。\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -f              - 输出 rpm 的完整名称(NVRA)。\n"
 
-#: ../rurpmi:11 ../urpmi:284
+#: ../rurpmi:11 ../urpmi:285
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
@@ -459,7 +459,7 @@ msgstr "无效的 rpm 文件名[%s]"
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:326 ../urpm/get_pkgs.pm:234
+#: ../urpm.pm:326 ../urpm/get_pkgs.pm:255
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
@@ -494,62 +494,62 @@ msgstr "注册本地软件包出错"
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "运行于限制模式运行时，禁止执行此操作"
 
-#: ../urpm/args.pm:152 ../urpm/args.pm:161
+#: ../urpm/args.pm:153 ../urpm/args.pm:162
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令行声明的代理服务器无效\n"
 
-#: ../urpm/args.pm:306
+#: ../urpm/args.pm:307
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:377
 #, c-format
 msgid "unexpected expression %s"
 msgstr "意外表达式 %s"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:378
 #, c-format
 msgid "missing expression before %s"
 msgstr "%s 前缺少表达式"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:384
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "意外表达式 %s(建议：使用 -a 或 -o?)"
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:388
 #, c-format
 msgid "no expression to close"
 msgstr "没有要关闭的表达式"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:397
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "默认情况下，urpmf 使用正则表达式。您应该使用选项“--literal”"
 
-#: ../urpm/args.pm:465
+#: ../urpm/args.pm:466
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目录不存在"
 
-#: ../urpm/args.pm:488
+#: ../urpm/args.pm:489
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "没有 %2$s 无法使用 %1$s"
 
-#: ../urpm/args.pm:491 ../urpm/args.pm:494 ../urpmq:157
+#: ../urpm/args.pm:492 ../urpm/args.pm:495 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "无法和 %2$s 一起使用 %1$s"
 
-#: ../urpm/args.pm:502
+#: ../urpm/args.pm:503
 #, c-format
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
 
-#: ../urpm/bug_report.pm:55 ../urpmi:274
+#: ../urpm/bug_report.pm:55 ../urpmi:275
 #, c-format
 msgid "Copying failed"
 msgstr "复制失败"
@@ -591,7 +591,7 @@ msgstr "无法读取配置文件[%s]"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "介质“%s”定义了两次，正在退出"
 
-#: ../urpm/cfg.pm:251 ../urpm/media.pm:537
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:540
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件[%s]"
@@ -686,42 +686,42 @@ msgstr "无法执行 prozilla\n"
 msgid "aria2 is missing\n"
 msgstr "缺少 aria2\n"
 
-#: ../urpm/download.pm:703
+#: ../urpm/download.pm:704
 #, c-format
 msgid "Failed to download %s"
 msgstr ""
 
-#: ../urpm/download.pm:798
+#: ../urpm/download.pm:799
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
 
-#: ../urpm/download.pm:799
+#: ../urpm/download.pm:800
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 已完成，速度为 %s"
 
-#: ../urpm/download.pm:872
+#: ../urpm/download.pm:874
 #, c-format
 msgid "retrieving %s"
 msgstr "正在获取 %s"
 
-#: ../urpm/download.pm:879
+#: ../urpm/download.pm:881
 #, c-format
 msgid "retrieved %s"
 msgstr "已获取 %s"
 
-#: ../urpm/download.pm:943
+#: ../urpm/download.pm:945
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm/download.pm:955
+#: ../urpm/download.pm:957
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 
-#: ../urpm/download.pm:972
+#: ../urpm/download.pm:974
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
@@ -750,7 +750,7 @@ msgstr ""
 msgid "NOT OK\n"
 msgstr ""
 
-#: ../urpm/dudf.pm:253 ../urpm/dudf.pm:485
+#: ../urpm/dudf.pm:253 ../urpm/dudf.pm:487
 #, c-format
 msgid "OK\n"
 msgstr ""
@@ -771,17 +771,17 @@ msgstr ""
 #: ../urpm/dudf.pm:279
 #, c-format
 msgid ""
-"You can access to a log of your uploads in\n"
+"You can access a log of your uploads in\n"
 "\t"
 msgstr ""
 
-#: ../urpm/dudf.pm:358 ../urpm/msg.pm:76 ../urpmi:511 ../urpmi:526
-#: ../urpmi:633
+#: ../urpm/dudf.pm:360 ../urpm/main_loop.pm:106 ../urpm/msg.pm:76 ../urpmi:512
+#: ../urpmi:527 ../urpmi:634
 #, c-format
 msgid "Nn"
 msgstr "nN否"
 
-#: ../urpm/dudf.pm:359
+#: ../urpm/dudf.pm:361
 #, c-format
 msgid ""
 "A problem has been encountered. You can help Mandriva to improve package\n"
@@ -790,25 +790,25 @@ msgid ""
 "More at http://www.mancoosi.org\n"
 msgstr ""
 
-#: ../urpm/dudf.pm:360
+#: ../urpm/dudf.pm:362
 #, c-format
-msgid "Do you want to upload to Mandriva a DUDF report?"
+msgid "Do you want to upload a DUDF report to Mandriva?"
 msgstr ""
 
-#: ../urpm/dudf.pm:361 ../urpmi:513 ../urpmi:528 ../urpmi:634
+#: ../urpm/dudf.pm:363 ../urpmi:514 ../urpmi:529 ../urpmi:635
 #: ../urpmi.addmedia:135
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
 
-#: ../urpm/dudf.pm:362
+#: ../urpm/dudf.pm:364
 #, c-format
 msgid ""
 "\n"
 "Generating DUDF... "
 msgstr ""
 
-#: ../urpm/dudf.pm:489
+#: ../urpm/dudf.pm:491
 #, fuzzy, c-format
 msgid ""
 "Cannot write DUDF file\n"
@@ -825,7 +825,7 @@ msgstr "清除 %s 和 %s"
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm/get_pkgs.pm:227
+#: ../urpm/get_pkgs.pm:248
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
@@ -926,12 +926,12 @@ msgstr "中止"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s 数据库已锁定(其它程序正在使用它)"
 
-#: ../urpm/main_loop.pm:108
+#: ../urpm/main_loop.pm:77
 #, c-format
 msgid "Retry?"
 msgstr ""
 
-#: ../urpm/main_loop.pm:119
+#: ../urpm/main_loop.pm:87
 #, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -940,9 +940,7 @@ msgstr ""
 "安装失败，rpm 有问题:\n"
 "%s"
 
-#. -PO: we silently update the string from "You may want to..." to "You may need to..".
-#. -PO: so that translations do not got fuzzy-ed just before the release:
-#: ../urpm/main_loop.pm:124
+#: ../urpm/main_loop.pm:90
 #, fuzzy, c-format
 msgid "You may need to update your urpmi database."
 msgstr ""
@@ -950,7 +948,7 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../urpm/main_loop.pm:127
+#: ../urpm/main_loop.pm:93
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -959,68 +957,76 @@ msgstr ""
 "安装失败，rpm 有问题:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:135 ../urpm/main_loop.pm:174 ../urpm/main_loop.pm:255
-#: ../urpm/main_loop.pm:262
+#: ../urpm/main_loop.pm:107
+#, c-format
+msgid ""
+"There is not enough space on your filesystem to download all packages (%s "
+"needed, %s available).\n"
+"Are you sure you want to continue?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:159 ../urpm/main_loop.pm:199 ../urpm/main_loop.pm:280
+#: ../urpm/main_loop.pm:287
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../urpm/main_loop.pm:136
+#: ../urpm/main_loop.pm:160
 #, fuzzy, c-format
 msgid "Try to continue anyway?"
 msgstr "仍然继续吗? (y/N)"
 
-#: ../urpm/main_loop.pm:159
+#: ../urpm/main_loop.pm:184
 #, c-format
 msgid "The following package has bad signature"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpm/main_loop.pm:160
+#: ../urpm/main_loop.pm:185
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpm/main_loop.pm:161
+#: ../urpm/main_loop.pm:186
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:203
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "删除已安装的 rpm(%s)"
 
-#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:223
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#: ../urpm/main_loop.pm:213
+#: ../urpm/main_loop.pm:238
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在从 %2$s 安装 %1$s"
 
-#: ../urpm/main_loop.pm:215
+#: ../urpm/main_loop.pm:240
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpm/main_loop.pm:256
+#: ../urpm/main_loop.pm:281
 #, fuzzy, c-format
 msgid "Try installation without checking dependencies?"
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpm/main_loop.pm:263
+#: ../urpm/main_loop.pm:288
 #, fuzzy, c-format
 msgid "Try harder to install (--force)?"
 msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
 
-#: ../urpm/main_loop.pm:306
+#: ../urpm/main_loop.pm:331
 #, c-format
 msgid "Packages are up to date"
 msgstr "软件包已为最新"
 
-#: ../urpm/main_loop.pm:317 ../urpm/parallel.pm:299
+#: ../urpm/main_loop.pm:342 ../urpm/parallel.pm:299
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
@@ -1030,47 +1036,47 @@ msgstr "可以安装"
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告: %s 的 md5 校验和未在 MD5SUM 文件中找到"
 
-#: ../urpm/media.pm:254
+#: ../urpm/media.pm:257
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "虚拟介质“%s”应该有清楚的 URL，介质被忽略"
 
-#: ../urpm/media.pm:256
+#: ../urpm/media.pm:259
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的列表文件，介质被忽略"
 
-#: ../urpm/media.pm:259
+#: ../urpm/media.pm:262
 #, c-format
 msgid "unable to access synthesis file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的综合文件，介质被忽略"
 
-#: ../urpm/media.pm:285
+#: ../urpm/media.pm:288
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "试图覆盖已有介质“%s”，正跳过"
 
-#: ../urpm/media.pm:501
+#: ../urpm/media.pm:504
 #, c-format
 msgid "failed to migrate removable device, ignoring media"
 msgstr "迁移可移动设备失败，忽略介质"
 
-#: ../urpm/media.pm:539
+#: ../urpm/media.pm:542
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "写入配置文件[%s]"
 
-#: ../urpm/media.pm:582
+#: ../urpm/media.pm:585
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "无法与发行模式一起使用并行模式"
 
-#: ../urpm/media.pm:590
+#: ../urpm/media.pm:593
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "并行模式时使用关联介质: %s"
 
-#: ../urpm/media.pm:606
+#: ../urpm/media.pm:609
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -1079,217 +1085,217 @@ msgstr ""
 "--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update, --use-"
 "distrib 或 --parallel 一起使用"
 
-#: ../urpm/media.pm:724
+#: ../urpm/media.pm:727
 #, c-format
 msgid "skipping package %s"
 msgstr "跳过软件包 %s"
 
-#: ../urpm/media.pm:740
+#: ../urpm/media.pm:743
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "将安装而非升级软件包 %s"
 
-#: ../urpm/media.pm:765
+#: ../urpm/media.pm:768
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已存在"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:807
 #, c-format
 msgid "(ignored by default)"
 msgstr "(默认忽略)"
 
-#: ../urpm/media.pm:810
+#: ../urpm/media.pm:813
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "在远程介质“%2$s”之前添加介质“%1$s”"
 
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:819
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "添加介质“%s”"
 
-#: ../urpm/media.pm:842
+#: ../urpm/media.pm:843
 #, fuzzy, c-format
 msgid "failed to copy media.cfg to %s (%d)"
 msgstr "主机 %s cp 失败 (%d)"
 
-#: ../urpm/media.pm:883
+#: ../urpm/media.pm:884
 #, c-format
 msgid "directory %s does not exist"
 msgstr "目录 %s 不存在"
 
-#: ../urpm/media.pm:891
+#: ../urpm/media.pm:892
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "此位置似乎不包含任何发行版"
 
-#: ../urpm/media.pm:910
+#: ../urpm/media.pm:911
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "无法分析 media.cfg"
 
-#: ../urpm/media.pm:913
+#: ../urpm/media.pm:914
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "无法访问发行版介质(未发现 media.cfg 文件)"
 
-#: ../urpm/media.pm:931
+#: ../urpm/media.pm:932
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "跳过不兼容的介质“%s”(原因是 %s)"
 
-#: ../urpm/media.pm:982
+#: ../urpm/media.pm:983
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "正在获取 media.cfg 文件..."
 
-#: ../urpm/media.pm:1023
+#: ../urpm/media.pm:1024
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm/media.pm:1026
+#: ../urpm/media.pm:1027
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm/media.pm:1087
+#: ../urpm/media.pm:1086
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm/media.pm:1170
+#: ../urpm/media.pm:1169
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在从介质“%s”重新配置 urpmi"
 
-#: ../urpm/media.pm:1204
+#: ../urpm/media.pm:1203
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...重新配置失败"
 
-#: ../urpm/media.pm:1210
+#: ../urpm/media.pm:1209
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新配置完成"
 
-#: ../urpm/media.pm:1226
+#: ../urpm/media.pm:1225
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "生成命名文件出错：依赖关系 %d 未找到"
 
-#: ../urpm/media.pm:1247
+#: ../urpm/media.pm:1246
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "介质“%s”已为最新"
 
-#: ../urpm/media.pm:1258
+#: ../urpm/media.pm:1257
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm/media.pm:1278
+#: ../urpm/media.pm:1277
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm/media.pm:1291 ../urpm/media.pm:1386
+#: ../urpm/media.pm:1290 ../urpm/media.pm:1385
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "正在复制介质“%2$s”的 [%1$s]..."
 
-#: ../urpm/media.pm:1293 ../urpm/media.pm:1363 ../urpm/media.pm:1616
+#: ../urpm/media.pm:1292 ../urpm/media.pm:1362 ../urpm/media.pm:1615
 #, c-format
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm/media.pm:1359
+#: ../urpm/media.pm:1358
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm/media.pm:1361 ../urpm/media.pm:1390
+#: ../urpm/media.pm:1360 ../urpm/media.pm:1389
 #, c-format
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm/media.pm:1392
+#: ../urpm/media.pm:1391
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm/media.pm:1440
+#: ../urpm/media.pm:1439
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "正在计算所获取的源综合文件的 md5sum"
 
-#: ../urpm/media.pm:1442 ../urpm/media.pm:1882
+#: ../urpm/media.pm:1441 ../urpm/media.pm:1881
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "获取[%s]失败(md5sum 不匹配)"
 
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1456
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "在 %s 上 genhdlist2 失败"
 
-#: ../urpm/media.pm:1467
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "comparing %s and %s"
 msgstr "比较 %s 和 %s"
 
-#: ../urpm/media.pm:1497
+#: ../urpm/media.pm:1496
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "介质“%2$s”的 hdlist 文件 %1$s 无效"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1522
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "正在复制“%s”的 MD5SUM..."
 
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1562
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "无效的 MD5SUM 文件(从 %s 下载)"
 
-#: ../urpm/media.pm:1566
+#: ../urpm/media.pm:1565
 #, c-format
 msgid "no metadata found for medium \"%s\""
 msgstr "介质“%s”未发现元数据"
 
-#: ../urpm/media.pm:1598
+#: ../urpm/media.pm:1597
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "正在获取“%s”的源综合文件..."
 
-#: ../urpm/media.pm:1664
+#: ../urpm/media.pm:1663
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm/media.pm:1676
+#: ../urpm/media.pm:1675
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
 
-#: ../urpm/media.pm:1680
+#: ../urpm/media.pm:1679
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm/media.pm:1721
+#: ../urpm/media.pm:1720
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "介质“%s”未发现综合文件"
 
-#: ../urpm/media.pm:1754
+#: ../urpm/media.pm:1753
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "已更新介质“%s”"
 
-#: ../urpm/media.pm:1876
+#: ../urpm/media.pm:1875
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "获取[%s]失败"
@@ -1304,18 +1310,18 @@ msgstr "正在重试连接镜像 %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "无法从镜像列表 %s 里找到一个镜像"
 
-#: ../urpm/mirrors.pm:222
+#: ../urpm/mirrors.pm:231
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "找到地理位置较近的 %s %.2f %.2f，从时区 %s"
 
-#: ../urpm/mirrors.pm:267
+#: ../urpm/mirrors.pm:276
 #, 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:563 ../urpmi:671 ../urpmi:677
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:564 ../urpmi:672 ../urpmi:678
 #: ../urpmi.addmedia:132
 #, c-format
 msgid "Yy"
@@ -1396,7 +1402,7 @@ msgstr "TB"
 msgid "Marking %s as manually installed, it won't be auto-orphaned"
 msgstr ""
 
-#: ../urpm/orphans.pm:362
+#: ../urpm/orphans.pm:426
 #, fuzzy, c-format
 msgid ""
 "The following package:\n"
@@ -1586,27 +1592,37 @@ msgstr "无效的密钥 ID(%s)"
 msgid "Missing signature (%s)"
 msgstr "缺少签名(%s)"
 
-#: ../urpm/sys.pm:178
+#: ../urpm/sys.pm:186
 #, c-format
 msgid "system"
 msgstr "系统"
 
-#: ../urpm/sys.pm:213
+#: ../urpm/sys.pm:223
+#, fuzzy, c-format
+msgid "You should restart your computer for %s"
+msgstr "为了 %2$s，您应该重新启动 %1$s"
+
+#: ../urpm/sys.pm:225
+#, fuzzy, c-format
+msgid "You should restart your session for %s"
+msgstr "为了 %2$s，您应该重新启动 %1$s"
+
+#: ../urpm/sys.pm:227
 #, c-format
 msgid "You should restart %s for %s"
 msgstr "为了 %2$s，您应该重新启动 %1$s"
 
-#: ../urpm/sys.pm:316
+#: ../urpm/sys.pm:331
 #, c-format
 msgid "Can't write file"
 msgstr "无法写入文件"
 
-#: ../urpm/sys.pm:316
+#: ../urpm/sys.pm:331
 #, c-format
 msgid "Can't open file"
 msgstr "无法打开文件"
 
-#: ../urpm/sys.pm:329
+#: ../urpm/sys.pm:344
 #, c-format
 msgid "Can't move file %s to %s"
 msgstr "无法将文件 %s 移动到 %s"
@@ -1647,7 +1663,7 @@ msgstr "  --test         - 验证删除是否可以正确进行。\n"
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
-#: ../urpme:52 ../urpmi:151
+#: ../urpme:52 ../urpmi:152
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - 在删除之前重新对文件打包\n"
@@ -1682,7 +1698,7 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:59 ../urpmi:162 ../urpmq:89
+#: ../urpme:59 ../urpmi:163 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - 详细提示。\n"
@@ -1778,7 +1794,7 @@ msgstr ""
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 打印此工具的版本号。\n"
 
-#: ../urpmf:37 ../urpmi:141 ../urpmq:80
+#: ../urpmf:37 ../urpmi:142 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
@@ -2167,43 +2183,50 @@ msgstr "  --metalink     - 生成并使用本地 metallink。\n"
 #: ../urpmi:124
 #, c-format
 msgid ""
+"  --download-all - download all needed packages before trying to install "
+"them\n"
+msgstr ""
+
+#: ../urpmi:125
+#, c-format
+msgid ""
 "  --downloader   - program to use to retrieve distant files. \n"
 "                   known programs: %s\n"
 msgstr ""
 "  --downloader   - 用于重新获取远程文件的程序。\n"
 "                   已知程序：%s\n"
 
-#: ../urpmi:127
+#: ../urpmi:128
 #, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - 给 curl 传递额外的选项\n"
 
-#: ../urpmi:128
+#: ../urpmi:129
 #, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- 给 rsync 传递额外的选项\n"
 
-#: ../urpmi:129
+#: ../urpmi:130
 #, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - 给 wget 传递额外的选项\n"
 
-#: ../urpmi:130
+#: ../urpmi:131
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --prozilla-options - 给 prozilla 传递额外的选项\n"
 
-#: ../urpmi:131
+#: ../urpmi:132
 #, c-format
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr "  --aria2-options - 给 aria2 传递额外的选项\n"
 
-#: ../urpmi:132 ../urpmi.addmedia:60 ../urpmi.update:38
+#: ../urpmi:133 ../urpmi.addmedia:60 ../urpmi.update:38
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 降低下载速度。\n"
 
-#: ../urpmi:133
+#: ../urpmi:134
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -2212,7 +2235,7 @@ msgstr ""
 "  --resume       - 续传未下载完成的文件\n"
 "                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmi:135 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
+#: ../urpmi:136 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -2221,7 +2244,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:137 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
+#: ../urpmi:138 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2230,7 +2253,7 @@ msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
 "                   密码(格式如 <用户: 密码>)。\n"
 
-#: ../urpmi:139
+#: ../urpmi:140
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -2239,47 +2262,47 @@ msgstr ""
 "  --bug          - 输出故障报告\n"
 "                   下一个参数指定输出目录。\n"
 
-#: ../urpmi:145
+#: ../urpmi:146
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
-#: ../urpmi:146
+#: ../urpmi:147
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - 排除文档文件。\n"
 
-#: ../urpmi:147
+#: ../urpmi:148
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - 安装前不检查磁盘空间。\n"
 
-#: ../urpmi:148
+#: ../urpmi:149
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 允许安装体系不匹配的 RPM。\n"
 
-#: ../urpmi:149
+#: ../urpmi:150
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - 不执行软件包脚本。\n"
 
-#: ../urpmi:150
+#: ../urpmi:151
 #, fuzzy, c-format
 msgid "  --replacefiles - ignore file conflicts\n"
 msgstr "  --conflicts    - 打印 conflict 标签。\n"
 
-#: ../urpmi:152
+#: ../urpmi:153
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安装要跳过的软件包。\n"
 
-#: ../urpmi:153
+#: ../urpmi:154
 #, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr "  --prefer       - 首选的软件包\n"
 
-#: ../urpmi:154
+#: ../urpmi:155
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -2287,82 +2310,82 @@ msgid ""
 msgstr ""
 "  --more-choices - 如果找到了多个软件包，则提供多个选择而不是默认选择。\n"
 
-#: ../urpmi:156
+#: ../urpmi:157
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - 不锁定 rpm 数据库。\n"
 
-#: ../urpmi:157
+#: ../urpmi:158
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 更新只限于相同体系的软件包。\n"
 
-#: ../urpmi:158 ../urpmq:97
+#: ../urpmi:159 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:161
+#: ../urpmi:162
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - 安静模式。\n"
 
-#: ../urpmi:163
+#: ../urpmi:164
 #, c-format
 msgid "  --debug        - very verbose mode.\n"
 msgstr "  --debug        - 非常详细模式。\n"
 
-#: ../urpmi:164
+#: ../urpmi:165
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:198
+#: ../urpmi:199
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "错误: 无法在使用软件包列表时使用 --auto-select。\n"
 
-#: ../urpmi:205
+#: ../urpmi:206
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr "错误: 要生成错误报告，请在指定命令行参数时多加 --bug。\n"
 
-#: ../urpmi:235
+#: ../urpmi:236
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "您无法使用 --install-src 安装二进制 RPM 文件"
 
-#: ../urpmi:236
+#: ../urpmi:237
 #, c-format
 msgid "You can't install spec files"
 msgstr "您不能安装 spec 文件"
 
-#: ../urpmi:243
+#: ../urpmi:244
 #, c-format
 msgid "defaulting to --buildrequires"
 msgstr "正在设置默认为 --buildrequires"
 
-#: ../urpmi:248
+#: ../urpmi:249
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr "请使用 --buildrequires 或 --install-src，默认为 --buildrequires"
 
-#: ../urpmi:268
+#: ../urpmi:269
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:269
+#: ../urpmi:270
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:290
+#: ../urpmi:291
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2372,42 +2395,42 @@ msgstr ""
 "请使用 --allow-force 强制操作。"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:445
+#: ../urpmi:446
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (即将升级)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:447
+#: ../urpmi:448
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (即将升级)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:451
+#: ../urpmi:452
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (即将安装)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:453
+#: ../urpmi:454
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (即将安装)"
 
-#: ../urpmi:459
+#: ../urpmi:460
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "为满足“%s”的依赖关系，需要安装下列软件包之一："
 
-#: ../urpmi:462
+#: ../urpmi:463
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:504
+#: ../urpmi:505
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2417,7 +2440,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:506
+#: ../urpmi:507
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2427,7 +2450,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:512 ../urpmi:527
+#: ../urpmi:513 ../urpmi:528
 #, c-format
 msgid ""
 "\n"
@@ -2436,7 +2459,7 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:521
+#: ../urpmi:522
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2445,7 +2468,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:522
+#: ../urpmi:523
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2454,12 +2477,12 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:539
+#: ../urpmi:540
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpmi:547
+#: ../urpmi:548
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2469,7 +2492,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:549
+#: ../urpmi:550
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2479,12 +2502,12 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:558
+#: ../urpmi:559
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(只是测试，删除将不会实际发生)"
 
-#: ../urpmi:578
+#: ../urpmi:579
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2494,44 +2517,44 @@ msgstr ""
 "您必须首先用 --buildrequires 调用 urpmi，以便安装下列依赖关系：\n"
 "%s\n"
 
-#: ../urpmi:588
+#: ../urpmi:589
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "下列孤立软件包将被删除。"
 
-#: ../urpmi:616
+#: ../urpmi:617
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(只是测试，安装将不会实际发生)"
 
-#: ../urpmi:622
+#: ../urpmi:623
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "将会使用 %s 的额外磁盘空间。"
 
-#: ../urpmi:623
+#: ../urpmi:624
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "将会释放 %s 的磁盘空间。"
 
-#: ../urpmi:624
+#: ../urpmi:625
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "将会获取 %s 的软件包。"
 
-#: ../urpmi:625
+#: ../urpmi:626
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "继续安装 %d 个软件包吗？"
 
-#: ../urpmi:648
+#: ../urpmi:649
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:656
+#: ../urpmi:657
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "挂载后按 Enter..."
-- 
cgit v1.2.1