Regenerate .pot files and merge .po files with them

1 files changed, 167 insertions, 173 deletions

diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po
index 14af48a8b..614205ff3 100644
--- a/dselect/po/zh_CN.po
+++ b/dselect/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-12-20 02:29+0100\n"
+"POT-Creation-Date: 2011-03-06 10:45+0100\n"
 "PO-Revision-Date: 2006-05-06 20:11+0800\n"
 "Last-Translator: Kov Chai <tchaikov@sjtu.edu.cn>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -117,22 +117,22 @@ msgstr "无法新建相关信息小窗口"
 msgid "failed to create query window"
 msgstr "创建查询窗口失败"
 
-#: dselect/baselist.cc:260
+#: dselect/baselist.cc:255
 #, fuzzy
 msgid "Keybindings"
 msgstr "键位绑定"
 
-#: dselect/baselist.cc:308
+#: dselect/baselist.cc:303
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%，请摁 "
 
-#: dselect/baselist.cc:311
+#: dselect/baselist.cc:306
 #, c-format
 msgid "%s for more"
 msgstr "%s 继续往下读"
 
-#: dselect/baselist.cc:315
+#: dselect/baselist.cc:310
 #, c-format
 msgid "%s to go back"
 msgstr "%s 可以跳回原来的位置"
@@ -715,100 +715,100 @@ msgstr ""
 msgid "Type dselect --help for help."
 msgstr "输入 dselect --help 就可以阅读帮助信息。"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "[A]ccess"
 msgstr "来源[A]"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:143
 msgid "Choose the access method to use."
 msgstr "选择所使用的安装来源。"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "[U]pdate"
 msgstr "更新[U]"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:144
 msgid "Update list of available packages, if possible."
 msgstr "如果可能的话，更新可用的软件包列表。"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[S]elect"
 msgstr "选择[S]"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Request which packages you want on your system."
 msgstr "对系统中安装的软件包进行取舍。"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[I]nstall"
 msgstr "安装[I]"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Install and upgrade wanted packages."
 msgstr "安装并升级之前指定的软件包。"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[C]onfig"
 msgstr "配置[C]"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Configure any packages that are unconfigured."
 msgstr "对所有还未配置的软件包进行配置"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[R]emove"
 msgstr "删除[R]"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Remove unwanted software."
 msgstr "删除不需要的软件包"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[Q]uit"
 msgstr "退出[Q]"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Quit dselect."
 msgstr "退出 dselect 程序"
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "menu"
 msgstr "菜单"
 
-#: dselect/main.cc:156
+#: dselect/main.cc:155
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian “%s” 软件包操作前端 %s 版。\n"
 
-#: dselect/main.cc:159
+#: dselect/main.cc:158
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -816,7 +816,7 @@ msgstr ""
 "版权所有 (C) 1994-1996 Ian Jackson。\n"
 "版权所有 (C) 2000,2001 Wichert Akkerman。\n"
 
-#: dselect/main.cc:163
+#: dselect/main.cc:162
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -826,11 +826,11 @@ msgstr ""
 "第二版或其更新的版本。该软件【不】提供任何担保。\n"
 "请通过执行 %s --licence 来查看版权和许可证的细节。\n"
 
-#: dselect/main.cc:173 dselect/main.cc:221
+#: dselect/main.cc:172 dselect/main.cc:220
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc:183
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -839,7 +839,7 @@ msgstr ""
 "用法：%s [<选项> ...] [<操作> ...]\n"
 "\n"
 
-#: dselect/main.cc:188
+#: dselect/main.cc:187
 #, c-format
 msgid ""
 "Options:\n"
@@ -858,7 +858,7 @@ msgstr ""
 "                             设置显示所用的配色。\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc:196
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -870,7 +870,7 @@ msgstr ""
 "  --license | --license      显示许可证。\n"
 "\n"
 
-#: dselect/main.cc:202
+#: dselect/main.cc:201
 #, c-format
 msgid ""
 "Actions:\n"
@@ -881,56 +881,56 @@ msgstr ""
 "  手段 更新 选择 安装 设置 卸载 退出\n"
 "\n"
 
-#: dselect/main.cc:206
+#: dselect/main.cc:205
 #, c-format
 msgid "Screenparts:\n"
 msgstr "显示部位：\n"
 
-#: dselect/main.cc:211
+#: dselect/main.cc:210
 #, c-format
 msgid "Colours:\n"
 msgstr "颜色：\n"
 
-#: dselect/main.cc:216
+#: dselect/main.cc:215
 #, c-format
 msgid "Attributes:\n"
 msgstr "属性：\n"
 
-#: dselect/main.cc:231
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "无法打开调试信息文件“%.255s”\n"
 
-#: dselect/main.cc:248
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "无效的 %s “%s”\n"
 
-#: dselect/main.cc:265
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "显示部分"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "未指定颜色\n"
 
-#: dselect/main.cc:279 dselect/main.cc:284
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "颜色"
 
-#: dselect/main.cc:292
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "颜色属性"
 
-#: dselect/main.cc:324
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "终端不支持游标的定位。\n"
 
-#: dselect/main.cc:326
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "终端不支持高亮显示。\n"
 
-#: dselect/main.cc:328
+#: dselect/main.cc:333
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -939,11 +939,11 @@ msgstr ""
 "请正确设置您的 TERM 变量，用一个更合适的终端类型，\n"
 "或者转用针对单个软件包的包管理工具，即 %s。\n"
 
-#: dselect/main.cc:331
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "由于终端缺乏必要的特性，只得中止操作"
 
-#: dselect/main.cc:413
+#: dselect/main.cc:418
 msgid ""
 "\n"
 "\n"
@@ -957,7 +957,7 @@ msgstr ""
 "摁 <回车> 来确认。  用 ^L 来刷屏。\n"
 "\n"
 
-#: dselect/main.cc:428
+#: dselect/main.cc:433
 msgid ""
 "\n"
 "\n"
@@ -967,11 +967,11 @@ msgstr ""
 "\n"
 "只读访问：仅仅可以查看被选中的项目！"
 
-#: dselect/main.cc:447
+#: dselect/main.cc:452
 msgid "failed to getch in main menu"
 msgstr "在主菜单界面中 getch 失败"
 
-#: dselect/main.cc:523
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "不能识别的操作字串“%.50s”"
@@ -989,32 +989,32 @@ msgstr "安装手段“%s”。"
 msgid "Abbrev."
 msgstr "缩写"
 
-#: dselect/methlist.cc:121 dselect/pkginfo.cc:105 dselect/pkgtop.cc:301
+#: dselect/methlist.cc:121 dselect/pkginfo.cc:105 dselect/pkgtop.cc:291
 msgid "Description"
 msgstr "简介"
 
-#: dselect/methlist.cc:165 dselect/pkglist.cc:577
+#: dselect/methlist.cc:164 dselect/pkglist.cc:572
 msgid "doupdate failed"
 msgstr "doupdate 失败"
 
-#: dselect/methlist.cc:167 dselect/pkglist.cc:580
+#: dselect/methlist.cc:166 dselect/pkglist.cc:575
 msgid "failed to unblock SIGWINCH"
 msgstr "无法取消阻塞 SIGWINCH 信号"
 
-#: dselect/methlist.cc:171 dselect/pkglist.cc:585
+#: dselect/methlist.cc:170 dselect/pkglist.cc:580
 msgid "failed to re-block SIGWINCH"
 msgstr "重新阻塞 SIGWINCH 信号失败"
 
-#: dselect/methlist.cc:172 dselect/pkglist.cc:587
+#: dselect/methlist.cc:171 dselect/pkglist.cc:582
 msgid "getch failed"
 msgstr "getch 失败"
 
-#: dselect/methlist.cc:190
+#: dselect/methlist.cc:188
 #, fuzzy
 msgid "Explanation"
 msgstr "后面安装手段的说明"
 
-#: dselect/methlist.cc:199
+#: dselect/methlist.cc:197
 msgid "No explanation available."
 msgstr "没有发现相应的说明。"
 
@@ -1037,54 +1037,29 @@ msgstr ""
 "\n"
 "摁 <回车> 继续。"
 
-#: dselect/method.cc:166
-#, c-format
-msgid "returned error exit status %d.\n"
-msgstr "返回了错误的退出状态码 %d。\n"
-
-#: dselect/method.cc:170
-#, c-format
-msgid "was interrupted.\n"
-msgstr "被中断了。\n"
-
-#: dselect/method.cc:172
-#, c-format
-msgid "was terminated by a signal: %s.\n"
-msgstr "被一个信号中断了：%s。\n"
-
-#: dselect/method.cc:175
-#, c-format
-msgid "(It left a coredump.)\n"
-msgstr "(它 coredump 了。)\n"
-
-#: dselect/method.cc:177
-#, c-format
-msgid "failed with an unknown wait return code %d.\n"
-msgstr "因为得到了一个不能识别的返回码 %d 而使操作失败。\n"
-
-#: dselect/method.cc:179
+#: dselect/method.cc:165
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "请摁 <回车> 继续。\n"
 
-#: dselect/method.cc:180
+#: dselect/method.cc:166
 #, fuzzy
 msgid "<standard error>"
 msgstr "写标准错误输出时出错"
 
-#: dselect/method.cc:183
+#: dselect/method.cc:169
 msgid "error reading acknowledgement of program failure message"
 msgstr "读取程序的错误提示时出错"
 
-#: dselect/method.cc:214
+#: dselect/method.cc:200
 msgid "update available list script"
 msgstr "更新可用软件包列表的脚本"
 
-#: dselect/method.cc:218
+#: dselect/method.cc:204
 msgid "installation script"
 msgstr "软件包安装脚本"
 
-#: dselect/method.cc:264
+#: dselect/method.cc:250
 msgid "query/setup script"
 msgstr "查询/设置脚本"
 
@@ -1232,275 +1207,279 @@ msgstr "删除"
 msgid "purge"
 msgstr "清除"
 
-#: dselect/pkgdisplay.cc:46
+#. TRANSLATORS: The space is a trick to work around gettext which uses
+#. * the empty string to store information about the translation. DO NOT
+#. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
+#. * a single space.
+#: dselect/pkgdisplay.cc:47
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc:48
 msgid "REINSTALL"
 msgstr "【重新安装】"
 
-#: dselect/pkgdisplay.cc:50
+#: dselect/pkgdisplay.cc:51
 msgid "not installed"
 msgstr "没有安装"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc:52
 msgid "removed (configs remain)"
 msgstr "删除(残存配置文件)"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc:53
 msgid "half installed"
 msgstr "部分安装"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc:54
 msgid "unpacked (not set up)"
 msgstr "已解压缩(尚未设置)"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc:55
 msgid "half configured (config failed)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc:56
 msgid "awaiting trigger processing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc:57
 msgid "triggered"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc:58
 msgid "installed"
 msgstr "已安装完毕"
 
-#: dselect/pkgdisplay.cc:60
+#: dselect/pkgdisplay.cc:61
 msgid "Required"
 msgstr "需要"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc:62
 msgid "Important"
 msgstr "重要"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc:63
 msgid "Standard"
 msgstr "标准"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc:64
 msgid "Optional"
 msgstr "可选"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc:65
 msgid "Extra"
 msgstr "额外"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc:66
 msgid "!Bug!"
 msgstr "!瑕疵!"
 
-#: dselect/pkgdisplay.cc:66
+#: dselect/pkgdisplay.cc:67
 msgid "Unclassified"
 msgstr "未归类"
 
-#: dselect/pkgdisplay.cc:69
+#: dselect/pkgdisplay.cc:70
 msgid "suggests"
 msgstr "建议"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc:71
 msgid "recommends"
 msgstr "推荐"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc:72
 msgid "depends on"
 msgstr "依赖于"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc:73
 msgid "pre-depends on"
 msgstr "预依赖于"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc:74
 msgid "breaks"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc:75
 msgid "conflicts with"
 msgstr "与之冲突"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc:76
 msgid "provides"
 msgstr "提供"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:77
 msgid "replaces"
 msgstr "替换"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:78
 msgid "enhances"
 msgstr "有助于"
 
-#: dselect/pkgdisplay.cc:80
+#: dselect/pkgdisplay.cc:81
 msgid "Req"
 msgstr "需"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc:82
 msgid "Imp"
 msgstr "要"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:83
 msgid "Std"
 msgstr "标"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:84
 msgid "Opt"
 msgstr "选"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:85
 msgid "Xtr"
 msgstr "余"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:86
 msgid "bUG"
 msgstr "瑕"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:87
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:94 dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
 msgid "Broken"
 msgstr "有故障"
 
-#: dselect/pkgdisplay.cc:95
+#: dselect/pkgdisplay.cc:96
 msgid "New"
 msgstr "新的"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc:97
 msgid "Updated"
 msgstr "有更新"
 
-#: dselect/pkgdisplay.cc:97
+#: dselect/pkgdisplay.cc:98
 msgid "Obsolete/local"
 msgstr "淘汰/本地"
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:99
 msgid "Up-to-date"
 msgstr "已更新"
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:100
 msgid "Available"
 msgstr "可用"
 
-#: dselect/pkgdisplay.cc:100 dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
 msgid "Removed"
 msgstr "已删除"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:110
+#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
 msgid "Brokenly installed packages"
 msgstr "有故障的已安装软件包"
 
-#: dselect/pkgdisplay.cc:102
+#: dselect/pkgdisplay.cc:103
 msgid "Newly available packages"
 msgstr "新的可用软件包"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc:104
 msgid "Updated packages (newer version is available)"
 msgstr "软件包有更新版本(有更高的版本可用了)"
 
-#: dselect/pkgdisplay.cc:104
+#: dselect/pkgdisplay.cc:105
 msgid "Obsolete and local packages present on system"
 msgstr "系统中安装这些的软件包是已淘汰的和本地的"
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:106
 msgid "Up to date installed packages"
 msgstr "安装了的软件包版本是最新的"
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:107
 msgid "Available packages (not currently installed)"
 msgstr "可用的软件包(目前没有被安装)"
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:108
 msgid "Removed and no longer available packages"
 msgstr "被删除而且不再可用的软件包"
 
-#: dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc:112
 msgid "Installed packages"
 msgstr "已经安装的软件包"
 
-#: dselect/pkgdisplay.cc:112
+#: dselect/pkgdisplay.cc:113
 msgid "Removed packages (configuration still present)"
 msgstr "被删除的软件包 (其配置文件仍然存在于系统中)"
 
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:114
 msgid "Purged packages and those never installed"
 msgstr "被完全清除的软件包以及那些从未被安装过的软件包"
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:116
 msgid "Installed"
 msgstr "已安装"
 
-#: dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:118
 msgid "Purged"
 msgstr "已清除"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc:198
 msgid "dselect - recursive package listing"
 msgstr "dselect - 递归地列出软件包"
 
-#: dselect/pkgdisplay.cc:198
+#: dselect/pkgdisplay.cc:199
 msgid "dselect - inspection of package states"
 msgstr "dselect - 检视软件包的状态"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc:200
 msgid "dselect - main package listing"
 msgstr "dselect - 软件包主列表"
 
-#: dselect/pkgdisplay.cc:207
+#: dselect/pkgdisplay.cc:208
 msgid " (by section)"
 msgstr " (按所属大类)"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:211
 msgid " (avail., section)"
 msgstr " (按是否可用和所属大类)"
 
-#: dselect/pkgdisplay.cc:213
+#: dselect/pkgdisplay.cc:214
 msgid " (status, section)"
 msgstr " (按状态和所属大类)"
 
-#: dselect/pkgdisplay.cc:222
+#: dselect/pkgdisplay.cc:223
 msgid " (by priority)"
 msgstr " (按优先级)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:226
 msgid " (avail., priority)"
 msgstr " (按是否可用和优先级)"
 
-#: dselect/pkgdisplay.cc:228
+#: dselect/pkgdisplay.cc:229
 msgid " (status, priority)"
 msgstr " (按状态和优先级)"
 
-#: dselect/pkgdisplay.cc:237 dselect/pkgdisplay.cc:249
+#: dselect/pkgdisplay.cc:238 dselect/pkgdisplay.cc:250
 msgid " (alphabetically)"
 msgstr " (按字母表顺序)"
 
-#: dselect/pkgdisplay.cc:240
+#: dselect/pkgdisplay.cc:241
 msgid " (by availability)"
 msgstr " (按是否可用)"
 
-#: dselect/pkgdisplay.cc:243
+#: dselect/pkgdisplay.cc:244
 msgid " (by status)"
 msgstr " (按状态)"
 
-#: dselect/pkgdisplay.cc:257
+#: dselect/pkgdisplay.cc:258
 msgid " mark:+/=/- terse:v help:?"
 msgstr " 标记:+/=/- 简略:v 帮助:?"
 
-#: dselect/pkgdisplay.cc:258
+#: dselect/pkgdisplay.cc:259
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " 标记:+/=/- 详尽:v 帮助:?"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc:260
 msgid " terse:v help:?"
 msgstr " 简略:v 帮助:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:261
 msgid " verbose:v help:?"
 msgstr " 详尽:v 帮助:?"
 
@@ -1543,23 +1522,23 @@ msgstr "为下面软件包安装的控制信息"
 msgid "Available control file information"
 msgstr "可用的控制信息的版本"
 
-#: dselect/pkglist.cc:421
+#: dselect/pkglist.cc:416
 msgid "There are no packages."
 msgstr ""
 
-#: dselect/pkglist.cc:512
+#: dselect/pkglist.cc:507
 msgid "invalid search option given"
 msgstr "指定了无效的搜索选项"
 
-#: dselect/pkglist.cc:526
+#: dselect/pkglist.cc:521
 msgid "error in regular expression"
 msgstr "正则表达式有误"
 
-#: dselect/pkgsublist.cc:108
+#: dselect/pkgsublist.cc:107
 msgid " does not appear to be available\n"
 msgstr " 看上去应该不可用\n"
 
-#: dselect/pkgsublist.cc:128
+#: dselect/pkgsublist.cc:127
 msgid " or "
 msgstr " 或者 "
 
@@ -1601,46 +1580,61 @@ msgstr "在 %3$s 大类中 %1$s %2$s 软件包"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (曾为：%s).  %s"
 
-#: dselect/pkgtop.cc:273
+#: dselect/pkgtop.cc:263
 msgid "Error"
 msgstr "错误"
 
-#: dselect/pkgtop.cc:277
+#: dselect/pkgtop.cc:267
 msgid "Installed?"
 msgstr "已安装？"
 
-#: dselect/pkgtop.cc:281
+#: dselect/pkgtop.cc:271
 msgid "Old mark"
 msgstr "原有标记"
 
-#: dselect/pkgtop.cc:285
+#: dselect/pkgtop.cc:275
 msgid "Marked for"
 msgstr "现标记为"
 
-#: dselect/pkgtop.cc:288
+#: dselect/pkgtop.cc:278
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgtop.cc:290
+#: dselect/pkgtop.cc:280
 msgid "Section"
 msgstr "所属大类"
 
-#: dselect/pkgtop.cc:291
+#: dselect/pkgtop.cc:281
 msgid "Priority"
 msgstr "优先级"
 
-#: dselect/pkgtop.cc:292
+#: dselect/pkgtop.cc:282
 msgid "Package"
 msgstr "软件包名"
 
-#: dselect/pkgtop.cc:296
+#: dselect/pkgtop.cc:286
 msgid "Inst.ver"
 msgstr "安装版本"
 
-#: dselect/pkgtop.cc:299
+#: dselect/pkgtop.cc:289
 msgid "Avail.ver"
 msgstr "可用版本"
 
+#~ msgid "returned error exit status %d.\n"
+#~ msgstr "返回了错误的退出状态码 %d。\n"
+
+#~ msgid "was interrupted.\n"
+#~ msgstr "被中断了。\n"
+
+#~ msgid "was terminated by a signal: %s.\n"
+#~ msgstr "被一个信号中断了：%s。\n"
+
+#~ msgid "(It left a coredump.)\n"
+#~ msgstr "(它 coredump 了。)\n"
+
+#~ msgid "failed with an unknown wait return code %d.\n"
+#~ msgstr "因为得到了一个不能识别的返回码 %d 而使操作失败。\n"
+
 #~ msgid "unable to run %.250s process `%.250s'"
 #~ msgstr "无法运行 %.250s 进程“%.250s”"