Regenerate .pot files and merge .po files with them

1 files changed, 49 insertions, 49 deletions

diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po
index 686692799..8b5a4af3e 100644
--- a/dselect/po/zh_CN.po
+++ b/dselect/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2013-07-27 03:54+0200\n"
+"POT-Creation-Date: 2013-12-04 07:10+0100\n"
 "PO-Revision-Date: 2006-05-06 20:11+0800\n"
 "Last-Translator: Kov Chai <tchaikov@sjtu.edu.cn>\n"
 "Language-Team: Chinese (simplified) <debian-chinese-gb@lists.debian.org>\n"
@@ -713,104 +713,104 @@ msgstr ""
 "  /                进行搜索(摁回车取消搜索)\n"
 "  \\               重复上次的搜索\n"
 
-#: dselect/main.cc:64
+#: dselect/main.cc:63
 msgid "Type dselect --help for help."
 msgstr "输入 dselect --help 就可以阅读帮助信息。"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "[A]ccess"
 msgstr "来源[A]"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:145
 msgid "Choose the access method to use."
 msgstr "选择所使用的安装来源。"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "[U]pdate"
 msgstr "更新[U]"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:146
 msgid "Update list of available packages, if possible."
 msgstr "如果可能的话，更新可用的软件包列表。"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "[S]elect"
 msgstr "选择[S]"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:147
 msgid "Request which packages you want on your system."
 msgstr "对系统中安装的软件包进行取舍。"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "[I]nstall"
 msgstr "安装[I]"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:148
 msgid "Install and upgrade wanted packages."
 msgstr "安装并升级之前指定的软件包。"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "[C]onfig"
 msgstr "配置[C]"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:149
 msgid "Configure any packages that are unconfigured."
 msgstr "对所有还未配置的软件包进行配置"
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "[R]emove"
 msgstr "删除[R]"
 
-#: dselect/main.cc:151
+#: dselect/main.cc:150
 msgid "Remove unwanted software."
 msgstr "删除不需要的软件包"
 
-#: dselect/main.cc:152
+#: dselect/main.cc:151
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:152
+#: dselect/main.cc:151
 msgid "[Q]uit"
 msgstr "退出[Q]"
 
-#: dselect/main.cc:152
+#: dselect/main.cc:151
 msgid "Quit dselect."
 msgstr "退出 dselect 程序"
 
-#: dselect/main.cc:153
+#: dselect/main.cc:152
 msgid "menu"
 msgstr "菜单"
 
-#: dselect/main.cc:158
+#: dselect/main.cc:157
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian “%s” 软件包操作前端 %s 版。\n"
 
-#: dselect/main.cc:161
+#: dselect/main.cc:160
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -820,11 +820,11 @@ msgstr ""
 "第二版或其更新的版本。该软件【不】提供任何担保。\n"
 "请通过执行 %s --licence 来查看版权和许可证的细节。\n"
 
-#: dselect/main.cc:170 dselect/main.cc:218
+#: dselect/main.cc:169 dselect/main.cc:217
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:181
+#: dselect/main.cc:180
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -833,7 +833,7 @@ msgstr ""
 "用法：%s [<选项> ...] [<操作> ...]\n"
 "\n"
 
-#: dselect/main.cc:185
+#: dselect/main.cc:184
 #, fuzzy, c-format
 #| msgid ""
 #| "Options:\n"
@@ -862,7 +862,7 @@ msgstr ""
 "                             设置显示所用的配色。\n"
 "\n"
 
-#: dselect/main.cc:194
+#: dselect/main.cc:193
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -874,65 +874,65 @@ msgstr ""
 "  --license | --license      显示许可证。\n"
 "\n"
 
-#: dselect/main.cc:198
+#: dselect/main.cc:197
 #, fuzzy, c-format
 #| msgid "Section"
 msgid "Actions:\n"
 msgstr "所属大类"
 
-#: dselect/main.cc:203
+#: dselect/main.cc:202
 #, c-format
 msgid "Screenparts:\n"
 msgstr "显示部位：\n"
 
-#: dselect/main.cc:208
+#: dselect/main.cc:207
 #, c-format
 msgid "Colours:\n"
 msgstr "颜色：\n"
 
-#: dselect/main.cc:213
+#: dselect/main.cc:212
 #, c-format
 msgid "Attributes:\n"
 msgstr "属性：\n"
 
-#: dselect/main.cc:231
+#: dselect/main.cc:230
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "无法打开调试信息文件“%.255s”\n"
 
-#: dselect/main.cc:251
+#: dselect/main.cc:250
 #, fuzzy, c-format
 #| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "无效的 %s “%s”\n"
 
-#: dselect/main.cc:268
+#: dselect/main.cc:267
 msgid "screen part"
 msgstr "显示部分"
 
-#: dselect/main.cc:274
+#: dselect/main.cc:273
 #, fuzzy
 #| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "未指定颜色\n"
 
-#: dselect/main.cc:282 dselect/main.cc:287
+#: dselect/main.cc:281 dselect/main.cc:286
 msgid "colour"
 msgstr "颜色"
 
-#: dselect/main.cc:295
+#: dselect/main.cc:294
 msgid "colour attribute"
 msgstr "颜色属性"
 
-#: dselect/main.cc:327
+#: dselect/main.cc:326
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "终端不支持游标的定位。\n"
 
-#: dselect/main.cc:329
+#: dselect/main.cc:328
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "终端不支持高亮显示。\n"
 
-#: dselect/main.cc:331
+#: dselect/main.cc:330
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -941,11 +941,11 @@ msgstr ""
 "请正确设置您的 TERM 变量，用一个更合适的终端类型，\n"
 "或者转用针对单个软件包的包管理工具，即 %s。\n"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 msgid "terminal lacks necessary features, giving up"
 msgstr "由于终端缺乏必要的特性，只得中止操作"
 
-#: dselect/main.cc:415
+#: dselect/main.cc:414
 msgid ""
 "\n"
 "\n"
@@ -959,7 +959,7 @@ msgstr ""
 "摁 <回车> 来确认。  用 ^L 来刷屏。\n"
 "\n"
 
-#: dselect/main.cc:420
+#: dselect/main.cc:419
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -967,7 +967,7 @@ msgstr ""
 "版权所有 (C) 1994-1996 Ian Jackson。\n"
 "版权所有 (C) 2000,2001 Wichert Akkerman。\n"
 
-#: dselect/main.cc:426
+#: dselect/main.cc:425
 msgid ""
 "\n"
 "\n"
@@ -977,11 +977,11 @@ msgstr ""
 "\n"
 "只读访问：仅仅可以查看被选中的项目！"
 
-#: dselect/main.cc:445
+#: dselect/main.cc:444
 msgid "failed to getch in main menu"
 msgstr "在主菜单界面中 getch 失败"
 
-#: dselect/main.cc:531
+#: dselect/main.cc:527
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "不能识别的操作字串“%.50s”"