X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/38fd54f14c482842f5f861a13d373e72fbd795e4..a2884e32d61a123cf1298df6b1e1ea9cf50cab70:/po/zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0d9ea77f7..20e6f8a54 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,13 +1,14 @@
 # Chinese/Simplified translation of apt.
 # This file is put in the public domain.
 # Tchaikov <chaisave@263.net>, 2004.
+# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004.
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.23\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-29 21:46-0700\n"
-"PO-Revision-Date: 2004-03-15 22:55+0800\n"
+"POT-Creation-Date: 2004-07-29 09:38-0700\n"
+"PO-Revision-Date: 2005-01-15 00:39+0800\n"
 "Last-Translator: Tchaikov <chaisave@263.net>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -187,7 +188,7 @@ msgid ""
 "  -q   Disable progress indicator.\n"
 "  -i   Show only important deps for the unmet command.\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 "用法： apt-cache [选项] 命令\n"
@@ -243,7 +244,7 @@ msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 "用法：apt-config [选项] 命令\n"
 "\n"
@@ -274,7 +275,7 @@ msgid ""
 "  -h   This help text\n"
 "  -t   Set the temp dir\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 "用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
 "\n"
@@ -359,7 +360,7 @@ msgid ""
 "  --no-delink Enable delinking debug mode\n"
 "  --contents  Control contents file generation\n"
 "  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitary configuration option"
+"  -o=?  Set an arbitrary configuration option"
 msgstr ""
 "用法： apt-ftparchive [选项] 命令\n"
 "命令： packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n"
@@ -416,12 +417,12 @@ msgstr "缓存数据库被损坏了，该数据库文件的文件名已改成 %s
 #: ftparchive/cachedb.cc:63
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
-msgstr ""
+msgstr "DB 已过时，现试图进行升级 %s"
 
 #: ftparchive/cachedb.cc:73
-#, fuzzy, c-format
-msgid "Unable to open DB file %s"
-msgstr "无法打开 DB2 文件 %s"
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "无法打开 DB 文件 %s：%s"
 
 #: ftparchive/cachedb.cc:114
 #, c-format
@@ -623,28 +624,28 @@ msgstr "下列的软件包有不能满足的依赖关系："
 #: cmdline/apt-get.cc:325
 #, c-format
 msgid "but %s is installed"
-msgstr "但是，%s 已经安装了"
+msgstr "但是 %s 已经安装了"
 
 #: cmdline/apt-get.cc:327
 #, c-format
 msgid "but %s is to be installed"
-msgstr "但是，%s 正要被安装"
+msgstr "但是 %s 正要被安装"
 
 #: cmdline/apt-get.cc:334
 msgid "but it is not installable"
-msgstr "但是，它无法被安装"
+msgstr "但却无法安装它"
 
 #: cmdline/apt-get.cc:336
 msgid "but it is a virtual package"
-msgstr "但是，它只是个虚拟软件包"
+msgstr "但是它只是个虚拟软件包"
 
 #: cmdline/apt-get.cc:339
 msgid "but it is not installed"
-msgstr "但是，它还没有被安装"
+msgstr "但是它还没有被安装"
 
 #: cmdline/apt-get.cc:339
 msgid "but it is not going to be installed"
-msgstr "但是，它将不会被安装"
+msgstr "但是它将不会被安装"
 
 #: cmdline/apt-get.cc:344
 msgid " or"
@@ -660,7 +661,7 @@ msgstr "下列软件包将被【卸载】："
 
 #: cmdline/apt-get.cc:421
 msgid "The following packages have been kept back:"
-msgstr "下列的软件包的版本将保持持不变："
+msgstr "下列的软件包的版本将保持不变："
 
 #: cmdline/apt-get.cc:442
 msgid "The following packages will be upgraded:"
@@ -788,7 +789,7 @@ msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作
 
 #: cmdline/apt-get.cc:819
 msgid "Yes, do as I say!"
-msgstr ""
+msgstr "Yes, do as I say!"
 
 #: cmdline/apt-get.cc:821
 #, c-format
@@ -1149,7 +1150,7 @@ msgid ""
 "  -b  Build the source package after fetching it\n"
 "  -V  Show verbose version numbers\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
@@ -1168,10 +1169,10 @@ msgstr ""
 "   remove - 卸载软件包\n"
 "   source - 下载源码包文件\n"
 "   build-dep - 为源码包配置所需的构建依赖关系\n"
-"   dist-upgrade - 发布版升级，见 apt-get(8)   dselect-upgrade - 根据 dselect "
-"的选择来进行升级\n"
+"   dist-upgrade - 发布版升级，见 apt-get(8)\n"
+"   dselect-upgrade - 根据 dselect的选择来进行升级\n"
 "   clean - 删除所有已下载的包文件\n"
-"   auto-clean - 删除老版本的已下载的包文件\n"
+"   autoclean - 删除老版本的已下载的包文件\n"
 "   check - 核对以确认系统的依赖关系的完整性\n"
 "选项：\n"
 "  -h  本帮助文档。\n"
@@ -1188,7 +1189,7 @@ msgstr ""
 "  -c=? 读取指定配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 "请查阅 apt-get(8)、sources.list(5) 和 apt.conf(5)的参考手册\n"
-"以猎取更多信息和选项。\n"
+"以获取更多信息和选项。\n"
 "                       本 APT 有着超级牛力。\n"
 
 #: cmdline/acqprogress.cc:55
@@ -1243,7 +1244,7 @@ msgid ""
 "  -h   This help text\n"
 "  -s   Use source file sorting\n"
 "  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 "用法： apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n"
 "\n"
@@ -1564,8 +1565,8 @@ msgid ""
 "Please use apt-cdrom to make this CD recognized by APT. apt-get update "
 "cannot be used to add new CDs"
 msgstr ""
-"请使用 apt-cdrom 来让此光盘能被 APT 所识别。apt-get upgdate 不能被用来加入新"
-"的光盘。"
+"请使用 apt-cdrom，通过它就可以让 APT 能识别该光盘。apt-get upgdate 不能被用来"
+"加入新的光盘。"
 
 #: methods/cdrom.cc:130 methods/cdrom.cc:168
 msgid "Wrong CD"
@@ -1711,7 +1712,7 @@ msgstr "数据套接字连接超时"
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 
-#: methods/ftp.cc:864 methods/http.cc:912 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "把文件加入散列表时出错"
 
@@ -1805,76 +1806,76 @@ msgstr "无法为 %s 开启管道"
 msgid "Read error from %s process"
 msgstr "从 %s 进程读取数据出错"
 
-#: methods/http.cc:340
+#: methods/http.cc:344
 msgid "Waiting for headers"
 msgstr "正在等待报头"
 
-#: methods/http.cc:486
+#: methods/http.cc:490
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "受到了一行报头条目，它的长度超过了 %u 个字符"
 
-#: methods/http.cc:494
+#: methods/http.cc:498
 msgid "Bad header line"
 msgstr "错误的报头条目"
 
-#: methods/http.cc:513 methods/http.cc:520
+#: methods/http.cc:517 methods/http.cc:524
 msgid "The http server sent an invalid reply header"
 msgstr "该 http 服务器发送了一个无效的应答报头"
 
-#: methods/http.cc:549
+#: methods/http.cc:553
 msgid "The http server sent an invalid Content-Length header"
 msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
 
-#: methods/http.cc:564
+#: methods/http.cc:568
 msgid "The http server sent an invalid Content-Range header"
 msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
 
-#: methods/http.cc:566
+#: methods/http.cc:570
 msgid "This http server has broken range support"
 msgstr "该 http 服务器的 range 支持不正常"
 
-#: methods/http.cc:590
+#: methods/http.cc:594
 msgid "Unknown date format"
 msgstr "无法识别的日期格式"
 
-#: methods/http.cc:733
+#: methods/http.cc:737
 msgid "Select failed"
-msgstr "Select 调用出错"
+msgstr "select 调用出错"
 
-#: methods/http.cc:738
+#: methods/http.cc:742
 msgid "Connection timed out"
 msgstr "连接服务器超时"
 
-#: methods/http.cc:761
+#: methods/http.cc:765
 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 
-#: methods/http.cc:789
+#: methods/http.cc:793
 msgid "Error writing to file"
 msgstr "写文件时出错"
 
-#: methods/http.cc:814
+#: methods/http.cc:818
 msgid "Error writing to the file"
 msgstr "写文件时出错"
 
-#: methods/http.cc:828
+#: methods/http.cc:832
 msgid "Error reading from server Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 
-#: methods/http.cc:830
+#: methods/http.cc:834
 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 
-#: methods/http.cc:1061
+#: methods/http.cc:1065
 msgid "Bad header Data"
-msgstr "错误的包头数据"
+msgstr "错误的报头数据"
 
-#: methods/http.cc:1078
+#: methods/http.cc:1082
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: methods/http.cc:1169
+#: methods/http.cc:1173
 msgid "Internal error"
 msgstr "内部错误"
 
@@ -1903,9 +1904,9 @@ msgid "Opening configuration file %s"
 msgstr "正在打开配置文件 %s"
 
 #: apt-pkg/contrib/configuration.cc:471
-#, fuzzy, c-format
+#, c-format
 msgid "Line %d too long (max %d)"
-msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。"
+msgstr "软件包来源档的第 %d 行超长了(长度限制为 %d)。"
 
 #: apt-pkg/contrib/configuration.cc:567
 #, c-format
@@ -2226,8 +2227,8 @@ msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)"
 
 #: apt-pkg/sourcelist.cc:270
 #, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
-msgstr "无法识别在安装源列表 %3$s 第 %2$u 行中的软件包类别“%1$s”"
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
 
 #: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
 #, c-format
@@ -2435,7 +2436,7 @@ msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
-"我无法找到对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件包。"
+"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
 
 #: apt-pkg/acquire-item.cc:419
 #, c-format