Regenerate .pot files and merge .po files with them

1 files changed, 94 insertions, 96 deletions

diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po
index 5435678c5..f4a5e4724 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-09-23 03:38+0200\n"
+"POT-Creation-Date: 2012-03-19 07:23+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"
@@ -711,112 +711,104 @@ msgstr ""
 "  /                进行搜索(摁回车取消搜索)\n"
 "  \\               重复上次的搜索\n"
 
-#: dselect/main.cc:60
+#: dselect/main.cc:64
 msgid "Type dselect --help for help."
 msgstr "输入 dselect --help 就可以阅读帮助信息。"
 
-#: dselect/main.cc:143
+#: dselect/main.cc:146
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:143
+#: dselect/main.cc:146
 msgid "[A]ccess"
 msgstr "来源[A]"
 
-#: dselect/main.cc:143
+#: dselect/main.cc:146
 msgid "Choose the access method to use."
 msgstr "选择所使用的安装来源。"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:147
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:147
 msgid "[U]pdate"
 msgstr "更新[U]"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:147
 msgid "Update list of available packages, if possible."
 msgstr "如果可能的话，更新可用的软件包列表。"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:148
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:148
 msgid "[S]elect"
 msgstr "选择[S]"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:148
 msgid "Request which packages you want on your system."
 msgstr "对系统中安装的软件包进行取舍。"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:149
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:149
 msgid "[I]nstall"
 msgstr "安装[I]"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:149
 msgid "Install and upgrade wanted packages."
 msgstr "安装并升级之前指定的软件包。"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:150
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:150
 msgid "[C]onfig"
 msgstr "配置[C]"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:150
 msgid "Configure any packages that are unconfigured."
 msgstr "对所有还未配置的软件包进行配置"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:151
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:151
 msgid "[R]emove"
 msgstr "删除[R]"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:151
 msgid "Remove unwanted software."
 msgstr "删除不需要的软件包"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:152
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:152
 msgid "[Q]uit"
 msgstr "退出[Q]"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:152
 msgid "Quit dselect."
 msgstr "退出 dselect 程序"
 
-#: dselect/main.cc:150
+#: dselect/main.cc:153
 msgid "menu"
 msgstr "菜单"
 
-#: dselect/main.cc:155
+#: dselect/main.cc:158
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian “%s” 软件包操作前端 %s 版。\n"
 
-#: dselect/main.cc:158
-msgid ""
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-msgstr ""
-"版权所有 (C) 1994-1996 Ian Jackson。\n"
-"版权所有 (C) 2000,2001 Wichert Akkerman。\n"
-
-#: dselect/main.cc:162
+#: dselect/main.cc:161
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -826,11 +818,11 @@ msgstr ""
 "第二版或其更新的版本。该软件【不】提供任何担保。\n"
 "请通过执行 %s --licence 来查看版权和许可证的细节。\n"
 
-#: dselect/main.cc:172 dselect/main.cc:220
+#: dselect/main.cc:170 dselect/main.cc:218
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:183
+#: dselect/main.cc:181
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -839,7 +831,7 @@ msgstr ""
 "用法：%s [<选项> ...] [<操作> ...]\n"
 "\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:185
 #, c-format
 msgid ""
 "Options:\n"
@@ -858,7 +850,7 @@ msgstr ""
 "                             设置显示所用的配色。\n"
 "\n"
 
-#: dselect/main.cc:196
+#: dselect/main.cc:194
 #, fuzzy, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -870,7 +862,7 @@ msgstr ""
 "  --license | --license      显示许可证。\n"
 "\n"
 
-#: dselect/main.cc:201
+#: dselect/main.cc:199
 #, c-format
 msgid ""
 "Actions:\n"
@@ -881,56 +873,56 @@ msgstr ""
 "  手段 更新 选择 安装 设置 卸载 退出\n"
 "\n"
 
-#: dselect/main.cc:205
+#: dselect/main.cc:203
 #, c-format
 msgid "Screenparts:\n"
 msgstr "显示部位：\n"
 
-#: dselect/main.cc:210
+#: dselect/main.cc:208
 #, c-format
 msgid "Colours:\n"
 msgstr "颜色：\n"
 
-#: dselect/main.cc:215
+#: dselect/main.cc:213
 #, c-format
 msgid "Attributes:\n"
 msgstr "属性：\n"
 
-#: dselect/main.cc:233
+#: dselect/main.cc:231
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "无法打开调试信息文件“%.255s”\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc:251
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "无效的 %s “%s”\n"
 
-#: dselect/main.cc:270
+#: dselect/main.cc:268
 msgid "screen part"
 msgstr "显示部分"
 
-#: dselect/main.cc:276
+#: dselect/main.cc:274
 msgid "Null colour specification\n"
 msgstr "未指定颜色\n"
 
-#: dselect/main.cc:284 dselect/main.cc:289
+#: dselect/main.cc:282 dselect/main.cc:287
 msgid "colour"
 msgstr "颜色"
 
-#: dselect/main.cc:297
+#: dselect/main.cc:295
 msgid "colour attribute"
 msgstr "颜色属性"
 
-#: dselect/main.cc:329
+#: dselect/main.cc:327
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "终端不支持游标的定位。\n"
 
-#: dselect/main.cc:331
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "终端不支持高亮显示。\n"
 
-#: dselect/main.cc:333
+#: dselect/main.cc:331
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -939,11 +931,15 @@ msgstr ""
 "请正确设置您的 TERM 变量，用一个更合适的终端类型，\n"
 "或者转用针对单个软件包的包管理工具，即 %s。\n"
 
-#: dselect/main.cc:336
+#: dselect/main.cc:334
 msgid "terminal lacks necessary features, giving up"
 msgstr "由于终端缺乏必要的特性，只得中止操作"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:369
+msgid "foreign architectures enabled but multi-arch is not supported"
+msgstr ""
+
+#: dselect/main.cc:422
 msgid ""
 "\n"
 "\n"
@@ -957,7 +953,15 @@ msgstr ""
 "摁 <回车> 来确认。  用 ^L 来刷屏。\n"
 "\n"
 
-#: dselect/main.cc:428
+#: dselect/main.cc:427
+msgid ""
+"Copyright (C) 1994-1996 Ian Jackson.\n"
+"Copyright (C) 2000,2001 Wichert Akkerman.\n"
+msgstr ""
+"版权所有 (C) 1994-1996 Ian Jackson。\n"
+"版权所有 (C) 2000,2001 Wichert Akkerman。\n"
+
+#: dselect/main.cc:433
 msgid ""
 "\n"
 "\n"
@@ -967,11 +971,11 @@ msgstr ""
 "\n"
 "只读访问：仅仅可以查看被选中的项目！"
 
-#: dselect/main.cc:448
+#: dselect/main.cc:453
 msgid "failed to getch in main menu"
 msgstr "在主菜单界面中 getch 失败"
 
-#: dselect/main.cc:531
+#: dselect/main.cc:536
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "不能识别的操作字串“%.50s”"
@@ -993,19 +997,19 @@ msgstr "缩写"
 msgid "Description"
 msgstr "简介"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:572
+#: dselect/methlist.cc:164 dselect/pkglist.cc:577
 msgid "doupdate failed"
 msgstr "doupdate 失败"
 
-#: dselect/methlist.cc:166 dselect/pkglist.cc:575
+#: dselect/methlist.cc:166 dselect/pkglist.cc:580
 msgid "failed to unblock SIGWINCH"
 msgstr "无法取消阻塞 SIGWINCH 信号"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:580
+#: dselect/methlist.cc:170 dselect/pkglist.cc:585
 msgid "failed to re-block SIGWINCH"
 msgstr "重新阻塞 SIGWINCH 信号失败"
 
-#: dselect/methlist.cc:171 dselect/pkglist.cc:582
+#: dselect/methlist.cc:171 dselect/pkglist.cc:587
 msgid "getch failed"
 msgstr "getch 失败"
 
@@ -1167,26 +1171,11 @@ msgstr "读取安装手段的选项文件“%.250s”时出错"
 msgid "unable to open current option file `%.250s'"
 msgstr "无法打开当前的选项文件“%.250s”"
 
-#: dselect/methparse.cc:289
-#, c-format
-msgid "unable to open new option file `%.250s'"
-msgstr "无法打开新的的选项文件“%.250s”"
-
-#: dselect/methparse.cc:292
+#: dselect/methparse.cc:283
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "无法写入新的选项文件“%.250s”"
 
-#: dselect/methparse.cc:295
-#, c-format
-msgid "unable to close new option file `%.250s'"
-msgstr "无法关闭新的选项文件“%.250s”"
-
-#: dselect/methparse.cc:297
-#, c-format
-msgid "unable to install new option as `%.250s'"
-msgstr "无法安装新的选项文件到“%.250s”"
-
 #: dselect/pkgdisplay.cc:36
 msgid "new package"
 msgstr "新到软件包"
@@ -1423,63 +1412,63 @@ msgstr "已清除"
 msgid "dselect - recursive package listing"
 msgstr "dselect - 递归地列出软件包"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc:200
 msgid "dselect - inspection of package states"
 msgstr "dselect - 检视软件包的状态"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - main package listing"
 msgstr "dselect - 软件包主列表"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc:209
 msgid " (by section)"
 msgstr " (按所属大类)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc:212
 msgid " (avail., section)"
 msgstr " (按是否可用和所属大类)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc:215
 msgid " (status, section)"
 msgstr " (按状态和所属大类)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc:224
 msgid " (by priority)"
 msgstr " (按优先级)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc:227
 msgid " (avail., priority)"
 msgstr " (按是否可用和优先级)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc:230
 msgid " (status, priority)"
 msgstr " (按状态和优先级)"
 
-#: dselect/pkgdisplay.cc:238 dselect/pkgdisplay.cc:250
+#: dselect/pkgdisplay.cc:239
 msgid " (alphabetically)"
 msgstr " (按字母表顺序)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc:242
 msgid " (by availability)"
 msgstr " (按是否可用)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc:245
 msgid " (by status)"
 msgstr " (按状态)"
 
-#: dselect/pkgdisplay.cc:258
+#: dselect/pkgdisplay.cc:260
 msgid " mark:+/=/- terse:v help:?"
 msgstr " 标记:+/=/- 简略:v 帮助:?"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " 标记:+/=/- 详尽:v 帮助:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " 简略:v 帮助:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " 详尽:v 帮助:?"
 
@@ -1522,23 +1511,23 @@ msgstr "为下面软件包安装的控制信息"
 msgid "Available control file information"
 msgstr "可用的控制信息的版本"
 
-#: dselect/pkglist.cc:416
+#: dselect/pkglist.cc:421
 msgid "There are no packages."
 msgstr ""
 
-#: dselect/pkglist.cc:507
+#: dselect/pkglist.cc:512
 msgid "invalid search option given"
 msgstr "指定了无效的搜索选项"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc:526
 msgid "error in regular expression"
 msgstr "正则表达式有误"
 
-#: dselect/pkgsublist.cc:107
+#: dselect/pkgsublist.cc:108
 msgid " does not appear to be available\n"
 msgstr " 看上去应该不可用\n"
 
-#: dselect/pkgsublist.cc:127
+#: dselect/pkgsublist.cc:128
 msgid " or "
 msgstr " 或者 "
 
@@ -1620,6 +1609,15 @@ msgstr "安装版本"
 msgid "Avail.ver"
 msgstr "可用版本"
 
+#~ msgid "unable to open new option file `%.250s'"
+#~ msgstr "无法打开新的的选项文件“%.250s”"
+
+#~ msgid "unable to close new option file `%.250s'"
+#~ msgstr "无法关闭新的选项文件“%.250s”"
+
+#~ msgid "unable to install new option as `%.250s'"
+#~ msgstr "无法安装新的选项文件到“%.250s”"
+
 #~ msgid "returned error exit status %d.\n"
 #~ msgstr "返回了错误的退出状态码 %d。\n"