Regenerate .pot files and merge .po files with them

1 files changed, 54 insertions, 54 deletions

diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po
index cba7b43d8..8a0da82cb 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: 2011-04-02 00:59+0200\n"
+"POT-Creation-Date: 2011-08-01 22:21+0200\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"
@@ -28,20 +28,20 @@ msgstr "想搜索什么？"
 msgid "Error: "
 msgstr "错误："
 
-#: dselect/basecmds.cc:176
+#: dselect/basecmds.cc:178
 msgid "Help: "
 msgstr "帮助："
 
-#: dselect/basecmds.cc:182
+#: dselect/basecmds.cc:184
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "摁 ? 可以弹出帮助菜单，用 . 来进入下个主题，通过 <空格> 就能退出帮助界面。"
 
-#: dselect/basecmds.cc:189
+#: dselect/basecmds.cc:191
 msgid "Help information is available under the following topics:"
 msgstr "您可获得有关下列主题的帮助信息："
 
-#: dselect/basecmds.cc:197
+#: dselect/basecmds.cc:199
 msgid ""
 "Press a key from the list above, <space> or `q' to exit help,\n"
 "  or `.' (full stop) to read each help page in turn. "
@@ -49,7 +49,7 @@ msgstr ""
 "请摁上面列表中所示的按键，用 <空格> 或者“q”来退出帮助界面，\n"
 "或者用“.”(英文句点)来依次阅读帮助页面。"
 
-#: dselect/basecmds.cc:203
+#: dselect/basecmds.cc:205
 msgid "error reading keyboard in help"
 msgstr "在帮助界面读取键盘输入时出错"
 
@@ -711,104 +711,104 @@ msgstr ""
 "  /                进行搜索(摁回车取消搜索)\n"
 "  \\               重复上次的搜索\n"
 
-#: dselect/main.cc:61
+#: dselect/main.cc:60
 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:234
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "无法打开调试信息文件“%.255s”\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "无效的 %s “%s”\n"
 
-#: dselect/main.cc:271
+#: dselect/main.cc:270
 msgid "screen part"
 msgstr "显示部分"
 
-#: dselect/main.cc:277
+#: dselect/main.cc:276
 msgid "Null colour specification\n"
 msgstr "未指定颜色\n"
 
-#: dselect/main.cc:285 dselect/main.cc:290
+#: dselect/main.cc:284 dselect/main.cc:289
 msgid "colour"
 msgstr "颜色"
 
-#: dselect/main.cc:298
+#: dselect/main.cc:297
 msgid "colour attribute"
 msgstr "颜色属性"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "终端不支持游标的定位。\n"
 
-#: dselect/main.cc:332
+#: dselect/main.cc:331
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "终端不支持高亮显示。\n"
 
-#: dselect/main.cc:334
+#: 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:337
+#: dselect/main.cc:336
 msgid "terminal lacks necessary features, giving up"
 msgstr "由于终端缺乏必要的特性，只得中止操作"
 
-#: dselect/main.cc:418
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -957,7 +957,7 @@ msgstr ""
 "摁 <回车> 来确认。  用 ^L 来刷屏。\n"
 "\n"
 
-#: dselect/main.cc:429
+#: dselect/main.cc:428
 msgid ""
 "\n"
 "\n"
@@ -967,11 +967,11 @@ msgstr ""
 "\n"
 "只读访问：仅仅可以查看被选中的项目！"
 
-#: dselect/main.cc:449
+#: dselect/main.cc:448
 msgid "failed to getch in main menu"
 msgstr "在主菜单界面中 getch 失败"
 
-#: dselect/main.cc:530
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "不能识别的操作字串“%.50s”"