Run update-po.

1 files changed, 209 insertions, 201 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 17a9055a..d3656ee4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude 0.4.3-1\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2007-11-21 19:47-0800\n"
+"POT-Creation-Date: 2007-11-21 21:11-0800\n"
 "PO-Revision-Date: 2007-04-07 18:33+0800\n"
 "Last-Translator: Kov Chai <tchaikov@sjtu.org>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -406,48 +406,52 @@ msgstr "%s：下一个"
 msgid "%ls: Previous"
 msgstr "%s：上一个"
 
-#: src/broken_indicator.cc:239
+#: src/broken_indicator.cc:238
+msgid "Dependency resolution disabled."
+msgstr ""
+
+#: src/broken_indicator.cc:249
 msgid "Unable to resolve dependencies."
 msgstr "无法解决依赖关系。"
 
-#: src/broken_indicator.cc:250
+#: src/broken_indicator.cc:260
 msgid "Fatal error in resolver"
 msgstr ""
 
-#: src/broken_indicator.cc:262
+#: src/broken_indicator.cc:272
 #, c-format
 msgid "[%d(%d)/...] Resolving dependencies"
 msgstr "[%d(%d)/...] 正在解决依赖关系"
 
-#: src/broken_indicator.cc:297 src/solution_dialog.cc:140
+#: src/broken_indicator.cc:307 src/solution_dialog.cc:140
 msgid "Internal error: unexpected null solution."
 msgstr "内部错误：意料之外的空解决方案。"
 
-#: src/broken_indicator.cc:356
+#: src/broken_indicator.cc:366
 #, c-format
 msgid "%d install"
 msgid_plural "%d installs"
 msgstr[0] "安装 %d 个包"
 
-#: src/broken_indicator.cc:366
+#: src/broken_indicator.cc:376
 #, c-format
 msgid "%d removal"
 msgid_plural "%d removals"
 msgstr[0] "删除 %d 个包"
 
-#: src/broken_indicator.cc:376
+#: src/broken_indicator.cc:386
 #, c-format
 msgid "%d keep"
 msgid_plural "%d keeps"
 msgstr[0] "保持 %d 个包"
 
-#: src/broken_indicator.cc:386
+#: src/broken_indicator.cc:396
 #, c-format
 msgid "%d upgrade"
 msgid_plural "%d upgrades"
 msgstr[0] "升级 %d 个包"
 
-#: src/broken_indicator.cc:396
+#: src/broken_indicator.cc:406
 #, c-format
 msgid "%d downgrade"
 msgid_plural "%d downgrades"
@@ -456,7 +460,7 @@ msgstr[0] "降级 %d 个包"
 #. ForTranslators: %F is replaced with a comma separated list such as
 #. "n1 installs, n2 removals", ...
 #.
-#: src/broken_indicator.cc:407
+#: src/broken_indicator.cc:417
 #, c-format
 msgid "Suggest %F"
 msgstr "建议 %F"
@@ -1070,37 +1074,37 @@ msgstr ""
 "软件包的名称(或者模式)。该动作将被实施到您所选择的全部软件包。下列动作可供选"
 "择："
 
-#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:186
+#: src/cmdline/cmdline_prompt.cc:710 src/cmdline/cmdline_resolver.cc:189
 msgid "'+' to install packages"
 msgstr "按'+'键来安装软件包"
 
-#: src/cmdline/cmdline_prompt.cc:713 src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_prompt.cc:713 src/cmdline/cmdline_resolver.cc:191
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr "按'+M'安装软件包并且立即将它们标记为已安装状态"
 
-#: src/cmdline/cmdline_prompt.cc:715 src/cmdline/cmdline_resolver.cc:190
+#: src/cmdline/cmdline_prompt.cc:715 src/cmdline/cmdline_resolver.cc:193
 msgid "'-' to remove packages"
 msgstr "按'-'卸载软件包"
 
-#: src/cmdline/cmdline_prompt.cc:717 src/cmdline/cmdline_resolver.cc:192
+#: src/cmdline/cmdline_prompt.cc:717 src/cmdline/cmdline_resolver.cc:195
 msgid "'_' to purge packages"
 msgstr "按'_'清除软件包"
 
-#: src/cmdline/cmdline_prompt.cc:719 src/cmdline/cmdline_resolver.cc:194
+#: src/cmdline/cmdline_prompt.cc:719 src/cmdline/cmdline_resolver.cc:197
 msgid "'=' to place packages on hold"
 msgstr "按'='将软件包置于保持状态"
 
-#: src/cmdline/cmdline_prompt.cc:721 src/cmdline/cmdline_resolver.cc:196
+#: src/cmdline/cmdline_prompt.cc:721 src/cmdline/cmdline_resolver.cc:199
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "按':'将维持软件包当前状态但是并不将其置于保持状态"
 
-#: src/cmdline/cmdline_prompt.cc:723 src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_prompt.cc:723 src/cmdline/cmdline_resolver.cc:201
 msgid "'&M' to mark packages as automatically installed"
 msgstr "按'&M'将软件包标记为自动安装"
 
-#: src/cmdline/cmdline_prompt.cc:725 src/cmdline/cmdline_resolver.cc:200
+#: src/cmdline/cmdline_prompt.cc:725 src/cmdline/cmdline_resolver.cc:203
 msgid "'&m' to mark packages as manually installed"
 msgstr "按'm'将软件包标记为手动安装"
 
@@ -1122,12 +1126,12 @@ msgstr "您要继续吗？[Y/n/?] "
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:826
+#: src/cmdline/cmdline_prompt.cc:829
 #, fuzzy
 msgid "You must resolve these dependencies before continuing."
 msgstr "未能解决依赖关系！放弃..."
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 #, c-format
 msgid ""
 "\n"
@@ -1138,7 +1142,7 @@ msgstr ""
 "将显示依赖关系信息。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid ""
 "\n"
@@ -1149,7 +1153,7 @@ msgstr ""
 "将不显示依赖关系信息。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 #, c-format
 msgid ""
 "\n"
@@ -1160,7 +1164,7 @@ msgstr ""
 "将显示版本号。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid ""
 "\n"
@@ -1171,7 +1175,7 @@ msgstr ""
 "将不显示版本号。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:857
+#: src/cmdline/cmdline_prompt.cc:860
 #, c-format
 msgid ""
 "\n"
@@ -1182,7 +1186,7 @@ msgstr ""
 "尺寸变化将被显示。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:859
+#: src/cmdline/cmdline_prompt.cc:862
 #, c-format
 msgid ""
 "\n"
@@ -1193,27 +1197,27 @@ msgstr ""
 "尺寸变化将不被显示。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:886
+#: src/cmdline/cmdline_prompt.cc:889
 #, c-format
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "非法响应。请输入一个合法命令或者“?”请求帮助。\n"
 
-#: src/cmdline/cmdline_resolver.cc:126 src/cmdline/cmdline_resolver.cc:668
+#: src/cmdline/cmdline_resolver.cc:129 src/cmdline/cmdline_resolver.cc:695
 #: src/generic/apt/apt.cc:202
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "无法打开 %s 以写入"
 
-#: src/cmdline/cmdline_resolver.cc:132 src/cmdline/cmdline_resolver.cc:673
+#: src/cmdline/cmdline_resolver.cc:135 src/cmdline/cmdline_resolver.cc:700
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr "将依赖关系解决状态写入文件 %s 时发生错误"
 
-#: src/cmdline/cmdline_resolver.cc:134 src/cmdline/cmdline_resolver.cc:675
+#: src/cmdline/cmdline_resolver.cc:137 src/cmdline/cmdline_resolver.cc:702
 msgid "Resolver state successfully written!"
 msgstr "成功写入依赖关系解决状态！"
 
-#: src/cmdline/cmdline_resolver.cc:147
+#: src/cmdline/cmdline_resolver.cc:150
 #, c-format
 msgid ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
@@ -1222,190 +1226,194 @@ msgstr ""
 "y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr 包 版本 ...: %F%na 包 版本 ...: %F%n<动"
 "作> 包... : %F%n%F%F%F%F%F%F%F%F"
 
-#: src/cmdline/cmdline_resolver.cc:166
+#: src/cmdline/cmdline_resolver.cc:169
 msgid "accept the proposed changes"
 msgstr "接受所建议的变动"
 
-#: src/cmdline/cmdline_resolver.cc:168
+#: src/cmdline/cmdline_resolver.cc:171
 msgid "reject the proposed changes and search for another solution"
 msgstr "拒绝所建议的变动并寻找另一个解决方案"
 
-#: src/cmdline/cmdline_resolver.cc:170
+#: src/cmdline/cmdline_resolver.cc:173
 msgid "give up and quit the program"
 msgstr "放弃并退出此程序"
 
-#: src/cmdline/cmdline_resolver.cc:172
+#: src/cmdline/cmdline_resolver.cc:175
 msgid "move to the next solution"
 msgstr "到下一个解决方案"
 
-#: src/cmdline/cmdline_resolver.cc:174
+#: src/cmdline/cmdline_resolver.cc:177
 msgid "move to the previous solution"
 msgstr "到上一个解决方案"
 
-#: src/cmdline/cmdline_resolver.cc:176
+#: src/cmdline/cmdline_resolver.cc:179
 msgid ""
 "toggle between the contents of the solution and an explanation of the "
 "solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:178
+#: src/cmdline/cmdline_resolver.cc:181
 msgid "examine the solution in the visual user interface"
 msgstr "检查用户可视界面中的设置方案"
 
-#: src/cmdline/cmdline_resolver.cc:180
+#: src/cmdline/cmdline_resolver.cc:183
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur."
 msgstr "拒绝给定的软件包版本；不显示任何包括它们的解决方案。"
 
-#: src/cmdline/cmdline_resolver.cc:182
+#: src/cmdline/cmdline_resolver.cc:185
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur."
 msgstr "接受给定的软件包版本；仅显示包括它们的解决方案。"
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:187
 msgid "adjust the state of the listed packages, where ACTION is one of:"
 msgstr "修改所列软件包的状态，这里“动作”为下列项之一："
 
-#: src/cmdline/cmdline_resolver.cc:202
+#: src/cmdline/cmdline_resolver.cc:205
 msgid ""
 "Adjustments will cause the current solution to be discarded and recalculated "
 "as necessary."
 msgstr "修改将导致当前解决方案被放弃或者必须重新计算。"
 
-#: src/cmdline/cmdline_resolver.cc:216
+#: src/cmdline/cmdline_resolver.cc:219
 #, c-format
 msgid "The version %s is available in the following archives:"
 msgstr "在下列存档中版本 %s 已经可用了:"
 
-#: src/cmdline/cmdline_resolver.cc:224
+#: src/cmdline/cmdline_resolver.cc:227
 #, c-format
 msgid "Select the version of %s that should be used: "
 msgstr "选择要被使用的 %s 的版本号："
 
-#: src/cmdline/cmdline_resolver.cc:231
+#: src/cmdline/cmdline_resolver.cc:234
 #, c-format
 msgid "Invalid response.  Please enter an integer between 1 and %d."
 msgstr "无效响应。请输入 1 到 %d 之间的一个整数。"
 
-#: src/cmdline/cmdline_resolver.cc:246
+#: src/cmdline/cmdline_resolver.cc:249
 #, c-format
 msgid "Expected at least one package/version pair following '%c'"
 msgstr "在“%c”后需要至少一个软件包/版本对"
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:263
 #, c-format
 msgid "Expected a version after \"%s\""
 msgstr "在“%s”之后的一个预料中的版本"
 
-#: src/cmdline/cmdline_resolver.cc:270
+#: src/cmdline/cmdline_resolver.cc:273
 #, c-format
 msgid "No such package \"%s\""
 msgstr "没有这个软件包“%s”"
 
-#: src/cmdline/cmdline_resolver.cc:286
+#: src/cmdline/cmdline_resolver.cc:289
 #, c-format
 msgid "%s has no version named \"%s\""
 msgstr "%s 没有名字叫“%s”的版本"
 
-#: src/cmdline/cmdline_resolver.cc:303
+#: src/cmdline/cmdline_resolver.cc:306
 #, c-format
 msgid "Allowing the removal of %s"
 msgstr "同意删除 %s"
 
-#: src/cmdline/cmdline_resolver.cc:306
+#: src/cmdline/cmdline_resolver.cc:309
 #, c-format
 msgid "Allowing the installation of %s version %s (%s)"
 msgstr "同意安装 %s 的 %s 版本(%s)"
 
-#: src/cmdline/cmdline_resolver.cc:316
+#: src/cmdline/cmdline_resolver.cc:319
 #, c-format
 msgid "Rejecting the removal of %s"
 msgstr "放弃删除 %s"
 
-#: src/cmdline/cmdline_resolver.cc:319
+#: src/cmdline/cmdline_resolver.cc:322
 #, c-format
 msgid "Rejecting the installation of %s version %s (%s)"
 msgstr "放弃安装 %s 的 %s 版本(%s)"
 
-#: src/cmdline/cmdline_resolver.cc:332
+#: src/cmdline/cmdline_resolver.cc:335
 #, c-format
 msgid "No longer requiring the removal of %s"
 msgstr "不再要求删除 %s"
 
-#: src/cmdline/cmdline_resolver.cc:335
+#: src/cmdline/cmdline_resolver.cc:338
 #, c-format
 msgid "No longer requiring the installation of %s version %s (%s)"
 msgstr "不再要求安装 %s 的 %s 版本(%s)"
 
-#: src/cmdline/cmdline_resolver.cc:344
+#: src/cmdline/cmdline_resolver.cc:347
 #, c-format
 msgid "Requiring the removal of %s"
 msgstr "要求删除 %s"
 
-#: src/cmdline/cmdline_resolver.cc:347
+#: src/cmdline/cmdline_resolver.cc:350
 #, c-format
 msgid "Requiring the installation of %s version %s (%s)"
 msgstr "要求安装 %s 的 %s 版本(%s)"
 
-#: src/cmdline/cmdline_resolver.cc:484
+#: src/cmdline/cmdline_resolver.cc:497
 #, c-format
 msgid ""
 "Would resolve dependencies, but dependency resolution is disabled.\n"
 "   (%s::ProblemResolver::StepLimit = 0)\n"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:492 src/solution_dialog.cc:127
+#: src/cmdline/cmdline_resolver.cc:506
+msgid "I want to resolve dependencies, but no dependency resolver was created."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:519 src/solution_dialog.cc:127
 msgid "Resolving dependencies..."
 msgstr "依赖关系分析中..."
 
-#: src/cmdline/cmdline_resolver.cc:524
+#: src/cmdline/cmdline_resolver.cc:551
 #, c-format
 msgid "open: %d; closed: %d; defer: %d; conflict: %d"
 msgstr "打开：%d；关闭；%d；defer: %d; 冲突；%d"
 
-#: src/cmdline/cmdline_resolver.cc:574
+#: src/cmdline/cmdline_resolver.cc:601
 msgid "The following actions will resolve these dependencies:"
 msgstr "下列动作将解决这些依赖关系："
 
-#: src/cmdline/cmdline_resolver.cc:591
+#: src/cmdline/cmdline_resolver.cc:618
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "是否接受该解决方案？[Y/n/q/?] "
 
-#: src/cmdline/cmdline_resolver.cc:618 src/cmdline/cmdline_resolver.cc:719
+#: src/cmdline/cmdline_resolver.cc:645 src/cmdline/cmdline_resolver.cc:746
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr "放弃解决这些依赖关系的全部努力。"
 
-#: src/cmdline/cmdline_resolver.cc:648
+#: src/cmdline/cmdline_resolver.cc:675
 msgid "The following commands are available:"
 msgstr "下列命令可选："
 
-#: src/cmdline/cmdline_resolver.cc:665
+#: src/cmdline/cmdline_resolver.cc:692
 msgid "File to write resolver state to: "
 msgstr "将依赖关系解决状态写入文件："
 
-#: src/cmdline/cmdline_resolver.cc:680
+#: src/cmdline/cmdline_resolver.cc:707
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "无效响应；请输入下列命令之一："
 
-#: src/cmdline/cmdline_resolver.cc:693
+#: src/cmdline/cmdline_resolver.cc:720
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr "在限定的时间内没能找到解决方案。加把劲再试试？[Y/n]"
 
-#: src/cmdline/cmdline_resolver.cc:722
+#: src/cmdline/cmdline_resolver.cc:749
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "非法响应；请输入“y”或者“n”。"
 
-#: src/cmdline/cmdline_resolver.cc:731
+#: src/cmdline/cmdline_resolver.cc:758
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "未能解决依赖关系！放弃..."
 
-#: src/cmdline/cmdline_resolver.cc:737
+#: src/cmdline/cmdline_resolver.cc:764
 msgid "*** No more solutions available ***"
 msgstr "*** 没有更多的解决方案了 ***"
 
-#: src/cmdline/cmdline_resolver.cc:751
+#: src/cmdline/cmdline_resolver.cc:783
 msgid ""
 "*** ERROR: search aborted by fatal exception.  You may continue\n"
 "           searching, but some solutions will be unreachable."
@@ -3110,7 +3118,7 @@ msgstr "mine-help.txt 的编码|UTF-8"
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:88 src/ui.cc:2530
+#: src/pkg_columnizer.cc:88 src/ui.cc:2535
 msgid "Package"
 msgstr "软件包"
 
@@ -4075,7 +4083,7 @@ msgstr "真的要退出 Aptitude 吗？"
 msgid "Preferences"
 msgstr "预依赖于"
 
-#: src/ui.cc:692 src/ui.cc:2296
+#: src/ui.cc:692 src/ui.cc:2301
 msgid "Change the behavior of aptitude"
 msgstr ""
 
@@ -4141,7 +4149,7 @@ msgstr ""
 msgid "View a brief introduction to aptitude"
 msgstr ""
 
-#: src/ui.cc:1046 src/ui.cc:2535
+#: src/ui.cc:1046 src/ui.cc:2540
 msgid "Help"
 msgstr "帮助"
 
@@ -4171,7 +4179,7 @@ msgstr "手册"
 msgid "FAQ"
 msgstr "常见问题回答(^F)"
 
-#: src/ui.cc:1076 src/ui.cc:2380
+#: src/ui.cc:1076 src/ui.cc:2385
 msgid "View a list of frequently asked questions"
 msgstr "查看常见问题列表"
 
@@ -4180,7 +4188,7 @@ msgstr "查看常见问题列表"
 msgid "News"
 msgstr "新闻(^N)"
 
-#: src/ui.cc:1086 src/ui.cc:2384
+#: src/ui.cc:1086 src/ui.cc:2389
 msgid "View the important changes made in each version of "
 msgstr "查看该程序每一版本中所做的重大修改"
 
@@ -4339,7 +4347,7 @@ msgstr ""
 msgid "Minesweeper"
 msgstr "扫雷"
 
-#: src/ui.cc:1591 src/ui.cc:2147
+#: src/ui.cc:1591 src/ui.cc:2152
 msgid "Waste time trying to find mines"
 msgstr "通过扫雷来消磨时间"
 
@@ -4370,521 +4378,521 @@ msgstr "过期的下载文件已经被删除，正在释放 %sB 的磁盘空间�
 msgid "No more solutions."
 msgstr "没有更多的解决方案了。"
 
-#: src/ui.cc:2001
+#: src/ui.cc:2005
 msgid "Unable to find a solution to apply."
 msgstr "未能找到一个可以应用的解决方案。"
 
-#: src/ui.cc:2007
+#: src/ui.cc:2011
 msgid "Ran out of time while trying to find a solution."
 msgstr "寻求解决方案时耗尽了时限。"
 
-#: src/ui.cc:2050 src/ui.cc:2052
+#: src/ui.cc:2055 src/ui.cc:2057
 msgid "Resolve Dependencies"
 msgstr "解决依赖关系"
 
-#: src/ui.cc:2051
+#: src/ui.cc:2056
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "为未满足的依赖关系寻找解决方案"
 
-#: src/ui.cc:2063
+#: src/ui.cc:2068
 #, c-format
 msgid "Unable to open %ls"
 msgstr "无法打开 %ls"
 
-#: src/ui.cc:2069
+#: src/ui.cc:2074
 msgid "Error while dumping resolver state"
 msgstr "存储依赖关系解决状态时出错"
 
-#: src/ui.cc:2079
+#: src/ui.cc:2084
 msgid "File to which the resolver state should be dumped:"
 msgstr "存储依赖关系解决状态的文件："
 
-#: src/ui.cc:2109
+#: src/ui.cc:2114
 msgid "^Install/remove packages"
 msgstr "安装/卸载软件包(^I)"
 
-#: src/ui.cc:2110
+#: src/ui.cc:2115
 msgid "Perform all pending installs and removals"
 msgstr "执行所有等待执行的安装和卸载任务"
 
-#: src/ui.cc:2112
+#: src/ui.cc:2117
 msgid "^Update package list"
 msgstr "更新软件包列表(^U)"
 
-#: src/ui.cc:2113
+#: src/ui.cc:2118
 msgid "Check for new versions of packages"
 msgstr "正在检查新版本的软件包"
 
-#: src/ui.cc:2117
+#: src/ui.cc:2122
 msgid "Mark Up^gradable"
 msgstr "标记可升级的(^g)"
 
-#: src/ui.cc:2118
+#: src/ui.cc:2123
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "为所有未被保持现状的软件包加上升级标记"
 
-#: src/ui.cc:2122
+#: src/ui.cc:2127
 msgid "^Forget new packages"
 msgstr "忘记新软件包(^F)"
 
-#: src/ui.cc:2123
+#: src/ui.cc:2128
 msgid "Forget which packages are \"new\""
 msgstr "忘记哪些软件包是“新”的"
 
-#: src/ui.cc:2126
+#: src/ui.cc:2131
 msgid "Canc^el pending actions"
 msgstr "取消待执行的动作(^E)"
 
-#: src/ui.cc:2127
+#: src/ui.cc:2132
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr "执行所有等待执行的安装、卸载、保持和升级任务"
 
-#: src/ui.cc:2130
+#: src/ui.cc:2135
 msgid "^Clean package cache"
 msgstr "清除软件包缓存(^C)"
 
-#: src/ui.cc:2131
+#: src/ui.cc:2136
 msgid "Delete package files which were previously downloaded"
 msgstr "删除以前下载的软件包文件"
 
-#: src/ui.cc:2134
+#: src/ui.cc:2139
 msgid "Clean ^obsolete files"
 msgstr "关闭过期文件(^O)"
 
-#: src/ui.cc:2135
+#: src/ui.cc:2140
 msgid "Delete package files which can no longer be downloaded"
 msgstr "删除无法再下载的软件包文件"
 
-#: src/ui.cc:2141
+#: src/ui.cc:2146
 msgid "^Reload package cache"
 msgstr "重新载入软件包缓存(^R)"
 
-#: src/ui.cc:2142
+#: src/ui.cc:2147
 msgid "Reload the package cache"
 msgstr "重新载入软件包缓存"
 
-#: src/ui.cc:2146
+#: src/ui.cc:2151
 msgid "^Play Minesweeper"
 msgstr "玩扫雷游戏(^P)"
 
-#: src/ui.cc:2151
+#: src/ui.cc:2156
 msgid "^Become root"
 msgstr "变成 root (^B)"
 
-#: src/ui.cc:2152
+#: src/ui.cc:2157
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
 msgstr "运行“su”成为 root。这将重新启动程序，但是您的设置将会被保存下来。"
 
-#: src/ui.cc:2154
+#: src/ui.cc:2159
 msgid "^Quit"
 msgstr "退出(^Q)"
 
-#: src/ui.cc:2155
+#: src/ui.cc:2160
 msgid "Exit the program"
 msgstr "退出此程序"
 
-#: src/ui.cc:2161 src/ui.cc:2529
+#: src/ui.cc:2166 src/ui.cc:2534
 msgid "Undo"
 msgstr "撤消"
 
-#: src/ui.cc:2162
+#: src/ui.cc:2167
 msgid "Undo the last package operation or group of operations"
 msgstr "撤销最近一次或者一组软件包操作"
 
-#: src/ui.cc:2170
+#: src/ui.cc:2175
 msgid "^Install"
 msgstr "安装(^I)"
 
-#: src/ui.cc:2171
+#: src/ui.cc:2176
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "标记当前选择的软件包以安装或者升级"
 
-#: src/ui.cc:2174
+#: src/ui.cc:2179
 msgid "^Remove"
 msgstr "删除(^R)"
 
-#: src/ui.cc:2175
+#: src/ui.cc:2180
 msgid "Flag the currently selected package for removal"
 msgstr "标记当前选择的软件包以删除"
 
-#: src/ui.cc:2178
+#: src/ui.cc:2183
 msgid "^Purge"
 msgstr "清除(^P)"
 
-#: src/ui.cc:2179
+#: src/ui.cc:2184
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "标记当前选择的软件包和它的配置文件以删除"
 
-#: src/ui.cc:2182
+#: src/ui.cc:2187
 msgid "^Keep"
 msgstr "保持(^K)"
 
-#: src/ui.cc:2183
+#: src/ui.cc:2188
 msgid "Cancel any action on the selected package"
 msgstr "取消选定软件包上的任何动作"
 
-#: src/ui.cc:2186
+#: src/ui.cc:2191
 msgid "^Hold"
 msgstr "保持(^H)"
 
-#: src/ui.cc:2187
+#: src/ui.cc:2192
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr "取消选定软件包上的任何动作，并且保护它免于以后被升级"
 
-#: src/ui.cc:2190
+#: src/ui.cc:2195
 msgid "Mark ^Auto"
 msgstr "标记为自动安装(^A)"
 
-#: src/ui.cc:2191
+#: src/ui.cc:2196
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
 msgstr ""
 "将所选定的软件包标记为自动安装；如果没有其它软件包依赖于它，它将会被自动删除"
 
-#: src/ui.cc:2194
+#: src/ui.cc:2199
 msgid "Mark ^Manual"
 msgstr "标记为手动安装(^M)"
 
-#: src/ui.cc:2195
+#: src/ui.cc:2200
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr ""
 "将所选定的软件包标记为手动安装；除非您手动删除该软件包，否则它将不会被删除"
 
-#: src/ui.cc:2198
+#: src/ui.cc:2203
 msgid "^Forbid Version"
 msgstr "禁止版本(^F)"
 
-#: src/ui.cc:2199
+#: src/ui.cc:2204
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
 msgstr "禁止安装选定软件包的候选版本；该软件包的新版本将可以正常安装"
 
-#: src/ui.cc:2203
+#: src/ui.cc:2208
 msgid "I^nformation"
 msgstr "信息(^N)"
 
-#: src/ui.cc:2204
+#: src/ui.cc:2209
 msgid "Display more information about the selected package"
 msgstr "显示关于选定软件包上的更多信息"
 
-#: src/ui.cc:2207
+#: src/ui.cc:2212
 msgid "^Changelog"
 msgstr "变更日志(^C)"
 
-#: src/ui.cc:2208
+#: src/ui.cc:2213
 msgid "Display the Debian changelog of the selected package"
 msgstr "显示选定软件包上的变更日志"
 
-#: src/ui.cc:2215
+#: src/ui.cc:2220
 msgid "^Examine Solution"
 msgstr "检查解决方案(^E)"
 
-#: src/ui.cc:2216
+#: src/ui.cc:2221
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "检查当前选择的处理依赖问题的解决方案"
 
-#: src/ui.cc:2219
+#: src/ui.cc:2224
 msgid "Apply ^Solution"
 msgstr "应用解决方案(^S)"
 
-#: src/ui.cc:2220
+#: src/ui.cc:2225
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "确认当前选择的解决方案中包含的动作。"
 
-#: src/ui.cc:2223
+#: src/ui.cc:2228
 msgid "^Next Solution"
 msgstr "下一个解决方案(^N)"
 
-#: src/ui.cc:2224
+#: src/ui.cc:2229
 msgid "Select the next solution to the dependency problems."
 msgstr "选择解决此依赖问题的下一个方案。"
 
-#: src/ui.cc:2227
+#: src/ui.cc:2232
 msgid "^Previous Solution"
 msgstr "前一个解决方案(^P)"
 
-#: src/ui.cc:2228
+#: src/ui.cc:2233
 msgid "Select the previous solution to the dependency problems."
 msgstr "选择解决此依赖问题的前一个方案。"
 
-#: src/ui.cc:2231
+#: src/ui.cc:2236
 msgid "^First Solution"
 msgstr "第一个解决方案(^F)"
 
-#: src/ui.cc:2232
+#: src/ui.cc:2237
 msgid "Select the first solution to the dependency problems."
 msgstr "选择解决此依赖问题的第一个方案。"
 
-#: src/ui.cc:2235
+#: src/ui.cc:2240
 msgid "^Last Solution"
 msgstr "最后一个解决方案(^L)"
 
-#: src/ui.cc:2236
+#: src/ui.cc:2241
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr "选择当前已经生成的解决此依赖问题的最后一个方案。"
 
-#: src/ui.cc:2242
+#: src/ui.cc:2247
 msgid "Toggle ^Rejected"
 msgstr "放弃(^R)"
 
-#: src/ui.cc:2243
+#: src/ui.cc:2248
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "切换是否放弃当前选择的动作。"
 
-#: src/ui.cc:2247
+#: src/ui.cc:2252
 msgid "Toggle ^Approved"
 msgstr "确认(^A)"
 
-#: src/ui.cc:2248
+#: src/ui.cc:2253
 msgid "Toggle whether the currently selected action is approved."
 msgstr "切换当前选择的动作是否被允许。"
 
-#: src/ui.cc:2252
+#: src/ui.cc:2257
 msgid "^View Target"
 msgstr "查看目标(^V)"
 
-#: src/ui.cc:2253
+#: src/ui.cc:2258
 msgid "View the package which will be affected by the selected action"
 msgstr "查看会被所选的动作影响的软件包"
 
-#: src/ui.cc:2261
+#: src/ui.cc:2266
 msgid "^Find"
 msgstr "查找(^F)"
 
-#: src/ui.cc:2262
+#: src/ui.cc:2267
 msgid "Search forwards"
 msgstr "向前搜索"
 
-#: src/ui.cc:2265
+#: src/ui.cc:2270
 msgid "^Find Backwards"
 msgstr "向后查找(^F)"
 
-#: src/ui.cc:2266
+#: src/ui.cc:2271
 msgid "Search backwards"
 msgstr "向后搜索"
 
-#: src/ui.cc:2269
+#: src/ui.cc:2274
 msgid "Find ^Again"
 msgstr "继续查找(^A)"
 
-#: src/ui.cc:2270
+#: src/ui.cc:2275
 msgid "Repeat the last search"
 msgstr "重复上一次查找"
 
-#: src/ui.cc:2273
+#: src/ui.cc:2278
 #, fuzzy
 msgid "Find Again ^Backwards"
 msgstr "向后查找(^F)"
 
-#: src/ui.cc:2274
+#: src/ui.cc:2279
 #, fuzzy
 msgid "Repeat the last search in the opposite direction"
 msgstr "重复上一次查找"
 
-#: src/ui.cc:2278
+#: src/ui.cc:2283
 msgid "^Limit Display"
 msgstr "限制显示(^L)"
 
-#: src/ui.cc:2279
+#: src/ui.cc:2284
 msgid "Apply a filter to the package list"
 msgstr "使用过滤器过滤软件包列表"
 
-#: src/ui.cc:2282
+#: src/ui.cc:2287
 msgid "^Un-Limit Display"
 msgstr "取消显示限制(^U)"
 
-#: src/ui.cc:2283
+#: src/ui.cc:2288
 msgid "Remove the filter from the package list"
 msgstr "取消软件包列表中过滤器的效果"
 
-#: src/ui.cc:2287
+#: src/ui.cc:2292
 msgid "Find ^Broken"
 msgstr "搜寻损坏(^F)"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2293
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "下列软件包存在未满足的依赖关系："
 
-#: src/ui.cc:2295
+#: src/ui.cc:2300
 #, fuzzy
 msgid "^Preferences"
 msgstr "预依赖于"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2305
 msgid "^UI options"
 msgstr "用户界面选项(^U)"
 
-#: src/ui.cc:2301
+#: src/ui.cc:2306
 msgid "Change the settings which affect the user interface"
 msgstr "修改影响用户界面的设置"
 
-#: src/ui.cc:2304
+#: src/ui.cc:2309
 msgid "^Dependency handling"
 msgstr "处理依赖关系(^D)"
 
-#: src/ui.cc:2305
+#: src/ui.cc:2310
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "改变影响处理依赖关系的设置"
 
-#: src/ui.cc:2308
+#: src/ui.cc:2313
 msgid "^Miscellaneous"
 msgstr "杂项(^M)"
 
-#: src/ui.cc:2309
+#: src/ui.cc:2314
 msgid "Change miscellaneous program settings"
 msgstr "改变程序的杂项设置"
 
-#: src/ui.cc:2315
+#: src/ui.cc:2320
 msgid "^Revert options"
 msgstr "还原选项(^R)"
 
-#: src/ui.cc:2316
+#: src/ui.cc:2321
 msgid "Reset all settings to the system defaults"
 msgstr "把所有项目重设为它们的默认值"
 
-#: src/ui.cc:2327
+#: src/ui.cc:2332
 msgid "^Next"
 msgstr "下一个(^N)"
 
-#: src/ui.cc:2328
+#: src/ui.cc:2333
 msgid "View next display"
 msgstr "查看下一个画面"
 
-#: src/ui.cc:2331
+#: src/ui.cc:2336
 msgid "^Prev"
 msgstr "上一个(^P)"
 
-#: src/ui.cc:2332
+#: src/ui.cc:2337
 msgid "View previous display"
 msgstr "查看上一画面"
 
-#: src/ui.cc:2335
+#: src/ui.cc:2340
 msgid "^Close"
 msgstr "关闭(^C)"
 
-#: src/ui.cc:2336
+#: src/ui.cc:2341
 msgid "Close this display"
 msgstr "关闭此画面"
 
-#: src/ui.cc:2341
+#: src/ui.cc:2346
 msgid "New Package ^View"
 msgstr "新建软件包视图(^V)"
 
-#: src/ui.cc:2342
+#: src/ui.cc:2347
 msgid "Create a new default package view"
 msgstr "创建新的默认软件包视图"
 
-#: src/ui.cc:2345
+#: src/ui.cc:2350
 msgid "Audit ^Recommendations"
 msgstr "检查推荐结果(^R)"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2351
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr "查看推荐您安装，但是现在尚未安装的软件包。"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2354
 msgid "New ^Flat Package List"
 msgstr "新建平面软件包列表(^F)"
 
-#: src/ui.cc:2350
+#: src/ui.cc:2355
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "在一个未分类的列表中查看系统中的所有的软件包"
 
-#: src/ui.cc:2353
+#: src/ui.cc:2358
 msgid "New ^Debtags Browser"
 msgstr "新建 Debtags 浏览器(^D)"
 
-#: src/ui.cc:2355
+#: src/ui.cc:2360
 msgid "Browse packages using Debtags data"
 msgstr "用 Debtags 的信息来浏览软件包"
 
-#: src/ui.cc:2358
+#: src/ui.cc:2363
 msgid "New Categorical ^Browser"
 msgstr "新建分类浏览器(^B)"
 
-#: src/ui.cc:2360
+#: src/ui.cc:2365
 msgid "Browse packages by category"
 msgstr "分类浏览软件包"
 
-#: src/ui.cc:2368
+#: src/ui.cc:2373
 msgid "^About"
 msgstr "关于(^A)"
 
-#: src/ui.cc:2369
+#: src/ui.cc:2374
 msgid "View information about this program"
 msgstr "查看关于此程序的信息"
 
-#: src/ui.cc:2372
+#: src/ui.cc:2377
 msgid "^Help"
 msgstr "帮助(^H)"
 
-#: src/ui.cc:2373
+#: src/ui.cc:2378
 msgid "View the on-line help"
 msgstr "查看在线帮助"
 
-#: src/ui.cc:2375
+#: src/ui.cc:2380
 msgid "User's ^Manual"
 msgstr "用户手册(^M)"
 
-#: src/ui.cc:2376
+#: src/ui.cc:2381
 msgid "View the detailed program manual"
 msgstr "查看详细的程序使用手册"
 
-#: src/ui.cc:2379
+#: src/ui.cc:2384
 msgid "^FAQ"
 msgstr "常见问题回答(^F)"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2388
 msgid "^News"
 msgstr "新闻(^N)"
 
-#: src/ui.cc:2387
+#: src/ui.cc:2392
 msgid "^License"
 msgstr "许可证(^L)"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2393
 #, fuzzy
 msgid "View the terms under which you may copy and distribute aptiutde"
 msgstr "查看您可以在何种条款下拷贝该程序"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2533
 msgid "Actions"
 msgstr "动作"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2536
 msgid "Resolver"
 msgstr "解决手段"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2537
 msgid "Search"
 msgstr "搜索"
 
-#: src/ui.cc:2533
+#: src/ui.cc:2538
 msgid "Options"
 msgstr "选项"
 
-#: src/ui.cc:2534
+#: src/ui.cc:2539
 msgid "Views"
 msgstr "视图"
 
-#: src/ui.cc:2945
+#: src/ui.cc:2950
 msgid "yes_key"
 msgstr "y"
 
-#: src/ui.cc:2946
+#: src/ui.cc:2951
 msgid "no_key"
 msgstr "n"