Regenerate .pot files and merge .po files with them

1 files changed, 116 insertions, 72 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index b35e84f8f..ecc2089a7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-31 20:58+0200\n"
+"POT-Creation-Date: 2010-11-25 07:13+0100\n"
 "PO-Revision-Date: 2010-08-26 22:24+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -1286,82 +1286,82 @@ msgstr "无法创建“%.255s”(处理“%.255s”时)"
 msgid "backend dpkg-deb during `%.255s'"
 msgstr "“%.255s” 时，dpkg-deb 被作为后端"
 
-#: src/archives.c:711 src/archives.c:886
+#: src/archives.c:712 src/archives.c:888
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr "关闭/写入“%.255s”出错"
 
-#: src/archives.c:716
+#: src/archives.c:717
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr "新建管道“%.255s”时出错"
 
-#: src/archives.c:722 src/archives.c:728
+#: src/archives.c:723 src/archives.c:729
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "新建设备文件“%.255s”时出错"
 
-#: src/archives.c:741
+#: src/archives.c:742
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr "新建硬链接“%.255s”时出错"
 
-#: src/archives.c:748
+#: src/archives.c:749
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr "新建符号链接“%.255s”时出错"
 
-#: src/archives.c:755
+#: src/archives.c:756
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr "为符号链接“%.255s”设置属主时出错"
 
-#: src/archives.c:760
+#: src/archives.c:761
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr "新建目录“%.255s”时出错"
 
-#: src/archives.c:798
+#: src/archives.c:799
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr "无法将“%.255s”改名，以安装新的版本"
 
-#: src/archives.c:808
+#: src/archives.c:809
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr "无法读取符号链接“%.255s”"
 
-#: src/archives.c:813
+#: src/archives.c:814
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "无法为“%.255s”做一个符号链接备份"
 
-#: src/archives.c:815
+#: src/archives.c:816
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "无法更改“%.255s”的符号链接备份的属主"
 
-#: src/archives.c:820
+#: src/archives.c:821
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr "无法在安装新的版本前，为“%.255s”做一个符号链接备份"
 
-#: src/archives.c:835 src/archives.c:895
+#: src/archives.c:836 src/archives.c:897
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "无法安装“%.255s”的新版本"
 
-#: src/archives.c:882
+#: src/archives.c:884
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr "无法打开“%.255s”"
 
-#: src/archives.c:884
+#: src/archives.c:886
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr "无法同步文件“%.255s”"
 
-#: src/archives.c:932
+#: src/archives.c:934
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
@@ -1370,14 +1370,14 @@ msgstr ""
 "忽视 %s 的依赖关系问题：\n"
 "%s"
 
-#: src/archives.c:937
+#: src/archives.c:939
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
 " package %s, to enable %s."
 msgstr "正在考虑反配置基础软件包 %s，以便启用 %s。"
 
-#: src/archives.c:940
+#: src/archives.c:942
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1386,7 +1386,7 @@ msgstr ""
 "dpkg：拒绝，%s 是基础软件包，不能反配置该软件包\n"
 " 启用开启 %s。\n"
 
-#: src/archives.c:954
+#: src/archives.c:956
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1395,28 +1395,28 @@ msgstr ""
 "dpkg：拒绝，不能继续进行 %s (不妨尝试 --auto-deconfigure)：\n"
 "%s"
 
-#: src/archives.c:964
+#: src/archives.c:966
 #, c-format
 msgid "removal of %.250s"
 msgstr "卸载 %.250s"
 
-#: src/archives.c:989
+#: src/archives.c:991
 #, c-format
 msgid "installation of %.250s"
 msgstr "安装 %.250s"
 
-#: src/archives.c:990
+#: src/archives.c:992
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg：正在考虑反配置 %s ，否则会被 %s 破坏 ...\n"
 
-#: src/archives.c:997
+#: src/archives.c:999
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg：好的，将反配置 %s (被 %s 破坏)。\n"
 
-#: src/archives.c:1001 src/archives.c:1122
+#: src/archives.c:1003 src/archives.c:1124
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1425,11 +1425,11 @@ msgstr ""
 "dpkg：关于含有 %2$s 的 %1$s：\n"
 "%3$s"
 
-#: src/archives.c:1009
+#: src/archives.c:1011
 msgid "ignoring breakage, may proceed anyway!"
 msgstr "忽视软件包间的破坏，无论怎样，继续安装！"
 
-#: src/archives.c:1014
+#: src/archives.c:1016
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
@@ -1438,27 +1438,27 @@ msgstr ""
 "安装 %.250s 将破坏 %.250s，并且\n"
 "不允许反配置(--auto-deconfigure 也许会有帮助)"
 
-#: src/archives.c:1018
+#: src/archives.c:1020
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr "安装 %.250s 将破坏现有软件"
 
-#: src/archives.c:1048
+#: src/archives.c:1050
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg：为了 %2$s，正考虑卸载 %1$s ...\n"
 
-#: src/archives.c:1054
+#: src/archives.c:1056
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s 没有被正常安装 - 将忽略所有对它的依赖关系。\n"
 
-#: src/archives.c:1083
+#: src/archives.c:1085
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg：也许卸载 %s 会有问题，因为它提供了 %s ...\n"
 
-#: src/archives.c:1098
+#: src/archives.c:1100
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1467,69 +1467,69 @@ msgstr ""
 "dpkg：尽管软件包 %s 需要重新安装，但还是将遵照您的要求，\n"
 "把它卸载。\n"
 
-#: src/archives.c:1101
+#: src/archives.c:1103
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg：软件包 %s 需要重新安装，它不会被卸载。\n"
 
-#: src/archives.c:1108
+#: src/archives.c:1110
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr "软件包 %s 有太多的冲突/替换组合"
 
-#: src/archives.c:1114
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg：好的，为了 %2$s 卸载 %1$s。\n"
 
-#: src/archives.c:1125
+#: src/archives.c:1127
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "软件包相互冲突 - 将不安装 %.250s"
 
-#: src/archives.c:1126
+#: src/archives.c:1128
 msgid "ignoring conflict, may proceed anyway!"
 msgstr "忽视软件包间的冲突，无论怎样，继续安装！"
 
-#: src/archives.c:1167
+#: src/archives.c:1169
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --递归执行需要至少一个路径作为参数"
 
-#: src/archives.c:1177
+#: src/archives.c:1179
 msgid "find for dpkg --recursive"
 msgstr "启用 --recursive 选项执行 find"
 
-#: src/archives.c:1199
+#: src/archives.c:1201
 msgid "failed to fdopen find's pipe"
 msgstr "无法 fdopen find 的管道"
 
-#: src/archives.c:1205
+#: src/archives.c:1207
 msgid "error reading find's pipe"
 msgstr "读取 find 的管道时出错"
 
-#: src/archives.c:1206
+#: src/archives.c:1208
 msgid "error closing find's pipe"
 msgstr "关闭 find 的管道时出错"
 
-#: src/archives.c:1209
+#: src/archives.c:1211
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "--recursive 选项所调用的 find 返回了一个没有被处理的错误 %i"
 
-#: src/archives.c:1212
+#: src/archives.c:1214
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "已搜索包文件，但是没有发现任何软件包(即与 *.deb 匹配的文件)"
 
-#: src/archives.c:1228
+#: src/archives.c:1230
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s 需要至少一个软件包文件作为参数"
 
-#: src/archives.c:1260 src/divertcmd.c:78 src/divertcmd.c:118
+#: src/archives.c:1262 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:163 src/enquiry.c:270 src/enquiry.c:413 src/enquiry.c:415
-#: src/enquiry.c:424 src/main.c:65 src/main.c:159 src/main.c:257
-#: src/main.c:432 src/packages.c:249 src/querycmd.c:187 src/querycmd.c:290
+#: src/enquiry.c:424 src/main.c:65 src/main.c:159 src/main.c:259
+#: src/main.c:435 src/packages.c:249 src/querycmd.c:187 src/querycmd.c:290
 #: src/querycmd.c:332 src/querycmd.c:341 src/querycmd.c:388 src/querycmd.c:454
 #: src/querycmd.c:593 src/querycmd.c:637 src/select.c:77 src/statcmd.c:67
 #: src/statcmd.c:97 src/trigcmd.c:60 src/trigcmd.c:92 dpkg-deb/build.c:384
@@ -1540,33 +1540,33 @@ msgstr "--%s 需要至少一个软件包文件作为参数"
 msgid "<standard output>"
 msgstr "<标准输出>"
 
-#: src/archives.c:1261 src/packages.c:250 src/querycmd.c:188
+#: src/archives.c:1263 src/packages.c:250 src/querycmd.c:188
 #: src/querycmd.c:288 src/querycmd.c:394 src/querycmd.c:455 src/select.c:78
 #: dpkg-split/main.c:199 dpkg-split/queue.c:213
 msgid "<standard error>"
 msgstr "<标准错误>"
 
-#: src/archives.c:1305
+#: src/archives.c:1307
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "选中了曾被取消选择的软件包 %s。\n"
 
-#: src/archives.c:1310
+#: src/archives.c:1312
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "忽略了被取消选择的软件包 %s。\n"
 
-#: src/archives.c:1327
+#: src/archives.c:1329
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "%1$.250s 的 %2$.250s 版本已经安装，因而将不再安装它。\n"
 
-#: src/archives.c:1338
+#: src/archives.c:1340
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr "即将把 %.250s 从 %.250s 降级到 %.250s。"
 
-#: src/archives.c:1343
+#: src/archives.c:1345
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr "由于不希望把 %.250s 从 %.250s 降级到 %.250s，因而将不再安装它。\n"
@@ -2297,7 +2297,7 @@ msgstr ""
 msgid "Removing '%s'\n"
 msgstr "正在删除 %s\n"
 
-#: src/divertcmd.c:672 src/main.c:224 src/querycmd.c:651 src/statcmd.c:113
+#: src/divertcmd.c:672 src/main.c:226 src/querycmd.c:651 src/statcmd.c:113
 #: dpkg-deb/main.c:198 dpkg-split/main.c:167
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
@@ -2936,12 +2936,12 @@ msgstr ""
 "带有 [*] 的选项将会输出较大篇幅的文字 - 可使用管道将其输出连接"
 "到“less”或“more”！"
 
-#: src/main.c:230
+#: src/main.c:232
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr "废弃的选项“--%s”\n"
 
-#: src/main.c:238
+#: src/main.c:240
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2984,36 +2984,79 @@ msgstr ""
 "可以用位与(bitwise-or)把除错选项组合起来使用。\n"
 "注意，意义和数值将有可能更动。\n"
 
-#: src/main.c:262
+#: src/main.c:264
 msgid "--debug requires an octal argument"
 msgstr "--debug 需要一个八进制的参数"
 
-#: src/main.c:291
+#: src/main.c:293
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "在 --ignore-depends 的用逗号相隔的参数列表“%s”中，发现有的软件包名为空"
 
-#: src/main.c:297
+#: src/main.c:299
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends 需要一个有效的软件包名。而“%.250s”却不是；%s"
 
-#: src/main.c:314 src/main.c:326 src/main.c:602 dpkg-split/main.c:126
+#: src/main.c:316 src/main.c:328 src/main.c:605 dpkg-split/main.c:126
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s 有一个无效的数字参数：“%.250s”"
 
-#: src/main.c:328
+#: src/main.c:330
 msgid "<package status and progress file descriptor>"
 msgstr "<包状态和进度文件描述符>"
 
-#: src/main.c:386
+#: src/main.c:388
 #, c-format
 msgid "error executing hook '%s', exit code %d"
 msgstr "执行钩子 %s 出错，退出状态书为 %d"
 
-#: src/main.c:400
-#, c-format
+#: src/main.c:402
+#, fuzzy, c-format
+#| msgid ""
+#| "%s forcing options - control behaviour when problems found:\n"
+#| "  warn but continue:  --force-<thing>,<thing>,...\n"
+#| "  stop with error:    --refuse-<thing>,<thing>,... | --no-force-"
+#| "<thing>,...\n"
+#| " Forcing things:\n"
+#| "  all [!]                Set all force options\n"
+#| "  downgrade [*]          Replace a package with a lower version\n"
+#| "  configure-any          Configure any package which may help this one\n"
+#| "  hold                   Process incidental packages even when on hold\n"
+#| "  bad-path               PATH is missing important programs, problems "
+#| "likely\n"
+#| "  not-root               Try to (de)install things even when not root\n"
+#| "  overwrite              Overwrite a file from one package with another\n"
+#| "  overwrite-diverted     Overwrite a diverted file with an undiverted "
+#| "version\n"
+#| "  bad-verify             Install a package even if it fails authenticity "
+#| "check\n"
+#| "  depends-version [!]    Turn dependency version problems into warnings\n"
+#| "  depends [!]            Turn all dependency problems into warnings\n"
+#| "  confnew [!]            Always use the new config files, don't prompt\n"
+#| "  confold [!]            Always use the old config files, don't prompt\n"
+#| "  confdef [!]            Use the default option for new config files if "
+#| "one\n"
+#| "                         is available, don't prompt. If no default can be "
+#| "found,\n"
+#| "                         you will be prompted unless one of the confold "
+#| "or\n"
+#| "                         confnew options is also given\n"
+#| "  confmiss [!]           Always install missing config files\n"
+#| "  confask [!]            Offer to replace config files with no new "
+#| "versions\n"
+#| "  breaks [!]             Install even if it would break another package\n"
+#| "  conflicts [!]          Allow installation of conflicting packages\n"
+#| "  architecture [!]       Process even packages with wrong architecture\n"
+#| "  overwrite-dir [!]      Overwrite one package's directory with another's "
+#| "file\n"
+#| "  remove-reinstreq [!]   Remove packages which require installation\n"
+#| "  remove-essential [!]   Remove an essential package\n"
+#| "\n"
+#| "WARNING - use of options marked [!] can seriously damage your "
+#| "installation.\n"
+#| "Forcing options marked [*] are enabled by default.\n"
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
 "  warn but continue:  --force-<thing>,<thing>,...\n"
@@ -3047,6 +3090,7 @@ msgid ""
 "  architecture [!]       Process even packages with wrong architecture\n"
 "  overwrite-dir [!]      Overwrite one package's directory with another's "
 "file\n"
+"  unsafe-io [!]          Do not perform safe I/O operations when unpacking\n"
 "  remove-reinstreq [!]   Remove packages which require installation\n"
 "  remove-essential [!]   Remove an essential package\n"
 "\n"
@@ -3088,35 +3132,35 @@ msgstr ""
 "警告 - 使用带有[!]标记的选项可能会严重破坏您的系统。\n"
 "默认情况下，是使用带有[*]标记的强制手段的。\n"
 
-#: src/main.c:447
+#: src/main.c:450
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "无法识别的 force/refuse 选项“%.*s”"
 
-#: src/main.c:453
+#: src/main.c:456
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr "废弃的强制或拒绝选项“%s”\n"
 
-#: src/main.c:596
+#: src/main.c:599
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd 需要一个参数，而非零个"
 
-#: src/main.c:598
+#: src/main.c:601
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd 只需带一个参数"
 
-#: src/main.c:604
+#: src/main.c:607
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "无法打开“%i”，并把它作为字符流操作"
 
-#: src/main.c:629
+#: src/main.c:632
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "在第 %d 行还未结束时，发现未预料的 eof"
 
-#: src/main.c:673 src/main.c:695 src/querycmd.c:693 src/statcmd.c:401
+#: src/main.c:676 src/main.c:698 src/querycmd.c:693 src/statcmd.c:401
 #: dpkg-deb/main.c:222 dpkg-split/main.c:186
 msgid "need an action option"
 msgstr "需要一个指示操作的选项"