Regenerate .pot files and merge .po files with them

1 files changed, 104 insertions, 104 deletions

diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po
index 8b5a4af3e..69e4d96c2 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-12-04 07:10+0100\n"
+"POT-Creation-Date: 2013-12-07 07:53+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"
@@ -61,78 +61,78 @@ msgstr "ioctl(TIOCGWINSZ) 失败"
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "在 SIGWINCH 的处理函数里 doupdate 失败了"
 
-#: dselect/baselist.cc:71
+#: dselect/baselist.cc:72
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "恢复原先的 SIGWINCH sigact 失败"
 
-#: dselect/baselist.cc:73
+#: dselect/baselist.cc:75
 msgid "failed to restore old signal mask"
 msgstr "恢复原先的 signal mask 失败"
 
-#: dselect/baselist.cc:83
+#: dselect/baselist.cc:86
 msgid "failed to get old signal mask"
 msgstr "获取原先的 signal mask 失败"
 
-#: dselect/baselist.cc:84
+#: dselect/baselist.cc:88
 msgid "failed to get old SIGWINCH sigact"
 msgstr "获取原先的 SIGWINCH sigact 出错"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc:93
 msgid "failed to block SIGWINCH"
 msgstr "无法阻塞 SIGWINCH 信号"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc:99
 msgid "failed to set new SIGWINCH sigact"
 msgstr "设置新的 SIGWINCH sigact 失败"
 
-#: dselect/baselist.cc:130
+#: dselect/baselist.cc:136
 msgid "failed to allocate colour pair"
 msgstr "分配颜色对失败"
 
-#: dselect/baselist.cc:159
+#: dselect/baselist.cc:165
 msgid "failed to create title window"
 msgstr "创建标题窗口失败"
 
-#: dselect/baselist.cc:163
+#: dselect/baselist.cc:169
 msgid "failed to create whatinfo window"
 msgstr "创建 whatinfo 窗口失败"
 
-#: dselect/baselist.cc:167
+#: dselect/baselist.cc:173
 msgid "failed to create baselist pad"
 msgstr "无法新建基列表的小窗口"
 
-#: dselect/baselist.cc:170
+#: dselect/baselist.cc:176
 msgid "failed to create heading pad"
 msgstr "无法新建标题小窗口"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc:180
 msgid "failed to create thisstate pad"
 msgstr "无法新建 thisstate 小窗口"
 
-#: dselect/baselist.cc:178
+#: dselect/baselist.cc:184
 msgid "failed to create info pad"
 msgstr "无法新建相关信息小窗口"
 
-#: dselect/baselist.cc:183
+#: dselect/baselist.cc:189
 msgid "failed to create query window"
 msgstr "创建查询窗口失败"
 
-#: dselect/baselist.cc:251
+#: dselect/baselist.cc:258
 #, fuzzy
 msgid "Keybindings"
 msgstr "键位绑定"
 
-#: dselect/baselist.cc:299
+#: dselect/baselist.cc:306
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%，请摁 "
 
-#: dselect/baselist.cc:302
+#: dselect/baselist.cc:309
 #, c-format
 msgid "%s for more"
 msgstr "%s 继续往下读"
 
-#: dselect/baselist.cc:306
+#: dselect/baselist.cc:313
 #, c-format
 msgid "%s to go back"
 msgstr "%s 可以跳回原来的位置"
@@ -146,138 +146,138 @@ msgstr "[未绑定]"
 msgid "[unk: %d]"
 msgstr "[未知：%d]"
 
-#: dselect/bindings.cc:139
+#: dselect/bindings.cc:141
 msgid "Scroll onwards through help/information"
 msgstr "在帮助文档或相关信息中向前滚动"
 
-#: dselect/bindings.cc:140
+#: dselect/bindings.cc:142
 msgid "Scroll backwards through help/information"
 msgstr "在帮助或相关信息中向前滚动"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc:143
 msgid "Move up"
 msgstr "上移"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc:144
 msgid "Move down"
 msgstr "下移"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc:145
 msgid "Go to top of list"
 msgstr "跳到顶端列表"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc:146
 msgid "Go to end of list"
 msgstr "跳到底端列表"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc:147
 msgid "Request help (cycle through help screens)"
 msgstr "请求帮助(在帮助界面周游)"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc:148
 msgid "Cycle through information displays"
 msgstr "在相关信息界面里周游"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc:149
 msgid "Redraw display"
 msgstr "重画屏幕"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc:150
 msgid "Scroll onwards through list by 1 line"
 msgstr "在列表中向前滚动一行"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc:151
 msgid "Scroll backwards through list by 1 line"
 msgstr "在列表中向后滚动一行"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc:152
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "在帮助或相关信息中向前滚动一行"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc:153
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "在帮助或相关信息中向后滚动一行"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc:154
 msgid "Scroll onwards through list"
 msgstr "在列表中向前滚动"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc:155
 msgid "Scroll backwards through list"
 msgstr "在列表中向前滚动"
 
-#: dselect/bindings.cc:156
+#: dselect/bindings.cc:158
 msgid "Mark package(s) for installation"
 msgstr "把软件包标记为“将要安装”"
 
-#: dselect/bindings.cc:157
+#: dselect/bindings.cc:159
 msgid "Mark package(s) for deinstallation"
 msgstr "把软件包标记为“将要卸载”"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc:160
 msgid "Mark package(s) for deinstall and purge"
 msgstr "把软件包标记为“卸载并清除”"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc:161
 msgid "Make highlight more specific"
 msgstr "让高亮显示更有针对性"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc:162
 msgid "Make highlight less specific"
 msgstr "让高亮显示更没有针对性"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc:163
 msgid "Search for a package whose name contains a string"
 msgstr "搜索软件包名字含有特定字符串的软件包"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc:164
 #, fuzzy
 #| msgid "Repeat last search."
 msgid "Repeat last search"
 msgstr "重复上次的搜索。"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc:165
 msgid "Swap sort order priority/section"
 msgstr "调整排序的依据 - 优先级/所属大类"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc:166
 msgid "Quit, confirming, and checking dependencies"
 msgstr "退出，并确认操作而且对依赖问题进行复查"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc:167
 msgid "Quit, confirming without check"
 msgstr "退出，并确认操作而且不再检查"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc:168
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "退出，并拒绝有关冲突和依赖问题的建议"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc:169
 msgid "Abort - quit without making changes"
 msgstr "中止操作 - 不作任何更改并退出"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc:170
 msgid "Revert to old state for all packages"
 msgstr "把所有软件包的状态恢复到修改前"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc:171
 msgid "Revert to suggested state for all packages"
 msgstr "把所有软件包的状态恢复到建议值"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc:172
 msgid "Revert to directly requested state for all packages"
 msgstr "把所有软件包的状态恢复到所要求的值"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc:173
 #, fuzzy
 msgid "Revert to currently installed state for all packages"
 msgstr "把所有软件包的状态恢复到所要求的值"
 
-#: dselect/bindings.cc:174
+#: dselect/bindings.cc:176
 msgid "Select currently-highlighted access method"
 msgstr "选中当前高亮显示的安装手段"
 
-#: dselect/bindings.cc:175
+#: dselect/bindings.cc:177
 msgid "Quit without changing selected access method"
 msgstr "退出程序，而且不修改所选的安装手段"
 
@@ -895,44 +895,44 @@ msgstr "颜色：\n"
 msgid "Attributes:\n"
 msgstr "属性：\n"
 
-#: dselect/main.cc:230
+#: dselect/main.cc:232
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "无法打开调试信息文件“%.255s”\n"
 
-#: dselect/main.cc:250
+#: dselect/main.cc:254
 #, fuzzy, c-format
 #| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "无效的 %s “%s”\n"
 
-#: dselect/main.cc:267
+#: dselect/main.cc:273
 msgid "screen part"
 msgstr "显示部分"
 
-#: dselect/main.cc:273
+#: dselect/main.cc:279
 #, fuzzy
 #| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "未指定颜色\n"
 
-#: dselect/main.cc:281 dselect/main.cc:286
+#: dselect/main.cc:287 dselect/main.cc:292
 msgid "colour"
 msgstr "颜色"
 
-#: dselect/main.cc:294
+#: dselect/main.cc:300
 msgid "colour attribute"
 msgstr "颜色属性"
 
-#: dselect/main.cc:326
+#: dselect/main.cc:332
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "终端不支持游标的定位。\n"
 
-#: dselect/main.cc:328
+#: dselect/main.cc:334
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "终端不支持高亮显示。\n"
 
-#: dselect/main.cc:330
+#: dselect/main.cc:336
 #, 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:333
+#: dselect/main.cc:339
 msgid "terminal lacks necessary features, giving up"
 msgstr "由于终端缺乏必要的特性，只得中止操作"
 
-#: dselect/main.cc:414
+#: dselect/main.cc:420
 msgid ""
 "\n"
 "\n"
@@ -959,7 +959,7 @@ msgstr ""
 "摁 <回车> 来确认。  用 ^L 来刷屏。\n"
 "\n"
 
-#: dselect/main.cc:419
+#: dselect/main.cc:425
 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:425
+#: dselect/main.cc:431
 msgid ""
 "\n"
 "\n"
@@ -977,11 +977,11 @@ msgstr ""
 "\n"
 "只读访问：仅仅可以查看被选中的项目！"
 
-#: dselect/main.cc:444
+#: dselect/main.cc:450
 msgid "failed to getch in main menu"
 msgstr "在主菜单界面中 getch 失败"
 
-#: dselect/main.cc:527
+#: dselect/main.cc:533
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "不能识别的操作字串“%.50s”"
@@ -999,32 +999,32 @@ msgstr "安装手段“%s”。"
 msgid "Abbrev."
 msgstr "缩写"
 
-#: dselect/methlist.cc:117 dselect/pkginfo.cc:106 dselect/pkgtop.cc:292
+#: dselect/methlist.cc:117 dselect/pkginfo.cc:110 dselect/pkgtop.cc:292
 msgid "Description"
 msgstr "简介"
 
-#: dselect/methlist.cc:160 dselect/pkglist.cc:579
+#: dselect/methlist.cc:160 dselect/pkglist.cc:583
 msgid "doupdate failed"
 msgstr "doupdate 失败"
 
-#: dselect/methlist.cc:162 dselect/pkglist.cc:582
+#: dselect/methlist.cc:163 dselect/pkglist.cc:586
 msgid "failed to unblock SIGWINCH"
 msgstr "无法取消阻塞 SIGWINCH 信号"
 
-#: dselect/methlist.cc:166 dselect/pkglist.cc:587
+#: dselect/methlist.cc:168 dselect/pkglist.cc:591
 msgid "failed to re-block SIGWINCH"
 msgstr "重新阻塞 SIGWINCH 信号失败"
 
-#: dselect/methlist.cc:167 dselect/pkglist.cc:589
+#: dselect/methlist.cc:169 dselect/pkglist.cc:593
 msgid "getch failed"
 msgstr "getch 失败"
 
-#: dselect/methlist.cc:184
+#: dselect/methlist.cc:186
 #, fuzzy
 msgid "Explanation"
 msgstr "后面安装手段的说明"
 
-#: dselect/methlist.cc:194
+#: dselect/methlist.cc:196
 msgid "No explanation available."
 msgstr "没有发现相应的说明。"
 
@@ -1083,101 +1083,101 @@ msgstr "安装手段的选项文件“%.250s”中有语法错误 -- %s"
 msgid "error reading options file `%.250s'"
 msgstr "读取安装手段的选项文件“%.250s”时出错"
 
-#: dselect/methparse.cc:90
+#: dselect/methparse.cc:93
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "无法读取“%.250s”目录以获取安装手段的相关信息"
 
-#: dselect/methparse.cc:106
+#: dselect/methparse.cc:109
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "安装手段“%.250s”的名字超长(%d > %d 个字符)"
 
-#: dselect/methparse.cc:117
+#: dselect/methparse.cc:120
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "无法访问手段脚本“%.250s”"
 
-#: dselect/methparse.cc:123
+#: dselect/methparse.cc:126
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "无法读取手段脚本“%.250s”"
 
-#: dselect/methparse.cc:147
+#: dselect/methparse.cc:150
 msgid "non-digit where digit wanted"
 msgstr "在本该有数字的地方没有发现数字"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc:153
 msgid "EOF in index string"
 msgstr "在索引字串中发现了 EOF"
 
-#: dselect/methparse.cc:153
+#: dselect/methparse.cc:156
 msgid "index string too long"
 msgstr "索引字串超长"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc:159
 msgid "newline before option name start"
 msgstr "在选项名开始前就发现了换行符"
 
-#: dselect/methparse.cc:158
+#: dselect/methparse.cc:161
 msgid "EOF before option name start"
 msgstr "在选项名开始前就发现了 EOF"
 
-#: dselect/methparse.cc:162
+#: dselect/methparse.cc:165
 msgid "nonalpha where option name start wanted"
 msgstr "在本该是选项名开头的地方不是字母"
 
-#: dselect/methparse.cc:164
+#: dselect/methparse.cc:167
 msgid "non-alphanum in option name"
 msgstr "在选项名中发现了既不是字母也不是数字的字符"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc:170
 msgid "EOF in option name"
 msgstr "在选项名中发现了 EOF"
 
-#: dselect/methparse.cc:172
+#: dselect/methparse.cc:175
 msgid "newline before summary"
 msgstr "在概述前发现了换行符"
 
-#: dselect/methparse.cc:174
+#: dselect/methparse.cc:177
 msgid "EOF before summary"
 msgstr "在概述前发现了 EOF"
 
-#: dselect/methparse.cc:180
+#: dselect/methparse.cc:183
 msgid "EOF in summary - missing newline"
 msgstr "在概述中发现了 EOF - 本该是换行符的"
 
-#: dselect/methparse.cc:190
+#: dselect/methparse.cc:193
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "无法打开选项说明文件“%.250s”"
 
-#: dselect/methparse.cc:194
+#: dselect/methparse.cc:197
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "无法 stat 选项说明文件“%.250s”"
 
-#: dselect/methparse.cc:198
+#: dselect/methparse.cc:201
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "读取选项说明文件“%.250s”失败"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc:204
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "读取选项说明文件“%.250s”时出错"
 
-#: dselect/methparse.cc:224
+#: dselect/methparse.cc:227
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "读取安装手段的选项文件“%.250s”时出错"
 
-#: dselect/methparse.cc:247
+#: dselect/methparse.cc:250
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "无法打开当前的选项文件“%.250s”"
 
-#: dselect/methparse.cc:283
+#: dselect/methparse.cc:286
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "无法写入新的选项文件“%.250s”"
@@ -1478,7 +1478,7 @@ msgstr " 简略:v 帮助:?"
 msgid " verbose:v help:?"
 msgstr " 详尽:v 帮助:?"
 
-#: dselect/pkginfo.cc:81
+#: dselect/pkginfo.cc:85
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
 "install, remove, hold, etc. it you will affect all the packages which match "
@@ -1497,37 +1497,37 @@ msgstr ""
 "您可以摁“o”或者“O”来以不同的规则排序，这样您就能给不同类型的软件包作上\n"
 "标记了。"
 
-#: dselect/pkginfo.cc:94
+#: dselect/pkginfo.cc:98
 #, fuzzy
 msgid "Interrelationships"
 msgstr "软件包的相互关系"
 
-#: dselect/pkginfo.cc:113
+#: dselect/pkginfo.cc:117
 #, fuzzy
 msgid "No description available."
 msgstr "无相关介绍。"
 
-#: dselect/pkginfo.cc:131
+#: dselect/pkginfo.cc:135
 #, fuzzy
 msgid "Installed control file information"
 msgstr "为下面软件包安装的控制信息"
 
-#: dselect/pkginfo.cc:147
+#: dselect/pkginfo.cc:151
 #, fuzzy
 msgid "Available control file information"
 msgstr "可用的控制信息的版本"
 
-#: dselect/pkglist.cc:422
+#: dselect/pkglist.cc:424
 #, fuzzy
 #| msgid "Installed packages"
 msgid "there are no packages"
 msgstr "已经安装的软件包"
 
-#: dselect/pkglist.cc:513
+#: dselect/pkglist.cc:517
 msgid "invalid search option given"
 msgstr "指定了无效的搜索选项"
 
-#: dselect/pkglist.cc:528
+#: dselect/pkglist.cc:532
 msgid "error in regular expression"
 msgstr "正则表达式有误"