Updated POT file

1 files changed, 155 insertions, 143 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 74dab213..f818e804 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: 2007-08-22 09:55+0200\n"
+"POT-Creation-Date: 2007-08-29 01:12+0200\n"
 "PO-Revision-Date: 2007-08-22 16:02+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -145,7 +145,7 @@ msgstr ""
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:113 ../urpmi:637
+#: ../gurpmi2:113 ../urpmi:635
 #, c-format
 msgid "Ok"
 msgstr "确定"
@@ -186,19 +186,19 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
+#: ../gurpmi2:217 ../urpmi:599 ../urpmi:610
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
+#: ../gurpmi2:218 ../urpmi:600 ../urpmi:611
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:220 ../urpmi:603
+#: ../gurpmi2:220 ../urpmi:601
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -214,7 +214,7 @@ msgstr "软件包安装..."
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi2:242 ../urpm/install.pm:70
+#: ../gurpmi2:242 ../urpm/install.pm:84
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
@@ -224,7 +224,7 @@ msgstr "正在准备..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:262 ../urpmi:631
+#: ../gurpmi2:262 ../urpmi:629
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请将标签为“%s”的介质插入到设备 [%s]"
@@ -239,7 +239,7 @@ msgstr "正在下载软件包“%s”..."
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:298 ../urpm/main_loop.pm:241
+#: ../gurpmi2:298 ../urpm/main_loop.pm:242
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -250,8 +250,8 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
-#: ../urpm/main_loop.pm:215
+#: ../gurpmi2:304 ../urpm/main_loop.pm:180 ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:216
 #, c-format
 msgid "Installation failed:"
 msgstr "安装失败: "
@@ -305,7 +305,7 @@ msgstr "  -f              - 输出 rpm 的完整名称(NVRA)。\n"
 msgid "                    defaults to %s.\n"
 msgstr "                    默认为 %s。\n"
 
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:268
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
@@ -356,52 +356,52 @@ msgstr "无法访问 rpm 文件[%s]"
 msgid "unable to parse spec file %s [%s]"
 msgstr "无法处理 spec 文件 %s [%s]"
 
-#: ../urpm.pm:170
+#: ../urpm.pm:168
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:172
+#: ../urpm.pm:170
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "RPM 的架构不兼容[%s]"
 
-#: ../urpm.pm:176
+#: ../urpm.pm:174
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:274
+#: ../urpm.pm:272
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "运行于限制模式运行时，禁止执行此操作"
 
-#: ../urpm/args.pm:116 ../urpm/args.pm:125
+#: ../urpm/args.pm:121 ../urpm/args.pm:130
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令行声明的代理服务器无效\n"
 
-#: ../urpm/args.pm:263
+#: ../urpm/args.pm:268
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
-#: ../urpm/args.pm:407
+#: ../urpm/args.pm:412
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目录不存在"
 
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:429
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "没有 %2$s 无法使用 %1$s"
 
-#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#: ../urpm/args.pm:432 ../urpm/args.pm:435
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "无法和 %2$s 一起使用 %1$s"
 
-#: ../urpm/args.pm:444
+#: ../urpm/args.pm:449
 #, c-format
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
@@ -411,7 +411,7 @@ msgstr "参数太多\n"
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "创建介质“%s”的 hdlist 综合文件"
 
-#: ../urpm/bug_report.pm:51 ../urpmi:247
+#: ../urpm/bug_report.pm:51 ../urpmi:248
 #, c-format
 msgid "Copying failed"
 msgstr "复制失败"
@@ -596,8 +596,8 @@ msgid "malformed URL: [%s]"
 msgstr "URL 格式错误: [%s]"
 
 #: ../urpm/get_pkgs.pm:179
-#, c-format
-msgid "sorry you can't --install-src remote .src.rpm files"
+#, fuzzy, c-format
+msgid "sorry, you can't use --install-src to install remote .src.rpm files"
 msgstr "抱歉，您无法用 --install-src 安装远程 .src.rpm 文件"
 
 #: ../urpm/get_pkgs.pm:185
@@ -605,53 +605,48 @@ msgstr "抱歉，您无法用 --install-src 安装远程 .src.rpm 文件"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm/install.pm:77
+#: ../urpm/install.pm:91
 #, c-format
 msgid "[repackaging]"
 msgstr "[重新打包]"
 
-#: ../urpm/install.pm:143
+#: ../urpm/install.pm:157
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm/install.pm:146
+#: ../urpm/install.pm:160
 #, c-format
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm/install.pm:164
+#: ../urpm/install.pm:182
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
 
-#: ../urpm/install.pm:170
-#, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
-
-#: ../urpm/install.pm:173
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm/install.pm:210
+#: ../urpm/install.pm:230
 #, c-format
 msgid "Removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:231
 #, c-format
 msgid "removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:226
+#: ../urpm/install.pm:246
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "正在从 %2$s 删除已安装的 rpm(%1$s)"
 
-#: ../urpm/install.pm:232
+#: ../urpm/install.pm:252
 #, c-format
 msgid "More information on package %s"
 msgstr "关于软件包 %s 的更多信息"
@@ -711,7 +706,7 @@ msgstr "下列软件包的签名有错误"
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:187 ../urpm/main_loop.pm:205
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
@@ -731,48 +726,48 @@ msgstr "正在从 %2$s 安装 %1$s"
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpm/main_loop.pm:187
+#: ../urpm/main_loop.pm:188
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpm/main_loop.pm:205
+#: ../urpm/main_loop.pm:206
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
 
-#: ../urpm/main_loop.pm:247
+#: ../urpm/main_loop.pm:248
 #, c-format
 msgid "%d installation transaction failed"
 msgid_plural "%d installation transactions failed"
 msgstr[0] "%d 安装交易失败"
 
-#: ../urpm/main_loop.pm:258
+#: ../urpm/main_loop.pm:259
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpm/main_loop.pm:263
+#: ../urpm/main_loop.pm:264
 #, c-format
 msgid "Packages are up to date"
 msgstr "软件包已为最新"
 
-#: ../urpm/main_loop.pm:271
+#: ../urpm/main_loop.pm:272
 #, c-format
 msgid "Package %s is already installed"
 msgstr "软件包 %s 已经安装"
 
-#: ../urpm/main_loop.pm:272
+#: ../urpm/main_loop.pm:273
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "软件包 %s 已经安装"
 
-#: ../urpm/main_loop.pm:275
+#: ../urpm/main_loop.pm:276
 #, c-format
 msgid "Package %s can not be installed"
 msgstr "软件包 %s 无法安装"
 
-#: ../urpm/main_loop.pm:276
+#: ../urpm/main_loop.pm:277
 #, c-format
 msgid "Packages %s can not be installed"
 msgstr "软件包 %s 无法安装"
@@ -1190,14 +1185,14 @@ msgstr "读取介质“%s”的综合文件出现问题"
 msgid "reading headers from medium \"%s\""
 msgstr "正在从介质“%s”读取头"
 
-#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
+#: ../urpm/msg.pm:62 ../urpmi:503 ../urpmi:523 ../urpmi:620
 #, c-format
 msgid "Nn"
 msgstr "nN否"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
-#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:504 ../urpmi:524 ../urpmi:567
+#: ../urpmi:621 ../urpmi:651 ../urpmi:657 ../urpmi.addmedia:128
 #, c-format
 msgid "Yy"
 msgstr "yY是"
@@ -1257,67 +1252,78 @@ msgstr "非连贯介质“%s”标为可移动但实际不是"
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质“%s”"
 
-#: ../urpm/select.pm:125
+#: ../urpm/select.pm:21
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:23
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:144
 #, c-format
 msgid "No package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm/select.pm:127 ../urpme:110
+#: ../urpm/select.pm:146 ../urpme:110
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm/select.pm:441 ../urpm/select.pm:484
+#: ../urpm/select.pm:460 ../urpm/select.pm:503
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:461
 #, c-format
 msgid "due to already installed %s"
 msgstr "原因是已经安装 %s"
 
-#: ../urpm/select.pm:443 ../urpm/select.pm:482
+#: ../urpm/select.pm:462 ../urpm/select.pm:501
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm/select.pm:449
+#: ../urpm/select.pm:468
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm/select.pm:450
+#: ../urpm/select.pm:469
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm/select.pm:478
+#: ../urpm/select.pm:497
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm/select.pm:488
+#: ../urpm/select.pm:507
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
 
-#: ../urpm/select.pm:490
+#: ../urpm/select.pm:509
 #, c-format
 msgid "unrequested"
 msgstr "未请求"
 
-#: ../urpm/signature.pm:27
+#: ../urpm/signature.pm:29
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "无效的签名(%s)"
 
-#: ../urpm/signature.pm:58
+#: ../urpm/signature.pm:60
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "无效的密钥 ID(%s)"
 
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:62
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "缺少签名(%s)"
@@ -1364,18 +1370,18 @@ msgstr "  --auto         - 自动选中软件包。\n"
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 验证删除是否可以正确进行。\n"
 
-#: ../urpme:48 ../urpmi:106 ../urpmq:64
+#: ../urpme:48 ../urpmi:107 ../urpmq:64
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
 
-#: ../urpme:49 ../urpmi:111 ../urpmq:66
+#: ../urpme:49 ../urpmi:112 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
-#: ../urpme:50 ../urpmi:143
+#: ../urpme:50 ../urpmi:144
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - 在删除之前重新对文件打包\n"
@@ -1385,7 +1391,7 @@ msgstr "  --repackage    - 在删除之前重新对文件打包\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
 
-#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpme:52 ../urpmf:40 ../urpmi:114 ../urpmi.addmedia:58
 #: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
@@ -1405,17 +1411,17 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:56 ../urpmi:116 ../urpmq:71
+#: ../urpme:56 ../urpmi:117 ../urpmq:71
 #, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "    --probe-synthesis - 使用综合文件。\n"
 
-#: ../urpme:57 ../urpmi:117 ../urpmq:72
+#: ../urpme:57 ../urpmi:118 ../urpmq:72
 #, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "    --probe-hdlist - 使用 hdlist 文件。\n"
 
-#: ../urpme:58 ../urpmi:154 ../urpmq:83
+#: ../urpme:58 ../urpmi:155 ../urpmq:83
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - 详细提示。\n"
@@ -1440,7 +1446,7 @@ msgstr "未知的软件包"
 msgid "unknown package"
 msgstr "未知的软件包"
 
-#: ../urpme:116 ../urpmi:543
+#: ../urpme:116 ../urpmi:541
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
@@ -1462,7 +1468,7 @@ msgid_plural ""
 "To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] "为满足相关性要求，需要删除下列%d个软件包"
 
-#: ../urpme:133 ../urpmi:620
+#: ../urpme:133 ../urpmi:618
 #, c-format
 msgid " (%d MB)"
 msgstr "(%d MB)"
@@ -1473,7 +1479,7 @@ msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
+#: ../urpme:135 ../urpmi:568 ../urpmi:652 ../urpmi.addmedia:131
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
@@ -1504,7 +1510,7 @@ msgstr ""
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 打印此工具的版本号。\n"
 
-#: ../urpmf:37 ../urpmi:134 ../urpmq:80
+#: ../urpmf:37 ../urpmi:135 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
@@ -1751,7 +1757,7 @@ msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式不对: 您只能使用一个多值标签"
 
-#: ../urpmf:190 ../urpmi:254 ../urpmq:135
+#: ../urpmf:190 ../urpmi:255 ../urpmq:135
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
@@ -1879,32 +1885,36 @@ msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
 
 #: ../urpmi:105
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - 只使用更新介质。\n"
+
+#: ../urpmi:106
 #, c-format
 msgid ""
 "  --replacepkgs  - force installing packages which are already installed.\n"
-msgstr ""
-"  --replacepkgs  - 强制安装已经安装过的软件包。\n"
+msgstr "  --replacepkgs  - 强制安装已经安装过的软件包。\n"
 
-#: ../urpmi:107
+#: ../urpmi:108
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr "  --allow-nodeps - 允许要求用户不经过依赖性检验就安装软件包。\n"
 
-#: ../urpmi:109
+#: ../urpmi:110
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr "  --allow-force  - 允许提示用户安装软件包而不检查依赖性和完整性。\n"
 
-#: ../urpmi:112 ../urpmq:67
+#: ../urpmi:113 ../urpmq:67
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
 
-#: ../urpmi:114
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1913,47 +1923,47 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpmi，特别用于在 --root 选项\n"
 "                   下安装 chroot。\n"
 
-#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:119 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 用 wget 取远程文件。\n"
 
-#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:120 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 用 crul 取远程文件。\n"
 
-#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
+#: ../urpmi:121 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prizlla      - 用 prozilla 取远程文件。\n"
 
-#: ../urpmi:121
+#: ../urpmi:122
 #, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - 给 curl 传递额外的选项\n"
 
-#: ../urpmi:122
+#: ../urpmi:123
 #, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- 给 rsync 传递额外的选项\n"
 
-#: ../urpmi:123
+#: ../urpmi:124
 #, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - 给 wget 传递额外的选项\n"
 
-#: ../urpmi:124
+#: ../urpmi:125
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --prozilla-options - 给 prozilla 传递额外的选项\n"
 
-#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:126 ../urpmi.addmedia:48 ../urpmi.update:36
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 降低下载速度。\n"
 
-#: ../urpmi:126
+#: ../urpmi:127
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1962,7 +1972,7 @@ msgstr ""
 "  --resume       - 续传未下载完成的文件\n"
 "                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:129 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1971,7 +1981,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:131 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1980,7 +1990,7 @@ msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
 "                   密码(格式如 <用户: 密码>)。\n"
 
-#: ../urpmi:132
+#: ../urpmi:133
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1989,7 +1999,7 @@ msgstr ""
 "  --bug          - 输出故障报告\n"
 "                   下一个参数指定输出目录。\n"
 
-#: ../urpmi:135
+#: ../urpmi:136
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1998,49 +2008,49 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../urpmi:137
+#: ../urpmi:138
 #, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
-#: ../urpmi:138
+#: ../urpmi:139
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
-#: ../urpmi:139
+#: ../urpmi:140
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - 排除文档文件。\n"
 
-#: ../urpmi:140
+#: ../urpmi:141
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - 安装前不检查磁盘空间。\n"
 
-#: ../urpmi:141
+#: ../urpmi:142
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - 允许安装体系不匹配的 RPM。\n"
 
-#: ../urpmi:142
+#: ../urpmi:143
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - 不执行软件包脚本。\n"
 
-#: ../urpmi:144
+#: ../urpmi:145
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安装要跳过的软件包。\n"
 
-#: ../urpmi:145
+#: ../urpmi:146
 #, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr "  --prefer       - 首选的软件包\n"
 
-#: ../urpmi:146
+#: ../urpmi:147
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -2048,76 +2058,76 @@ msgid ""
 msgstr ""
 "  --more-choices - 如果找到了多个软件包，则提供多个选择而不是默认选择。\n"
 
-#: ../urpmi:148
+#: ../urpmi:149
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - 不锁定 rpm 数据库。\n"
 
-#: ../urpmi:149
+#: ../urpmi:150
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 更新只限于相同体系的软件包。\n"
 
-#: ../urpmi:150 ../urpmq:89
+#: ../urpmi:151 ../urpmq:89
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:151
+#: ../urpmi:152
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在 provides 字段中查找软件包。\n"
 
-#: ../urpmi:152
+#: ../urpmi:153
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 字段中查找软件包。\n"
 
-#: ../urpmi:153
+#: ../urpmi:154
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - 安静模式。\n"
 
-#: ../urpmi:155
+#: ../urpmi:156
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:184
+#: ../urpmi:185
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "错误: 无法在使用软件包列表时使用 --auto-select。\n"
 
-#: ../urpmi:191
+#: ../urpmi:192
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr "错误: 要生成错误报告，请在指定命令行参数时多加 --bug。\n"
 
-#: ../urpmi:218
+#: ../urpmi:219
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "您无法使用 --install-src 安装二进制 RPM 文件"
 
-#: ../urpmi:241
+#: ../urpmi:242
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:242
+#: ../urpmi:243
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:253
+#: ../urpmi:254
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "环境目录 %s 不存在"
 
-#: ../urpmi:273
+#: ../urpmi:274
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2126,48 +2136,48 @@ msgstr ""
 "错误: %s 似乎是以只读方式挂载的。\n"
 "请使用 --allow-force 强制操作。"
 
-#: ../urpmi:361
+#: ../urpmi:362
 #, c-format
 msgid "Updating media...\n"
 msgstr "正在更新介质...\n"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:438
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (即将升级)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:442
+#: ../urpmi:440
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (即将升级)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:446
+#: ../urpmi:444
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (即将安装)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:448
+#: ../urpmi:446
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (即将安装)"
 
-#: ../urpmi:454
+#: ../urpmi:452
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "为满足“%s”的依赖关系，需要删除下列软件包之一："
 
-#: ../urpmi:457
+#: ../urpmi:455
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:498
+#: ../urpmi:496
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2177,7 +2187,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:500
+#: ../urpmi:498
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2187,7 +2197,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:508 ../urpmi:528
+#: ../urpmi:506 ../urpmi:526
 #, c-format
 msgid ""
 "\n"
@@ -2196,12 +2206,12 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
+#: ../urpmi:506 ../urpmi:526 ../urpmi:622 ../urpmi.addmedia:131
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
 
-#: ../urpmi:520
+#: ../urpmi:518
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2210,7 +2220,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:521
+#: ../urpmi:519
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2219,7 +2229,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:552
+#: ../urpmi:550
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2229,7 +2239,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:554
+#: ../urpmi:552
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2239,7 +2249,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:561
+#: ../urpmi:559
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -2248,7 +2258,7 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:562
+#: ../urpmi:560
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -2257,17 +2267,17 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:564
+#: ../urpmi:562
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(只是测试，删除将不会实际发生)"
 
-#: ../urpmi:594
+#: ../urpmi:592
 #, c-format
 msgid "%s (suggested)"
 msgstr "%s (建议安装)"
 
-#: ../urpmi:609
+#: ../urpmi:607
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -2276,28 +2286,28 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi:615
+#: ../urpmi:613
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(只是测试，安装将不会实际发生)"
 
-#: ../urpmi:617
+#: ../urpmi:615
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "继续安装 %d 个软件包吗？"
 
-#: ../urpmi:632
+#: ../urpmi:630
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:637
+#: ../urpmi:635
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:676
+#: ../urpmi:674
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
@@ -2927,3 +2937,5 @@ msgstr "由于介质“%s”没有 hdlists，软件包 %s 无法返回任何结�
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
 
+#~ msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+#~ msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"