Simplified Chinese translation update

* po/zh_CN.po: Completed to 507 strings
Closes: #338267

2 files changed, 66 insertions, 73 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 04265a484..52086113d 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-13   Kov Tchai  <tchaikov@sjtu.edu.cn>
+
+	* zh_CN.po: Completed to 507 strings
+	         Closes: #338267
+
 2005-11-09  Jacobo Tarrio  <jacobo@tarrio.org>
 
 	* gl.po: Completed to 510 strings
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 24ccc3ec4..5f2be979d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,6 @@
 # Chinese/Simplified translation of apt.
 # This file is put in the public domain.
-# Tchaikov <chaisave@263.net>, 2004.
+# Tchaikov <tchaikov@sjtu.edu.cn>, 2005.
 # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004.
 # 
 msgid ""
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: apt 0.5.23\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-10-25 18:41+0200\n"
-"PO-Revision-Date: 2005-02-09 17:34+0800\n"
-"Last-Translator: Tchaikov <chaisave@263.net>\n"
-"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
+"PO-Revision-Date: 2005-10-29 10:08+0800\n"
+"Last-Translator: Tchaikov <tchaikov@sjtu.edu.cn>\n"
+"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -206,11 +206,11 @@ msgstr ""
 "   showsrc - 显示源文件的各项记录\n"
 "   stats - 显示一些基本的统计信息\n"
 "   dump - 简要显示整个缓存文件的内容\n"
-"   dumpavail - 把所有有效的包文件列表打印到 stdout\n"
+"   dumpavail - 把所有有效的包文件列表打印到标准输出\n"
 "   unmet - 显示所有未满足的依赖关系\n"
 "   search - 根据正则表达式搜索软件包列表\n"
-"   show - 显示关于该软件包的便于阅读的一个报告\n"
-"   depends - 原原本本的显示该软件包的依赖关系的信息\n"
+"   show - 以便于阅读的格式介绍该软件包\n"
+"   depends - 原原本本地显示该软件包的依赖信息\n"
 "   rdepends - 显示所有依赖于该软件包的软件包名字\n"
 "   pkgnames - 列出所有软件包的名字\n"
 "   dotty - 生成可用 GraphVis 处理的软件包关系图\n"
@@ -234,10 +234,7 @@ msgstr ""
 #: cmdline/apt-cdrom.cc:93
 #, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-"更换介质：请把标有\n"
-"“%s”\n"
-"的碟片插入驱动器“%s”再按回车键\n"
+msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -300,7 +297,7 @@ msgstr ""
 "\n"
 "选项：\n"
 "  -h   本帮助文本\n"
-"  -t   设置temp目录\n"
+"  -t   设置 temp 目录\n"
 "  -c=? 读指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 
@@ -338,7 +335,6 @@ msgid "Error processing contents %s"
 msgstr "处理 Contents %s 时出错"
 
 #: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -388,8 +384,8 @@ msgstr ""
 "       clean 配置文件\n"
 "\n"
 "apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n"
-"多种生成索引的方式，从全自动的生成到在功能上对 dpkg-scanpackages \n"
-"和 dpkg-scansources 的替代，都能游刃有余\n"
+"多种生成索引的方式，从全自动的索引生成到在功能上取代 dpkg-scanpackages \n"
+"和 dpkg-scansources，都能游刃有余\n"
 "\n"
 "apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n"
 "Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n"
@@ -410,7 +406,8 @@ msgstr ""
 "  -h    本帮助文档\n"
 "  --md5 使之生成 MD5 校验和\n"
 "  -s=?  源代码包 override 文件\n"
-"  -q    输出精简信息  -d=?  指定可选的缓存数据库\n"
+"  -q    输出精简信息\n"
+"  -d=?  指定可选的缓存数据库\n"
 "  -d=?  使用另一个可选的缓存数据库\n"
 "  --no-delink 开启delink的调试模式\n"
 "  --contents  使之生成控制内容文件\n"
@@ -703,13 +700,12 @@ msgid "%s (due to %s) "
 msgstr "%s (是由于 %s) "
 
 #: cmdline/apt-get.cc:544
-#, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 "【警告】：下列的重要软件包将被卸载 \n"
-"请勿尝试，除非您确实清楚您正在执行的操作！"
+"请勿尝试，除非您确实知道您在做什么！"
 
 #: cmdline/apt-get.cc:575
 #, c-format
@@ -750,7 +746,7 @@ msgstr "无法更正依赖关系"
 
 #: cmdline/apt-get.cc:656
 msgid "Unable to minimize the upgrade set"
-msgstr "无法使升级的软件包集最小化"
+msgstr "无法最小化要升级的软件包集合"
 
 #: cmdline/apt-get.cc:658
 msgid " Done"
@@ -766,11 +762,11 @@ msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
 
 #: cmdline/apt-get.cc:687
 msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "【警告】：下列的软件包不能通过认证！"
+msgstr "【警告】：下列的软件包不能通过验证！"
 
 #: cmdline/apt-get.cc:691
 msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "忽略了认证警告。\n"
 
 #: cmdline/apt-get.cc:698
 msgid "Install these packages without verification [y/N]? "
@@ -782,20 +778,19 @@ msgstr "有些软件包不能通过验证"
 
 #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
 msgid "There are problems and -y was used without --force-yes"
-msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes。"
+msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
 
 #: cmdline/apt-get.cc:753
 msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
 
 #: cmdline/apt-get.cc:762
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
 
 #: cmdline/apt-get.cc:773
-#, fuzzy
 msgid "Internal error, Ordering didn't finish"
-msgstr "添加 diversion 时出现内部错误"
+msgstr "内部错误，Ordering 没有完成"
 
 #: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
 msgid "Unable to lock the download directory"
@@ -808,7 +803,7 @@ msgstr "无法读取安装源列表。"
 
 #: cmdline/apt-get.cc:814
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
+msgstr "怪了……文件大小不符，发信给 apt@packages.debian.org 吧"
 
 #: cmdline/apt-get.cc:819
 #, c-format
@@ -831,9 +826,9 @@ msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "解压缩后将会空出 %sB 的空间。\n"
 
 #: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't determine free space in %s"
-msgstr "您在 %s 上没有足够的空余空间"
+msgstr "无法获知您在 %s 上的空余空间"
 
 #: cmdline/apt-get.cc:847
 #, c-format
@@ -849,13 +844,13 @@ msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
 #: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
-"您的操作会导致潜在的危害\n"
+"您的操作会导致潜在的危害。\n"
 "若还想继续的话，就输入下面的短句“%s”\n"
 " ?] "
 
@@ -1040,7 +1035,7 @@ msgstr "下列的信息可能会对问题的解决有所帮助："
 
 #: cmdline/apt-get.cc:1588
 msgid "Broken packages"
-msgstr "受损安装包"
+msgstr "无法安装的软件包"
 
 #: cmdline/apt-get.cc:1614
 msgid "The following extra packages will be installed:"
@@ -1067,9 +1062,8 @@ msgid "Done"
 msgstr "完成"
 
 #: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
-#, fuzzy
 msgid "Internal error, problem resolver broke stuff"
-msgstr "内部错误，AllUpgrade 造成某些故障"
+msgstr "内部错误，problem resolver 坏事了"
 
 #: cmdline/apt-get.cc:1887
 msgid "Must specify at least one package to fetch source for"
@@ -1117,7 +1111,7 @@ msgstr "运行解包的命令“%s”出错。\n"
 #: cmdline/apt-get.cc:2047
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
 
 #: cmdline/apt-get.cc:2064
 #, c-format
@@ -1427,7 +1421,7 @@ msgid "Duplicate conf file %s/%s"
 msgstr "重复的配置文件 %s/%s"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write file %s"
 msgstr "无法写入文件 %s"
 
@@ -1642,12 +1636,11 @@ msgstr "错误的光盘"
 #: methods/cdrom.cc:164
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "无法卸载现在挂载于 %s 的 CD-ROM，可能它正在使用中。"
+msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。"
 
 #: methods/cdrom.cc:169
-#, fuzzy
 msgid "Disk not found."
-msgstr "无法找到该文件"
+msgstr "找不到光盘。"
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
@@ -1871,41 +1864,39 @@ msgstr "不能连接上 %s %s："
 
 #: methods/gpgv.cc:92
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。"
 
 #: methods/gpgv.cc:191
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！"
 
 #: methods/gpgv.cc:196
 msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "至少发现一个无效的签名。"
 
 #. FIXME String concatenation considered harmful.
 #: methods/gpgv.cc:201
-#, fuzzy
 msgid "Could not execute "
-msgstr "无法获得锁 %s"
+msgstr "未能执行 "
 
 #: methods/gpgv.cc:202
 msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr "用于验证签名(您安装了 gnupg 么？)"
 
 #: methods/gpgv.cc:206
 msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "运行 gpgv 时发生未知错误"
 
 #: methods/gpgv.cc:237
-#, fuzzy
 msgid "The following signatures were invalid:\n"
-msgstr "将会安装下列的额外的软件包："
+msgstr "下列签名无效：\n"
 
 #: methods/gpgv.cc:244
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
-msgstr ""
+msgstr "由于没有公钥，下列签名无法进行验证：\n"
 
 #: methods/gzip.cc:57
 #, c-format
@@ -2386,7 +2377,7 @@ msgstr "找不到“%spartial”这个目录。"
 #: apt-pkg/acquire.cc:817
 #, c-format
 msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "正在下载第 %li 个文件(共 %li 个，尚需 %s)"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2399,12 +2390,9 @@ msgid "Method %s did not start correctly"
 msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
 
 #: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"更换介质：请把标有\n"
-"“%s”\n"
-"的碟片插入驱动器“%s”再按回车键\n"
+msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"
 
 #: apt-pkg/init.cc:119
 #, c-format
@@ -2422,7 +2410,7 @@ msgstr "无法读取 %s 的状态。"
 
 #: apt-pkg/srcrecords.cc:48
 msgid "You must put some 'source' URIs in your sources.list"
-msgstr "您必须在您的 sources.list 输入一些“软件包源”的 URL"
+msgstr "您必须在您的 sources.list 写入一些“软件包源”的 URI"
 
 #: apt-pkg/cachefile.cc:73
 msgid "The package lists or status file could not be parsed or opened."
@@ -2554,7 +2542,7 @@ msgstr ""
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
-msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段"
+msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
 
 #: apt-pkg/acquire-item.cc:898
 msgid "Size mismatch"
@@ -2660,54 +2648,54 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing %s"
-msgstr "正在打开 %s"
+msgstr "正在准备 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
 msgid "Unpacking %s"
-msgstr "正在打开 %s"
+msgstr "正在解压缩 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing to configure %s"
-msgstr "正在打开配置文件 %s"
+msgstr "正在准备配置 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring %s"
-msgstr "正在连接 %s"
+msgstr "正在配置 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
 msgid "Installed %s"
-msgstr "  已安装："
+msgstr "已安装 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "正在准备 %s 的删除操作"
 
 #: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "正在打开 %s"
+msgstr "正在删除 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
 msgid "Removed %s"
-msgstr "推荐"
+msgstr "已删除 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
 msgid "Preparing for remove with config %s"
-msgstr ""
+msgstr "正在准备连同配置文件的删除 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
 msgid "Removed with config %s"
-msgstr ""
+msgstr "连同配置文件一同删除 %s "
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"