Regenerate .pot files and merge .po files with them

1 files changed, 39 insertions, 28 deletions

diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po
index 2cce6447e..6b040eeec 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: 2012-04-27 10:06+0200\n"
+"POT-Creation-Date: 2012-06-30 04:20+0200\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"
@@ -231,7 +231,9 @@ msgid "Search for a package whose name contains a string"
 msgstr "搜索软件包名字含有特定字符串的软件包"
 
 #: dselect/bindings.cc:162
-msgid "Repeat last search."
+#, fuzzy
+#| msgid "Repeat last search."
+msgid "Repeat last search"
 msgstr "重复上次的搜索。"
 
 #: dselect/bindings.cc:163
@@ -872,16 +874,11 @@ msgstr ""
 "  --license | --license      显示许可证。\n"
 "\n"
 
-#: dselect/main.cc:199
-#, c-format
-msgid ""
-"Actions:\n"
-"  access update select install config remove quit\n"
-"\n"
-msgstr ""
-"操作：\n"
-"  手段 更新 选择 安装 设置 卸载 退出\n"
-"\n"
+#: dselect/main.cc:198
+#, fuzzy, c-format
+#| msgid "Section"
+msgid "Actions:\n"
+msgstr "所属大类"
 
 #: dselect/main.cc:203
 #, c-format
@@ -904,8 +901,9 @@ msgid "couldn't open debug file `%.255s'\n"
 msgstr "无法打开调试信息文件“%.255s”\n"
 
 #: dselect/main.cc:251
-#, c-format
-msgid "Invalid %s `%s'\n"
+#, fuzzy, c-format
+#| msgid "Invalid %s `%s'\n"
+msgid "invalid %s '%s'"
 msgstr "无效的 %s “%s”\n"
 
 #: dselect/main.cc:268
@@ -913,7 +911,9 @@ msgid "screen part"
 msgstr "显示部分"
 
 #: dselect/main.cc:274
-msgid "Null colour specification\n"
+#, fuzzy
+#| msgid "Null colour specification\n"
+msgid "null colour specification"
 msgstr "未指定颜色\n"
 
 #: dselect/main.cc:282 dselect/main.cc:287
@@ -1003,7 +1003,7 @@ msgstr "安装手段“%s”。"
 msgid "Abbrev."
 msgstr "缩写"
 
-#: dselect/methlist.cc:116 dselect/pkginfo.cc:105 dselect/pkgtop.cc:291
+#: dselect/methlist.cc:116 dselect/pkginfo.cc:105 dselect/pkgtop.cc:292
 msgid "Description"
 msgstr "简介"
 
@@ -1522,8 +1522,10 @@ msgid "Available control file information"
 msgstr "可用的控制信息的版本"
 
 #: dselect/pkglist.cc:421
-msgid "There are no packages."
-msgstr ""
+#, fuzzy
+#| msgid "Installed packages"
+msgid "there are no packages"
+msgstr "已经安装的软件包"
 
 #: dselect/pkglist.cc:512
 msgid "invalid search option given"
@@ -1579,46 +1581,55 @@ 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:263
+#: dselect/pkgtop.cc:264
 msgid "Error"
 msgstr "错误"
 
-#: dselect/pkgtop.cc:267
+#: dselect/pkgtop.cc:268
 msgid "Installed?"
 msgstr "已安装？"
 
-#: dselect/pkgtop.cc:271
+#: dselect/pkgtop.cc:272
 msgid "Old mark"
 msgstr "原有标记"
 
-#: dselect/pkgtop.cc:275
+#: dselect/pkgtop.cc:276
 msgid "Marked for"
 msgstr "现标记为"
 
-#: dselect/pkgtop.cc:278
+#: dselect/pkgtop.cc:279
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgtop.cc:280
+#: dselect/pkgtop.cc:281
 msgid "Section"
 msgstr "所属大类"
 
-#: dselect/pkgtop.cc:281
+#: dselect/pkgtop.cc:282
 msgid "Priority"
 msgstr "优先级"
 
-#: dselect/pkgtop.cc:282
+#: dselect/pkgtop.cc:283
 msgid "Package"
 msgstr "软件包名"
 
-#: dselect/pkgtop.cc:286
+#: dselect/pkgtop.cc:287
 msgid "Inst.ver"
 msgstr "安装版本"
 
-#: dselect/pkgtop.cc:289
+#: dselect/pkgtop.cc:290
 msgid "Avail.ver"
 msgstr "可用版本"
 
+#~ msgid ""
+#~ "Actions:\n"
+#~ "  access update select install config remove quit\n"
+#~ "\n"
+#~ msgstr ""
+#~ "操作：\n"
+#~ "  手段 更新 选择 安装 设置 卸载 退出\n"
+#~ "\n"
+
 #~ msgid "unable to open new option file `%.250s'"
 #~ msgstr "无法打开新的的选项文件“%.250s”"