Regenerate .pot files and merge .po files with them

1 files changed, 84 insertions, 84 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 451aee753..a6f1badd1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-08-18 03:58+0300\n"
+"POT-Creation-Date: 2007-11-19 08:48+0200\n"
 "PO-Revision-Date: 2007-03-18 19:25+0800\n"
 "Last-Translator: Kov Chai <tchaikov@gmail.com>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -154,7 +154,7 @@ msgstr "无法扫描更新目录“%.255s”"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "删除合并的更新文件“%.255s”失败"
 
-#: lib/dbmodify.c:111 src/archives.c:650 dpkg-deb/build.c:319
+#: lib/dbmodify.c:111 src/archives.c:650 dpkg-deb/build.c:342
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "无法创建“%.255s”"
@@ -2841,7 +2841,7 @@ msgstr ""
 msgid "dpkg: warning - unable to %s old file `%%.250s': %%s\n"
 msgstr "dpkg：警告 - 无法 %s 原有的文件“%%.250s”：%%s\n"
 
-#: src/processarc.c:751 src/processarc.c:992 src/remove.c:292
+#: src/processarc.c:751 src/processarc.c:992 src/remove.c:293
 msgid "cannot read info directory"
 msgstr "无法读取信息(info)目录"
 
@@ -3130,7 +3130,7 @@ msgstr "这样肯定会删除或清除(purge) %s ...\n"
 msgid "Removing %s ...\n"
 msgstr "正在删除 %s ...\n"
 
-#: src/remove.c:257 src/remove.c:374
+#: src/remove.c:258 src/remove.c:375
 #, c-format
 msgid ""
 "dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %"
@@ -3139,58 +3139,58 @@ msgstr ""
 "dpkg - 警告：当删除 %.250s 时，无法删掉目录“%.250s”：%s - 该目录会不会是一个"
 "挂载点呢？\n"
 
-#: src/remove.c:264 src/remove.c:381
+#: src/remove.c:265 src/remove.c:382
 #, c-format
 msgid "cannot remove `%.250s'"
 msgstr "无法删除“%.250s”"
 
-#: src/remove.c:282
+#: src/remove.c:283
 #, c-format
 msgid "cannot remove file `%.250s'"
 msgstr "无法删除文件“%.250s”"
 
-#: src/remove.c:315
+#: src/remove.c:316
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr "无法删除控制信息文件“%.250s”"
 
-#: src/remove.c:368
+#: src/remove.c:369
 #, c-format
 msgid ""
 "dpkg - warning: while removing %.250s, directory `%.250s' not empty so not "
 "removed.\n"
 msgstr "dpkg - 警告：当删除“%.250s”，目录“%.250s”非空，因而不会删除该目录。\n"
 
-#: src/remove.c:404
+#: src/remove.c:405
 #, c-format
 msgid "Purging configuration files for %s ...\n"
 msgstr "正在清除 %s 的配置文件 ...\n"
 
-#: src/remove.c:454
+#: src/remove.c:455
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
 msgstr "无法删除原有的配置文件“%.250s” (＝“%.250s”)"
 
-#: src/remove.c:469
+#: src/remove.c:470
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr "无法读取配置文件所在目录“%.250s”(从“%.250s”)"
 
-#: src/remove.c:504
+#: src/remove.c:505
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr "无法删除旧有的配置文件备份“%.250s”(在“%.250s”中提到)"
 
-#: src/remove.c:540
+#: src/remove.c:541
 #, c-format
 msgid "unable to check existence of `%.250s'"
 msgstr "无法判断“%.250s”是否存在"
 
-#: src/remove.c:575
+#: src/remove.c:576
 msgid "cannot remove old files list"
 msgstr "无法删除原有的文件列表"
 
-#: src/remove.c:581
+#: src/remove.c:582
 msgid "can't remove old postrm script"
 msgstr "无法删除原有的 postrm 脚本"
 
@@ -3278,34 +3278,34 @@ msgstr "共更新了 %d 个软件包的相关信息。\n"
 msgid "--forget-old-unavail takes no arguments"
 msgstr "--forget-old-unavail 不需带任何参数"
 
-#: dpkg-deb/build.c:67
+#: dpkg-deb/build.c:87
 #, c-format
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr "dpkg-deb - 错误：%s (“%s”) 未含有任何数字\n"
 
-#: dpkg-deb/build.c:111
+#: dpkg-deb/build.c:131
 #, c-format
 msgid "file name '%.50s...' is too long"
 msgstr ""
 
-#: dpkg-deb/build.c:172
+#: dpkg-deb/build.c:192
 msgid "--build needs a directory argument"
 msgstr "--build 需要一个目录名作为参数"
 
-#: dpkg-deb/build.c:181
+#: dpkg-deb/build.c:201
 msgid "--build takes at most two arguments"
 msgstr "--build 至多可有两个参数"
 
-#: dpkg-deb/build.c:185
+#: dpkg-deb/build.c:205
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr "无法判断包文件“%.250s”存在与否"
 
-#: dpkg-deb/build.c:200
+#: dpkg-deb/build.c:220
 msgid "target is directory - cannot skip control file check"
 msgstr "目标是一个目录 - 无法忽略主控文件的检查步骤"
 
-#: dpkg-deb/build.c:201
+#: dpkg-deb/build.c:221
 #, c-format
 msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
@@ -3314,175 +3314,175 @@ msgstr ""
 "dpkg-deb：警告，没有检查控制区的内容。\n"
 "dpkg-deb：正在在“%s“内新建一个未知的包文件。\n"
 
-#: dpkg-deb/build.c:219
+#: dpkg-deb/build.c:239
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr "软件包的名字含有不是小写字母或“-+”的字符"
 
-#: dpkg-deb/build.c:221
+#: dpkg-deb/build.c:241
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
 msgstr "警告，“%s”含有用户自定义的优先级别(Priority value) “%s”\n"
 
-#: dpkg-deb/build.c:226
+#: dpkg-deb/build.c:249
 #, c-format
 msgid "warning, `%s' contains user-defined field `%s'\n"
 msgstr "警告，“%s”含有用户自定义的字段“%s”\n"
 
-#: dpkg-deb/build.c:232
+#: dpkg-deb/build.c:255
 #, c-format
 msgid "%d errors in control file"
 msgstr "主控文件中共有 %d 个错误"
 
-#: dpkg-deb/build.c:243
+#: dpkg-deb/build.c:266
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr "dpkg-deb：正在新建软件包“%s”，包文件为“%s”。\n"
 
-#: dpkg-deb/build.c:251
+#: dpkg-deb/build.c:274
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr "控制目录的的权限位是 %03lo (必须 >=0755 且 <=0755)"
 
-#: dpkg-deb/build.c:262
+#: dpkg-deb/build.c:285
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr "维护者的脚本“%.50s”不是普通文件或符号链接"
 
-#: dpkg-deb/build.c:264
+#: dpkg-deb/build.c:287
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
 "<=0775)"
 msgstr "维护者的脚本“%.50s”的权限位是 %03lo (必须 >=0555 且 <=0775)"
 
-#: dpkg-deb/build.c:268
+#: dpkg-deb/build.c:291
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr "无法获取维护者的脚本文件“%.50s”的状态"
 
-#: dpkg-deb/build.c:278
+#: dpkg-deb/build.c:301
 msgid "empty string from fgets reading conffiles"
 msgstr "通过 fgets 读取 conffile 时，返回了空字符串"
 
-#: dpkg-deb/build.c:280
+#: dpkg-deb/build.c:303
 #, c-format
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
 msgstr "警告，conffile 的文件名“%.50s”超长，或是缺少最后结尾的换行符\n"
 
-#: dpkg-deb/build.c:293
+#: dpkg-deb/build.c:316
 #, c-format
 msgid "warning, conffile filename `%s' contains trailing white spaces\n"
 msgstr "警告，conffile “%s” 的文件名后面含有空格\n"
 
-#: dpkg-deb/build.c:295
+#: dpkg-deb/build.c:318
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr "软件包内没有发现 conffile “%.250s”"
 
-#: dpkg-deb/build.c:297
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr "无法 conffile “%.50s”的状态"
 
-#: dpkg-deb/build.c:299
+#: dpkg-deb/build.c:322
 #, c-format
 msgid "warning, conffile `%s' is not a plain file\n"
 msgstr "警告，conffile “%s”不是普通文件\n"
 
-#: dpkg-deb/build.c:304
+#: dpkg-deb/build.c:327
 msgid "error reading conffiles file"
 msgstr "读取 conffile 文件时出错"
 
-#: dpkg-deb/build.c:307
+#: dpkg-deb/build.c:330
 msgid "error opening conffiles file"
 msgstr "打开 conffile 文件时出错"
 
-#: dpkg-deb/build.c:310
+#: dpkg-deb/build.c:333
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr "dpkg-deb：共忽视了有关主控文件的 %d 个警告\n"
 
-#: dpkg-deb/build.c:320
+#: dpkg-deb/build.c:343
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr "无法关闭文件缓冲“%.255s”"
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:399 dpkg-deb/build.c:420
+#: dpkg-deb/build.c:348 dpkg-deb/build.c:422 dpkg-deb/build.c:443
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "chdir 到“%.255s”失败"
 
-#: dpkg-deb/build.c:326
+#: dpkg-deb/build.c:349
 msgid "failed to chdir to .../DEBIAN"
 msgstr "chdir 到 .../DEBIAN 失败"
 
-#: dpkg-deb/build.c:328 dpkg-deb/build.c:401
+#: dpkg-deb/build.c:351 dpkg-deb/build.c:424
 msgid "failed to exec tar -cf"
 msgstr "exec tar -cf 失败"
 
-#: dpkg-deb/build.c:334
+#: dpkg-deb/build.c:357
 msgid "failed to make tmpfile (control)"
 msgstr "新建临时文件(控制信息)失败"
 
-#: dpkg-deb/build.c:335
+#: dpkg-deb/build.c:358
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr "打开临时文件(控制信息)失败，%s"
 
-#: dpkg-deb/build.c:338
+#: dpkg-deb/build.c:361
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "unlink 临时文件(控制信息)失败，%s"
 
-#: dpkg-deb/build.c:346 dpkg-deb/build.c:375
+#: dpkg-deb/build.c:369 dpkg-deb/build.c:398
 msgid "control"
 msgstr "控制信息"
 
-#: dpkg-deb/build.c:351
+#: dpkg-deb/build.c:374
 msgid "failed to fstat tmpfile (control)"
 msgstr "fstat 临时文件(控制信息)失败"
 
-#: dpkg-deb/build.c:374
+#: dpkg-deb/build.c:397
 msgid "failed to rewind tmpfile (control)"
 msgstr "跳到临时文件(控制信息)的起始位置(rewind)失败"
 
-#: dpkg-deb/build.c:382
+#: dpkg-deb/build.c:405
 msgid "failed to make tmpfile (data)"
 msgstr "新建临时文件(数据)失败"
 
-#: dpkg-deb/build.c:383
+#: dpkg-deb/build.c:406
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr "新建临时文件(数据)失败，%s"
 
-#: dpkg-deb/build.c:386
+#: dpkg-deb/build.c:409
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "unlink 临时文件(数据)失败，%s"
 
-#: dpkg-deb/build.c:410 dpkg-deb/extract.c:279
+#: dpkg-deb/build.c:433 dpkg-deb/extract.c:279
 msgid "data"
 msgstr "数据"
 
-#: dpkg-deb/build.c:423
+#: dpkg-deb/build.c:446
 msgid "failed to exec find"
 msgstr "exec find 失败"
 
-#: dpkg-deb/build.c:434 dpkg-deb/build.c:441
+#: dpkg-deb/build.c:457 dpkg-deb/build.c:464
 msgid "failed to write filename to tar pipe (data)"
 msgstr "写入文件名到 tar 的管道(数据)失败"
 
-#: dpkg-deb/build.c:464
+#: dpkg-deb/build.c:487
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr "内部错误，未知的压缩类型“%i”！"
 
-#: dpkg-deb/build.c:476
+#: dpkg-deb/build.c:499
 msgid "failed to rewind tmpfile (data)"
 msgstr "跳到临时文件(数据)的起始位置(rewind)失败"
 
-#: dpkg-deb/build.c:477
+#: dpkg-deb/build.c:500
 msgid "cat (data)"
 msgstr "cat (数据)"
 
@@ -4630,7 +4630,7 @@ msgstr "创建新的 diversions-old：%s"
 msgid "install new diversions: %s"
 msgstr "安装新的转移项：%s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:738
+#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "内部错误：%s 损坏：%s"
@@ -5226,7 +5226,7 @@ msgstr "正在设置 %s 的自動选择"
 #: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
 #: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
 #: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:685 scripts/update-alternatives.pl:721
+#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "无法移除 %s：%s"
@@ -5319,43 +5319,43 @@ msgstr ""
 " （或者不存在），但读取链接失败：%s"
 
 #: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:605
+#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "无法确认 %s 不存在：%s"
 
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:608
-#: scripts/update-alternatives.pl:622 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707 scripts/update-alternatives.pl:746
+#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
+#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
+#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "无法创建 %s 为 %s 的符号链接(symlink)：%s"
 
 #: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:624
-#: scripts/update-alternatives.pl:673 scripts/update-alternatives.pl:709
-#: scripts/update-alternatives.pl:751
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
+#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
+#: scripts/update-alternatives.pl:753
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "无法把 %s 安装为 %s：%s"
 
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "维持 %s（%s）指向 %s。"
 
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:618
+#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "正在更新 %s（%s）指向 %s。"
 
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:682
-#: scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
+#: scripts/update-alternatives.pl:720
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "正在移除 %s（%s），不适用于 %s。"
 
-#: scripts/update-alternatives.pl:599
+#: scripts/update-alternatives.pl:600
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5364,7 +5364,7 @@ msgstr ""
 "警告：%s 本该是指向 %s 的次要链接，\n"
 "或者不存在；但读取链接失败：%s"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:634
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5373,7 +5373,7 @@ msgstr ""
 "只有一个程序提供 %s\n"
 "（%s）。无须做任何配置。\n"
 
-#: scripts/update-alternatives.pl:638
+#: scripts/update-alternatives.pl:640
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5382,7 +5382,7 @@ msgstr ""
 "只有一个程序提供 %s\n"
 "（%s）。无须做任何配置。\n"
 
-#: scripts/update-alternatives.pl:643
+#: scripts/update-alternatives.pl:645
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5395,41 +5395,41 @@ msgstr ""
 "    选择        可选项\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:655
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "要维持缺省值[*]，按回车键，或者键入选择的编号："
 
-#: scripts/update-alternatives.pl:668 scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "使用 “%s” 来提供 “%s”。"
 
-#: scripts/update-alternatives.pl:703
+#: scripts/update-alternatives.pl:705
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "找不到替换项 “%s”。"
 
-#: scripts/update-alternatives.pl:726 scripts/update-alternatives.pl:729
+#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "写入标准输出(stdout)时出错：%s"
 
-#: scripts/update-alternatives.pl:728
+#: scripts/update-alternatives.pl:730
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives 文件（%s）禁止换行符"
 
-#: scripts/update-alternatives.pl:733
+#: scripts/update-alternatives.pl:735
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%2$s：读取 %1$s 时发生错误或是 eof （%3$s）"
 
-#: scripts/update-alternatives.pl:734
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "missing newline after %s"
 msgstr "在 %s 后缺少换行符"
 
-#: scripts/update-alternatives.pl:754
+#: scripts/update-alternatives.pl:756
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "严重问题：%s"