From 0d180af1cc4d9b9aecffa29fcf298ffb141b0d08 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@mandriva.com>
Date: Thu, 30 Jul 2009 13:16:24 +0000
Subject: update po files

---
 po/zh_CN.po | 446 ++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 269 insertions(+), 177 deletions(-)

(limited to 'po/zh_CN.po')

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 71595f21..e37ad808 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-04-15 15:00+0200\n"
+"POT-Creation-Date: 2009-07-29 15:49+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."
@@ -109,7 +109,7 @@ msgstr "取消(_C)"
 msgid "Choose location to save file"
 msgstr "选择保存文件的位置"
 
-#: ../gurpmi.pm:39 ../urpmi:67
+#: ../gurpmi.pm:39 ../urpmi:76
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -130,32 +130,32 @@ msgstr ""
 msgid "Options:"
 msgstr "选项："
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:81 ../urpmi.addmedia:54
 #: ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
 
-#: ../gurpmi.pm:47 ../urpmi:79
+#: ../gurpmi.pm:47 ../urpmi:88
 #, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr "  --auto         - 非交互模式，对全部问题假定默认回答。\n"
 
-#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:89 ../urpmq:52
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
 
-#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:112 ../urpmq:66
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
 
-#: ../gurpmi.pm:50 ../urpmi:133
+#: ../gurpmi.pm:50 ../urpmi:142
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -164,34 +164,34 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:82 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
-#: ../gurpmi.pm:53 ../urpmi:150
+#: ../gurpmi.pm:53 ../urpmi:159
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在 provides 字段中查找软件包。\n"
 
-#: ../gurpmi.pm:54 ../urpmi:151
+#: ../gurpmi.pm:54 ../urpmi:160
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 字段中查找软件包。\n"
 
-#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
+#: ../gurpmi.pm:55 ../urpmi:119 ../urpmq:69
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
 
-#: ../gurpmi.pm:56 ../urpmi:135
+#: ../gurpmi.pm:56 ../urpmi:144
 #, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
-#: ../gurpmi.pm:57 ../urpmi:76
+#: ../gurpmi.pm:57 ../urpmi:85
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
@@ -243,7 +243,7 @@ msgstr ""
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:146 ../urpmi:626
+#: ../gurpmi2:146 ../urpmi:648
 #, c-format
 msgid "Ok"
 msgstr "确定"
@@ -284,13 +284,13 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:267 ../urpmi:593
+#: ../gurpmi2:267 ../urpmi:613
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:268 ../urpmi:594
+#: ../gurpmi2:268 ../urpmi:614
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -317,29 +317,29 @@ msgstr "正在准备..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:333 ../urpmi:621
+#: ../gurpmi2:334 ../urpmi:643
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "请插入介质“%s”"
 
-#: ../gurpmi2:347
+#: ../gurpmi2:348
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../gurpmi2:359 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../gurpmi2:360 ../urpm.pm:327 ../urpm/download.pm:821
 #: ../urpm/get_pkgs.pm:236 ../urpm/media.pm:810 ../urpm/media.pm:1271
 #: ../urpm/media.pm:1422
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../gurpmi2:375
+#: ../gurpmi2:376
 #, c-format
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:391
+#: ../gurpmi2:393
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -350,27 +350,27 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi2:397 ../urpm/main_loop.pm:253 ../urpm/main_loop.pm:296
+#: ../gurpmi2:399 ../urpm/main_loop.pm:253 ../urpm/main_loop.pm:296
 #, c-format
 msgid "Installation failed:"
 msgstr "安装失败: "
 
-#: ../gurpmi2:402
+#: ../gurpmi2:404
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "软件包已经安装"
 
-#: ../gurpmi2:404
+#: ../gurpmi2:406
 #, c-format
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../gurpmi2:405 ../urpme:169
+#: ../gurpmi2:407 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:413 ../urpmi:688
+#: ../gurpmi2:415 ../urpmi:710
 #, 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:269
+#: ../rurpmi:11 ../urpmi:284
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
@@ -504,52 +504,52 @@ msgstr "命令行声明的代理服务器无效\n"
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
-#: ../urpm/args.pm:371
+#: ../urpm/args.pm:376
 #, c-format
 msgid "unexpected expression %s"
 msgstr "意外表达式 %s"
 
-#: ../urpm/args.pm:372
+#: ../urpm/args.pm:377
 #, c-format
 msgid "missing expression before %s"
 msgstr "%s 前缺少表达式"
 
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:383
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "意外表达式 %s(建议：使用 -a 或 -o?)"
 
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:387
 #, c-format
 msgid "no expression to close"
 msgstr "没有要关闭的表达式"
 
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:396
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "默认情况下，urpmf 使用正则表达式。您应该使用选项“--literal”"
 
-#: ../urpm/args.pm:460
+#: ../urpm/args.pm:465
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目录不存在"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:488
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "没有 %2$s 无法使用 %1$s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:491 ../urpm/args.pm:494 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "无法和 %2$s 一起使用 %1$s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:502
 #, c-format
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
 
-#: ../urpm/bug_report.pm:55 ../urpmi:259
+#: ../urpm/bug_report.pm:55 ../urpmi:274
 #, c-format
 msgid "Copying failed"
 msgstr "复制失败"
@@ -621,106 +621,210 @@ msgstr "用户名:"
 msgid "Password:"
 msgstr "密码:"
 
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:259
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
 msgstr "未知的 webfetch“%s”!!!\n"
 
-#: ../urpm/download.pm:266
+#: ../urpm/download.pm:267
 #, c-format
 msgid "%s failed: exited with signal %d"
 msgstr "%s 失败: 退出信号为 %d"
 
-#: ../urpm/download.pm:267
+#: ../urpm/download.pm:268
 #, c-format
 msgid "%s failed: exited with %d"
 msgstr "%s 失败: 退出代码为 %d"
 
-#: ../urpm/download.pm:301
+#: ../urpm/download.pm:302
 #, c-format
 msgid "copy failed"
 msgstr "复制失败"
 
-#: ../urpm/download.pm:307
+#: ../urpm/download.pm:308
 #, c-format
 msgid "wget is missing\n"
 msgstr "缺少 wget\n"
 
-#: ../urpm/download.pm:374
+#: ../urpm/download.pm:375
 #, c-format
 msgid "curl is missing\n"
 msgstr "缺少 curl\n"
 
-#: ../urpm/download.pm:499
+#: ../urpm/download.pm:511
+#, fuzzy, c-format
+msgid "curl failed: upload canceled\n"
+msgstr "curl 失败: 下载已取消\n"
+
+#: ../urpm/download.pm:512
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl 失败: 下载已取消\n"
 
-#: ../urpm/download.pm:538
+#: ../urpm/download.pm:547
 #, c-format
 msgid "rsync is missing\n"
 msgstr "缺少 rsync\n"
 
-#: ../urpm/download.pm:606
+#: ../urpm/download.pm:615
 #, c-format
 msgid "ssh is missing\n"
 msgstr "缺少 ssh\n"
 
-#: ../urpm/download.pm:625
+#: ../urpm/download.pm:634
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "缺少 prozilla\n"
 
-#: ../urpm/download.pm:641
+#: ../urpm/download.pm:650
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "无法执行 prozilla\n"
 
-#: ../urpm/download.pm:651
+#: ../urpm/download.pm:660
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "缺少 aria2\n"
 
-#: ../urpm/download.pm:694
+#: ../urpm/download.pm:703
 #, c-format
 msgid "Failed to download %s"
 msgstr ""
 
-#: ../urpm/download.pm:788
+#: ../urpm/download.pm:798
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
 
-#: ../urpm/download.pm:789
+#: ../urpm/download.pm:799
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 已完成，速度为 %s"
 
-#: ../urpm/download.pm:862
+#: ../urpm/download.pm:872
 #, c-format
 msgid "retrieving %s"
 msgstr "正在获取 %s"
 
-#: ../urpm/download.pm:869
+#: ../urpm/download.pm:879
 #, c-format
 msgid "retrieved %s"
 msgstr "已获取 %s"
 
-#: ../urpm/download.pm:933
+#: ../urpm/download.pm:943
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm/download.pm:945
+#: ../urpm/download.pm:955
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 
-#: ../urpm/download.pm:962
+#: ../urpm/download.pm:972
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
 
+#: ../urpm/dudf.pm:194
+#, c-format
+msgid ""
+"# Here are logs of your DUDF uploads.\n"
+"# Line format is : <date time of generation> <uid>\n"
+"# You can use uids to see the content of your uploads at this url :\n"
+"# http://dudf.forge.mandriva.com/\n"
+msgstr ""
+
+#: ../urpm/dudf.pm:243
+#, c-format
+msgid "curl is missing, cannot upload DUDF file.\n"
+msgstr ""
+
+#: ../urpm/dudf.pm:247
+#, c-format
+msgid "Compressing DUDF data... "
+msgstr ""
+
+#: ../urpm/dudf.pm:249 ../urpm/dudf.pm:250
+#, c-format
+msgid "NOT OK\n"
+msgstr ""
+
+#: ../urpm/dudf.pm:258 ../urpm/dudf.pm:452
+#, c-format
+msgid "OK\n"
+msgstr ""
+
+#: ../urpm/dudf.pm:260
+#, c-format
+msgid "Uploading DUDF data:\n"
+msgstr ""
+
+#: ../urpm/dudf.pm:281
+#, c-format
+msgid ""
+"\n"
+"You can see your DUDF report at the following URL :\n"
+"\t"
+msgstr ""
+
+#: ../urpm/dudf.pm:287
+#, c-format
+msgid ""
+"You can access to a log of your uploads in\n"
+"\t"
+msgstr ""
+
+#: ../urpm/dudf.pm:331 ../urpm/msg.pm:76 ../urpmi:511 ../urpmi:526
+#: ../urpmi:633
+#, c-format
+msgid "Nn"
+msgstr "nN否"
+
+#: ../urpm/dudf.pm:332
+#, c-format
+msgid ""
+"A problem has been encountered. You can help Mandriva to improve packages "
+"installation \n"
+msgstr ""
+
+#: ../urpm/dudf.pm:333
+#, c-format
+msgid ""
+"by uploading us a DUDF report file. This is a part of the Mancoosi european "
+"research project.\n"
+msgstr ""
+
+#: ../urpm/dudf.pm:334
+#, c-format
+msgid "More at http://www.mancoosi.org\n"
+msgstr ""
+
+#: ../urpm/dudf.pm:335
+#, c-format
+msgid "Do you want to upload to Mandriva a DUDF report?"
+msgstr ""
+
+#: ../urpm/dudf.pm:336 ../urpmi:513 ../urpmi:528 ../urpmi:634
+#: ../urpmi.addmedia:135
+#, c-format
+msgid " (Y/n) "
+msgstr "(是(Y)/否(n))[是]"
+
+#: ../urpm/dudf.pm:337
+#, c-format
+msgid ""
+"\n"
+"Generating DUDF... "
+msgstr ""
+
+#: ../urpm/dudf.pm:456
+#, fuzzy, c-format
+msgid ""
+"Cannot write DUDF file\n"
+"."
+msgstr "无法写入文件"
+
 #: ../urpm/get_pkgs.pm:16
 #, c-format
 msgid "cleaning %s and %s"
@@ -1205,23 +1309,18 @@ msgstr "正在重试连接镜像 %s"
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "无法从镜像列表 %s 里找到一个镜像"
 
-#: ../urpm/mirrors.pm:218
+#: ../urpm/mirrors.pm:222
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "找到地理位置较近的 %s %.2f %.2f，从时区 %s"
 
-#: ../urpm/mirrors.pm:263
+#: ../urpm/mirrors.pm:267
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "从 %s 中获得镜像列表"
 
-#: ../urpm/msg.pm:76 ../urpmi:494 ../urpmi:509 ../urpmi:613
-#, c-format
-msgid "Nn"
-msgstr "nN否"
-
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:545 ../urpmi:649 ../urpmi:655
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:563 ../urpmi:671 ../urpmi:677
 #: ../urpmi.addmedia:132
 #, c-format
 msgid "Yy"
@@ -1425,32 +1524,27 @@ msgstr "软件包 %s 已经安装"
 msgid "Packages %s are already installed"
 msgstr "软件包 %s 已经安装"
 
-#: ../urpm/select.pm:564 ../urpm/select.pm:648
-#, c-format
-msgid "due to missing %s"
-msgstr "原因是丢失 %s"
-
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:563 ../urpm/select.pm:650
 #, c-format
-msgid "due to already installed %s"
-msgstr "原因是已经安装 %s"
+msgid "due to conflicts with %s"
+msgstr "原因是与 %s 冲突"
 
-#: ../urpm/select.pm:566 ../urpm/select.pm:646
+#: ../urpm/select.pm:564 ../urpm/select.pm:644
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm/select.pm:572
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm/select.pm:573
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm/select.pm:614
+#: ../urpm/select.pm:612
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1459,7 +1553,7 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpm/select.pm:615
+#: ../urpm/select.pm:613
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1468,15 +1562,15 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpm/select.pm:642
+#: ../urpm/select.pm:640
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm/select.pm:652
+#: ../urpm/select.pm:646
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "原因是与 %s 冲突"
+msgid "due to missing %s"
+msgstr "原因是丢失 %s"
 
 #: ../urpm/signature.pm:33
 #, c-format
@@ -1549,12 +1643,12 @@ msgstr "  --auto-orphans - 删除孤立软件包\n"
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 验证删除是否可以正确进行。\n"
 
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#: ../urpme:51 ../urpmi:118 ../urpmq:68
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
-#: ../urpme:52 ../urpmi:142
+#: ../urpme:52 ../urpmi:151
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - 在删除之前重新对文件打包\n"
@@ -1564,13 +1658,13 @@ msgstr "  --repackage    - 在删除之前重新对文件打包\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
+#: ../urpme:54 ../urpmf:40 ../urpmi:120 ../urpmi.addmedia:72
 #: ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr "  --urpmi-root   - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
 
-#: ../urpme:55 ../urpmi:101
+#: ../urpme:55 ../urpmi:110
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr "  --justdb       - 只使用 rpm 数据库，不更新文件系统。\n"
@@ -1589,7 +1683,7 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:59 ../urpmi:153 ../urpmq:89
+#: ../urpme:59 ../urpmi:162 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - 详细提示。\n"
@@ -1685,12 +1779,12 @@ msgstr ""
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 打印此工具的版本号。\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpmf:37 ../urpmi:141 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../urpmf:38 ../urpmi:83 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
@@ -1701,7 +1795,7 @@ msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr "  --literal, -l  - 不匹配模式，参数为字面字符串。\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpmf:42 ../urpmi:86 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1712,7 +1806,7 @@ msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - 使用给定的路径访问介质\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../urpmf:44 ../urpmi:87 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
@@ -1722,7 +1816,7 @@ msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 不打印相同行。\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpmf:46 ../urpmi:84 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质。\n"
@@ -1947,44 +2041,44 @@ msgstr "介质“%s”的综合文件不可用"
 msgid "no xml-info available for medium \"%s\""
 msgstr "介质“%s”没有可用的 xml-info"
 
-#: ../urpmi:81
+#: ../urpmi:90
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
 msgstr "  --auto-update  - 更新介质后再升级系统。\n"
 
-#: ../urpmi:82
+#: ../urpmi:91
 #, c-format
 msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "    --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi:83
+#: ../urpmi:92
 #, c-format
 msgid "    --force-key    - force update of gpg key.\n"
 msgstr "    --force-key    - 强制更新 gpg 密钥。\n"
 
-#: ../urpmi:84
+#: ../urpmi:93
 #, c-format
 msgid "  --auto-orphans - remove orphans without asking\n"
 msgstr "  --auto-orphans - 不询问直接删除孤立软件包\n"
 
-#: ../urpmi:85 ../urpmq:54
+#: ../urpmi:94 ../urpmq:54
 #, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
 msgstr "  --no-suggests  - 不自动选择“推荐的”软件包。\n"
 
-#: ../urpmi:86
+#: ../urpmi:95
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
 
-#: ../urpmi:87
+#: ../urpmi:96
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - 不安装软件包(只下载)。\n"
 
-#: ../urpmi:88 ../urpmq:56
+#: ../urpmi:97 ../urpmq:56
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1992,7 +2086,7 @@ msgid ""
 msgstr ""
 "  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
 
-#: ../urpmi:90
+#: ../urpmi:99
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -2002,62 +2096,62 @@ msgstr ""
 "  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
 "                   较小的交易。默认为 %d。\n"
 
-#: ../urpmi:94
+#: ../urpmi:103
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 小交易长度，默认为 %d。\n"
 
-#: ../urpmi:96
+#: ../urpmi:105
 #, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy, -y    - 利用模糊查询。\n"
 
-#: ../urpmi:97
+#: ../urpmi:106
 #, c-format
 msgid "  --buildrequires - install the buildrequires of the packages\n"
 msgstr "  --buildrequires - 安装软件包构建需求\n"
 
-#: ../urpmi:98
+#: ../urpmi:107
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
 
-#: ../urpmi:99
+#: ../urpmi:108
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "   --clean       - 首先删除缓存中的 rpm。\n"
 
-#: ../urpmi:100
+#: ../urpmi:109
 #, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
 
-#: ../urpmi:102
+#: ../urpmi:111
 #, c-format
 msgid ""
 "  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr "  --replacepkgs  - 强制安装已经安装过的软件包。\n"
 
-#: ../urpmi:104
+#: ../urpmi:113
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr "  --allow-nodeps - 允许要求用户不经过依赖性检验就安装软件包。\n"
 
-#: ../urpmi:106
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr "  --allow-force  - 允许提示用户安装软件包而不检查依赖性和完整性。\n"
 
-#: ../urpmi:108
+#: ../urpmi:117
 #, c-format
 msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
 msgstr "  --allow-suggests - 自动选择“推荐的”软件包。\n"
 
-#: ../urpmi:112
+#: ../urpmi:121
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -2066,12 +2160,12 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpmi，特别用于在 --root 选项\n"
 "                   下安装 chroot。\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:37
+#: ../urpmi:123 ../urpmi.addmedia:59 ../urpmi.update:37
 #, c-format
 msgid "  --metalink     - generate and use a local metalink.\n"
 msgstr "  --metalink     - 生成并使用本地 metallink。\n"
 
-#: ../urpmi:115
+#: ../urpmi:124
 #, c-format
 msgid ""
 "  --downloader   - program to use to retrieve distant files. \n"
@@ -2080,37 +2174,37 @@ msgstr ""
 "  --downloader   - 用于重新获取远程文件的程序。\n"
 "                   已知程序：%s\n"
 
-#: ../urpmi:118
+#: ../urpmi:127
 #, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - 给 curl 传递额外的选项\n"
 
-#: ../urpmi:119
+#: ../urpmi:128
 #, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- 给 rsync 传递额外的选项\n"
 
-#: ../urpmi:120
+#: ../urpmi:129
 #, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - 给 wget 传递额外的选项\n"
 
-#: ../urpmi:121
+#: ../urpmi:130
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --prozilla-options - 给 prozilla 传递额外的选项\n"
 
-#: ../urpmi:122
+#: ../urpmi:131
 #, c-format
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr "  --aria2-options - 给 aria2 传递额外的选项\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:38
+#: ../urpmi:132 ../urpmi.addmedia:60 ../urpmi.update:38
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 降低下载速度。\n"
 
-#: ../urpmi:124
+#: ../urpmi:133
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -2119,7 +2213,7 @@ msgstr ""
 "  --resume       - 续传未下载完成的文件\n"
 "                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
+#: ../urpmi:135 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -2128,7 +2222,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:128 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
+#: ../urpmi:137 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2137,7 +2231,7 @@ msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
 "                   密码(格式如 <用户: 密码>)。\n"
 
-#: ../urpmi:130
+#: ../urpmi:139
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -2146,47 +2240,47 @@ msgstr ""
 "  --bug          - 输出故障报告\n"
 "                   下一个参数指定输出目录。\n"
 
-#: ../urpmi:136
+#: ../urpmi:145
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
-#: ../urpmi:137
+#: ../urpmi:146
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - 排除文档文件。\n"
 
-#: ../urpmi:138
+#: ../urpmi:147
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - 安装前不检查磁盘空间。\n"
 
-#: ../urpmi:139
+#: ../urpmi:148
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 允许安装体系不匹配的 RPM。\n"
 
-#: ../urpmi:140
+#: ../urpmi:149
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - 不执行软件包脚本。\n"
 
-#: ../urpmi:141
+#: ../urpmi:150
 #, fuzzy, c-format
 msgid "  --replacefiles - ignore file conflicts\n"
 msgstr "  --conflicts    - 打印 conflict 标签。\n"
 
-#: ../urpmi:143
+#: ../urpmi:152
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安装要跳过的软件包。\n"
 
-#: ../urpmi:144
+#: ../urpmi:153
 #, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr "  --prefer       - 首选的软件包\n"
 
-#: ../urpmi:145
+#: ../urpmi:154
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -2194,82 +2288,82 @@ msgid ""
 msgstr ""
 "  --more-choices - 如果找到了多个软件包，则提供多个选择而不是默认选择。\n"
 
-#: ../urpmi:147
+#: ../urpmi:156
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - 不锁定 rpm 数据库。\n"
 
-#: ../urpmi:148
+#: ../urpmi:157
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 更新只限于相同体系的软件包。\n"
 
-#: ../urpmi:149 ../urpmq:97
+#: ../urpmi:158 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:152
+#: ../urpmi:161
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - 安静模式。\n"
 
-#: ../urpmi:154
+#: ../urpmi:163
 #, c-format
 msgid "  --debug        - very verbose mode.\n"
 msgstr "  --debug        - 非常详细模式。\n"
 
-#: ../urpmi:155
+#: ../urpmi:164
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:183
+#: ../urpmi:198
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "错误: 无法在使用软件包列表时使用 --auto-select。\n"
 
-#: ../urpmi:190
+#: ../urpmi:205
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr "错误: 要生成错误报告，请在指定命令行参数时多加 --bug。\n"
 
-#: ../urpmi:220
+#: ../urpmi:235
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "您无法使用 --install-src 安装二进制 RPM 文件"
 
-#: ../urpmi:221
+#: ../urpmi:236
 #, c-format
 msgid "You can't install spec files"
 msgstr "您不能安装 spec 文件"
 
-#: ../urpmi:228
+#: ../urpmi:243
 #, c-format
 msgid "defaulting to --buildrequires"
 msgstr "正在设置默认为 --buildrequires"
 
-#: ../urpmi:233
+#: ../urpmi:248
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr "请使用 --buildrequires 或 --install-src，默认为 --buildrequires"
 
-#: ../urpmi:253
+#: ../urpmi:268
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:254
+#: ../urpmi:269
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:275
+#: ../urpmi:290
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2279,42 +2373,42 @@ msgstr ""
 "请使用 --allow-force 强制操作。"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:428
+#: ../urpmi:445
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (即将升级)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:430
+#: ../urpmi:447
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (即将升级)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:434
+#: ../urpmi:451
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (即将安装)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:436
+#: ../urpmi:453
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (即将安装)"
 
-#: ../urpmi:442
+#: ../urpmi:459
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "为满足“%s”的依赖关系，需要安装下列软件包之一："
 
-#: ../urpmi:445
+#: ../urpmi:462
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:487
+#: ../urpmi:504
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2324,7 +2418,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:489
+#: ../urpmi:506
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2334,7 +2428,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:495 ../urpmi:510
+#: ../urpmi:512 ../urpmi:527
 #, c-format
 msgid ""
 "\n"
@@ -2343,12 +2437,7 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:496 ../urpmi:511 ../urpmi:614 ../urpmi.addmedia:135
-#, c-format
-msgid " (Y/n) "
-msgstr "(是(Y)/否(n))[是]"
-
-#: ../urpmi:504
+#: ../urpmi:521
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2357,7 +2446,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:505
+#: ../urpmi:522
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2366,12 +2455,12 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:522
+#: ../urpmi:539
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpmi:530
+#: ../urpmi:547
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2381,7 +2470,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:532
+#: ../urpmi:549
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2391,12 +2480,12 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:540
+#: ../urpmi:558
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(只是测试，删除将不会实际发生)"
 
-#: ../urpmi:560
+#: ../urpmi:578
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2406,44 +2495,44 @@ msgstr ""
 "您必须首先用 --buildrequires 调用 urpmi，以便安装下列依赖关系：\n"
 "%s\n"
 
-#: ../urpmi:571
+#: ../urpmi:588
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "下列孤立软件包将被删除。"
 
-#: ../urpmi:596
+#: ../urpmi:616
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(只是测试，安装将不会实际发生)"
 
-#: ../urpmi:602
+#: ../urpmi:622
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "将会使用 %s 的额外磁盘空间。"
 
-#: ../urpmi:603
+#: ../urpmi:623
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "将会释放 %s 的磁盘空间。"
 
-#: ../urpmi:604
+#: ../urpmi:624
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "将会获取 %s 的软件包。"
 
-#: ../urpmi:605
+#: ../urpmi:625
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "继续安装 %d 个软件包吗？"
 
-#: ../urpmi:626
+#: ../urpmi:648
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:634
+#: ../urpmi:656
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "挂载后按 Enter..."
@@ -3039,6 +3128,9 @@ msgstr "图形化安装 RPM 软件包"
 msgid "Software Installer"
 msgstr "软件安装程序"
 
+#~ msgid "due to already installed %s"
+#~ msgstr "原因是已经安装 %s"
+
 #~ msgid "Search start: %s end: %s"
 #~ msgstr "搜索开始: %s 结束: %s"
 
-- 
cgit v1.2.1