summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-12-08 18:07:48 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-12-08 18:07:48 +0000
commitfc25afd0b3fbe47a9ded2978142dadafe52a989b (patch)
tree6604b7df797e34ad2347c00d7b727c3b943127d8 /po/zh_CN.po
parent193593331d2833dbc640f3bb1ad3dd6bfaac858f (diff)
parentb7475c1ea32e60fca03b7092bfe7ee3fd3dfde47 (diff)
* star-merged with apt--mvo
Patches applied: * bubulle@debian.org--2005/apt--main--0--patch-133 Merge with Michael AND update PO files * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-102 * finalized this release * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-103 * changelog updates * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-104 * build-depend on libdb4.3 now, fix for kFreeBSD (#317718) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-105 * fix mailaddress * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-106 * fix a string (thanks to bubulle) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-107 * merged with bubulle
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po20
1 files changed, 10 insertions, 10 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0ecf15e24..34cfbb679 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.23\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
"PO-Revision-Date: 2005-11-15 00:05+0800\n"
"Last-Translator: Tchaikov <tchaikov@sjtu.edu.cn>\n"
"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -1778,7 +1778,7 @@ msgstr "数据套接字连接超时"
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "把文件加入散列表时出错"
@@ -1953,31 +1953,31 @@ msgstr "连接服务器超时"
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:834
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "写文件时出错"
-#: methods/http.cc:859
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "写文件时出错"
-#: methods/http.cc:873
+#: methods/http.cc:879
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错,对方关闭了连接"
-#: methods/http.cc:875
+#: methods/http.cc:881
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:1106
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/http.cc:1123
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1214
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "内部错误"
@@ -2320,7 +2320,7 @@ msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)"
#: apt-pkg/sourcelist.cc:244
#, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %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:252 apt-pkg/sourcelist.cc:255