Update the pofiles.

1 files changed, 986 insertions, 529 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7a171a7a..5d53c3c6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2008-11-11 19:42-0800\n"
+"POT-Creation-Date: 2009-01-18 16:00-0800\n"
 "PO-Revision-Date: 2008-09-02 21:41+0800\n"
 "Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -590,7 +590,7 @@ msgstr "解决器发生致命错误"
 msgid "[%d(%d)/...] Resolving dependencies"
 msgstr "[%d(%d)/...] 正在解决依赖关系"
 
-#: src/broken_indicator.cc:311 src/gtk/resolver.cc:345
+#: src/broken_indicator.cc:311 src/gtk/resolver.cc:307 src/gtk/resolver.cc:488
 #: src/solution_dialog.cc:140 src/solution_screen.cc:542
 msgid "Internal error: unexpected null solution."
 msgstr "内部错误：意料之外的空解决方案。"
@@ -779,16 +779,16 @@ msgstr ""
 msgid "Bad action character '%c'\n"
 msgstr "非法的动作字符“%c”\n"
 
-#: src/cmdline/cmdline_changelog.cc:99
+#: src/cmdline/cmdline_changelog.cc:102
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "无法执行 sensible-pager，这是一个正常运行的 Debian 系统吗？"
 
-#: src/cmdline/cmdline_changelog.cc:157
+#: src/cmdline/cmdline_changelog.cc:160
 #, c-format
 msgid "%s is not an official Debian package, cannot display its changelog."
 msgstr "%s 不是官方 Debian 软件包，无法显示其变更日志。"
 
-#: src/cmdline/cmdline_changelog.cc:246
+#: src/cmdline/cmdline_changelog.cc:256
 #, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "无法找到 %s 的变更日志"
@@ -839,7 +839,7 @@ msgid ""
 msgstr "无法安全解决依赖关系，请尝试使用 --full-resolver 来运行。\n"
 
 #: src/cmdline/cmdline_do_action.cc:313 src/cmdline/cmdline_simulate.cc:35
-#: src/cmdline/cmdline_upgrade.cc:175 src/main.cc:755
+#: src/cmdline/cmdline_upgrade.cc:175 src/main.cc:757
 #, c-format
 msgid "Abort.\n"
 msgstr "放弃。\n"
@@ -947,7 +947,7 @@ msgid_plural "(for %s)"
 msgstr[0] "(用于 %s)"
 
 #: src/cmdline/cmdline_prompt.cc:298 src/cmdline/cmdline_show.cc:437
-#: src/cmdline/cmdline_why.cc:194 src/gtk/dependency_chains_tab.cc:158
+#: src/cmdline/cmdline_why.cc:194 src/gtk/dependency_chains_tab.cc:199
 msgid "Provides"
 msgstr "提供"
 
@@ -970,17 +970,17 @@ msgstr "但是 %s 已被安装并且被保持不升级。"
 msgid "but %s is installed."
 msgstr "但是 %s 已安装。"
 
-#: src/cmdline/cmdline_prompt.cc:545 src/cmdline/cmdline_show_broken.cc:83
+#: src/cmdline/cmdline_prompt.cc:545
 #, c-format
 msgid "but it is not installable"
 msgstr "但是它不是可安装的"
 
-#: src/cmdline/cmdline_prompt.cc:549 src/cmdline/cmdline_show_broken.cc:87
+#: src/cmdline/cmdline_prompt.cc:549 src/cmdline/cmdline_show_broken.cc:93
 #, c-format
 msgid " which is a virtual package."
 msgstr " 这是一个虚拟软件包。"
 
-#: src/cmdline/cmdline_prompt.cc:552 src/cmdline/cmdline_show_broken.cc:90
+#: src/cmdline/cmdline_prompt.cc:552 src/cmdline/cmdline_show_broken.cc:96
 #, c-format
 msgid " or"
 msgstr " 或者"
@@ -1624,7 +1624,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr "我想解决依赖关系，但没有创建依赖关系解决器"
 
-#: src/cmdline/cmdline_resolver.cc:530 src/gtk/resolver.cc:317
+#: src/cmdline/cmdline_resolver.cc:530 src/gtk/resolver.cc:614
 #: src/solution_dialog.cc:127 src/solution_screen.cc:519
 msgid "Resolving dependencies..."
 msgstr "依赖关系分析中..."
@@ -1725,13 +1725,25 @@ msgstr "用 iconv 转换 %s 失败。\n"
 msgid "search: You must provide at least one search term\n"
 msgstr "查找：您必须提供至少一个查找项\n"
 
-#: src/cmdline/cmdline_show_broken.cc:113
+#: src/cmdline/cmdline_show_broken.cc:86
+#, fuzzy, c-format
+#| msgid "but it is not installable"
+msgid "but it is not installable."
+msgstr "但是它不是可安装的"
+
+#: src/cmdline/cmdline_show_broken.cc:88
+#, fuzzy, c-format
+#| msgid "but %s is to be installed."
+msgid "but it is not going to be installed."
+msgstr "但是 %s 将被安装。"
+
+#: src/cmdline/cmdline_show_broken.cc:119
 #, c-format
 msgid "The following packages have unmet dependencies:\n"
 msgstr "下列软件包存在未满足的依赖关系：\n"
 
 #: src/cmdline/cmdline_show.cc:172 src/cmdline/cmdline_show.cc:416
-#: src/gtk/resolver.cc:208 src/solution_fragment.cc:58
+#: src/gtk/resolver.cc:218 src/solution_fragment.cc:58
 msgid "<NULL>"
 msgstr "<NULL>"
 
@@ -1853,7 +1865,7 @@ msgstr "是"
 msgid "New"
 msgstr "新"
 
-#: src/cmdline/cmdline_show.cc:383 src/gtk/gui.cc:89
+#: src/cmdline/cmdline_show.cc:383 src/gtk/gui.cc:91
 msgid "Forbidden version"
 msgstr "被禁止的版本"
 
@@ -1865,8 +1877,8 @@ msgstr "自动安装"
 msgid "no"
 msgstr "否"
 
-#: src/cmdline/cmdline_show.cc:391 src/gtk/packagestab.cc:414
-#: src/gtk/previewtab.cc:215
+#: src/cmdline/cmdline_show.cc:391 src/gtk/packagestab.cc:665
+#: src/gtk/previewtab.cc:225
 msgid "Version: "
 msgstr "版本号："
 
@@ -1908,6 +1920,7 @@ msgid "MD5sum: "
 msgstr "MD5sum: "
 
 #: src/cmdline/cmdline_show.cc:413 src/cmdline/cmdline_show.cc:416
+#: src/gtk/entityview.cc:606
 msgid "Archive"
 msgstr "存档"
 
@@ -1943,8 +1956,8 @@ msgstr "代替"
 msgid "Obsoletes"
 msgstr "过期"
 
-#: src/cmdline/cmdline_show.cc:441 src/gtk/info.cc:624
-#: src/gtk/packagestab.cc:422 src/gtk/previewtab.cc:223
+#: src/cmdline/cmdline_show.cc:441 src/gtk/info.cc:692
+#: src/gtk/packagestab.cc:673 src/gtk/previewtab.cc:233
 #: src/pkg_info_screen.cc:102
 msgid "Description: "
 msgstr "描述："
@@ -2088,8 +2101,8 @@ msgstr "当前"
 msgid "Candidate"
 msgstr "候选"
 
-#: src/cmdline/cmdline_why.cc:285 src/gtk/aptitude.glade:1630
-#: src/gtk/gui.cc:82
+#: src/cmdline/cmdline_why.cc:285 src/gtk/aptitude.glade:1906
+#: src/gtk/gui.cc:84 src/gtk/gui.cc:1144
 msgid "Install"
 msgstr "安装"
 
@@ -2154,49 +2167,49 @@ msgstr "    ++   --> 跳过，父节点不是选定的版本\n"
 msgid "    ++   --> skipping, the dep is satisfied by the current version\n"
 msgstr "    ++   --> 跳过，当前版本已满足依赖\n"
 
-#: src/cmdline/cmdline_why.cc:526
+#: src/cmdline/cmdline_why.cc:529
 msgid "    ++   --> ENQUEUING\n"
 msgstr "    ++   --> 加入队列\n"
 
-#: src/cmdline/cmdline_why.cc:533
+#: src/cmdline/cmdline_why.cc:536
 msgid "    ++   --> skipping, version check failed\n"
 msgstr "    ++   --> 跳过，版本检查失败\n"
 
-#: src/cmdline/cmdline_why.cc:551
+#: src/cmdline/cmdline_why.cc:554
 #, c-format
 msgid "    ++   --> ENQUEUING %s Provides %s\n"
 msgstr "    ++   --> 加入队列 %s 提供了 %s\n"
 
-#: src/cmdline/cmdline_why.cc:683
+#: src/cmdline/cmdline_why.cc:688
 #, c-format
 msgid "Starting search with parameters %ls\n"
 msgstr "开始搜索参数 %ls\n"
 
-#: src/cmdline/cmdline_why.cc:906
+#: src/cmdline/cmdline_why.cc:903
 msgid "Skipping this solution, I've already seen it.\n"
 msgstr "跳过这个解决方案，我已经看过了。\n"
 
-#: src/cmdline/cmdline_why.cc:981
+#: src/cmdline/cmdline_why.cc:1005
 #, c-format
 msgid "Unable to find a reason to remove %s.\n"
 msgstr "未能找到理由以移除 %s。\n"
 
-#: src/cmdline/cmdline_why.cc:983
+#: src/cmdline/cmdline_why.cc:1007
 #, c-format
 msgid "Unable to find a reason to install %s.\n"
 msgstr "未能找到理由以安装 %s。\n"
 
-#: src/cmdline/cmdline_why.cc:1028 src/cmdline/cmdline_why.cc:1054
-#: src/cmdline/cmdline_why.cc:1109
+#: src/cmdline/cmdline_why.cc:1052 src/cmdline/cmdline_why.cc:1078
+#: src/cmdline/cmdline_why.cc:1133
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "名称为“%s”的软件包的软件包不存在。"
 
-#: src/cmdline/cmdline_why.cc:1058
+#: src/cmdline/cmdline_why.cc:1082
 msgid "Unable to parse some match patterns."
 msgstr "无法分析某些匹配模式"
 
-#: src/cmdline/cmdline_why.cc:1082
+#: src/cmdline/cmdline_why.cc:1106
 #, c-format
 msgid "%s: this command requires at least one argument (the package to query)."
 msgstr "%s：这个命令要求至少一个参数(要查询的软件包)。"
@@ -2209,7 +2222,7 @@ msgstr "未满足的"
 msgid "UNAVAILABLE"
 msgstr "不可用"
 
-#: src/desc_render.cc:133 src/gtk/aptitude.glade:1114
+#: src/desc_render.cc:133 src/gtk/aptitude.glade:1110
 msgid "Tags"
 msgstr "标签"
 
@@ -2241,11 +2254,11 @@ msgstr "已下载 %sB，耗时 %s (%sB/s)。"
 msgid "%n%nSome files were not downloaded successfully."
 msgstr "%n%n某些文件无法下载。"
 
-#: src/download_list.cc:98 src/download_list.cc:345 src/gtk/download.cc:340
+#: src/download_list.cc:98 src/download_list.cc:345 src/gtk/download.cc:389
 msgid "Continue"
 msgstr "继续"
 
-#: src/download_list.cc:100 src/mine/cmine.cc:311 src/mine/cmine.cc:376
+#: src/download_list.cc:100 src/mine/cmine.cc:303 src/mine/cmine.cc:368
 msgid "Cancel"
 msgstr "取消"
 
@@ -2272,12 +2285,12 @@ msgstr " [ %i%% ]"
 msgid "Downloading... "
 msgstr "正在下载... "
 
-#: src/download_list.cc:340 src/gtk/download.cc:337
+#: src/download_list.cc:340 src/gtk/download.cc:386
 #, c-format
 msgid "Please insert the disc labeled \"%s\" into the drive \"%s\""
 msgstr "请将标号为“%s”的磁盘插入驱动器“%s”"
 
-#: src/download_list.cc:347 src/gtk/download.cc:341
+#: src/download_list.cc:347 src/gtk/download.cc:390
 msgid "Abort"
 msgstr "放弃"
 
@@ -2437,8 +2450,31 @@ msgstr ""
 "无法锁定缓存文件；这通常意味着 dpkg 或另一个 apt 工具已经在安装软件包。正在以"
 "只读方式打开；您对软件包状态所作的任何改变都“不会”被保存！"
 
-#: src/generic/apt/aptitude_resolver.cc:39
-msgid "Invalid hint: expected an action, but found nothing."
+#: src/generic/apt/aptitude_resolver.cc:170
+#, c-format
+msgid "Invalid hint \"%s\": expected an action, but found nothing."
+msgstr ""
+
+#: src/generic/apt/aptitude_resolver.cc:188
+#, c-format
+msgid "Invalid hint \"%s\": expected a target, but found nothing."
+msgstr ""
+
+#: src/generic/apt/aptitude_resolver.cc:213
+#, c-format
+msgid "Invalid hint \"%s\": invalid target: %s"
+msgstr ""
+
+#: src/generic/apt/aptitude_resolver.cc:231
+#, c-format
+msgid "Invalid hint \"%s\": trailing junk after the version."
+msgstr ""
+
+#: src/generic/apt/aptitude_resolver.cc:310
+#, c-format
+msgid ""
+"Invalid hint: the action \"%s\" should be \"approve\", \"reject\", or a "
+"number."
 msgstr ""
 
 #: src/generic/apt/download_install_manager.cc:60
@@ -2658,39 +2694,39 @@ msgstr ""
 "\n"
 "日志完成。\n"
 
-#: src/generic/apt/matching/parse.cc:303
+#: src/generic/apt/matching/parse.cc:307
 #, c-format
 msgid "Unknown action type: %s"
 msgstr "未知的操作类型：%s"
 
-#: src/generic/apt/matching/parse.cc:344
+#: src/generic/apt/matching/parse.cc:348
 #, c-format
 msgid "Unterminated literal string after %s"
 msgstr "无法对 %s 之后的未结束的文字字符串"
 
-#: src/generic/apt/matching/parse.cc:441
+#: src/generic/apt/matching/parse.cc:445
 #, c-format
 msgid "Unknown priority %s"
 msgstr "未知的优先级：%s"
 
-#: src/generic/apt/matching/parse.cc:460
+#: src/generic/apt/matching/parse.cc:464
 #, c-format
 msgid "Match pattern ends unexpectedly (expected '%c')."
 msgstr "匹配模式异常结束(预期为'%c')。"
 
-#: src/generic/apt/matching/parse.cc:463
+#: src/generic/apt/matching/parse.cc:467
 #, c-format
 msgid "Expected '%c', got '%c'."
 msgstr "预期得到“%c”，却得到“%c”。"
 
-#: src/generic/apt/matching/parse.cc:800
-#: src/generic/apt/matching/parse.cc:1239
-#: src/generic/apt/matching/parse.cc:1279
+#: src/generic/apt/matching/parse.cc:807
+#: src/generic/apt/matching/parse.cc:1255
+#: src/generic/apt/matching/parse.cc:1295
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr "未知依赖类型：%s"
 
-#: src/generic/apt/matching/parse.cc:853
+#: src/generic/apt/matching/parse.cc:860
 #, fuzzy, c-format
 #| msgid "Unknown matcher type: \"%s\"."
 msgid "Unknown term type: \"%s\"."
@@ -2698,7 +2734,7 @@ msgstr "未知的匹配器类型：“%s”。"
 
 #. ForTranslators: Question marks ("?") are used as prefix for function names.
 #. Leave the question marks attached to the string placeholders.
-#: src/generic/apt/matching/parse.cc:867 src/generic/apt/matching/parse.cc:876
+#: src/generic/apt/matching/parse.cc:874 src/generic/apt/matching/parse.cc:883
 #, fuzzy, c-format
 #| msgid ""
 #| "The ?%s matcher must be used in a \"wide\" context (a top-level context, "
@@ -2709,37 +2745,45 @@ msgid ""
 msgstr ""
 "?%s 匹配器必须在“宽”上下文中使用(顶层上下文，或者被 ?%s 包含的上下文)。"
 
-#: src/generic/apt/matching/parse.cc:1100
+#: src/generic/apt/matching/parse.cc:1113
 msgid "Unmatched '('"
 msgstr "不匹配的“(”"
 
-#: src/generic/apt/matching/parse.cc:1245
+#: src/generic/apt/matching/parse.cc:1261
 msgid "Provides: cannot be broken"
 msgstr "“提供”类型不可能损坏"
 
-#: src/generic/apt/matching/parse.cc:1301
+#: src/generic/apt/matching/parse.cc:1317
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr "未知的模式类型：%c"
 
-#: src/generic/apt/matching/parse.cc:1315
+#: src/generic/apt/matching/parse.cc:1334
 msgid "Can't search for \"\""
 msgstr "无法搜索“”"
 
-#: src/generic/apt/matching/parse.cc:1342
+#: src/generic/apt/matching/parse.cc:1362
 msgid "Unexpected empty expression"
 msgstr "意外的空表达式"
 
-#: src/generic/apt/matching/parse.cc:1371
+#: src/generic/apt/matching/parse.cc:1391
 #, fuzzy, c-format
 #| msgid "Badly formed expression"
 msgid "Badly formed expression: expected '|', got '%c'"
 msgstr "错误格式的表达式"
 
-#: src/generic/apt/matching/parse.cc:1412
+#: src/generic/apt/matching/parse.cc:1438
 msgid "Unexpected ')'"
 msgstr "意外的“)”"
 
+#: src/generic/apt/parse_dpkg_status.cc:72
+msgid "<aptitude: internal parse error: no apostrophe>"
+msgstr ""
+
+#: src/generic/apt/parse_dpkg_status.cc:80
+msgid "<aptitude: internal parse error: missing terminal apostrophe>"
+msgstr ""
+
 #: src/generic/apt/pkg_acqfile.cc:50
 #, c-format
 msgid ""
@@ -2755,7 +2799,7 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "软件包索引文件被损坏。软件包 %s 无 Filename：域。"
 
-#: src/generic/apt/pkg_changelog.cc:189 src/view_changelog.cc:270
+#: src/generic/apt/pkg_changelog.cc:215 src/view_changelog.cc:270
 #, c-format
 msgid "ChangeLog of %s"
 msgstr "%s 的变更日志"
@@ -2841,506 +2885,543 @@ msgstr "无法关闭文件夹“%s”"
 msgid "Unable to remove directory \"%s\""
 msgstr "无法删除目录“%s”"
 
-#: src/gtk/aptitude.glade:17
+#: src/gtk/aptitude.glade:6
+msgid "Aptitude Package Manager"
+msgstr ""
+
+#: src/gtk/aptitude.glade:18
 #, fuzzy
 #| msgid "False"
 msgid "_File"
 msgstr "假"
 
-#: src/gtk/aptitude.glade:25 src/ui.cc:2219
+#: src/gtk/aptitude.glade:26 src/ui.cc:2219
 msgid "Perform all pending installs and removals"
 msgstr "执行所有等待执行的安装和卸载任务"
 
-#: src/gtk/aptitude.glade:26
+#: src/gtk/aptitude.glade:27
 #, fuzzy
 #| msgid "^Install/remove packages"
-msgid "_Install/remove packages"
+msgid "_Install/Remove Packages"
 msgstr "安装/卸载软件包(^I)"
 
-#: src/gtk/aptitude.glade:39 src/ui.cc:2222
+#: src/gtk/aptitude.glade:42 src/ui.cc:2222
 msgid "Check for new versions of packages"
 msgstr "正在检查新版本的软件包"
 
-#: src/gtk/aptitude.glade:40
+#: src/gtk/aptitude.glade:43
 #, fuzzy
 #| msgid "^Update package list"
-msgid "_Update package list"
+msgid "_Update Package List"
 msgstr "更新软件包列表(^U)"
 
-#: src/gtk/aptitude.glade:58 src/ui.cc:2227
+#: src/gtk/aptitude.glade:63 src/ui.cc:2227
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "为所有未被保持现状的软件包加上升级标记"
 
-#: src/gtk/aptitude.glade:59
+#: src/gtk/aptitude.glade:64
 #, fuzzy
 #| msgid "Mark Up^gradable"
 msgid "Mark Up_gradable"
 msgstr "标记可升级的(^g)"
 
-#: src/gtk/aptitude.glade:72 src/ui.cc:2232
+#: src/gtk/aptitude.glade:79 src/ui.cc:2232
 msgid "Forget which packages are \"new\""
 msgstr "忘记哪些软件包是“新”的"
 
-#: src/gtk/aptitude.glade:73
+#: src/gtk/aptitude.glade:80
 #, fuzzy
 #| msgid "^Forget new packages"
-msgid "_Forget new packages"
+msgid "_Forget New Packages"
 msgstr "忘记新软件包(^F)"
 
-#: src/gtk/aptitude.glade:86 src/ui.cc:2236
+#: src/gtk/aptitude.glade:94 src/ui.cc:2236
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr "执行所有等待执行的安装、卸载、保持和升级任务"
 
-#: src/gtk/aptitude.glade:87
+#: src/gtk/aptitude.glade:95
 #, fuzzy
 #| msgid "Canc^el pending actions"
-msgid "Canc_el pending actions"
+msgid "Canc_el Pending Actions"
 msgstr "取消待执行的动作(^E)"
 
-#: src/gtk/aptitude.glade:100 src/ui.cc:2240
+#: src/gtk/aptitude.glade:109 src/ui.cc:2240
 msgid "Delete package files which were previously downloaded"
 msgstr "删除以前下载的软件包文件"
 
-#: src/gtk/aptitude.glade:101
+#: src/gtk/aptitude.glade:110
 #, fuzzy
 #| msgid "^Clean package cache"
-msgid "_Clean package cache"
+msgid "C_lean Package Cache"
 msgstr "清除软件包缓存(^C)"
 
-#: src/gtk/aptitude.glade:114 src/ui.cc:2244
+#: src/gtk/aptitude.glade:124 src/ui.cc:2244
 msgid "Delete package files which can no longer be downloaded"
 msgstr "删除无法再下载的软件包文件"
 
-#: src/gtk/aptitude.glade:115
+#: src/gtk/aptitude.glade:125
 #, fuzzy
 #| msgid "Clean ^obsolete files"
-msgid "Clean _obsolete files"
+msgid "Clean _Obsolete Files"
 msgstr "关闭过期文件(^O)"
 
-#: src/gtk/aptitude.glade:133 src/ui.cc:2251
+#: src/gtk/aptitude.glade:144 src/ui.cc:2251
 msgid "Reload the package cache"
 msgstr "重新载入软件包缓存"
 
-#: src/gtk/aptitude.glade:134
+#: src/gtk/aptitude.glade:145
 #, fuzzy
 #| msgid "^Reload package cache"
-msgid "_Reload package cache"
+msgid "_Reload Package Cache"
 msgstr "重新载入软件包缓存(^R)"
 
-#: src/gtk/aptitude.glade:147 src/ui.cc:1700 src/ui.cc:2256
+#: src/gtk/aptitude.glade:159 src/ui.cc:1700 src/ui.cc:2256
 msgid "Waste time trying to find mines"
 msgstr "通过扫雷来消磨时间"
 
-#: src/gtk/aptitude.glade:148
+#: src/gtk/aptitude.glade:160
 #, fuzzy
 #| msgid "^Play Minesweeper"
 msgid "_Play Minesweeper"
 msgstr "玩扫雷游戏(^P)"
 
-#: src/gtk/aptitude.glade:166 src/ui.cc:2261
+#: src/gtk/aptitude.glade:179 src/ui.cc:2261
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
 msgstr "运行“su”成为 root。这将重新启动程序，但是您的设置将会被保存下来。"
 
-#: src/gtk/aptitude.glade:167
+#: src/gtk/aptitude.glade:180
 #, fuzzy
 #| msgid "Become root"
-msgid "_Become root"
+msgid "_Become Root"
 msgstr "变成 root"
 
-#: src/gtk/aptitude.glade:180 src/ui.cc:2264
+#: src/gtk/aptitude.glade:194 src/ui.cc:2264
 msgid "Exit the program"
 msgstr "退出此程序"
 
-#: src/gtk/aptitude.glade:181
+#: src/gtk/aptitude.glade:195
 #, fuzzy
 #| msgid "^Quit"
 msgid "_Quit"
 msgstr "退出(^Q)"
 
-#: src/gtk/aptitude.glade:197
+#: src/gtk/aptitude.glade:212
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:205 src/ui.cc:2271
+#: src/gtk/aptitude.glade:220 src/ui.cc:2271
 msgid "Undo the last package operation or group of operations"
 msgstr "撤销最近一次或者一组软件包操作"
 
-#: src/gtk/aptitude.glade:206 src/ui.cc:2270 src/ui.cc:2650
-msgid "Undo"
-msgstr "撤消"
+#: src/gtk/aptitude.glade:221
+msgid "gtk-undo"
+msgstr ""
 
-#: src/gtk/aptitude.glade:224
+#: src/gtk/aptitude.glade:234
 msgid "gtk-cut"
 msgstr ""
 
-#: src/gtk/aptitude.glade:232
+#: src/gtk/aptitude.glade:242
 msgid "gtk-copy"
 msgstr ""
 
-#: src/gtk/aptitude.glade:240
+#: src/gtk/aptitude.glade:250
 msgid "gtk-paste"
 msgstr ""
 
-#: src/gtk/aptitude.glade:248
+#: src/gtk/aptitude.glade:258
 #, fuzzy
 #| msgid "delete"
 msgid "gtk-delete"
 msgstr "删除"
 
-#: src/gtk/aptitude.glade:260
+#: src/gtk/aptitude.glade:270
 #, fuzzy
 #| msgid "Package"
 msgid "_Package"
 msgstr "软件包"
 
-#: src/gtk/aptitude.glade:268 src/ui.cc:2280
-msgid "Flag the currently selected package for installation or upgrade"
-msgstr "标记当前选择的软件包以安装或者升级"
-
-#: src/gtk/aptitude.glade:269
-#, fuzzy
-#| msgid "Install"
-msgid "_Install"
-msgstr "安装"
-
-#: src/gtk/aptitude.glade:282 src/ui.cc:2284
-msgid "Flag the currently selected package for removal"
-msgstr "标记当前选择的软件包以删除"
-
-#: src/gtk/aptitude.glade:283
-#, fuzzy
-#| msgid "Remove"
-msgid "_Remove"
-msgstr "删除"
-
-#: src/gtk/aptitude.glade:296 src/ui.cc:2288
-msgid ""
-"Flag the currently selected package and its configuration files for removal"
-msgstr "标记当前选择的软件包和它的配置文件以删除"
-
-#: src/gtk/aptitude.glade:297
-#, fuzzy
-#| msgid "^Purge"
-msgid "_Purge"
-msgstr "清除(^P)"
-
-#: src/gtk/aptitude.glade:310
-msgid ""
-"Cancel any pending installation, upgrade, or removal of the currently "
-"selected package, and remove any hold that was set on the package"
-msgstr ""
-
-#: src/gtk/aptitude.glade:311
+#: src/gtk/aptitude.glade:282
 #, fuzzy
-#| msgid "Keep"
-msgid "_Keep"
-msgstr "保持"
-
-#: src/gtk/aptitude.glade:324 src/ui.cc:2296
-msgid ""
-"Cancel any action on the selected package, and protect it from future "
-"upgrades"
-msgstr "取消选定软件包上的任何动作，并且保护它免于以后被升级"
-
-#: src/gtk/aptitude.glade:325
-#, fuzzy
-#| msgid "Hold"
-msgid "_Hold"
-msgstr "保持"
+#| msgid "Views"
+msgid "_View"
+msgstr "视图"
 
-#: src/gtk/aptitude.glade:338 src/ui.cc:2300
-msgid ""
-"Mark the selected package as having been automatically installed; it will "
-"automatically be removed if no other packages depend on it"
+#: src/gtk/aptitude.glade:290
+msgid "Change which columns are visible in the currently active view."
 msgstr ""
-"将所选定的软件包标记为自动安装；如果没有其它软件包依赖于它，它将会被自动删除"
 
-#: src/gtk/aptitude.glade:339
-#, fuzzy
-#| msgid "Mark ^Auto"
-msgid "Mark _Auto"
-msgstr "标记为自动安装(^A)"
-
-#: src/gtk/aptitude.glade:352 src/ui.cc:2304
-msgid ""
-"Mark the selected package as having been manually installed; it will not be "
-"removed unless you manually remove it"
+#: src/gtk/aptitude.glade:291
+msgid "_Edit Columns..."
 msgstr ""
-"将所选定的软件包标记为手动安装；除非您手动删除该软件包，否则它将不会被删除"
-
-#: src/gtk/aptitude.glade:353
-#, fuzzy
-#| msgid "Mark ^Manual"
-msgid "Mark _Manual"
-msgstr "标记为手动安装(^M)"
-
-#: src/gtk/aptitude.glade:366 src/ui.cc:2308
-msgid ""
-"Forbid the candidate version of the selected package from being installed; "
-"newer versions of the package will be installed as usual"
-msgstr "禁止安装选定软件包的候选版本；该软件包的新版本将可以正常安装"
 
-#: src/gtk/aptitude.glade:367
-#, fuzzy
-#| msgid "^Forbid Version"
-msgid "_Forbid Version"
-msgstr "禁止版本(^F)"
-
-#: src/gtk/aptitude.glade:384
-#, fuzzy
-#| msgid "Views"
-msgid "_Views"
-msgstr "视图"
-
-#: src/gtk/aptitude.glade:392
+#: src/gtk/aptitude.glade:310
 msgid ""
 "View errors that have occurred in the apt system since the program was "
 "started."
 msgstr ""
 
-#: src/gtk/aptitude.glade:393
-msgid "View apt _errors"
+#: src/gtk/aptitude.glade:311
+msgid "View Apt _Errors"
 msgstr ""
 
-#: src/gtk/aptitude.glade:400
+#: src/gtk/aptitude.glade:325
 msgid "Find chains of dependencies linking one package to another."
 msgstr ""
 
-#: src/gtk/aptitude.glade:401
+#: src/gtk/aptitude.glade:326
 #, fuzzy
 #| msgid "Dependency handling"
 msgid "Find _Dependency Chains"
 msgstr "处理依赖关系"
 
-#: src/gtk/aptitude.glade:412
+#: src/gtk/aptitude.glade:344
 #, fuzzy
 #| msgid "Help"
 msgid "_Help"
 msgstr "帮助"
 
-#: src/gtk/aptitude.glade:420
+#: src/gtk/aptitude.glade:352
 msgid "gtk-about"
 msgstr ""
 
-#: src/gtk/aptitude.glade:440 src/gtk/aptitude.glade:723
+#: src/gtk/aptitude.glade:372 src/gtk/aptitude.glade:671
+#: src/gtk/dashboardtab.cc:234 src/gtk/gui.cc:1320 src/gtk/gui.cc:1511
 msgid "Dashboard"
 msgstr ""
 
-#: src/gtk/aptitude.glade:459
+#: src/gtk/aptitude.glade:391
 #, fuzzy
 #| msgid "List Update"
 msgid "Update"
 msgstr "列表更新"
 
-#: src/gtk/aptitude.glade:469 src/gtk/aptitude.glade:890 src/ui.cc:837
-#: src/ui.cc:839 src/ui.cc:884 src/ui.cc:886 src/ui.cc:912 src/ui.cc:914
-#: src/ui.cc:935 src/ui.cc:937
+#: src/gtk/aptitude.glade:401 src/gtk/aptitude.glade:883 src/gtk/gui.cc:1050
+#: src/ui.cc:837 src/ui.cc:839 src/ui.cc:884 src/ui.cc:886 src/ui.cc:912
+#: src/ui.cc:914 src/ui.cc:935 src/ui.cc:937
 msgid "Packages"
 msgstr "软件包"
 
-#: src/gtk/aptitude.glade:479 src/gtk/aptitude.glade:1195 src/ui.cc:1336
+#: src/gtk/aptitude.glade:411 src/gtk/aptitude.glade:1191 src/gtk/gui.cc:755
+#: src/gtk/previewtab.cc:116 src/ui.cc:1336
 msgid "Preview"
 msgstr "预览"
 
-#: src/gtk/aptitude.glade:489 src/gtk/aptitude.glade:1289 src/ui.cc:2652
+#: src/gtk/aptitude.glade:421 src/gtk/aptitude.glade:1352 src/gtk/gui.cc:750
+#: src/ui.cc:2652
 msgid "Resolver"
 msgstr "解决手段"
 
-#: src/gtk/aptitude.glade:499
+#: src/gtk/aptitude.glade:431
 #, fuzzy
 #| msgid "Installed"
 msgid "Install/Remove"
 msgstr "已安装"
 
-#: src/gtk/aptitude.glade:529 src/gtk/aptitude.glade:798
-#: src/gtk/aptitude.glade:1352 src/gtk/aptitude.glade:1445
+#: src/gtk/aptitude.glade:462 src/gtk/aptitude.glade:748
+#: src/gtk/aptitude.glade:1418 src/gtk/aptitude.glade:1555
 #, fuzzy
 #| msgid "Search"
 msgid "Search:"
 msgstr "搜索"
 
-#: src/gtk/aptitude.glade:549 src/gtk/aptitude.glade:818
-#: src/gtk/aptitude.glade:1372 src/gtk/aptitude.glade:1465
+#: src/gtk/aptitude.glade:482 src/gtk/aptitude.glade:768
+#: src/gtk/aptitude.glade:1438 src/gtk/aptitude.glade:1575
 msgid "gtk-find"
 msgstr ""
 
-#: src/gtk/aptitude.glade:632
+#: src/gtk/aptitude.glade:500 src/gtk/aptitude.glade:786
+#: src/gtk/aptitude.glade:1381 src/gtk/aptitude.glade:1456
+#: src/gtk/aptitude.glade:1593
+#, fuzzy
+#| msgid "Err "
+msgid "Errors"
+msgstr "错误 "
+
+#: src/gtk/aptitude.glade:580
 #, fuzzy
 #| msgid "Upgrade"
 msgid "Upgrade Summary"
 msgstr "升级"
 
-#: src/gtk/aptitude.glade:661
+#: src/gtk/aptitude.glade:609
 #, fuzzy
 #| msgid "Source Package: "
 msgid "Selected Package"
 msgstr "源码软件包："
 
-#: src/gtk/aptitude.glade:689 src/gtk/gui.cc:84
+#: src/gtk/aptitude.glade:637 src/gtk/gui.cc:86 src/gtk/gui.cc:1135
 msgid "Upgrade"
 msgstr "升级"
 
-#: src/gtk/aptitude.glade:706
+#: src/gtk/aptitude.glade:654
 msgid "<b>Available Upgrades:</b>"
 msgstr ""
 
-#: src/gtk/aptitude.glade:754
+#: src/gtk/aptitude.glade:702 src/gtk/tab.cc:64
 #, fuzzy
 #| msgid "[Downloaded]"
 msgid "Download"
 msgstr "[已下载]"
 
-#: src/gtk/aptitude.glade:954
+#: src/gtk/aptitude.glade:803 src/gtk/aptitude.glade:1473
+#: src/gtk/aptitude.glade:1610
+msgid "Show "
+msgstr ""
+
+#: src/gtk/aptitude.glade:949
 msgid "<span size=\"xx-large\">Versions:</span>"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1015
+#: src/gtk/aptitude.glade:1011
 #, fuzzy
 #| msgid "Dependencies of %s"
 msgid "Dependencies"
 msgstr "%s 的依赖关系"
 
-#: src/gtk/aptitude.glade:1045
+#: src/gtk/aptitude.glade:1041
 #, fuzzy
 #| msgid "^Changelog"
 msgid "Changelog"
 msgstr "变更日志(^C)"
 
-#: src/gtk/aptitude.glade:1074
+#: src/gtk/aptitude.glade:1070
 #, fuzzy
 #| msgid "False"
 msgid "Files"
 msgstr "假"
 
-#: src/gtk/aptitude.glade:1085
+#: src/gtk/aptitude.glade:1081
 msgid "popcon"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1094
+#: src/gtk/aptitude.glade:1090
 msgid "Popcon"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1105
+#: src/gtk/aptitude.glade:1101
 #, fuzzy
 #| msgid "Tags"
 msgid "tags"
 msgstr "标签"
 
-#: src/gtk/aptitude.glade:1136
+#: src/gtk/aptitude.glade:1132 src/gtk/info.cc:727
 #, fuzzy
 #| msgid "no"
 msgid "Info"
 msgstr "否"
 
-#: src/gtk/aptitude.glade:1227 src/gtk/download.cc:200
+#: src/gtk/aptitude.glade:1219
+msgid ""
+"Arrange the actions of the current solution so that actions that are of the "
+"same type are placed together (for instance, all the actions that remove "
+"packages).\n"
+"\n"
+"This is the default view mode."
+msgstr ""
+
+#: src/gtk/aptitude.glade:1222
+#, fuzzy
+#| msgid "Unknown action type: %s"
+msgid "Group by action type"
+msgstr "未知的操作类型：%s"
+
+#: src/gtk/aptitude.glade:1235
+msgid ""
+"Show the order in which the actions in the current solution were performed "
+"and the dependency that triggered each action."
+msgstr ""
+
+#: src/gtk/aptitude.glade:1236
+#, fuzzy
+#| msgid "view an explanation of the changes in the solution"
+msgid "Show an explanation of the solution"
+msgstr "查看关于解决方案中做的修改的说明"
+
+#: src/gtk/aptitude.glade:1253
+msgid "<b>View Mode</b>"
+msgstr ""
+
+#: src/gtk/aptitude.glade:1290 src/gtk/download.cc:203
+#: src/gtk/entityview.cc:551
 #, fuzzy
 #| msgid "State"
 msgid "Status"
 msgstr "状态"
 
-#: src/gtk/aptitude.glade:1236
+#: src/gtk/aptitude.glade:1299
 msgid "gtk-go-back"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1251
+#: src/gtk/aptitude.glade:1314
 msgid "gtk-go-forward"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1266
+#: src/gtk/aptitude.glade:1329
 msgid "gtk-apply"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1318
-#, fuzzy
-#| msgid "Err "
-msgid "Errors"
-msgstr "错误 "
-
-#: src/gtk/aptitude.glade:1413
+#: src/gtk/aptitude.glade:1521
 msgid "<b>Start at these packages:</b>"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1506
+#: src/gtk/aptitude.glade:1658
 msgid "<b>End at these packages:</b>"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1544
+#: src/gtk/aptitude.glade:1705
 #, fuzzy
 #| msgid "Dependency handling"
 msgid "Dependency Chain"
 msgstr "处理依赖关系"
 
-#: src/gtk/aptitude.glade:1561
+#: src/gtk/aptitude.glade:1723
 msgid "A terminal running dpkg will appear here."
 msgstr ""
 
-#: src/gtk/aptitude.glade:1572
+#: src/gtk/aptitude.glade:1734
 msgid "Applying Changes"
 msgstr ""
 
-#: src/gtk/aptitude.glade:1643 src/gtk/gui.cc:86
+#: src/gtk/aptitude.glade:1747
+msgid ""
+"Placeholder label for the explanation that two conffiles are being "
+"compared.\n"
+"This text should not appear in the program."
+msgstr ""
+
+#: src/gtk/aptitude.glade:1773
+msgid "View the differences\t"
+msgstr ""
+
+#: src/gtk/aptitude.glade:1799
+msgid ""
+"Do you want to apply these changes?\n"
+"You can also modify the files by hand, then click \"No\"."
+msgstr ""
+
+#: src/gtk/aptitude.glade:1811
+#, fuzzy
+#| msgid "yes"
+msgid "gtk-yes"
+msgstr "是"
+
+#: src/gtk/aptitude.glade:1821
+msgid "gtk-no"
+msgstr ""
+
+#: src/gtk/aptitude.glade:1847
+#, fuzzy
+#| msgid "Config files"
+msgid "Conffile Diff"
+msgstr "配置文件"
+
+#: src/gtk/aptitude.glade:1919 src/gtk/gui.cc:88 src/gtk/gui.cc:1151
 msgid "Remove"
 msgstr "删除"
 
-#: src/gtk/aptitude.glade:1656
+#: src/gtk/aptitude.glade:1932 src/gtk/gui.cc:1156
 #, fuzzy
 #| msgid "^Purge"
 msgid "Purge"
 msgstr "清除(^P)"
 
-#: src/gtk/aptitude.glade:1669
+#: src/gtk/aptitude.glade:1945 src/gtk/gui.cc:1161
 msgid "Keep"
 msgstr "保持"
 
-#: src/gtk/aptitude.glade:1682
+#: src/gtk/aptitude.glade:1958 src/gtk/gui.cc:1166
 msgid "Hold"
 msgstr "保持"
 
-#: src/gtk/changelog.cc:251
+#: src/gtk/aptitude.glade:1971
+msgid "Edit Columns..."
+msgstr ""
+
+#: src/gtk/aptitude.glade:1984
+msgid "Dummy label (will be replaced at runtime)."
+msgstr ""
+
+#: src/gtk/aptitude.glade:2016
+#, fuzzy
+#| msgid "Remove the filter from the package list"
+msgid "Make this the default for new package lists."
+msgstr "取消软件包列表中过滤器的效果"
+
+#: src/gtk/aptitude.glade:2032
+#, fuzzy
+#| msgid "Apply a filter to the package list"
+msgid "Apply these settings to all active package lists."
+msgstr "使用过滤器过滤软件包列表"
+
+#: src/gtk/aptitude.glade:2050
+#, fuzzy
+#| msgid "delete"
+msgid "gtk-close"
+msgstr "删除"
+
+#: src/gtk/changelog.cc:276
 msgid "The changelog is empty."
 msgstr ""
 
-#: src/gtk/changelog.cc:253
+#: src/gtk/changelog.cc:278
 msgid ""
 "No new changelog entries; it looks like you installed a locally compiled "
 "version of this package."
 msgstr ""
 
-#: src/gtk/changelog.cc:255
+#: src/gtk/changelog.cc:280
 msgid ""
 "No new changelog entries; this is likely due to a binary-only upload of this "
 "package."
 msgstr ""
 
-#: src/gtk/changelog.cc:384 src/view_changelog.cc:369
-msgid "You can only view changelogs of official Debian packages."
+#: src/gtk/changelog.cc:376
+#, fuzzy, c-format
+#| msgid "URL to use to download changelogs"
+msgid "Failed to download the changelog: %s"
+msgstr "用于下载变更日志的 URL"
+
+#: src/gtk/changelog.cc:445
+#, fuzzy, c-format
+#| msgid "You can only view changelogs of official Debian packages."
+msgid ""
+"You can only view changelogs of official Debian packages; the origin of %s "
+"is unknown."
+msgstr "您只能查看官方 Debian 软件包的变更日志。"
+
+#: src/gtk/changelog.cc:449
+#, fuzzy, c-format
+#| msgid "You can only view changelogs of official Debian packages."
+msgid ""
+"You can only view changelogs of official Debian packages; %s is from %s."
 msgstr "您只能查看官方 Debian 软件包的变更日志。"
 
-#: src/gtk/changelog.cc:403
+#: src/gtk/changelog.cc:469
 #, fuzzy
 #| msgid "Downloading Changelog"
 msgid "Downloading changelog; please wait..."
 msgstr "正在下载变更日志"
 
-#: src/gtk/changelog.cc:447
+#: src/gtk/changelog.cc:528
 #, fuzzy
 #| msgid "Downloading Changelog"
 msgid "Downloading changelogs"
 msgstr "正在下载变更日志"
 
-#: src/gtk/dashboardtab.cc:87
+#: src/gtk/dashboardtab.cc:99
 #, fuzzy
 #| msgid "URL to use to download changelogs"
 msgid "Preparing to download changelogs"
 msgstr "用于下载变更日志的 URL"
 
-#: src/gtk/dashboardtab.cc:172
+#: src/gtk/dashboardtab.cc:185
 msgid "Available upgrades:"
 msgstr ""
 
-#: src/gtk/dashboardtab.cc:182
+#: src/gtk/dashboardtab.cc:195
 #, fuzzy, c-format
 #| msgid "%d upgrade"
 #| msgid_plural "%d upgrades"
@@ -3348,283 +3429,441 @@ msgid "%d available upgrade:"
 msgid_plural "%d available upgrades:"
 msgstr[0] "升级 %d 个包"
 
-#: src/gtk/dependency_chains_tab.cc:179
+#: src/gtk/dashboardtab.cc:302
+#, c-format
+msgid ""
+"The package %s has no candidate version and will not be upgraded; unable to "
+"show its changelog."
+msgstr ""
+
+#: src/gtk/dependency_chains_tab.cc:77
+#, fuzzy
+#| msgid "Dependency handling"
+msgid "Find dependency chains: start"
+msgstr "处理依赖关系"
+
+#: src/gtk/dependency_chains_tab.cc:79
+#, fuzzy
+#| msgid "Dependency handling"
+msgid "Find dependency chains: end"
+msgstr "处理依赖关系"
+
+#: src/gtk/dependency_chains_tab.cc:81
+#, fuzzy
+#| msgid "Dependency handling"
+msgid "Find dependency chains: results"
+msgstr "处理依赖关系"
+
+#: src/gtk/dependency_chains_tab.cc:220
 msgid "Select one or more starting packages and an ending package to search."
 msgstr ""
 
-#: src/gtk/dependency_chains_tab.cc:239
+#: src/gtk/dependency_chains_tab.cc:275
 #, fuzzy
 #| msgid "Dependency handling"
 msgid "No dependency chain found."
 msgstr "处理依赖关系"
 
-#: src/gtk/download.cc:127
+#: src/gtk/download.cc:129
 msgid "Ignored"
 msgstr ""
 
-#: src/gtk/download.cc:134
+#: src/gtk/download.cc:136
 #, fuzzy
 #| msgid "False"
 msgid "Failed"
 msgstr "假"
 
-#: src/gtk/download.cc:143
+#: src/gtk/download.cc:145
 #, fuzzy
 #| msgid "Deleting downloaded files"
 msgid "Already downloaded"
 msgstr "删除下载的文件"
 
-#: src/gtk/download.cc:150
+#: src/gtk/download.cc:152
 #, fuzzy
 #| msgid "death"
 msgid "Fetch"
 msgstr "死亡"
 
-#: src/gtk/download.cc:156
+#: src/gtk/download.cc:158
 #, fuzzy
 #| msgid "none"
 msgid "Done"
 msgstr "无"
 
-#: src/gtk/download.cc:199
+#: src/gtk/download.cc:202
 msgid "URI"
 msgstr ""
 
-#: src/gtk/download.cc:205
+#: src/gtk/download.cc:208
 #, fuzzy
 #| msgid "Total Progress: "
 msgid "Progress"
 msgstr "总进度："
 
-#: src/gtk/download.cc:212
+#: src/gtk/download.cc:216
 #, fuzzy
 #| msgid "Description"
 msgid "Short Description"
 msgstr "描述"
 
-#: src/gtk/download.cc:213 src/pkg_columnizer.cc:93 src/pkg_view.cc:671
+#: src/gtk/download.cc:217 src/gtk/entityview.cc:397 src/pkg_columnizer.cc:93
+#: src/pkg_view.cc:671
 msgid "Description"
 msgstr "描述"
 
-#: src/gtk/download.cc:297
+#: src/gtk/download.cc:264
+#, fuzzy
+#| msgid "Cleaning while a download is in progress is not allowed"
+msgid "The download is still in progress.  Should it be canceled?"
+msgstr "在下载进行过程中不允许执行清除"
+
+#: src/gtk/download.cc:340 src/gtk/gui.cc:568
 #, fuzzy
 #| msgid "View next display"
 msgid "View Details"
 msgstr "查看下一个画面"
 
-#: src/gtk/download.cc:335
+#: src/gtk/download.cc:384
 msgid "Change media"
 msgstr ""
 
-#: src/gtk/download.cc:356
+#: src/gtk/download.cc:405
 #, c-format
 msgid "%s: %sB/s"
 msgstr ""
 
-#: src/gtk/download.cc:376
+#: src/gtk/download.cc:425
 #, c-format
 msgid "%s: %lu/%lu, %sB/s"
 msgstr ""
 
-#: src/gtk/download.cc:382
+#: src/gtk/download.cc:431
 #, fuzzy, c-format
 #| msgid "%s; will be installed"
 msgid "%s: %lu/%lu, stalled"
 msgstr "%s；将被安装"
 
-#: src/gtk/download.cc:403
+#: src/gtk/download.cc:452
 #, fuzzy, c-format
 #| msgid " [ %i%% ] (%sB/s, %s remaining)"
 msgid "%s: %sB of %sB at %sB/s, %s remaining"
 msgstr " [ %i%% ]  (%sB/s, 剩下 %s)"
 
-#: src/gtk/download.cc:410
+#: src/gtk/download.cc:459
 #, fuzzy, c-format
 #| msgid "but %s is to be installed."
 msgid "%s: %sB of %sB, stalled"
 msgstr "但是 %s 将被安装。"
 
-#: src/gtk/download.cc:439
+#: src/gtk/download.cc:488
 msgid "Completed"
 msgstr ""
 
-#: src/gtk/download.cc:441
+#: src/gtk/download.cc:490
 msgid "Completed with errors"
 msgstr ""
 
-#: src/gtk/dpkg_terminal.cc:83
+#: src/gtk/dpkg_terminal.cc:142
 #, fuzzy, c-format
 #| msgid "Unable to locate package %s"
 msgid "%s: Unable to create a Unix-domain socket: %s"
 msgstr "无法定位软件包 %s"
 
-#: src/gtk/dpkg_terminal.cc:263
+#: src/gtk/dpkg_terminal.cc:307
+#, c-format
+msgid "[%s] dpkg process starting...\n"
+msgstr ""
+
+#: src/gtk/dpkg_terminal.cc:342
+#, c-format
+msgid "[%s] dpkg process complete.\n"
+msgstr ""
+
+#: src/gtk/dpkg_terminal.cc:345
+#, c-format
+msgid "[%s] dpkg process failed.\n"
+msgstr ""
+
+#: src/gtk/dpkg_terminal.cc:348
+#, c-format
+msgid "[%s] dpkg process complete; there are more packages left to process.\n"
+msgstr ""
+
+#: src/gtk/dpkg_terminal.cc:366
 #, fuzzy, c-format
 #| msgid "Unable to create temporary directory from template \"%s\": %s"
 msgid "%s: Unable to accept a connection from the subprocess: %s"
 msgstr "无法为模板“%s”创建临时文件夹：%s"
 
-#: src/gtk/entityview.cc:192 src/gtk/resolver.cc:155
+#: src/gtk/entityview.cc:381 src/gtk/entityview.cc:575 src/gtk/resolver.cc:159
 #, fuzzy
 #| msgid "ProgName"
 msgid "Name"
 msgstr "程序名"
 
-#: src/gtk/entityview.cc:207
+#: src/gtk/entityview.cc:385
+msgid "Visible?"
+msgstr ""
+
+#: src/gtk/entityview.cc:411
+#, fuzzy, c-format
+#| msgid "Could not open file \"%s\""
+msgid "Columns of \"%s\":"
+msgstr "无法打开文件“%s”"
+
+#: src/gtk/entityview.cc:412
+#, fuzzy, c-format
+#| msgid "Rejecting the removal of %s"
+msgid "Editing the columns of \"%s\""
+msgstr "放弃删除 %s"
+
+#: src/gtk/entityview.cc:552
+msgid "Icons showing the current and future status of this package."
+msgstr ""
+
+#: src/gtk/entityview.cc:564 src/pkg_columnizer.cc:102
+msgid "Auto"
+msgstr "自动"
+
+#: src/gtk/entityview.cc:570
+#, fuzzy
+#| msgid "'&M' to mark packages as automatically installed"
+msgid "Whether the package is automatically installed."
+msgstr "按'&M'将软件包标记为自动安装"
+
+#: src/gtk/entityview.cc:576
+#, fuzzy
+#| msgid "Cancel any action on the selected package"
+msgid "The name and description of the package."
+msgstr "取消选定软件包上的任何动作"
+
+#: src/gtk/entityview.cc:591
 #, fuzzy
 #| msgid "Version: "
 msgid "Version"
 msgstr "版本号："
 
-#: src/gtk/gui.cc:71
+#: src/gtk/entityview.cc:592
+#, fuzzy
+#| msgid "Check for new versions of packages"
+msgid "The version number of the package."
+msgstr "正在检查新版本的软件包"
+
+#: src/gtk/entityview.cc:607
+msgid "The package archives that contain this version."
+msgstr ""
+
+#: src/gtk/filesview.cc:293
+#, c-format
+msgid ""
+"This file list pertains to the currently installed version \"%s\", not the "
+"selected version \"%s\"."
+msgstr ""
+
+#: src/gtk/filesview.cc:307
+msgid "Files list is only available for installed packages."
+msgstr ""
+
+#: src/gtk/gui.cc:73
 #, fuzzy
 #| msgid "not installed"
 msgid "Not installed"
 msgstr "未安装"
 
-#: src/gtk/gui.cc:72
+#: src/gtk/gui.cc:74
 msgid "Virtual"
 msgstr "虚拟"
 
-#: src/gtk/gui.cc:73
+#: src/gtk/gui.cc:75
 #, fuzzy
 #| msgid "unpacked"
 msgid "Unpacked"
 msgstr "未解包的"
 
-#: src/gtk/gui.cc:74
+#: src/gtk/gui.cc:76
 #, fuzzy
 #| msgid "half-config"
 msgid "Half-configured"
 msgstr "配置完成一半"
 
-#: src/gtk/gui.cc:75
+#: src/gtk/gui.cc:77
 #, fuzzy
 #| msgid "half-install"
 msgid "Half-installed"
 msgstr "安装完成一半"
 
-#: src/gtk/gui.cc:76
+#: src/gtk/gui.cc:78
 #, fuzzy
 #| msgid "not installed (configuration files remain)"
 msgid "Configuration files and data remain"
 msgstr "未安装(配置文件保留)"
 
-#: src/gtk/gui.cc:77
+#: src/gtk/gui.cc:79
 #, fuzzy
 #| msgid "triggers-awaited"
 msgid "Triggers awaited"
 msgstr "等待触发"
 
-#: src/gtk/gui.cc:78
+#: src/gtk/gui.cc:80
 #, fuzzy
 #| msgid "triggers-pending"
 msgid "Triggers pending"
 msgstr "即将触发"
 
-#: src/gtk/gui.cc:79
+#: src/gtk/gui.cc:81
 msgid "Installed"
 msgstr "已安装"
 
-#: src/gtk/gui.cc:83
+#: src/gtk/gui.cc:85
 msgid "Reinstall"
 msgstr "重新安装"
 
-#: src/gtk/gui.cc:85
+#: src/gtk/gui.cc:87 src/gtk/gui.cc:1141
 msgid "Downgrade"
 msgstr "降级"
 
-#: src/gtk/gui.cc:87
+#: src/gtk/gui.cc:89
 msgid "Remove and purge configuration/data"
 msgstr ""
 
-#: src/gtk/gui.cc:88
-msgid "Hold (don't uprgade)"
-msgstr ""
-
 #: src/gtk/gui.cc:90
 #, fuzzy
+#| msgid "forbidden upgrade"
+msgid "Hold (don't upgrade)"
+msgstr "被禁止的升级"
+
+#: src/gtk/gui.cc:92
+#, fuzzy
 #| msgid "Related Dependencies"
 msgid "Unsatisfied dependencies"
 msgstr "相关依赖关系"
 
-#: src/gtk/gui.cc:201
+#: src/gtk/gui.cc:203
 msgid "Checking for updates"
 msgstr ""
 
-#: src/gtk/gui.cc:217
+#: src/gtk/gui.cc:219
 msgid "Insufficient privileges."
 msgstr ""
 
-#: src/gtk/gui.cc:220
+#: src/gtk/gui.cc:222
 #, fuzzy
 #| msgid "Apply a filter to the package list"
 msgid "You must be root to update the package lists."
 msgstr "使用过滤器过滤软件包列表"
 
-#: src/gtk/gui.cc:228 src/gtk/gui.cc:299
+#: src/gtk/gui.cc:230 src/gtk/gui.cc:670
 #, fuzzy
 #| msgid "Downloading... "
 msgid "Download already running."
 msgstr "正在下载... "
 
-#: src/gtk/gui.cc:230 src/gtk/gui.cc:301 src/ui.cc:1462 src/ui.cc:1695
+#: src/gtk/gui.cc:232 src/gtk/gui.cc:672 src/ui.cc:1462 src/ui.cc:1695
 msgid "A package-list update or install run is already taking place."
 msgstr "已经开始了一个软件包列表更新或者安装的动作。"
 
-#: src/gtk/gui.cc:315 src/ui.cc:1206
-msgid "Downloading packages"
-msgstr "正在下载软件包"
+#: src/gtk/gui.cc:291
+#, fuzzy, c-format
+#| msgid "List Update"
+msgid "Update %s?"
+msgstr "列表更新"
+
+#: src/gtk/gui.cc:317
+#, fuzzy, c-format
+#| msgid "Unable to replace %s with new configuration file"
+msgid ""
+"Replace configuration file\n"
+"'%s'?"
+msgstr "无法用新的配置文件代替 %s"
+
+#: src/gtk/gui.cc:321
+#, c-format
+msgid ""
+"The configuration file %s was modified (by you or by a script). An updated "
+"version is shipped in this package. If you want to keep your current "
+"version, choose 'No'. Do you want to replace the current file and install "
+"the new package maintainers version? "
+msgstr ""
+
+#: src/gtk/gui.cc:349
+#, c-format
+msgid "Comparing %s to %s..."
+msgstr ""
+
+#: src/gtk/gui.cc:508
+msgid ""
+"Interrupting this process could leave your system in an inconsistent state.  "
+"Are you sure you want to stop applying your changes?"
+msgstr ""
 
-#: src/gtk/gui.cc:379
+#: src/gtk/gui.cc:532
 #, fuzzy
-#| msgid "Resolver"
-msgid "Resolver:"
-msgstr "解决手段"
+#| msgid "%s changes"
+msgid "Done applying changes!"
+msgstr "%s 个包已改变"
 
-#: src/gtk/gui.cc:384
+#: src/gtk/gui.cc:560
 #, fuzzy
-#| msgid "Preview"
-msgid "Preview:"
-msgstr "预览"
+#| msgid "%s changes"
+msgid "Applying changes..."
+msgstr "%s 个包已改变"
+
+#: src/gtk/gui.cc:602
+#, fuzzy, c-format
+#| msgid "s: %F"
+msgid "%s: %s"
+msgstr "s: %F"
+
+#: src/gtk/gui.cc:605
+#, fuzzy, c-format
+#| msgid "No broken packages."
+msgid "Error in package %s"
+msgstr "无破损的软件包。"
+
+#: src/gtk/gui.cc:633
+#, fuzzy, c-format
+#| msgid "Unable to replace %s with new configuration file"
+msgid "Asking whether to replace the configuration file %s"
+msgstr "无法用新的配置文件代替 %s"
 
-#: src/gtk/gui.cc:389
+#: src/gtk/gui.cc:686 src/ui.cc:1206
+msgid "Downloading packages"
+msgstr "正在下载软件包"
+
+#: src/gtk/gui.cc:760
 #, fuzzy
 #| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "无破损的软件包。"
 
-#: src/gtk/gui.cc:423
+#: src/gtk/gui.cc:793
 #, fuzzy
 #| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "无破损的软件包。"
 
-#: src/gtk/gui.cc:427
+#: src/gtk/gui.cc:797
 #, fuzzy
 #| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "解决依赖关系"
 
-#: src/gtk/gui.cc:455
+#: src/gtk/gui.cc:825
 #, fuzzy, c-format
 #| msgid "No packages are broken."
 msgid "%d package is broken"
-msgstr "没有破损的软件包。"
+msgid_plural "%d packages are broken."
+msgstr[0] "没有破损的软件包。"
 
-#: src/gtk/gui.cc:456
-#, fuzzy, c-format
-#| msgid "No packages are broken."
-msgid "%d packages are broken."
-msgstr "没有破损的软件包。"
-
-#: src/gtk/gui.cc:499
+#: src/gtk/gui.cc:869
 #, fuzzy
 #| msgid "%s changes"
 msgid "View changes"
 msgstr "%s 个包已改变"
 
-#: src/gtk/gui.cc:503
+#: src/gtk/gui.cc:873
 #, fuzzy
 #| msgid "%s changes"
 msgid "Apply changes"
@@ -3633,83 +3872,100 @@ msgstr "%s 个包已改变"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:542
+#: src/gtk/gui.cc:912
 #, fuzzy, c-format
 #| msgid "%d install"
 #| msgid_plural "%d installs"
 msgid "%d package to install"
-msgstr "安装 %d 个包"
-
-#: src/gtk/gui.cc:543
-#, fuzzy, c-format
-#| msgid "%d install"
-#| msgid_plural "%d installs"
-msgid "%d packages to install"
-msgstr "安装 %d 个包"
+msgid_plural "%d packages to install"
+msgstr[0] "安装 %d 个包"
 
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:557
+#: src/gtk/gui.cc:927
 #, fuzzy, c-format
 #| msgid "failed to remove %s"
 msgid "%d package to remove"
-msgstr "无法删除 %s"
-
-#: src/gtk/gui.cc:558
-#, fuzzy, c-format
-#| msgid "No packages are broken."
-msgid "%d packages to remove"
-msgstr "没有破损的软件包。"
+msgid_plural "%d packages to remove"
+msgstr[0] "无法删除 %s"
 
-#: src/gtk/gui.cc:596
+#: src/gtk/gui.cc:966
 #, fuzzy, c-format
 #| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "下载文件大小"
 
-#: src/gtk/gui.cc:646
+#: src/gtk/gui.cc:1016
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:680
+#: src/gtk/gui.cc:1078
 #, fuzzy
-#| msgid "Packages"
-msgid "Packages:"
-msgstr "软件包"
+#| msgid "not installed"
+msgid "Not implemented"
+msgstr "未安装"
 
-#: src/gtk/gui.cc:789 src/gtk/gui.cc:794
-msgid "Dashboard:"
+#: src/gtk/gui.cc:1081
+msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:913
+#: src/gtk/gui.cc:1130 src/gtk/gui.cc:1149
+#, fuzzy
+#| msgid "Installed"
+msgid "Install/Upgrade"
+msgstr "已安装"
+
+#: src/gtk/gui.cc:1172
+msgid "Set as automatic"
+msgstr ""
+
+#: src/gtk/gui.cc:1177
+#, fuzzy
+#| msgid "User's Manual"
+msgid "Set as manual"
+msgstr "用户手册"
+
+#: src/gtk/gui.cc:1182
+msgid "Toggle automatic status"
+msgstr ""
+
+#: src/gtk/gui.cc:1490
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
 
-#: src/gtk/info.cc:157 src/gtk/pkgview.cc:162
+#: src/gtk/info.cc:160 src/gtk/pkgview.cc:166
 #, fuzzy
 #| msgid "Current status: %F."
 msgid "Current status"
 msgstr "当前状态：%F。"
 
-#: src/gtk/info.cc:159 src/gtk/pkgview.cc:164
+#: src/gtk/info.cc:162 src/gtk/pkgview.cc:168
 msgid "Selected status"
 msgstr ""
 
-#: src/gtk/info.cc:482
+#: src/gtk/info.cc:495
 #, fuzzy
 #| msgid "Not Installed"
 msgid "Not available"
 msgstr "未安装的"
 
-#: src/gtk/info.cc:528
-msgid "Please wait; reloading cache..."
-msgstr ""
+#: src/gtk/info.cc:540
+#, fuzzy
+#| msgid "C^ycle Package Information"
+msgid "Package information: version list"
+msgstr "循环软件包信息"
+
+#: src/gtk/info.cc:550
+#, fuzzy
+#| msgid "Packages which depend on %s"
+msgid "Package information: dependency list"
+msgstr "依赖于 %s 的软件包"
 
-#: src/gtk/info.cc:673
-msgid "Info:"
+#: src/gtk/info.cc:592
+msgid "Please wait; reloading cache..."
 msgstr ""
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
@@ -3720,132 +3976,172 @@ msgstr ""
 msgid "Unknown"
 msgstr "未知"
 
-#: src/gtk/packagestab.cc:57
+#: src/gtk/packagestab.cc:60
+msgid "Parse error"
+msgstr ""
+
+#: src/gtk/packagestab.cc:148
 #, fuzzy, c-format
 #| msgid "No packages matched the pattern \"%ls\"."
 msgid "No packages matched \"%s\"."
 msgstr "没有软件包匹配模式“%ls”。"
 
-#: src/gtk/packagestab.cc:88
+#: src/gtk/packagestab.cc:258
 msgid "Enter a search and click \"Find\" to display packages."
 msgstr ""
 
-#: src/gtk/packagestab.cc:142
+#: src/gtk/packagestab.cc:356
 #, fuzzy
 #| msgid "Package: "
 msgid "Packages: "
 msgstr "软件包："
 
-#: src/gtk/packagestab.cc:202
+#: src/gtk/packagestab.cc:433
 #, fuzzy, c-format
 #| msgid "%s versions"
 msgid "Upgrade to %s version %s"
 msgstr "%s 版本号"
 
-#: src/gtk/packagestab.cc:210
+#: src/gtk/packagestab.cc:441
 #, fuzzy, c-format
 #| msgid "Install(%s provides %s)"
 msgid "Install %s version %s"
 msgstr "安装(%s 提供了 %s)"
 
-#: src/gtk/packagestab.cc:218
+#: src/gtk/packagestab.cc:449
 #, fuzzy, c-format
 #| msgid "  cwidget version: %s\n"
 msgid "Downgrade to %s version %s"
 msgstr "  cwidget 版本：%s\n"
 
-#: src/gtk/packagestab.cc:229
+#: src/gtk/packagestab.cc:460
 #, fuzzy, c-format
 #| msgid "Keep the following packages at their current version:"
 msgid "Don't hold %s at its current version."
 msgstr "保持下列软件包于其当前版本："
 
-#: src/gtk/packagestab.cc:232 src/gtk/packagestab.cc:252
-#: src/gtk/packagestab.cc:255
+#: src/gtk/packagestab.cc:463 src/gtk/packagestab.cc:483
+#: src/gtk/packagestab.cc:486
 #, fuzzy, c-format
 #| msgid "Canc^el pending actions"
 msgid "Cancel any actions on %s."
 msgstr "取消待执行的动作(^E)"
 
-#: src/gtk/packagestab.cc:237
+#: src/gtk/packagestab.cc:468
 #, fuzzy, c-format
 #| msgid "Cancel the removal of %F"
 msgid "Cancel the purge of %s."
 msgstr "取消删除 %F"
 
-#: src/gtk/packagestab.cc:239
+#: src/gtk/packagestab.cc:470
 #, fuzzy, c-format
 #| msgid "Cancel the removal of %F"
 msgid "Cancel the removal of %s."
 msgstr "取消删除 %F"
 
-#: src/gtk/packagestab.cc:244
+#: src/gtk/packagestab.cc:475
 #, fuzzy, c-format
 #| msgid "Cancel the removal of %F"
 msgid "Cancel the upgrade of %s."
 msgstr "取消删除 %F"
 
-#: src/gtk/packagestab.cc:246
+#: src/gtk/packagestab.cc:477
 #, fuzzy, c-format
 #| msgid "Cancel the installation of %F"
 msgid "Cancel the installation of %s."
 msgstr "取消 %F 的安装"
 
-#: src/gtk/packagestab.cc:248
+#: src/gtk/packagestab.cc:479
 #, fuzzy, c-format
 #| msgid "Cancel the removal of %F"
 msgid "Cancel the downgrade of %s."
 msgstr "取消删除 %F"
 
-#: src/gtk/packagestab.cc:250
+#: src/gtk/packagestab.cc:481
 #, fuzzy, c-format
 #| msgid "Cancel the installation of %F"
 msgid "Cancel the reinstallation of %s."
 msgstr "取消 %F 的安装"
 
-#: src/gtk/packagestab.cc:335
-#, fuzzy, c-format
-#| msgid "\"%s\" is a virtual package provided by:\n"
-msgid "%s is a virtual package provided by:\n"
-msgstr "“%s”是一个虚拟软件包，提供者：\n"
-
-#: src/gtk/packagestab.cc:399 src/gtk/previewtab.cc:200
-msgid "(more info...)"
-msgstr ""
-
-#: src/gtk/packagestab.cc:452
+#: src/gtk/packagestab.cc:522
 #, fuzzy, c-format
 #| msgid "Remove(%s)"
 msgid "Remove %s"
 msgstr "移除(%s)"
 
-#: src/gtk/packagestab.cc:456
+#: src/gtk/packagestab.cc:526
 #, fuzzy, c-format
 #| msgid "^Purge"
 msgid "Purge %s"
 msgstr "清除(^P)"
 
-#: src/gtk/packagestab.cc:464
+#: src/gtk/packagestab.cc:534
 #, c-format
 msgid "Hold %s at its current version."
 msgstr ""
 
-#: src/gtk/pkgview.cc:335
+#: src/gtk/packagestab.cc:539
+#, fuzzy, c-format
+#| msgid "'&M' to mark packages as automatically installed"
+msgid "Mark %s as automatically installed."
+msgstr "按'&M'将软件包标记为自动安装"
+
+#: src/gtk/packagestab.cc:544
+#, fuzzy, c-format
+#| msgid "The package \"%s\" is manually installed.\n"
+msgid "Mark %s as manually installed."
+msgstr "软件包“%s”是手动安装的。\n"
+
+#: src/gtk/packagestab.cc:586
+#, fuzzy, c-format
+#| msgid "\"%s\" is a virtual package provided by:\n"
+msgid "%s is a virtual package provided by:\n"
+msgstr "“%s”是一个虚拟软件包，提供者：\n"
+
+#: src/gtk/packagestab.cc:650 src/gtk/previewtab.cc:210
+msgid "(more info...)"
+msgstr ""
+
+#: src/gtk/pkgview.cc:221
+#, fuzzy, c-format
+#| msgid "%s; will be installed automatically"
+msgid "%s was installed automatically."
+msgstr "%s；将被自动安装"
+
+#: src/gtk/pkgview.cc:224
+#, fuzzy, c-format
+#| msgid "%s; will be installed automatically"
+msgid "%s is being installed automatically."
+msgstr "%s；将被自动安装"
+
+#: src/gtk/pkgview.cc:232
+#, fuzzy, c-format
+#| msgid "%s; will be installed automatically"
+msgid "%s was installed manually."
+msgstr "%s；将被自动安装"
+
+#: src/gtk/pkgview.cc:235
+#, fuzzy, c-format
+#| msgid "%s; will be installed automatically"
+msgid "%s is being installed manually."
+msgstr "%s；将被自动安装"
+
+#: src/gtk/pkgview.cc:390
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:373 src/gtk/pkgview.cc:389 src/pkg_tree.cc:204
+#: src/gtk/pkgview.cc:422 src/gtk/pkgview.cc:438 src/pkg_tree.cc:204
 #: src/pkg_tree.cc:215 src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "编译视图"
 
-#: src/gtk/pkgview.cc:379 src/gtk/pkgview.cc:395
+#: src/gtk/pkgview.cc:428 src/gtk/pkgview.cc:444
 #, fuzzy
 #| msgid "Building view"
 msgid "Finalizing view"
 msgstr "编译视图"
 
-#: src/gtk/previewtab.cc:95 src/pkg_grouppolicy.cc:637
+#: src/gtk/previewtab.cc:96 src/pkg_grouppolicy.cc:637
 msgid ""
 "Packages with unsatisfied dependencies\n"
 " The dependency requirements of these packages will be unmet after the "
@@ -3859,7 +4155,7 @@ msgstr ""
 " .\n"
 " 该树的存在表示您的系统上或者 Debian 归档中的某些东西被破坏。"
 
-#: src/gtk/previewtab.cc:96 src/pkg_grouppolicy.cc:638
+#: src/gtk/previewtab.cc:97 src/pkg_grouppolicy.cc:638
 msgid ""
 "Packages being removed because they are no longer used\n"
 " These packages are being deleted because they were automatically installed "
@@ -3870,7 +4166,7 @@ msgstr ""
 " 这些软件包被删除，因为它们曾被自动安装以满足依赖关系，同时计划中的操作将导致"
 "没有任何软件包声明与它们有“重要”依赖关系。\n"
 
-#: src/gtk/previewtab.cc:97 src/pkg_grouppolicy.cc:639
+#: src/gtk/previewtab.cc:98 src/pkg_grouppolicy.cc:639
 msgid ""
 "Packages being automatically held in their current state\n"
 " These packages could be upgraded, but they have been kept in their current "
@@ -3879,7 +4175,7 @@ msgstr ""
 "被自动保持在当前状态的软件包\n"
 " 这些软件包可以被升级，但是它们被保持在其当前状态以避免破坏依赖关系。"
 
-#: src/gtk/previewtab.cc:98 src/pkg_grouppolicy.cc:640
+#: src/gtk/previewtab.cc:99 src/pkg_grouppolicy.cc:640
 msgid ""
 "Packages being automatically installed to satisfy dependencies\n"
 " These packages are being installed because they are required by another "
@@ -3888,7 +4184,7 @@ msgstr ""
 "被自动安装以满足依赖关系的软件包\n"
 " 这些软件包被安装的原因是您选择安装的另一个软件包要求它们。"
 
-#: src/gtk/previewtab.cc:99 src/pkg_grouppolicy.cc:641
+#: src/gtk/previewtab.cc:100 src/pkg_grouppolicy.cc:641
 msgid ""
 "Packages being deleted due to unsatisfied dependencies\n"
 " These packages are being deleted because one or more of their dependencies "
@@ -3898,7 +4194,7 @@ msgstr ""
 " 这些软件包被卸载，因为它们的一个或者多个依赖关系无法满足，或者另一个软件包和"
 "它们相冲突。"
 
-#: src/gtk/previewtab.cc:100 src/pkg_grouppolicy.cc:642
+#: src/gtk/previewtab.cc:101 src/pkg_grouppolicy.cc:642
 msgid ""
 "Packages to be downgraded\n"
 " An older version of these packages than is currently installed will be "
@@ -3907,7 +4203,7 @@ msgstr ""
 "将被降级的软件包\n"
 " 这些软件包的一个比目前安装版本老的版本将被安装。"
 
-#: src/gtk/previewtab.cc:101 src/pkg_grouppolicy.cc:643
+#: src/gtk/previewtab.cc:102 src/pkg_grouppolicy.cc:643
 msgid ""
 "Packages being held back\n"
 " These packages could be upgraded, but you have asked for them to be held at "
@@ -3916,7 +4212,7 @@ msgstr ""
 "被保持的软件包\n"
 " 这些软件包可以升级，但是您已经要求将它们保持在当前版本。"
 
-#: src/gtk/previewtab.cc:102 src/pkg_grouppolicy.cc:644
+#: src/gtk/previewtab.cc:103 src/pkg_grouppolicy.cc:644
 msgid ""
 "Packages to be reinstalled\n"
 " These packages will be reinstalled."
@@ -3924,7 +4220,7 @@ msgstr ""
 "重新安装的软件包\n"
 " 这些软件包将被重新安装。"
 
-#: src/gtk/previewtab.cc:103 src/pkg_grouppolicy.cc:645
+#: src/gtk/previewtab.cc:104 src/pkg_grouppolicy.cc:645
 msgid ""
 "Packages to be installed\n"
 " These packages have been manually selected for installation on your "
@@ -3933,7 +4229,7 @@ msgstr ""
 "将要安装的软件包\n"
 " 这些软件包已经被手动选择安装在您的机器上。"
 
-#: src/gtk/previewtab.cc:104 src/pkg_grouppolicy.cc:646
+#: src/gtk/previewtab.cc:105 src/pkg_grouppolicy.cc:646
 msgid ""
 "Packages to be removed\n"
 " These packages have been manually selected for removal."
@@ -3941,7 +4237,7 @@ msgstr ""
 "将被卸载的软件包\n"
 " 这些软件包已经被手动选择卸载。"
 
-#: src/gtk/previewtab.cc:105 src/pkg_grouppolicy.cc:647
+#: src/gtk/previewtab.cc:106 src/pkg_grouppolicy.cc:647
 msgid ""
 "Packages to be upgraded\n"
 " These packages will be upgraded to a newer version."
@@ -3949,7 +4245,7 @@ msgstr ""
 "将要升级的软件包\n"
 " 这些软件包将被升级到一个新版本。"
 
-#: src/gtk/previewtab.cc:106 src/pkg_grouppolicy.cc:648
+#: src/gtk/previewtab.cc:107 src/pkg_grouppolicy.cc:648
 msgid ""
 "Packages that are partially installed\n"
 " These packages are not fully installed and configured; an attempt will be "
@@ -3958,19 +4254,19 @@ msgstr ""
 "被部分安装的软件包\n"
 " 这些软件包没有被完全安装并配置；会尝试完成它们的安装。"
 
-#: src/gtk/previewtab.cc:164
+#: src/gtk/previewtab.cc:174
 #, fuzzy
 #| msgid "Preview"
 msgid "Preview: "
 msgstr "预览"
 
-#: src/gtk/resolver.cc:53
+#: src/gtk/resolver.cc:58
 #, fuzzy, c-format
 #| msgid "Error while dumping resolver state"
 msgid "Error in dependency resolver: %s"
 msgstr "存储依赖关系解决状态时出错"
 
-#: src/gtk/resolver.cc:56
+#: src/gtk/resolver.cc:61
 #, c-format
 msgid ""
 "Fatal error in dependency resolver.  You can continue searching, but some "
@@ -3979,122 +4275,164 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/gtk/resolver.cc:156 src/pkg_columnizer.cc:92
+#: src/gtk/resolver.cc:160 src/pkg_columnizer.cc:92
 msgid "Action"
 msgstr "动作"
 
-#: src/gtk/resolver.cc:256 src/solution_fragment.cc:106
+#: src/gtk/resolver.cc:266 src/solution_fragment.cc:106
 #, c-format
 msgid "%s depends upon %s"
 msgstr "%s 依赖于 %s"
 
-#: src/gtk/resolver.cc:259 src/solution_fragment.cc:109
+#: src/gtk/resolver.cc:269 src/solution_fragment.cc:109
 #, c-format
 msgid "%s pre-depends upon %s"
 msgstr "%s 预依赖于 %s"
 
-#: src/gtk/resolver.cc:262 src/solution_fragment.cc:112
+#: src/gtk/resolver.cc:272 src/solution_fragment.cc:112
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s 建议 %s"
 
-#: src/gtk/resolver.cc:265 src/solution_fragment.cc:115
+#: src/gtk/resolver.cc:275 src/solution_fragment.cc:115
 #: src/solution_item.cc:602
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s 推荐 %s"
 
-#: src/gtk/resolver.cc:268 src/solution_fragment.cc:118
+#: src/gtk/resolver.cc:278 src/solution_fragment.cc:118
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s 冲突 %s"
 
-#: src/gtk/resolver.cc:271 src/solution_fragment.cc:121
+#: src/gtk/resolver.cc:281 src/solution_fragment.cc:121
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s 破坏 %s"
 
-#: src/gtk/resolver.cc:274 src/solution_fragment.cc:124
+#: src/gtk/resolver.cc:284 src/solution_fragment.cc:124
 #, c-format
 msgid "%s replaces %s"
 msgstr "%s 替代 %s"
 
-#: src/gtk/resolver.cc:277 src/solution_fragment.cc:127
+#: src/gtk/resolver.cc:287 src/solution_fragment.cc:127
 #, c-format
 msgid "%s obsoletes %s"
 msgstr "%s 过期 %s"
 
-#: src/gtk/resolver.cc:292
-#, fuzzy
-#| msgid "No broken packages."
-msgid "Nothing to do: there are no broken packages."
-msgstr "无破损的软件包。"
-
-#: src/gtk/resolver.cc:299
-#, fuzzy
-#| msgid "No resolution found."
-msgid "No resolutions found."
-msgstr "未发现任何解决方案。"
-
-#: src/gtk/resolver.cc:314 src/solution_screen.cc:515
-#, c-format
-msgid "open: %d; closed: %d; defer: %d; conflict: %d"
-msgstr "打开：%d；关闭；%d；defer: %d; 冲突；%d"
-
-#: src/gtk/resolver.cc:405 src/solution_screen.cc:248
+#: src/gtk/resolver.cc:367 src/solution_screen.cc:248
 msgid "Remove the following packages:"
 msgstr "删除下列软件包："
 
-#: src/gtk/resolver.cc:420 src/solution_screen.cc:270
+#: src/gtk/resolver.cc:382 src/solution_screen.cc:270
 msgid "Install the following packages:"
 msgstr "安装下列软件包："
 
-#: src/gtk/resolver.cc:437
+#: src/gtk/resolver.cc:399
 #, fuzzy
 #| msgid "Remove the following packages:"
 msgid "Keep the following packages:"
 msgstr "删除下列软件包："
 
-#: src/gtk/resolver.cc:447 src/solution_fragment.cc:251
+#: src/gtk/resolver.cc:409 src/solution_fragment.cc:251
 msgid "Not Installed"
 msgstr "未安装的"
 
-#: src/gtk/resolver.cc:463 src/solution_screen.cc:281
+#: src/gtk/resolver.cc:425 src/solution_screen.cc:281
 msgid "Upgrade the following packages:"
 msgstr "升级下列软件包："
 
-#: src/gtk/resolver.cc:482 src/solution_screen.cc:292
+#: src/gtk/resolver.cc:444 src/solution_screen.cc:292
 msgid "Downgrade the following packages:"
 msgstr "降级下列软件包："
 
-#: src/gtk/resolver.cc:503
+#: src/gtk/resolver.cc:465
 #, fuzzy
 #| msgid "Leave the following dependencies unresolved:%n"
 msgid "Leave the following dependencies unresolved:"
 msgstr "保留下列未解决的依赖关系：%n"
 
-#: src/gtk/resolver.cc:522
+#: src/gtk/resolver.cc:523
+#, fuzzy, c-format
+#| msgid "Remove %F [%s (%s)]"
+msgid "Remove %s [%s (%s)]"
+msgstr "删除 %F [%s (%s)]"
+
+#: src/gtk/resolver.cc:530
+#, fuzzy, c-format
+#| msgid "Install %F [%s (%s)]"
+msgid "Install %s [%s (%s)]"
+msgstr "安装 %F [%s (%s)]"
+
+#: src/gtk/resolver.cc:538
+#, fuzzy, c-format
+#| msgid "Cancel the installation of %F"
+msgid "Cancel the installation of %s"
+msgstr "取消 %F 的安装"
+
+#: src/gtk/resolver.cc:541
+#, fuzzy, c-format
+#| msgid "Cancel the removal of %F"
+msgid "Cancel the removal of %s"
+msgstr "取消删除 %F"
+
+#: src/gtk/resolver.cc:544
+#, fuzzy, c-format
+#| msgid "Keep %F at version %s (%s)"
+msgid "Keep %s at version %s (%s)"
+msgstr "保持 %F 在版本 %s (%s)"
+
+#: src/gtk/resolver.cc:551
+#, fuzzy, c-format
+#| msgid "Upgrade %F [%s (%s) -> %s (%s)]"
+msgid "Upgrade %s [%s (%s) -> %s (%s)]"
+msgstr "升级 %F [%s (%s) -> %s (%s)]"
+
+#: src/gtk/resolver.cc:560
+#, fuzzy, c-format
+#| msgid "Downgrade %F [%s (%s) -> %s (%s)]"
+msgid "Downgrade %s [%s (%s) -> %s (%s)]"
+msgstr "降级 %F [%s (%s) -> %s (%s)]"
+
+#: src/gtk/resolver.cc:589
+#, fuzzy
+#| msgid "No broken packages."
+msgid "Nothing to do: there are no broken packages."
+msgstr "无破损的软件包。"
+
+#: src/gtk/resolver.cc:596
+#, fuzzy
+#| msgid "No resolution found."
+msgid "No resolutions found."
+msgstr "未发现任何解决方案。"
+
+#: src/gtk/resolver.cc:611 src/solution_screen.cc:515
+#, c-format
+msgid "open: %d; closed: %d; defer: %d; conflict: %d"
+msgstr "打开：%d；关闭；%d；defer: %d; 冲突；%d"
+
+#: src/gtk/resolver.cc:650
 #, fuzzy
 #| msgid "No more solutions."
 msgid "No solutions."
 msgstr "没有更多的解决方案了。"
 
-#: src/gtk/resolver.cc:522
+#: src/gtk/resolver.cc:650
 #, fuzzy
 #| msgid "No more solutions."
 msgid "No solutions yet."
 msgstr "没有更多的解决方案了。"
 
-#: src/gtk/resolver.cc:524
+#: src/gtk/resolver.cc:652
 #, c-format
 msgid "Solution %d of %d (score: %d)"
 msgstr ""
 
-#: src/gtk/resolver.cc:618 src/ui.cc:2093
+#: src/gtk/resolver.cc:746 src/ui.cc:2093
 msgid "Unable to find a solution to apply."
 msgstr "未能找到解决方案以实施。"
 
-#: src/gtk/resolver.cc:623 src/ui.cc:2099
+#: src/gtk/resolver.cc:751 src/ui.cc:2099
 msgid "Ran out of time while trying to find a solution."
 msgstr "寻求解决方案时耗尽了时限。"
 
@@ -4539,91 +4877,102 @@ msgstr " -h             此帮助文本\n"
 
 #: src/main.cc:172
 #, c-format
+msgid ""
+" --gui          Use the GTK GUI even if disabled in the configuration.\n"
+msgstr ""
+
+#: src/main.cc:173
+#, c-format
+msgid " --no-gui       Do not use the GTK GUI even if available.\n"
+msgstr ""
+
+#: src/main.cc:174
+#, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             模拟动作，但是并不真正执行。\n"
 
-#: src/main.cc:173
+#: src/main.cc:175
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr " -d             仅仅下载软件包，不安装或者卸载任何东西。\n"
 
-#: src/main.cc:174
+#: src/main.cc:176
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr " -P             总是提示确认执行动作\n"
 
-#: src/main.cc:175
+#: src/main.cc:177
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr " -y             假设对简单的 是/否 问题回答“是”\n"
 
-#: src/main.cc:176
+#: src/main.cc:178
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual\n"
 msgstr " -F 格式        指定显示搜索结果的格式；参见手册\n"
 
-#: src/main.cc:177
+#: src/main.cc:179
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr " -O 次序        指定如何排列显示搜索结果；参见手册\n"
 
-#: src/main.cc:178
+#: src/main.cc:180
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr " -w 宽度        指定显示搜索结果的格式宽度\n"
 
-#: src/main.cc:179
+#: src/main.cc:181
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             积极地尝试修复损坏的软件包。\n"
 
-#: src/main.cc:180
+#: src/main.cc:182
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             显示就要安装的软件包版本。\n"
 
-#: src/main.cc:181
+#: src/main.cc:183
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             显示自动改变的软件包的依赖关系\n"
 
-#: src/main.cc:182
+#: src/main.cc:184
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    显示每个软件包的安装尺寸的变化。\n"
 
-#: src/main.cc:183
+#: src/main.cc:185
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr " -v             显示附加信息。(可能会提供多次) \n"
 
-#: src/main.cc:184
+#: src/main.cc:186
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr " -t [release]   设置将要安装的软件包的发布版本\n"
 
-#: src/main.cc:185
+#: src/main.cc:187
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
 "                indicators.\n"
 msgstr " -q            在命令行状态下，不显示增量进度指示器\n"
 
-#: src/main.cc:187
+#: src/main.cc:189
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr " -o key=val     直接设置名为“key”的配置选项\n"
 
-#: src/main.cc:188
+#: src/main.cc:190
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -4632,64 +4981,64 @@ msgstr ""
 " --with(out)-recommends\t指定是否将推荐(建议)处理为\n"
 "              强依赖关系。\n"
 
-#: src/main.cc:190
+#: src/main.cc:192
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr " -S fname       从文件名中读取aptitude的扩展状态信息。\n"
 
-#: src/main.cc:191
+#: src/main.cc:193
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             开始运行时下载新的软件包列表。\n"
 
-#: src/main.cc:192
+#: src/main.cc:194
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             开始运行时执行安装。\n"
 
-#: src/main.cc:194
+#: src/main.cc:196
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  这个 aptitude 没有超级牛力。\n"
 
-#: src/main.cc:397
+#: src/main.cc:399
 #, c-format
 msgid "Expected a number after -q=\n"
 msgstr "在 -q= 之后需要一个数字\n"
 
-#: src/main.cc:406
+#: src/main.cc:408
 #, c-format
 msgid "Expected a number after -q=, got %s\n"
 msgstr "在 -q= 之后需要一个数字，但却得到 %s\n"
 
-#: src/main.cc:430
+#: src/main.cc:432
 #, c-format
 msgid "-o requires an argument of the form key=value, got %s\n"
 msgstr "-o 要求参数格式为 key=val，却接受到 %s\n"
 
-#: src/main.cc:530
+#: src/main.cc:532
 #, c-format
 msgid "No comma following tag name \"%s\".\n"
 msgstr "标签名“%s”后没有逗号。\n"
 
-#: src/main.cc:571 src/main.cc:580
+#: src/main.cc:573 src/main.cc:582
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "“诡异”：收到未知的选项代码\n"
 
-#: src/main.cc:600
+#: src/main.cc:602
 msgid "Only one of -u and -i may be specified\n"
 msgstr "选项 -u 和 -i 只能指定一个\n"
 
-#: src/main.cc:608
+#: src/main.cc:610
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr "选项 -u 和 -i 不能在命令行模式中指定 (例如，和“install”一起)"
 
-#: src/main.cc:629
+#: src/main.cc:631
 msgid "-u and -i may not be specified with a command"
 msgstr "选项 -u 和 -i 不能在和一个命令一起指定 "
 
-#: src/main.cc:691
+#: src/main.cc:693
 #, c-format
 msgid ""
 "The options --safe-resolver and --full-resolver are not meaningful\n"
@@ -4698,17 +5047,17 @@ msgstr ""
 "选项 --safe-resolver 和 --full-resolver 对 %s 没有意义，它总是使用安全解析"
 "器。\n"
 
-#: src/main.cc:748
+#: src/main.cc:750
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "未知的命令“%s”\n"
 
-#: src/main.cc:760 src/main.cc:825
+#: src/main.cc:762 src/main.cc:827
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "未知的例外：%s\n"
 
-#: src/main.cc:764 src/main.cc:829
+#: src/main.cc:766 src/main.cc:831
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -4725,7 +5074,7 @@ msgstr "搜索："
 msgid "Search backwards for: "
 msgstr "向前搜索："
 
-#: src/mine/cmine.cc:114 src/mine/cmine.cc:156 src/ui.cc:1700
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1700
 msgid "Minesweeper"
 msgstr "扫雷"
 
@@ -4734,198 +5083,198 @@ msgstr "扫雷"
 msgid "%i/%i mines  %d %s"
 msgstr "%i/%i 个地雷 %d %s"
 
-#: src/mine/cmine.cc:124 src/mine/cmine.cc:131
+#: src/mine/cmine.cc:124 src/mine/cmine.cc:129
 msgid "second"
 msgstr "秒"
 
-#: src/mine/cmine.cc:124 src/mine/cmine.cc:131
+#: src/mine/cmine.cc:124 src/mine/cmine.cc:129
 msgid "seconds"
 msgstr "秒"
 
-#: src/mine/cmine.cc:128
+#: src/mine/cmine.cc:126
 #, c-format
 msgid "    %s in %d %s"
 msgstr "    %s 在 %d %s"
 
-#: src/mine/cmine.cc:129
+#: src/mine/cmine.cc:127
 msgid "Won"
 msgstr "赢"
 
-#: src/mine/cmine.cc:129
+#: src/mine/cmine.cc:127
 msgid "Lost"
 msgstr "输"
 
-#: src/mine/cmine.cc:173 src/mine/cmine.cc:217
+#: src/mine/cmine.cc:169 src/mine/cmine.cc:209
 #, c-format
 msgid "Could not open file \"%s\""
 msgstr "无法打开文件“%s”"
 
-#: src/mine/cmine.cc:188
+#: src/mine/cmine.cc:182
 #, c-format
 msgid "Could not load game from %s"
 msgstr "无法从 %s 中载入游戏"
 
-#: src/mine/cmine.cc:255
+#: src/mine/cmine.cc:247
 msgid "The board height must be a positive integer"
 msgstr "棋盘高度必须是正整数"
 
-#: src/mine/cmine.cc:267
+#: src/mine/cmine.cc:259
 msgid "The board width must be a positive integer"
 msgstr "棋盘宽度必须是正整数"
 
-#: src/mine/cmine.cc:279
+#: src/mine/cmine.cc:271
 msgid "Invalid mine count; please enter a positive integer"
 msgstr "不合法的地雷数；请输入一个正整数"
 
-#: src/mine/cmine.cc:299
+#: src/mine/cmine.cc:291
 msgid "Setup custom game"
 msgstr "设置自定义游戏"
 
-#: src/mine/cmine.cc:301
+#: src/mine/cmine.cc:293
 msgid "Height of board: "
 msgstr "棋盘高度："
 
-#: src/mine/cmine.cc:304
+#: src/mine/cmine.cc:296
 msgid "Width of board: "
 msgstr "棋盘宽度："
 
-#: src/mine/cmine.cc:307
+#: src/mine/cmine.cc:299
 msgid "Number of mines: "
 msgstr "地雷数量："
 
-#: src/mine/cmine.cc:310 src/mine/cmine.cc:375 src/ui.cc:285 src/ui.cc:357
+#: src/mine/cmine.cc:302 src/mine/cmine.cc:367 src/ui.cc:285 src/ui.cc:357
 msgid "Ok"
 msgstr "确定"
 
-#: src/mine/cmine.cc:368
+#: src/mine/cmine.cc:360
 msgid "Choose difficulty level"
 msgstr "选择难度级别"
 
-#: src/mine/cmine.cc:370
+#: src/mine/cmine.cc:362
 msgid "Easy"
 msgstr "容易"
 
-#: src/mine/cmine.cc:371
+#: src/mine/cmine.cc:363
 msgid "Medium"
 msgstr "中等"
 
-#: src/mine/cmine.cc:372
+#: src/mine/cmine.cc:364
 msgid "Hard"
 msgstr "困难"
 
-#: src/mine/cmine.cc:373
+#: src/mine/cmine.cc:365
 msgid "Custom"
 msgstr "自定义"
 
-#: src/mine/cmine.cc:471
+#: src/mine/cmine.cc:463
 msgid "You have won."
 msgstr "您赢了。"
 
-#: src/mine/cmine.cc:474
+#: src/mine/cmine.cc:466
 msgid "You lose!"
 msgstr "您输了！"
 
-#: src/mine/cmine.cc:479
+#: src/mine/cmine.cc:471
 msgid "You die...  --More--"
 msgstr "您死了...  --更多--"
 
-#: src/mine/cmine.cc:492
+#: src/mine/cmine.cc:484
 msgid "The spikes were poisoned!  The poison was deadly...  --More--"
 msgstr "桩子有毒！毒药是致命的..  --更多--"
 
-#: src/mine/cmine.cc:495
+#: src/mine/cmine.cc:487
 msgid "You land on a set of sharp iron spikes!  --More--"
 msgstr "您着陆在了一片尖锐的铁桩上！  --更多--"
 
-#: src/mine/cmine.cc:498
+#: src/mine/cmine.cc:490
 msgid "You fall into a pit!  --More--"
 msgstr "您掉进坑里了！  --更多--"
 
-#: src/mine/cmine.cc:501
+#: src/mine/cmine.cc:493
 msgid "KABOOM!  You step on a land mine.  --More--"
 msgstr "梆！您踩上地雷了！  --更多--"
 
-#: src/mine/cmine.cc:506
+#: src/mine/cmine.cc:498
 msgid "The dart was poisoned!  The poison was deadly...  --More--"
 msgstr "飞镖有毒！毒药是致命的...  --更多--"
 
-#: src/mine/cmine.cc:508
+#: src/mine/cmine.cc:500
 msgid ""
 "A little dart shoots out at you!  You are hit by a little dart!  --More--"
 msgstr "一个飞镖向您射来！ 您被一个飞镖刺中了！  --更多--"
 
-#: src/mine/cmine.cc:512
+#: src/mine/cmine.cc:504
 msgid "You turn to stone... --More--"
 msgstr "您变成了石头... --更多--"
 
-#: src/mine/cmine.cc:514
+#: src/mine/cmine.cc:506
 msgid "Touching the cockatrice corpse was a fatal mistake.  --More--"
 msgstr "接触怪蛇的身体是一个致命的错误。 --更多--"
 
-#: src/mine/cmine.cc:516
+#: src/mine/cmine.cc:508
 msgid "You feel here a cockatrice corpse.  --More--"
 msgstr "这里您感觉到一个怪蛇的身体。 --更多--"
 
-#: src/mine/cmine.cc:520
+#: src/mine/cmine.cc:512
 msgid ""
 "Click!  You trigger a rolling boulder trap!  You are hit by a boulder! --"
 "More--"
 msgstr "啪！您触发了一个滚石陷阱！您被一个大圆石击中了！ --更多--"
 
-#: src/mine/cmine.cc:530
+#: src/mine/cmine.cc:522
 msgid "sleep"
 msgstr "休眠"
 
-#: src/mine/cmine.cc:533
+#: src/mine/cmine.cc:525
 msgid "striking"
 msgstr "攻击"
 
-#: src/mine/cmine.cc:536
+#: src/mine/cmine.cc:528
 msgid "death"
 msgstr "死亡"
 
-#: src/mine/cmine.cc:539
+#: src/mine/cmine.cc:531
 msgid "polymorph"
 msgstr "变形"
 
-#: src/mine/cmine.cc:542
+#: src/mine/cmine.cc:534
 msgid "magic missile"
 msgstr "魔术导弹"
 
-#: src/mine/cmine.cc:545
+#: src/mine/cmine.cc:537
 msgid "secret door detection"
 msgstr "探测密门"
 
-#: src/mine/cmine.cc:548
+#: src/mine/cmine.cc:540
 msgid "invisibility"
 msgstr "隐身"
 
-#: src/mine/cmine.cc:551
+#: src/mine/cmine.cc:543
 msgid "cold"
 msgstr "寒冷"
 
-#: src/mine/cmine.cc:557
+#: src/mine/cmine.cc:547
 #, c-format
 msgid "Your wand of %s breaks apart and explodes!  --More--"
 msgstr "您的魔杖 %s 断开并爆炸了！ --更多--"
 
-#: src/mine/cmine.cc:563
+#: src/mine/cmine.cc:553
 msgid "You are jolted by a surge of electricity!  --More--"
 msgstr "您被一股强电流击中了！  --更多--"
 
-#: src/mine/cmine.cc:667
+#: src/mine/cmine.cc:657
 msgid "Enter the filename to load: "
 msgstr "请输入要载入的文件名："
 
-#: src/mine/cmine.cc:674
+#: src/mine/cmine.cc:664
 msgid "Enter the filename to save: "
 msgstr "输入要保存的文件名："
 
-#: src/mine/cmine.cc:684
+#: src/mine/cmine.cc:672
 msgid "mine-help.txt"
 msgstr "mine-help.txt"
 
-#: src/mine/cmine.cc:686
+#: src/mine/cmine.cc:674
 msgid "Encoding of mine-help.txt|UTF-8"
 msgstr "mine-help.txt 的编码|UTF-8"
 
@@ -4977,10 +5326,6 @@ msgstr "部分"
 msgid "RC"
 msgstr "RC"
 
-#: src/pkg_columnizer.cc:102
-msgid "Auto"
-msgstr "自动"
-
 #: src/pkg_columnizer.cc:103
 msgid "Tag"
 msgstr "标签"
@@ -6224,18 +6569,35 @@ msgstr "变成 root (^B)"
 msgid "^Quit"
 msgstr "退出(^Q)"
 
+#: src/ui.cc:2270 src/ui.cc:2650
+msgid "Undo"
+msgstr "撤消"
+
 #: src/ui.cc:2279
 msgid "^Install"
 msgstr "安装(^I)"
 
+#: src/ui.cc:2280
+msgid "Flag the currently selected package for installation or upgrade"
+msgstr "标记当前选择的软件包以安装或者升级"
+
 #: src/ui.cc:2283
 msgid "^Remove"
 msgstr "删除(^R)"
 
+#: src/ui.cc:2284
+msgid "Flag the currently selected package for removal"
+msgstr "标记当前选择的软件包以删除"
+
 #: src/ui.cc:2287
 msgid "^Purge"
 msgstr "清除(^P)"
 
+#: src/ui.cc:2288
+msgid ""
+"Flag the currently selected package and its configuration files for removal"
+msgstr "标记当前选择的软件包和它的配置文件以删除"
+
 #: src/ui.cc:2291
 msgid "^Keep"
 msgstr "保持(^K)"
@@ -6248,18 +6610,44 @@ msgstr "取消选定软件包上的任何动作"
 msgid "^Hold"
 msgstr "保持(^H)"
 
+#: src/ui.cc:2296
+msgid ""
+"Cancel any action on the selected package, and protect it from future "
+"upgrades"
+msgstr "取消选定软件包上的任何动作，并且保护它免于以后被升级"
+
 #: src/ui.cc:2299
 msgid "Mark ^Auto"
 msgstr "标记为自动安装(^A)"
 
+#: src/ui.cc:2300
+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:2303
 msgid "Mark ^Manual"
 msgstr "标记为手动安装(^M)"
 
+#: src/ui.cc:2304
+msgid ""
+"Mark the selected package as having been manually installed; it will not be "
+"removed unless you manually remove it"
+msgstr ""
+"将所选定的软件包标记为手动安装；除非您手动删除该软件包，否则它将不会被删除"
+
 #: src/ui.cc:2307
 msgid "^Forbid Version"
 msgstr "禁止版本(^F)"
 
+#: src/ui.cc:2308
+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:2312
 msgid "I^nformation"
 msgstr "信息(^N)"
@@ -6611,14 +6999,89 @@ msgstr "%s 个包已改变"
 msgid "View the list of changes made to this Debian package."
 msgstr "查看这个 Debian 软件包的修订列表"
 
-#: src/view_changelog.cc:388
+#: src/view_changelog.cc:369
+msgid "You can only view changelogs of official Debian packages."
+msgstr "您只能查看官方 Debian 软件包的变更日志。"
+
+#: src/view_changelog.cc:389
 msgid "Downloading Changelog"
 msgstr "正在下载变更日志"
 
-#: src/view_changelog.cc:390
+#: src/view_changelog.cc:391
 msgid "Download Changelog"
 msgstr "下载变更日志"
 
+#, fuzzy
+#~| msgid "Install"
+#~ msgid "_Install"
+#~ msgstr "安装"
+
+#, fuzzy
+#~| msgid "Remove"
+#~ msgid "_Remove"
+#~ msgstr "删除"
+
+#, fuzzy
+#~| msgid "^Purge"
+#~ msgid "_Purge"
+#~ msgstr "清除(^P)"
+
+#, fuzzy
+#~| msgid "Keep"
+#~ msgid "_Keep"
+#~ msgstr "保持"
+
+#, fuzzy
+#~| msgid "Hold"
+#~ msgid "_Hold"
+#~ msgstr "保持"
+
+#, fuzzy
+#~| msgid "Mark ^Auto"
+#~ msgid "Mark _Auto"
+#~ msgstr "标记为自动安装(^A)"
+
+#, fuzzy
+#~| msgid "Mark ^Manual"
+#~ msgid "Mark _Manual"
+#~ msgstr "标记为手动安装(^M)"
+
+#, fuzzy
+#~| msgid "^Forbid Version"
+#~ msgid "_Forbid Version"
+#~ msgstr "禁止版本(^F)"
+
+#, fuzzy
+#~| msgid "Resolver"
+#~ msgid "Resolver:"
+#~ msgstr "解决手段"
+
+#, fuzzy
+#~| msgid "Preview"
+#~ msgid "Preview:"
+#~ msgstr "预览"
+
+#, fuzzy
+#~| msgid "No packages are broken."
+#~ msgid "%d packages are broken."
+#~ msgstr "没有破损的软件包。"
+
+#, fuzzy
+#~| msgid "%d install"
+#~| msgid_plural "%d installs"
+#~ msgid "%d packages to install"
+#~ msgstr "安装 %d 个包"
+
+#, fuzzy
+#~| msgid "No packages are broken."
+#~ msgid "%d packages to remove"
+#~ msgstr "没有破损的软件包。"
+
+#, fuzzy
+#~| msgid "Packages"
+#~ msgid "Packages:"
+#~ msgstr "软件包"
+
 #~ msgid "Yes"
 #~ msgstr "Yes"
 
@@ -6670,9 +7133,6 @@ msgstr "下载变更日志"
 #~ msgid "The package \"%s\" is a starting point of the search.\n"
 #~ msgstr "“%s”是搜索的起点。\n"
 
-#~ msgid "The package \"%s\" is manually installed.\n"
-#~ msgstr "软件包“%s”是手动安装的。\n"
-
 #~| msgid ""
 #~| " -V             Show which versions of packages are to be installed.\n"
 #~ msgid ""
@@ -7293,9 +7753,6 @@ msgstr "下载变更日志"
 #~ msgstr ""
 #~ "y: %Fn: %Fi: %Fc: %Fd: %Fs: %Fv: %Fw: %Fe: %F%n%F%n%F%F%F%F%F%F%F%F%F"
 
-#~ msgid "view an explanation of the changes in the solution"
-#~ msgstr "查看关于解决方案中做的修改的说明"
-
 #~ msgid "^NEWS"
 #~ msgstr "新闻(^N)"