Regenerated .pot files. Merged .po files with .pot files.

1 files changed, 86 insertions, 79 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6e15d7271..1f1f98978 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-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\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"
@@ -4311,7 +4311,7 @@ msgid "unable to close %s after read: %s"
 msgstr "读取完之后无法关闭 %s：%s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "无法关闭 %s：%s"
@@ -4398,9 +4398,10 @@ msgstr ""
 "在删除转移项的时候，--package 或 --local 选项和 --divert 选项必须一致。\n"
 "软件包的 preinst 和 postrm 脚本通常应当指定 --package 和 --divert 选项。\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "指定了两种模式：%s 以及 --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4422,13 +4423,13 @@ msgid "package may not contain newlines"
 msgstr "软件包不可以含有换行符"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s 需要一个 <directory> 参数"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "无法识别的选项 “%s”"
@@ -4581,7 +4582,7 @@ msgstr "创建新的 diversions-old：%s"
 msgid "install new diversions: %s"
 msgstr "安装新的转移项：%s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "内部错误：%s 损坏：%s"
@@ -5030,8 +5031,8 @@ msgstr ""
 "   --version                     显示版本信息。\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5065,92 +5066,92 @@ msgid ""
 "alternatives."
 msgstr "找不到指向 %2$s 的替换项 %1$s。正从替换项列表中移除。"
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - 状态为 %s"
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " 链接目前指向 %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " 链接目前不存在"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " 链接无法读取 - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - 优先级 %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " slave %s：%s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "无适用版本。"
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "目前“最佳”的版本为 %s。"
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "无法识别的参数 “%s”"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install 需要 <link> <name> <path> <priority>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "优先级必须为整数"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s 需要 <name> <path>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s 需要 <name>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave 需要 <link> <name> <path>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "次要名称(slave name) %s 有重复"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "次要链接(slave link) %s 有重复"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "文件名 %s 同時是主要(primary)和次要(slave)"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "链接 %s 同時是主要(primary)和次要(slave)"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5158,31 +5159,31 @@ msgstr ""
 "需要 --display, --config, --set, --install, --remove, --all, --remove-all 或 "
 "--auto 选项"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave 只能搭配 --install 使用"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "无 %s 的替换项。"
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "正在设置 %s 的自動选择"
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "无法移除 %s：%s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5191,7 +5192,7 @@ msgstr ""
 "%s 已更改（由于手动更改或通过脚本）。\n"
 "切换成只允许手动更新。"
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5200,67 +5201,67 @@ msgstr ""
 "检查 %s 的可用版本，正在更新 %s 中的链接…\n"
 "（如果愿意，你也可以自行修改符号链接 (symlink) - 请参阅 “man ln”。）"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "正在更改链接 %s 的名称，从 %s 改成 %s。"
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "无法把 %s 改名为 %s：%s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "次要链接名称 %s 已重复"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "正在更改次要链接 %s 的名称，从 %s 改成 %s。"
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "正在移除手动选择的替代项 - 切换为自动模式"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%2$s 的替换项 %1$s 没有注册，无法移除。"
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "舍弃已废弃的次要链接 %s（%s）。"
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "取消 %s 的自动更新功能。"
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "要回复成自动更新，请执行 “update-alternatives --auto %s”。"
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "正在从上一次更新 %s 的失败中恢复…"
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "无法打开文件 “%s” 以写入：%s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "最后一个提供 %s（%s）的软件包已移除，删除中。"
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5269,38 +5270,38 @@ msgstr ""
 "警告：%s 应该是指向 %s 的符号链接(symlink)\n"
 " （或者不存在），但读取链接失败：%s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "无法确认 %s 不存在：%s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "无法创建 %s 为 %s 的符号链接(symlink)：%s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "无法把 %s 安装为 %s：%s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "维持 %s（%s）指向 %s。"
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "正在更新 %s（%s）指向 %s。"
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5309,13 +5310,13 @@ msgstr ""
 "警告：%s 本该是指向 %s 的次要链接，\n"
 "或者不存在；但读取链接失败：%s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "正在移除 %s（%s），不适用于 %s。"
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5324,7 +5325,7 @@ msgstr ""
 "只有一个程序提供 %s\n"
 "（%s）。无须做任何配置。\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5333,7 +5334,7 @@ msgstr ""
 "只有一个程序提供 %s\n"
 "（%s）。无须做任何配置。\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5346,45 +5347,51 @@ msgstr ""
 "    选择        可选项\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "要维持缺省值[*]，按回车键，或者键入选择的编号："
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "使用 “%s” 来提供 “%s”。"
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "找不到替换项 “%s”。"
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "写入标准输出(stdout)时出错：%s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives 文件（%s）禁止换行符"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%2$s：读取 %1$s 时发生错误或是 eof （%3$s）"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "在 %s 后缺少换行符"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "严重问题：%s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "指定了两种模式：%s 以及 --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s：exec gzip -dc 失败"