dpkg.pot: Regenerated.

*.po: Merged with dpkg.pot. Formerly complete translations become 916t3f1u.

1 files changed, 99 insertions, 76 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index f4d756f77..1c96f79c2 100644
--- a/po/zh_CN.po
+++ b/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: 2006-06-21 07:26+0300\n"
+"POT-Creation-Date: 2006-08-17 16:02+0200\n"
 "PO-Revision-Date: 2006-05-12 20:57+0800\n"
 "Last-Translator: Kov Chai <tchaikov@sjtu.edu.cn>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -489,7 +489,7 @@ msgstr "“%s”字段，于“%.255s”：解析版本号时出错：%.255s"
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr "“%s”字段，在引用软件包“%.255s”后发现语法错误"
 
-#: lib/fields.c:445
+#: lib/fields.c:446
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr "在 %s 字段中不能含有替换项(“|”)"
@@ -705,100 +705,100 @@ msgstr "-%c 选项需要带一个参数"
 msgid "-%c option does not take a value"
 msgstr "-%c 选项并不需要带参数"
 
-#: lib/parse.c:105
+#: lib/parse.c:106
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr "无法打开软件包的 info 文件“%.255s”，以备读取"
 
-#: lib/parse.c:110
+#: lib/parse.c:111
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr "无法 stat 软件包的·info·文件“%.255s”"
 
-#: lib/parse.c:115
+#: lib/parse.c:116
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr "无法 mmap 软件包的 info 文件“%.255s”"
 
-#: lib/parse.c:118
+#: lib/parse.c:119
 #, c-format
 msgid "failed to malloc for info file `%.255s'"
 msgstr "在读取软件包的 info 文件“%.255s”时，malloc 失败"
 
-#: lib/parse.c:120
+#: lib/parse.c:121
 #, c-format
 msgid "copy info file `%.255s'"
 msgstr "拷贝 info 文件 “%.255s”"
 
-#: lib/parse.c:152
+#: lib/parse.c:153
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr "在字段名“%.*s”后发现 EOF"
 
-#: lib/parse.c:155
+#: lib/parse.c:156
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr "在字段名“%.*s”中发现换行符"
 
-#: lib/parse.c:158
+#: lib/parse.c:159
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr "在字段名“%.*s”中发现 MSDOS EOF (^Z)"
 
-#: lib/parse.c:161
+#: lib/parse.c:162
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr "字段名“%.*s”后必须紧跟冒号"
 
-#: lib/parse.c:169
+#: lib/parse.c:170
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr "在字段“%.*s”的值的前面发现了 EOF (缺少最后结尾的换行符)"
 
-#: lib/parse.c:173
+#: lib/parse.c:174
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr "在字段“%.*s”的值中间发现了 MSDOS EOF 字符(缺少最后结尾的换行符？)"
 
-#: lib/parse.c:187
+#: lib/parse.c:188
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr "在字段“%.*s”的值中间发现了 EOF 字符(缺少最后结尾的换行符)"
 
-#: lib/parse.c:210
+#: lib/parse.c:211
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr "有多个值对应于字段“%s”"
 
-#: lib/parse.c:215
+#: lib/parse.c:216
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr "用户自定义的字段名“%.*s”过短"
 
-#: lib/parse.c:220
+#: lib/parse.c:221
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr "有多个值对应于用户自定义的字段“%.*s”"
 
-#: lib/parse.c:233
+#: lib/parse.c:234
 msgid "several package info entries found, only one allowed"
 msgstr "发现了多个软件包的 info 条目，不过我只要一个"
 
-#: lib/parse.c:259
+#: lib/parse.c:260
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "软件包有 Configured-Version 的标志，但是它安装状态却与之不符"
 
-#: lib/parse.c:273
+#: lib/parse.c:274
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 "该软件包的状态是尚未安装(not-installed)，但是它却有 conoffiles，不管他了"
 
-#: lib/parse.c:330
+#: lib/parse.c:331
 #, c-format
 msgid "failed to close after read: `%.255s'"
 msgstr "读取完毕“%.255s”后，无法关闭该文件"
 
-#: lib/parse.c:331
+#: lib/parse.c:332
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "在”%.255s“中没有软件包的相关信息"
@@ -1550,7 +1550,7 @@ msgstr "在 conffile 提示输入时，在标准输入中读到了 EOF "
 msgid "unable to check for existence of `%.250s'"
 msgstr "无法检查“%.250s”是否存在"
 
-#: src/depcon.c:153 src/packages.c:393
+#: src/depcon.c:153 src/packages.c:396
 msgid " depends on "
 msgstr " 依赖于 "
 
@@ -1563,93 +1563,97 @@ msgid " recommends "
 msgstr " 推荐 "
 
 #: src/depcon.c:156
+msgid " breaks "
+msgstr ""
+
+#: src/depcon.c:157
 msgid " conflicts with "
 msgstr " 冲突于 "
 
-#: src/depcon.c:157
+#: src/depcon.c:158
 msgid " suggests "
 msgstr " 建议 "
 
-#: src/depcon.c:158
+#: src/depcon.c:159
 msgid " enhances "
 msgstr " 强化 "
 
-#: src/depcon.c:234
+#: src/depcon.c:246
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  即将删除 %.250s。\n"
 
-#: src/depcon.c:237
+#: src/depcon.c:249
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  即将抹除 %.250s 的配置信息。\n"
 
-#: src/depcon.c:241
+#: src/depcon.c:253
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  即将安装 %.250s，不过安装的版本是 %.250s。\n"
 
-#: src/depcon.c:249
+#: src/depcon.c:261
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  已安装了 %.250s，不过安装的版本是 %.250s。\n"
 
-#: src/depcon.c:264
+#: src/depcon.c:276
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  已经解开了 %.250s 的软件包，但是它还没有被配置过。\n"
 
-#: src/depcon.c:268
+#: src/depcon.c:280
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  已经解开了 %.250s 的软件包，不过它的版本是 %.250s。\n"
 
-#: src/depcon.c:274
+#: src/depcon.c:286
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  上次配置 %.250s 时，它的版本是 %.250s。\n"
 
-#: src/depcon.c:283
+#: src/depcon.c:295
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s 现在 %s。\n"
 
-#: src/depcon.c:319
+#: src/depcon.c:331
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s 提供了 %.250s，但是它即将被删除。\n"
 
-#: src/depcon.c:323
+#: src/depcon.c:335
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s 提供了 %.250s，但是它的配置信息将被抹去。\n"
 
-#: src/depcon.c:328
+#: src/depcon.c:340
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s 提供了 %.250s，但是它现在 %s。\n"
 
-#: src/depcon.c:342
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s 没有被安装。\n"
 
-#: src/depcon.c:373
+#: src/depcon.c:385
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  即将安装 %.250s (版本为 %.250s)。\n"
 
-#: src/depcon.c:387
+#: src/depcon.c:399
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (版本为 %.250s)现在 %s。\n"
 
-#: src/depcon.c:412
+#: src/depcon.c:424
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s 提供了 %.250s，它将被安装。\n"
 
-#: src/depcon.c:443
+#: src/depcon.c:455
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s 提供了 %.250s，它现在 %s。\n"
@@ -2095,7 +2099,7 @@ msgstr "unlink"
 msgid "chmod"
 msgstr "chmod"
 
-#: src/help.c:497 src/processarc.c:701
+#: src/help.c:497 src/processarc.c:711
 msgid "delete"
 msgstr "删除"
 
@@ -2581,7 +2585,7 @@ msgstr "  提供 %2$s 的软件包 %1$s 未曾安装。\n"
 msgid "  Package %s is not installed.\n"
 msgstr "  未曾安装软件包“%s”。\n"
 
-#: src/packages.c:399
+#: src/packages.c:402
 msgid "; however:\n"
 msgstr "；然而：\n"
 
@@ -2654,7 +2658,26 @@ msgstr "从 %2$s 获得的关于 %1$s 的信息。\n"
 msgid "package architecture (%s) does not match system (%s)"
 msgstr "软件包的体系架构(%s)与本机系统的架构(%s)不符"
 
-#: src/processarc.c:265
+#: src/processarc.c:256
+#, fuzzy, c-format
+msgid ""
+"dpkg: regarding %s containing %s:\n"
+" package uses Breaks; not supported in this dpkg\n"
+msgstr ""
+"dpkg：对于含 %2$s 的文件 %1$s 来说，有预依赖(pre-dependency)方面的问题：\n"
+"%3$s"
+
+#: src/processarc.c:260
+#, fuzzy, c-format
+msgid "unsupported dependency problem - not installing %.250s"
+msgstr "预依赖(pre-dependency)问题 - 将不安装%.250s"
+
+#: src/processarc.c:262
+#, fuzzy, c-format
+msgid "dpkg: warning - ignoring Breaks !\n"
+msgstr "dpkg：警告 - 忽视了预依赖(pre-dependency)问题！\n"
+
+#: src/processarc.c:275
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
@@ -2663,95 +2686,95 @@ msgstr ""
 "dpkg：对于含 %2$s 的文件 %1$s 来说，有预依赖(pre-dependency)方面的问题：\n"
 "%3$s"
 
-#: src/processarc.c:268
+#: src/processarc.c:278
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr "预依赖(pre-dependency)问题 - 将不安装%.250s"
 
-#: src/processarc.c:269
+#: src/processarc.c:279
 #, c-format
 msgid "dpkg: warning - ignoring pre-dependency problem !\n"
 msgstr "dpkg：警告 - 忽视了预依赖(pre-dependency)问题！\n"
 
-#: src/processarc.c:284
+#: src/processarc.c:294
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr "正预备替换 %s %s (使用 %s) ...\n"
 
-#: src/processarc.c:289
+#: src/processarc.c:299
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr "正在解压缩 %s (从 %s) ...\n"
 
-#: src/processarc.c:311
+#: src/processarc.c:321
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr "conffile 的文件名(其开头是“%.250s”)过长(> %d 个字符)"
 
-#: src/processarc.c:364
+#: src/processarc.c:374
 #, c-format
 msgid "read error in %.250s"
 msgstr "在 %.250s 中发生读错误"
 
-#: src/processarc.c:366
+#: src/processarc.c:376
 #, c-format
 msgid "error closing %.250s"
 msgstr "在关闭 %.250s 时发生错误"
 
-#: src/processarc.c:368
+#: src/processarc.c:378
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "当试图打开 %.250s 时发生错误"
 
-#: src/processarc.c:401
+#: src/processarc.c:411
 #, c-format
 msgid "De-configuring %s, so that we can remove %s ...\n"
 msgstr "正在抹去 %s 的设置信息，只有这样我们才能删除 %s ...\n"
 
-#: src/processarc.c:459
+#: src/processarc.c:469
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr "正在解压缩将用于更替的包文件 %.250s ...\n"
 
-#: src/processarc.c:540
+#: src/processarc.c:550
 msgid "unable to exec dpkg-deb to get filesystem archive"
 msgstr "无法 exec dpkg-deb，以此来获得打包后的文件系统"
 
-#: src/processarc.c:553
+#: src/processarc.c:563
 msgid "error reading dpkg-deb tar output"
 msgstr "无法读取 dpkg-deb 输出的 tar 文件"
 
-#: src/processarc.c:555
+#: src/processarc.c:565
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr "文件系统的 tar 文件已损坏 - 软件包文件已毁损"
 
-#: src/processarc.c:558
+#: src/processarc.c:568
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr "dpkg-deb：截去了最后的零数据(zeros)"
 
-#: src/processarc.c:611
+#: src/processarc.c:621
 #, c-format
 msgid "dpkg: warning - could not stat old file `%.250s' so not deleting it: %s"
 msgstr "dpkg：警告 - 无法 stat 原有的文件“%.250s”因此拒绝删除之：%s"
 
-#: src/processarc.c:619
+#: src/processarc.c:629
 #, c-format
 msgid "dpkg: warning - unable to delete old directory `%.250s': %s\n"
 msgstr "dpkg：警告 - 无法删除原有的目录“%.250s”：%s\n"
 
-#: src/processarc.c:623
+#: src/processarc.c:633
 #, c-format
 msgid ""
 "dpkg: warning - old conffile `%.250s' was an empty directory (and has now "
 "been deleted)\n"
 msgstr "dpkg：警告 - 原有 conffile “%.250s”是一个空目录 (现在已被删除)\n"
 
-#: src/processarc.c:653
+#: src/processarc.c:663
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr "无法 stat 其它新文件“%.250s”"
 
-#: src/processarc.c:664
+#: src/processarc.c:674
 #, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
@@ -2759,65 +2782,65 @@ msgid ""
 msgstr ""
 "dpkg：警告 - 原有文件“%.250s”与多个新文件相同！(都是“%.250s”和“%.250s”)"
 
-#: src/processarc.c:705
+#: src/processarc.c:715
 #, c-format
 msgid "dpkg: warning - unable to %s old file `%%.250s': %%s\n"
 msgstr "dpkg：警告 - 无法 %s 原有的文件“%%.250s”：%%s\n"
 
-#: src/processarc.c:731 src/processarc.c:972 src/remove.c:292
+#: src/processarc.c:741 src/processarc.c:982 src/remove.c:292
 msgid "cannot read info directory"
 msgstr "无法读取信息(info)目录"
 
-#: src/processarc.c:744
+#: src/processarc.c:754
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr "原先版本的软件包中有一个信息文件的文件名过长，文件名是以“%.250s”开头的"
 
-#: src/processarc.c:756
+#: src/processarc.c:766
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr "无法删除废弃不用的信息文件“%.250s”"
 
-#: src/processarc.c:759
+#: src/processarc.c:769
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr "无法安装文件“%.250s”，该文件被认定是新的信息文件"
 
-#: src/processarc.c:766
+#: src/processarc.c:776
 msgid "unable to open temp control directory"
 msgstr "无法打开临时主控目录"
 
-#: src/processarc.c:775
+#: src/processarc.c:785
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr "软件包中有一个主控信息文件的文件名过长(该文件名是以“%.250s”开头的)"
 
-#: src/processarc.c:780
+#: src/processarc.c:790
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr "软件包的主控信息含有一个目录“%.250s”"
 
-#: src/processarc.c:782
+#: src/processarc.c:792
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr "软件包控制信息，rmdir “%.250s”也没有说这不是一个目录"
 
-#: src/processarc.c:788
+#: src/processarc.c:798
 #, c-format
 msgid "dpkg: warning - package %s contained list as info file"
 msgstr "dpkg：警告 - 软件包 %s 把一个列表作为信息文件使用"
 
-#: src/processarc.c:795
+#: src/processarc.c:805
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr "无法把新的信息文件“%.250s”安装到“%.250s”"
 
-#: src/processarc.c:952
+#: src/processarc.c:962
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr "(注意到 %s 已经不复存在，它已然被完全取代了。)\n"
 
-#: src/processarc.c:988
+#: src/processarc.c:998
 #, c-format
 msgid "unable to delete disappearing control info file `%.250s'"
 msgstr "无法删除已经消失了的控制信息文件“%.250s”"