Regenerate .pot files and merge .po files with them

1 files changed, 28 insertions, 28 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3172b370d..3f7500c2f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2009-05-21 06:30+0200\n"
+"POT-Creation-Date: 2009-05-26 01:10+0200\n"
 "PO-Revision-Date: 2008-11-19 08:44+0800\n"
 "Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -1805,117 +1805,117 @@ msgstr "在 conffile 提示输入时，在标准输入中读到了 EOF "
 msgid "unable to check for existence of `%.250s'"
 msgstr "无法检查“%.250s”是否存在"
 
-#: src/depcon.c:166
+#: src/depcon.c:167
 #, c-format
 msgid "%s depends on %s"
 msgstr "%s 依赖于 %s"
 
-#: src/depcon.c:169
+#: src/depcon.c:170
 #, c-format
 msgid "%s pre-depends on %s"
 msgstr "%s 预依赖于 %s"
 
-#: src/depcon.c:172
+#: src/depcon.c:173
 #, c-format
 msgid "%s recommends %s"
 msgstr "%s 推荐 %s"
 
-#: src/depcon.c:175
+#: src/depcon.c:176
 #, c-format
 msgid "%s suggests %s"
 msgstr "%s 建议 %s"
 
-#: src/depcon.c:178
+#: src/depcon.c:179
 #, c-format
 msgid "%s breaks %s"
 msgstr "%s 破坏了 %s"
 
-#: src/depcon.c:181
+#: src/depcon.c:182
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s 冲突于 %s"
 
-#: src/depcon.c:184
+#: src/depcon.c:185
 #, c-format
 msgid "%s enhances %s"
 msgstr "%s 强化 %s"
 
-#: src/depcon.c:277
+#: src/depcon.c:278
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  即将删除 %.250s。\n"
 
-#: src/depcon.c:280
+#: src/depcon.c:281
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  即将抹除 %.250s 的配置信息。\n"
 
-#: src/depcon.c:284
+#: src/depcon.c:285
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  即将安装 %.250s，不过安装的版本是 %.250s。\n"
 
-#: src/depcon.c:293
+#: src/depcon.c:294
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  已安装了 %.250s，不过安装的版本是 %.250s。\n"
 
-#: src/depcon.c:309
+#: src/depcon.c:310
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  已经解开了 %.250s 的软件包，但是它还没有被配置过。\n"
 
-#: src/depcon.c:313
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  已经解开了 %.250s 的软件包，不过它的版本是 %.250s。\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:320
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  上次配置 %.250s 时，它的版本是 %.250s。\n"
 
-#: src/depcon.c:329
+#: src/depcon.c:330
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s 现在 %s。\n"
 
-#: src/depcon.c:365
+#: src/depcon.c:366
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s 提供了 %.250s，但是它即将被删除。\n"
 
-#: src/depcon.c:369
+#: src/depcon.c:370
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s 提供了 %.250s，但是它的配置信息将被抹去。\n"
 
-#: src/depcon.c:374
+#: src/depcon.c:375
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s 提供了 %.250s，但是它现在 %s。\n"
 
-#: src/depcon.c:389
+#: src/depcon.c:390
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s 没有被安装。\n"
 
-#: src/depcon.c:420
+#: src/depcon.c:421
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  即将安装 %.250s (版本为 %.250s)。\n"
 
-#: src/depcon.c:442
+#: src/depcon.c:443
 #, c-format
 msgid "  %.250s (version %.250s) is present and %s.\n"
 msgstr "  %.250s (版本为 %.250s)已存在并且 %s。\n"
 
-#: src/depcon.c:468
+#: src/depcon.c:469
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s 提供了 %.250s，它将被安装。\n"
 
-#: src/depcon.c:508
+#: src/depcon.c:509
 #, c-format
 msgid "  %.250s provides %.250s and is present and %s.\n"
 msgstr "  %.250s 提供了 %.250s 并已存在而且 %s。\n"
@@ -3600,7 +3600,7 @@ msgstr "dpkg-trigger：非法的等待软件包名“%.250s”:%.250s"
 msgid "invalid trigger name `%.250s': %.250s"
 msgstr "dpkg-trigger：无效的触发器名“%.250s”:%.250s"
 
-#: src/trigproc.c:234
+#: src/trigproc.c:235
 #, c-format
 msgid ""
 "%s: cycle found while processing triggers:\n"
@@ -3609,7 +3609,7 @@ msgstr ""
 "%s：处理触发器时发现回路：\n"
 " 包含或可能包含对此有责任的触发器的软件包链：\n"
 
-#: src/trigproc.c:242
+#: src/trigproc.c:243
 #, c-format
 msgid ""
 "\n"
@@ -3618,11 +3618,11 @@ msgstr ""
 "\n"
 " 无法解决的软件包未决触发器：\n"
 
-#: src/trigproc.c:265
+#: src/trigproc.c:266
 msgid "triggers looping, abandoned"
 msgstr "触发器循环，放弃"
 
-#: src/trigproc.c:292
+#: src/trigproc.c:293
 #, c-format
 msgid "Processing triggers for %s ...\n"
 msgstr "正在处理用于 %s 的触发器...\n"