Regenerate .pot files and merge .po files with them

1 files changed, 112 insertions, 100 deletions

diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po
index 4d01ffb8b..74d8dc3f1 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: 2014-08-09 12:48+0200\n"
+"POT-Creation-Date: 2014-08-15 03:51+0200\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"
@@ -85,54 +85,54 @@ msgstr "无法阻塞 SIGWINCH 信号"
 msgid "failed to set new SIGWINCH sigact"
 msgstr "设置新的 SIGWINCH sigact 失败"
 
-#: dselect/baselist.cc:136
+#: dselect/baselist.cc:174
 msgid "failed to allocate colour pair"
 msgstr "分配颜色对失败"
 
-#: dselect/baselist.cc:165
+#: dselect/baselist.cc:203
 msgid "failed to create title window"
 msgstr "创建标题窗口失败"
 
-#: dselect/baselist.cc:169
+#: dselect/baselist.cc:207
 msgid "failed to create whatinfo window"
 msgstr "创建 whatinfo 窗口失败"
 
-#: dselect/baselist.cc:173
+#: dselect/baselist.cc:211
 msgid "failed to create baselist pad"
 msgstr "无法新建基列表的小窗口"
 
-#: dselect/baselist.cc:176
+#: dselect/baselist.cc:214
 msgid "failed to create heading pad"
 msgstr "无法新建标题小窗口"
 
-#: dselect/baselist.cc:180
+#: dselect/baselist.cc:218
 msgid "failed to create thisstate pad"
 msgstr "无法新建 thisstate 小窗口"
 
-#: dselect/baselist.cc:184
+#: dselect/baselist.cc:222
 msgid "failed to create info pad"
 msgstr "无法新建相关信息小窗口"
 
-#: dselect/baselist.cc:189
+#: dselect/baselist.cc:227
 msgid "failed to create query window"
 msgstr "创建查询窗口失败"
 
-#: dselect/baselist.cc:258
+#: dselect/baselist.cc:298
 #, fuzzy
 msgid "Keybindings"
 msgstr "键位绑定"
 
-#: dselect/baselist.cc:307
+#: dselect/baselist.cc:347
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%，请摁 "
 
-#: dselect/baselist.cc:310
+#: dselect/baselist.cc:350
 #, c-format
 msgid "%s for more"
 msgstr "%s 继续往下读"
 
-#: dselect/baselist.cc:314
+#: dselect/baselist.cc:354
 #, c-format
 msgid "%s to go back"
 msgstr "%s 可以跳回原来的位置"
@@ -310,7 +310,7 @@ msgid ""
 "displays\n"
 "   Q     Confirm, quit (override dep.s)       o, O  cycle through sort "
 "options\n"
-" X, Esc  eXit, abandoning any changes made    v, V  change status display "
+" X, Esc  eXit, abandoning any changes made   v, A, V  change status display "
 "opts\n"
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
@@ -900,39 +900,39 @@ msgstr "属性：\n"
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "无法打开调试信息文件“%.255s”\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, fuzzy, c-format
 #| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "无效的 %s “%s”\n"
 
-#: dselect/main.cc:273
+#: dselect/main.cc:272
 msgid "screen part"
 msgstr "显示部分"
 
-#: dselect/main.cc:279
+#: dselect/main.cc:278
 #, fuzzy
 #| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "未指定颜色\n"
 
-#: dselect/main.cc:287 dselect/main.cc:292
+#: dselect/main.cc:286 dselect/main.cc:291
 msgid "colour"
 msgstr "颜色"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:299
 msgid "colour attribute"
 msgstr "颜色属性"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "终端不支持游标的定位。\n"
 
-#: dselect/main.cc:336
+#: dselect/main.cc:335
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "终端不支持高亮显示。\n"
 
-#: dselect/main.cc:338
+#: dselect/main.cc:337
 #, 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:341
+#: dselect/main.cc:340
 msgid "terminal lacks necessary features, giving up"
 msgstr "由于终端缺乏必要的特性，只得中止操作"
 
-#: dselect/main.cc:426
+#: dselect/main.cc:425
 msgid ""
 "\n"
 "\n"
@@ -959,7 +959,7 @@ msgstr ""
 "摁 <回车> 来确认。  用 ^L 来刷屏。\n"
 "\n"
 
-#: dselect/main.cc:431
+#: dselect/main.cc:430
 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:437
+#: dselect/main.cc:436
 msgid ""
 "\n"
 "\n"
@@ -977,15 +977,23 @@ msgstr ""
 "\n"
 "只读访问：仅仅可以查看被选中的项目！"
 
-#: dselect/main.cc:456
+#: dselect/main.cc:455
 msgid "failed to getch in main menu"
 msgstr "在主菜单界面中 getch 失败"
 
-#: dselect/main.cc:539
+#: dselect/main.cc:538
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "不能识别的操作字串“%.50s”"
 
+#: dselect/methlist.cc:66
+msgid "Abbrev."
+msgstr "缩写"
+
+#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+msgid "Description"
+msgstr "简介"
+
 #: dselect/methlist.cc:73
 msgid "dselect - list of access methods"
 msgstr "dselect - 安装手段的列表"
@@ -995,36 +1003,28 @@ msgstr "dselect - 安装手段的列表"
 msgid "Access method `%s'."
 msgstr "安装手段“%s”。"
 
-#: dselect/methlist.cc:116
-msgid "Abbrev."
-msgstr "缩写"
-
-#: dselect/methlist.cc:117 dselect/pkginfo.cc:110 dselect/pkgtop.cc:293
-msgid "Description"
-msgstr "简介"
-
-#: dselect/methlist.cc:160 dselect/pkglist.cc:585
+#: dselect/methlist.cc:161 dselect/pkglist.cc:587
 msgid "doupdate failed"
 msgstr "doupdate 失败"
 
-#: dselect/methlist.cc:163 dselect/pkglist.cc:588
+#: dselect/methlist.cc:164 dselect/pkglist.cc:590
 msgid "failed to unblock SIGWINCH"
 msgstr "无法取消阻塞 SIGWINCH 信号"
 
-#: dselect/methlist.cc:168 dselect/pkglist.cc:593
+#: dselect/methlist.cc:169 dselect/pkglist.cc:595
 msgid "failed to re-block SIGWINCH"
 msgstr "重新阻塞 SIGWINCH 信号失败"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc:170 dselect/pkglist.cc:597
 msgid "getch failed"
 msgstr "getch 失败"
 
-#: dselect/methlist.cc:186
+#: dselect/methlist.cc:187
 #, fuzzy
 msgid "Explanation"
 msgstr "后面安装手段的说明"
 
-#: dselect/methlist.cc:196
+#: dselect/methlist.cc:197
 msgid "No explanation available."
 msgstr "没有发现相应的说明。"
 
@@ -1414,67 +1414,119 @@ msgstr "已安装"
 msgid "Purged"
 msgstr "已清除"
 
-#: dselect/pkgdisplay.cc:193
+#: dselect/pkgdisplay.cc:138
+msgid "Error"
+msgstr "错误"
+
+#: dselect/pkgdisplay.cc:139
+msgid "Installed?"
+msgstr "已安装？"
+
+#: dselect/pkgdisplay.cc:140
+msgid "Old mark"
+msgstr "原有标记"
+
+#: dselect/pkgdisplay.cc:141
+msgid "Marked for"
+msgstr "现标记为"
+
+#: dselect/pkgdisplay.cc:143
+msgid "EIOM"
+msgstr "EIOM"
+
+#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+msgid "Section"
+msgstr "所属大类"
+
+#: dselect/pkgdisplay.cc:148
+msgid "Priority"
+msgstr "优先级"
+
+#: dselect/pkgdisplay.cc:152
+msgid "Package"
+msgstr "软件包名"
+
+#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#, fuzzy
+#| msgid "Avail.ver"
+msgid "Avail.arch"
+msgstr "可用版本"
+
+#: dselect/pkgdisplay.cc:164
+#, fuzzy
+#| msgid "Inst.ver"
+msgid "Inst.arch"
+msgstr "安装版本"
+
+#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+msgid "Avail.ver"
+msgstr "可用版本"
+
+#: dselect/pkgdisplay.cc:181
+msgid "Inst.ver"
+msgstr "安装版本"
+
+#: dselect/pkgdisplay.cc:197
 msgid "dselect - recursive package listing"
 msgstr "dselect - 递归地列出软件包"
 
-#: dselect/pkgdisplay.cc:195
+#: dselect/pkgdisplay.cc:199
 msgid "dselect - inspection of package states"
 msgstr "dselect - 检视软件包的状态"
 
-#: dselect/pkgdisplay.cc:196
+#: dselect/pkgdisplay.cc:200
 msgid "dselect - main package listing"
 msgstr "dselect - 软件包主列表"
 
-#: dselect/pkgdisplay.cc:204
+#: dselect/pkgdisplay.cc:208
 msgid " (by section)"
 msgstr " (按所属大类)"
 
-#: dselect/pkgdisplay.cc:207
+#: dselect/pkgdisplay.cc:211
 msgid " (avail., section)"
 msgstr " (按是否可用和所属大类)"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:214
 msgid " (status, section)"
 msgstr " (按状态和所属大类)"
 
-#: dselect/pkgdisplay.cc:219
+#: dselect/pkgdisplay.cc:223
 msgid " (by priority)"
 msgstr " (按优先级)"
 
-#: dselect/pkgdisplay.cc:222
+#: dselect/pkgdisplay.cc:226
 msgid " (avail., priority)"
 msgstr " (按是否可用和优先级)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:229
 msgid " (status, priority)"
 msgstr " (按状态和优先级)"
 
-#: dselect/pkgdisplay.cc:234
+#: dselect/pkgdisplay.cc:238
 msgid " (alphabetically)"
 msgstr " (按字母表顺序)"
 
-#: dselect/pkgdisplay.cc:237
+#: dselect/pkgdisplay.cc:241
 msgid " (by availability)"
 msgstr " (按是否可用)"
 
-#: dselect/pkgdisplay.cc:240
+#: dselect/pkgdisplay.cc:244
 msgid " (by status)"
 msgstr " (按状态)"
 
-#: dselect/pkgdisplay.cc:255
+#: dselect/pkgdisplay.cc:259
 msgid " mark:+/=/- terse:v help:?"
 msgstr " 标记:+/=/- 简略:v 帮助:?"
 
-#: dselect/pkgdisplay.cc:256
+#: dselect/pkgdisplay.cc:260
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " 标记:+/=/- 详尽:v 帮助:?"
 
-#: dselect/pkgdisplay.cc:258
+#: dselect/pkgdisplay.cc:262
 msgid " terse:v help:?"
 msgstr " 简略:v 帮助:?"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc:263
 msgid " verbose:v help:?"
 msgstr " 详尽:v 帮助:?"
 
@@ -1523,11 +1575,11 @@ msgstr "可用的控制信息的版本"
 msgid "there are no packages"
 msgstr "已经安装的软件包"
 
-#: dselect/pkglist.cc:519
+#: dselect/pkglist.cc:521
 msgid "invalid search option given"
 msgstr "指定了无效的搜索选项"
 
-#: dselect/pkglist.cc:534
+#: dselect/pkglist.cc:536
 msgid "error in regular expression"
 msgstr "正则表达式有误"
 
@@ -1577,46 +1629,6 @@ 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:265
-msgid "Error"
-msgstr "错误"
-
-#: dselect/pkgtop.cc:269
-msgid "Installed?"
-msgstr "已安装？"
-
-#: dselect/pkgtop.cc:273
-msgid "Old mark"
-msgstr "原有标记"
-
-#: dselect/pkgtop.cc:277
-msgid "Marked for"
-msgstr "现标记为"
-
-#: dselect/pkgtop.cc:280
-msgid "EIOM"
-msgstr "EIOM"
-
-#: dselect/pkgtop.cc:282
-msgid "Section"
-msgstr "所属大类"
-
-#: dselect/pkgtop.cc:283
-msgid "Priority"
-msgstr "优先级"
-
-#: dselect/pkgtop.cc:284
-msgid "Package"
-msgstr "软件包名"
-
-#: dselect/pkgtop.cc:288
-msgid "Inst.ver"
-msgstr "安装版本"
-
-#: dselect/pkgtop.cc:291
-msgid "Avail.ver"
-msgstr "可用版本"
-
 #~ msgid ""
 #~ "Actions:\n"
 #~ "  access update select install config remove quit\n"