Regenerate .pot files and merge .po files with them

1 files changed, 41 insertions, 41 deletions

diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po
index 33d9e5bfa..686692799 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-03-08 03:46+0000\n"
+"POT-Creation-Date: 2013-07-27 03:54+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"
@@ -53,86 +53,86 @@ msgstr ""
 msgid "error reading keyboard in help"
 msgstr "在帮助界面读取键盘输入时出错"
 
-#: dselect/baselist.cc:57
+#: dselect/baselist.cc:60
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) 失败"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc:63
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "在 SIGWINCH 的处理函数里 doupdate 失败了"
 
-#: dselect/baselist.cc:67
+#: dselect/baselist.cc:71
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "恢复原先的 SIGWINCH sigact 失败"
 
-#: dselect/baselist.cc:69
+#: dselect/baselist.cc:73
 msgid "failed to restore old signal mask"
 msgstr "恢复原先的 signal mask 失败"
 
-#: dselect/baselist.cc:79
+#: dselect/baselist.cc:83
 msgid "failed to get old signal mask"
 msgstr "获取原先的 signal mask 失败"
 
-#: dselect/baselist.cc:80
+#: dselect/baselist.cc:84
 msgid "failed to get old SIGWINCH sigact"
 msgstr "获取原先的 SIGWINCH sigact 出错"
 
-#: dselect/baselist.cc:84
+#: dselect/baselist.cc:88
 msgid "failed to block SIGWINCH"
 msgstr "无法阻塞 SIGWINCH 信号"
 
-#: dselect/baselist.cc:89
+#: dselect/baselist.cc:93
 msgid "failed to set new SIGWINCH sigact"
 msgstr "设置新的 SIGWINCH sigact 失败"
 
-#: dselect/baselist.cc:126
+#: dselect/baselist.cc:130
 msgid "failed to allocate colour pair"
 msgstr "分配颜色对失败"
 
-#: dselect/baselist.cc:155
+#: dselect/baselist.cc:159
 msgid "failed to create title window"
 msgstr "创建标题窗口失败"
 
-#: dselect/baselist.cc:159
+#: dselect/baselist.cc:163
 msgid "failed to create whatinfo window"
 msgstr "创建 whatinfo 窗口失败"
 
-#: dselect/baselist.cc:163
+#: dselect/baselist.cc:167
 msgid "failed to create baselist pad"
 msgstr "无法新建基列表的小窗口"
 
-#: dselect/baselist.cc:166
+#: dselect/baselist.cc:170
 msgid "failed to create heading pad"
 msgstr "无法新建标题小窗口"
 
-#: dselect/baselist.cc:170
+#: dselect/baselist.cc:174
 msgid "failed to create thisstate pad"
 msgstr "无法新建 thisstate 小窗口"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc:178
 msgid "failed to create info pad"
 msgstr "无法新建相关信息小窗口"
 
-#: dselect/baselist.cc:179
+#: dselect/baselist.cc:183
 msgid "failed to create query window"
 msgstr "创建查询窗口失败"
 
-#: dselect/baselist.cc:247
+#: dselect/baselist.cc:251
 #, fuzzy
 msgid "Keybindings"
 msgstr "键位绑定"
 
-#: dselect/baselist.cc:295
+#: dselect/baselist.cc:299
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%，请摁 "
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc:302
 #, c-format
 msgid "%s for more"
 msgstr "%s 继续往下读"
 
-#: dselect/baselist.cc:302
+#: dselect/baselist.cc:306
 #, c-format
 msgid "%s to go back"
 msgstr "%s 可以跳回原来的位置"
@@ -977,54 +977,54 @@ msgstr ""
 "\n"
 "只读访问：仅仅可以查看被选中的项目！"
 
-#: dselect/main.cc:446
+#: dselect/main.cc:445
 msgid "failed to getch in main menu"
 msgstr "在主菜单界面中 getch 失败"
 
-#: dselect/main.cc:532
+#: dselect/main.cc:531
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "不能识别的操作字串“%.50s”"
 
-#: dselect/methlist.cc:72
+#: dselect/methlist.cc:73
 msgid "dselect - list of access methods"
 msgstr "dselect - 安装手段的列表"
 
-#: dselect/methlist.cc:81
+#: dselect/methlist.cc:82
 #, c-format
 msgid "Access method `%s'."
 msgstr "安装手段“%s”。"
 
-#: dselect/methlist.cc:115
+#: dselect/methlist.cc:116
 msgid "Abbrev."
 msgstr "缩写"
 
-#: dselect/methlist.cc:116 dselect/pkginfo.cc:105 dselect/pkgtop.cc:292
+#: dselect/methlist.cc:117 dselect/pkginfo.cc:106 dselect/pkgtop.cc:292
 msgid "Description"
 msgstr "简介"
 
-#: dselect/methlist.cc:159 dselect/pkglist.cc:577
+#: dselect/methlist.cc:160 dselect/pkglist.cc:579
 msgid "doupdate failed"
 msgstr "doupdate 失败"
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:580
+#: dselect/methlist.cc:162 dselect/pkglist.cc:582
 msgid "failed to unblock SIGWINCH"
 msgstr "无法取消阻塞 SIGWINCH 信号"
 
-#: dselect/methlist.cc:165 dselect/pkglist.cc:585
+#: dselect/methlist.cc:166 dselect/pkglist.cc:587
 msgid "failed to re-block SIGWINCH"
 msgstr "重新阻塞 SIGWINCH 信号失败"
 
-#: dselect/methlist.cc:166 dselect/pkglist.cc:587
+#: dselect/methlist.cc:167 dselect/pkglist.cc:589
 msgid "getch failed"
 msgstr "getch 失败"
 
-#: dselect/methlist.cc:183
+#: dselect/methlist.cc:184
 #, fuzzy
 msgid "Explanation"
 msgstr "后面安装手段的说明"
 
-#: dselect/methlist.cc:192
+#: dselect/methlist.cc:194
 msgid "No explanation available."
 msgstr "没有发现相应的说明。"
 
@@ -1478,7 +1478,7 @@ msgstr " 简略:v 帮助:?"
 msgid " verbose:v help:?"
 msgstr " 详尽:v 帮助:?"
 
-#: dselect/pkginfo.cc:80
+#: dselect/pkginfo.cc:81
 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:93
+#: dselect/pkginfo.cc:94
 #, fuzzy
 msgid "Interrelationships"
 msgstr "软件包的相互关系"
 
-#: dselect/pkginfo.cc:112
+#: dselect/pkginfo.cc:113
 #, fuzzy
 msgid "No description available."
 msgstr "无相关介绍。"
 
-#: dselect/pkginfo.cc:130
+#: dselect/pkginfo.cc:131
 #, fuzzy
 msgid "Installed control file information"
 msgstr "为下面软件包安装的控制信息"
 
-#: dselect/pkginfo.cc:146
+#: dselect/pkginfo.cc:147
 #, fuzzy
 msgid "Available control file information"
 msgstr "可用的控制信息的版本"
 
-#: dselect/pkglist.cc:421
+#: dselect/pkglist.cc:422
 #, fuzzy
 #| msgid "Installed packages"
 msgid "there are no packages"
 msgstr "已经安装的软件包"
 
-#: dselect/pkglist.cc:512
+#: dselect/pkglist.cc:513
 msgid "invalid search option given"
 msgstr "指定了无效的搜索选项"
 
-#: dselect/pkglist.cc:526
+#: dselect/pkglist.cc:528
 msgid "error in regular expression"
 msgstr "正则表达式有误"