Merge from CVS

[ntk/apt.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0d9ea77..2fd5772 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,8 +6,8 @@ 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: 2004-08-12 11:56+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"
@@ -416,12 +416,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"
+msgid "Unable to open DB file %s: %s"
+msgstr "无法打开 DB 文件 %s"
 
 #: ftparchive/cachedb.cc:114
 #, c-format
@@ -623,28 +623,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 +660,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:"
@@ -1711,7 +1711,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 +1805,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 调用出错"
 
-#: 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 "错误的包头数据"
 
-#: methods/http.cc:1078
+#: methods/http.cc:1082
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: methods/http.cc:1169
+#: methods/http.cc:1173
 msgid "Internal error"
 msgstr "内部错误"
 
@@ -2225,8 +2225,8 @@ msgid "Malformed line %u in source list %s (type)"
 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"
+#, fuzzy, c-format
+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