Regenerate .pot files and merge .po files with them

1 files changed, 61 insertions, 61 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0b2e125c7..c63ef92f8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-12-29 05:57+0100\n"
+"POT-Creation-Date: 2008-01-07 11:55+0200\n"
 "PO-Revision-Date: 2008-01-04 15:52+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"
@@ -872,7 +872,7 @@ msgstr "字段宽度中有无效的字符“%c”\n"
 msgid "Closing brace missing in format\n"
 msgstr "没有发现格式字串中配对的右括弧\n"
 
-#: lib/varbuf.c:105
+#: lib/varbuf.c:109
 msgid "failed to realloc for variable buffer"
 msgstr "为变量缓冲区 realloc 时失败"
 
@@ -1180,57 +1180,57 @@ msgstr "dpkg：警告 - 忽视了软件包间的冲突，无论怎样，继续�
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --递归执行的话需要至少一个路径作为参数"
 
-#: src/archives.c:1120
+#: src/archives.c:1122
 msgid "failed to exec find for --recursive"
 msgstr "无法为 --recursive 选项 exec find"
 
-#: src/archives.c:1125
+#: src/archives.c:1127
 msgid "failed to fdopen find's pipe"
 msgstr "无法 fdopen find 的管道"
 
-#: src/archives.c:1131
+#: src/archives.c:1133
 msgid "error reading find's pipe"
 msgstr "读取 find 的管道时出错"
 
-#: src/archives.c:1132
+#: src/archives.c:1134
 msgid "error closing find's pipe"
 msgstr "关闭 find 的管道时出错"
 
-#: src/archives.c:1135
+#: src/archives.c:1137
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "--recursive 选项所调用的 find 返回了一个没有被处理的错误 %i"
 
-#: src/archives.c:1138
+#: src/archives.c:1140
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "已搜索包文件，但是没有发现任何软件包（即与 *.deb 匹配的文件）"
 
-#: src/archives.c:1154
+#: src/archives.c:1156
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "-- %s 需要至少一个软件包文件作为参数"
 
-#: src/archives.c:1223
+#: src/archives.c:1225
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "选中了曾被取消选择的软件包 %s。\n"
 
-#: src/archives.c:1228
+#: src/archives.c:1230
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "忽略了被取消选择的软件包 %s。\n"
 
-#: src/archives.c:1242
+#: src/archives.c:1244
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "%1$.250s 的 %2$.250s 版本已经安装，因而将不再安装它。\n"
 
-#: src/archives.c:1252
+#: src/archives.c:1254
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - 警告：即将把 %.250s 从 %.250s 降级到 %.250s。\n"
 
-#: src/archives.c:1258
+#: src/archives.c:1260
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "由于不希望把 %.250s 从 %.250s 降级到 %.250s，因而将不再安装它。\n"
@@ -3461,7 +3461,7 @@ msgstr "新建临时文件(数据)失败，%s"
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "unlink 临时文件(数据)失败，%s"
 
-#: dpkg-deb/build.c:433 dpkg-deb/extract.c:279
+#: dpkg-deb/build.c:433 dpkg-deb/extract.c:281
 msgid "data"
 msgstr "数据"
 
@@ -3500,81 +3500,81 @@ msgstr "无法从文件 %2$s 读取 %1$s"
 msgid "unexpected end of file in %s in %.255s"
 msgstr "在 %2$.255s 中读取 %1$s 时遇到意料之外的文件结束符"
 
-#: dpkg-deb/extract.c:73 dpkg-split/info.c:52
+#: dpkg-deb/extract.c:75 dpkg-split/info.c:52
 #, c-format
 msgid "file `%.250s' is corrupt - %.250s length contains nulls"
 msgstr "文件“%.250s”已损毁 - %.250s 的长度含有 null 位"
 
-#: dpkg-deb/extract.c:80 dpkg-split/info.c:43
+#: dpkg-deb/extract.c:82
+#, c-format
+msgid "file `%.250s' is corrupt - negative member length %zi"
+msgstr "文件“%.250s”已损毁 - 成员长度为负 %zi"
+
+#: dpkg-deb/extract.c:84 dpkg-split/info.c:43
 #, c-format
 msgid "file `%.250s' is corrupt - bad digit (code %d) in %s"
 msgstr "文件“%1$.250s”已损毁 - 在 %3$s 中有无效数字(即 %2$d)"
 
-#: dpkg-deb/extract.c:105
+#: dpkg-deb/extract.c:109
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr "读取包文件“%.255s”失败"
 
-#: dpkg-deb/extract.c:106
+#: dpkg-deb/extract.c:110
 msgid "failed to fstat archive"
 msgstr "fstat 包文件失败"
 
-#: dpkg-deb/extract.c:107
+#: dpkg-deb/extract.c:111
 msgid "version number"
 msgstr "版本号"
 
-#: dpkg-deb/extract.c:116
+#: dpkg-deb/extract.c:120
 msgid "between members"
 msgstr "成员间"
 
-#: dpkg-deb/extract.c:118 dpkg-split/info.c:95
+#: dpkg-deb/extract.c:122 dpkg-split/info.c:95
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of first header"
 msgstr "文件“%.250s”已损毁 - 在第一个文件头末尾有错误的魔数(magic)"
 
-#: dpkg-deb/extract.c:122
-#, c-format
-msgid "file `%.250s' is corrupt - negative member length %zi"
-msgstr "文件“%.250s”已损毁 - 成员长度为负 %zi"
-
-#: dpkg-deb/extract.c:126
+#: dpkg-deb/extract.c:128
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr "文件“%.250s”不是 debian 的二进制包文件(不妨试一下 dpkg-split？)"
 
-#: dpkg-deb/extract.c:129
+#: dpkg-deb/extract.c:131
 msgid "header info member"
 msgstr "文件头信息成员"
 
-#: dpkg-deb/extract.c:132
+#: dpkg-deb/extract.c:134
 msgid "archive has no newlines in header"
 msgstr "包文件的文件头中没有换行"
 
-#: dpkg-deb/extract.c:135
+#: dpkg-deb/extract.c:137
 msgid "archive has no dot in version number"
 msgstr "包文件的版本号中没有点"
 
-#: dpkg-deb/extract.c:138
+#: dpkg-deb/extract.c:140
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "不能识别包文件的版本 %.250s，请升级 dpkg-deb"
 
-#: dpkg-deb/extract.c:147 dpkg-deb/extract.c:180
+#: dpkg-deb/extract.c:149 dpkg-deb/extract.c:182
 #, c-format
 msgid "skipped member data from %s"
 msgstr "忽略了 %s 中的成员数据"
 
-#: dpkg-deb/extract.c:170
+#: dpkg-deb/extract.c:172
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr "文件“%.250s”含有未知的数据成员 %.*s，取消操作"
 
-#: dpkg-deb/extract.c:176
+#: dpkg-deb/extract.c:178
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr "文件“%.250s”含有两个控制成员，取消操作"
 
-#: dpkg-deb/extract.c:188
+#: dpkg-deb/extract.c:190
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
@@ -3583,16 +3583,16 @@ msgstr ""
 " 新格式的 debian 软件包，格式版本 %s。\n"
 " 大小 %ld 字节：主控包=%zi 字节。\n"
 
-#: dpkg-deb/extract.c:200
+#: dpkg-deb/extract.c:202
 msgid "control information length"
 msgstr "控制信息的长度"
 
-#: dpkg-deb/extract.c:202
+#: dpkg-deb/extract.c:204
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr "压缩文件中的控制信息长度 “%s” 格式有误"
 
-#: dpkg-deb/extract.c:205
+#: dpkg-deb/extract.c:207
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
@@ -3601,15 +3601,15 @@ msgstr ""
 " 旧格式的 debian 软件包，格式版本 %s。\n"
 " 大小 %ld 字节：主控包= %zi 字节，数据及程序包= %ld。\n"
 
-#: dpkg-deb/extract.c:213
+#: dpkg-deb/extract.c:215
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr "为变量“ctrlarea”申请内存时出错"
 
-#: dpkg-deb/extract.c:216
+#: dpkg-deb/extract.c:218
 msgid "control area"
 msgstr "控制区"
 
-#: dpkg-deb/extract.c:222
+#: dpkg-deb/extract.c:224
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
@@ -3618,65 +3618,65 @@ msgstr ""
 "dpkg-deb：该文件看上去似乎原本是一个包文件，但是由于下载它时\n"
 "dpkg-deb：使用的是 ASCII 模式，从而导致了包文件被损坏\n"
 
-#: dpkg-deb/extract.c:227
+#: dpkg-deb/extract.c:229
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr "“%.255s”并非 debian 格式的包文件"
 
-#: dpkg-deb/extract.c:233
+#: dpkg-deb/extract.c:235
 msgid "failed getting the current file position"
 msgstr "无法得到当前文件的位置"
 
-#: dpkg-deb/extract.c:238
+#: dpkg-deb/extract.c:240
 msgid "failed setting the current file position"
 msgstr "无法设置当前文件的位置"
 
-#: dpkg-deb/extract.c:247
+#: dpkg-deb/extract.c:249
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr "在粘贴时，无法打开管道描述符“1”"
 
-#: dpkg-deb/extract.c:249
+#: dpkg-deb/extract.c:251
 msgid "failed to write to gzip -dc"
 msgstr "在写入 gzip -dc 时，操作失败"
 
-#: dpkg-deb/extract.c:250
+#: dpkg-deb/extract.c:252
 msgid "failed to close gzip -dc"
 msgstr "在关闭 gzip -dc 时，操作失败"
 
-#: dpkg-deb/extract.c:257
+#: dpkg-deb/extract.c:259
 msgid "failed to syscall lseek to files archive portion"
 msgstr "当通过使用系统调用 lseek，以跳到文件档开始处时失败"
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:267
 msgid "failed to write to pipe in copy"
 msgstr "写入通向拷贝的管道时出错"
 
-#: dpkg-deb/extract.c:266
+#: dpkg-deb/extract.c:268
 msgid "failed to close pipe in copy"
 msgstr "关闭通向拷贝的管道时出错"
 
-#: dpkg-deb/extract.c:287
+#: dpkg-deb/extract.c:289
 msgid "failed to create directory"
 msgstr "新建目录失败"
 
-#: dpkg-deb/extract.c:288
+#: dpkg-deb/extract.c:290
 msgid "failed to chdir to directory after creating it"
 msgstr "新建目录后，chdir 到该目录失败"
 
-#: dpkg-deb/extract.c:290
+#: dpkg-deb/extract.c:292
 msgid "failed to chdir to directory"
 msgstr "chdir 到目录失败"
 
-#: dpkg-deb/extract.c:304
+#: dpkg-deb/extract.c:306
 msgid "failed to exec tar"
 msgstr "exec tar 失败"
 
-#: dpkg-deb/extract.c:327 dpkg-deb/extract.c:342 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:329 dpkg-deb/extract.c:344 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s 需要一个 .deb 文件的文件名作为参数"
 
-#: dpkg-deb/extract.c:330
+#: dpkg-deb/extract.c:332
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
@@ -3685,12 +3685,12 @@ msgstr ""
 "--%s 需要一个目录作为目标目录。\n"
 "或许您应该使用 dpkg --install？"
 
-#: dpkg-deb/extract.c:333
+#: dpkg-deb/extract.c:335
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s 至多能有两个参数(分别是 .deb 文件和目录)"
 
-#: dpkg-deb/extract.c:344
+#: dpkg-deb/extract.c:346
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr "--%s 只带一个参数(即 .deb 文件的文件名)"
@@ -3721,8 +3721,8 @@ msgid "failed to exec rm -rf"
 msgstr "exec rm -rf 失败"
 
 #: dpkg-deb/info.c:99
-#, c-format
-msgid "realloc failed (%lu bytes)"
+#, fuzzy, c-format
+msgid "realloc failed (%zu bytes)"
 msgstr "realloc 失败(%lu 字节)"
 
 #: dpkg-deb/info.c:108