Regenerate .pot files and merge .po files with them

1 files changed, 58 insertions, 53 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 020e360dd..d29abcb1d 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-11-14 17:44+0100\n"
+"POT-Creation-Date: 2009-11-27 18:45+0100\n"
 "PO-Revision-Date: 2009-11-14 17:50+0100\n"
 "Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n"
 "Language-Team: Simplified Chinese <debian-chinese-gb@lists.debian.org>\n"
@@ -5247,247 +5247,252 @@ msgstr "%s 已更改（由于手动更改或通过脚本）。切换成仅手动
 msgid "setting up automatic selection of %s."
 msgstr "正在设置 %s 的自動选择。"
 
-#: scripts/update-alternatives.pl:301
+#: scripts/update-alternatives.pl:297
+#, fuzzy, perl-format
+msgid "alternative %s for %s not registered, not setting."
+msgstr "%2$s 的替换项 %1$s 没有注册，不予移除。"
+
+#: scripts/update-alternatives.pl:306
 #, perl-format
 msgid "There is no program which provides %s."
 msgstr "没有程序提供 %s。"
 
-#: scripts/update-alternatives.pl:302 scripts/update-alternatives.pl:310
+#: scripts/update-alternatives.pl:307 scripts/update-alternatives.pl:315
 msgid "Nothing to configure."
 msgstr "无需配置。"
 
-#: scripts/update-alternatives.pl:308
+#: scripts/update-alternatives.pl:313
 #, perl-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr "链接组 %s 中只有一个替换项：%s"
 
-#: scripts/update-alternatives.pl:318
+#: scripts/update-alternatives.pl:323
 #, perl-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr "%2$s 的替换项 %1$s 没有注册，不予移除。"
 
-#: scripts/update-alternatives.pl:325
+#: scripts/update-alternatives.pl:330
 #, perl-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr "正在移除手动选择的替代项 - 切换 %s 到自动模式"
 
-#: scripts/update-alternatives.pl:341
+#: scripts/update-alternatives.pl:346
 #, perl-format
 msgid "renaming %s link from %s to %s."
 msgstr "正在将链接 %s 的名称从 %s 改成 %s。"
 
-#: scripts/update-alternatives.pl:359
+#: scripts/update-alternatives.pl:364
 #, perl-format
 msgid "renaming %s slave link from %s to %s."
 msgstr "正在将次要链接 %s 的名称从 %s 改成 %s。"
 
-#: scripts/update-alternatives.pl:376
+#: scripts/update-alternatives.pl:381
 #, perl-format
 msgid "automatic updates of %s are disabled, leaving it alone."
 msgstr "%s 的自动更新功能已禁用，保持现状。"
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:383
 #, perl-format
 msgid "to return to automatic updates use `update-alternatives --auto %s'."
 msgstr "要回复成自动更新请执行 “update-alternatives --auto %s”。"
 
-#: scripts/update-alternatives.pl:394
+#: scripts/update-alternatives.pl:399
 #, perl-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr "使用 %s 来提供 %s (%s)，于 %s 中。"
 
-#: scripts/update-alternatives.pl:572
+#: scripts/update-alternatives.pl:577
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "无法创建 %s 为 %s 的符号链接(symlink)：%s"
 
-#: scripts/update-alternatives.pl:578
+#: scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "无法把 %s 安装为 %s：%s"
 
-#: scripts/update-alternatives.pl:583
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "无法移除 %s：%s"
 
-#: scripts/update-alternatives.pl:746
+#: scripts/update-alternatives.pl:751
 #, perl-format
 msgid "while reading %s: %s"
 msgstr "当读取 %s 时：%s"
 
-#: scripts/update-alternatives.pl:747
+#: scripts/update-alternatives.pl:752
 #, perl-format
 msgid "unexpected end of file in %s while trying to read %s"
 msgstr "在读取 %2$s 时在 %1$s 中遇到非预期的文件结束符"
 
-#: scripts/update-alternatives.pl:755
+#: scripts/update-alternatives.pl:760
 #, perl-format
 msgid "%s corrupt: %s"
 msgstr "%s 损坏：%s"
 
-#: scripts/update-alternatives.pl:760
+#: scripts/update-alternatives.pl:765
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives 文件（%s）禁止换行符"
 
-#: scripts/update-alternatives.pl:762
+#: scripts/update-alternatives.pl:767
 #, perl-format
 msgid "while writing %s: %s"
 msgstr "当写入 %s 时：%s"
 
-#: scripts/update-alternatives.pl:770
+#: scripts/update-alternatives.pl:775
 #, perl-format
 msgid "unable to read %s: %s"
 msgstr "无法读取 %s：%s"
 
-#: scripts/update-alternatives.pl:772
+#: scripts/update-alternatives.pl:777
 msgid "status"
 msgstr "状态"
 
-#: scripts/update-alternatives.pl:773
+#: scripts/update-alternatives.pl:778
 msgid "invalid status"
 msgstr "无效状态"
 
-#: scripts/update-alternatives.pl:776
+#: scripts/update-alternatives.pl:781
 msgid "slave name"
 msgstr "次要名称"
 
-#: scripts/update-alternatives.pl:777
+#: scripts/update-alternatives.pl:782
 msgid "slave link"
 msgstr "次要链接"
 
-#: scripts/update-alternatives.pl:778
+#: scripts/update-alternatives.pl:783
 #, perl-format
 msgid "duplicate slave %s"
 msgstr "重复的次要(slave) %s"
 
-#: scripts/update-alternatives.pl:780
+#: scripts/update-alternatives.pl:785
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr "次要(slave)的链接与主要链接 %s 相同"
 
-#: scripts/update-alternatives.pl:782
+#: scripts/update-alternatives.pl:787
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr "重复的次要(slave)链接 %s"
 
-#: scripts/update-alternatives.pl:789
+#: scripts/update-alternatives.pl:794
 msgid "master file"
 msgstr "主要文件"
 
-#: scripts/update-alternatives.pl:790
+#: scripts/update-alternatives.pl:795
 #, perl-format
 msgid "duplicate path %s"
 msgstr "重复路径 %s"
 
-#: scripts/update-alternatives.pl:793 scripts/update-alternatives.pl:807
+#: scripts/update-alternatives.pl:798 scripts/update-alternatives.pl:812
 msgid "priority"
 msgstr "优先级"
 
-#: scripts/update-alternatives.pl:794
+#: scripts/update-alternatives.pl:799
 #, perl-format
 msgid "priority of %s: %s"
 msgstr "%s 的优先级：%s"
 
-#: scripts/update-alternatives.pl:798 scripts/update-alternatives.pl:809
+#: scripts/update-alternatives.pl:803 scripts/update-alternatives.pl:814
 msgid "slave file"
 msgstr "次要文件"
 
-#: scripts/update-alternatives.pl:803
+#: scripts/update-alternatives.pl:808
 #, perl-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
 "alternatives."
 msgstr "替换项 %s(链接组 %s 的一部分)不存在。从替换项列表中移除。"
 
-#: scripts/update-alternatives.pl:842
+#: scripts/update-alternatives.pl:847
 #, perl-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr "舍弃废弃的次要链接 %s(%s)。"
 
-#: scripts/update-alternatives.pl:848
+#: scripts/update-alternatives.pl:853
 #, perl-format
 msgid "unable to write %s: %s"
 msgstr "无法写进 %s：%s"
 
-#: scripts/update-alternatives.pl:870
+#: scripts/update-alternatives.pl:875
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "无法关闭 %s：%s"
 
-#: scripts/update-alternatives.pl:905 scripts/update-alternatives.pl:951
+#: scripts/update-alternatives.pl:910 scripts/update-alternatives.pl:956
 msgid "auto mode"
 msgstr "自动模式"
 
-#: scripts/update-alternatives.pl:905 scripts/update-alternatives.pl:960
+#: scripts/update-alternatives.pl:910 scripts/update-alternatives.pl:965
 msgid "manual mode"
 msgstr "手动模式"
 
-#: scripts/update-alternatives.pl:908
+#: scripts/update-alternatives.pl:913
 #, perl-format
 msgid " link currently points to %s"
 msgstr " 链接目前指向 %s"
 
-#: scripts/update-alternatives.pl:910
+#: scripts/update-alternatives.pl:915
 msgid " link currently absent"
 msgstr " 链接目前不存在"
 
-#: scripts/update-alternatives.pl:914
+#: scripts/update-alternatives.pl:919
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - 优先级 %s"
 
-#: scripts/update-alternatives.pl:917
+#: scripts/update-alternatives.pl:922
 #, perl-format
 msgid " slave %s: %s"
 msgstr " slave %s：%s"
 
-#: scripts/update-alternatives.pl:924
+#: scripts/update-alternatives.pl:929
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "目前“最佳”的版本为 %s。"
 
-#: scripts/update-alternatives.pl:926
+#: scripts/update-alternatives.pl:931
 msgid "No versions available."
 msgstr "无适用版本。"
 
-#: scripts/update-alternatives.pl:940
+#: scripts/update-alternatives.pl:945
 #, perl-format
 msgid "There are %s choices for the alternative %s (providing %s)."
 msgstr "有 %s 个选项可用于替换项 %s (提供 %s)。"
 
-#: scripts/update-alternatives.pl:946
+#: scripts/update-alternatives.pl:951
 msgid "Selection"
 msgstr "选择"
 
-#: scripts/update-alternatives.pl:947
+#: scripts/update-alternatives.pl:952
 msgid "Path"
 msgstr "路径"
 
-#: scripts/update-alternatives.pl:947
+#: scripts/update-alternatives.pl:952
 msgid "Priority"
 msgstr "优先级"
 
-#: scripts/update-alternatives.pl:947
+#: scripts/update-alternatives.pl:952
 msgid "Status"
 msgstr "状态"
 
-#: scripts/update-alternatives.pl:964
+#: scripts/update-alternatives.pl:969
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr "要维持当前值[*]请按回车键，或者键入选择的编号："
 
-#: scripts/update-alternatives.pl:998
+#: scripts/update-alternatives.pl:1003
 #, perl-format
 msgid "readlink(%s) failed: %s"
 msgstr "readlink(%s) 失败：%s"
 
-#: scripts/update-alternatives.pl:1028 scripts/update-alternatives.pl:1049
+#: scripts/update-alternatives.pl:1033 scripts/update-alternatives.pl:1054
 #, perl-format
 msgid "not replacing %s with a link."
 msgstr "未将 %s 替换为链接。"
 
-#: scripts/update-alternatives.pl:1052
+#: scripts/update-alternatives.pl:1057
 #, perl-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "