summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-04-10 10:37:03 +0200
committerMichael Vogt <mvo@debian.org>2014-04-10 10:37:03 +0200
commitb3f695d42baa95139e8172e97b0f4ab38550b7b5 (patch)
tree0aa1bc53b760b1c33acf662ea8614e128ccb34d0 /po/zh_CN.po
parenta1a253e8be978998b66af62240a25864db2cc694 (diff)
parent128aa7d3630f138f37ef83e3e8564feca01ec429 (diff)
Merge remote-tracking branch 'origin/debian/sid' into ubuntu/master1.0.1ubuntu1
Conflicts: debian/changelog
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po38
1 files changed, 19 insertions, 19 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index dd991a8a4..463d76e71 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 15:51+0200\n"
+"POT-Creation-Date: 2014-04-10 10:18+0200\n"
"PO-Revision-Date: 2010-08-26 14:42+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -826,9 +826,9 @@ msgstr "连接超时"
msgid "Server closed the connection"
msgstr "服务器关闭了连接"
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1468
-#: apt-pkg/contrib/fileutl.cc:1477 apt-pkg/contrib/fileutl.cc:1482
-#: apt-pkg/contrib/fileutl.cc:1484
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
msgid "Read error"
msgstr "读错误"
@@ -841,9 +841,9 @@ msgid "Protocol corruption"
msgstr "协议有误"
#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:875
-#: apt-pkg/contrib/fileutl.cc:1590 apt-pkg/contrib/fileutl.cc:1599
-#: apt-pkg/contrib/fileutl.cc:1604 apt-pkg/contrib/fileutl.cc:1606
-#: apt-pkg/contrib/fileutl.cc:1631
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
msgid "Write error"
msgstr "写出错"
@@ -1097,7 +1097,7 @@ msgstr "连接失败"
msgid "Internal error"
msgstr "内部错误"
-#: apt-private/private-list.cc:132
+#: apt-private/private-list.cc:131
msgid "Listing"
msgstr ""
@@ -2538,54 +2538,54 @@ msgstr "子进程 %s 异常退出"
msgid "Problem closing the gzip file %s"
msgstr "关闭 gzip %s 文件出错"
-#: apt-pkg/contrib/fileutl.cc:1097
+#: apt-pkg/contrib/fileutl.cc:1104
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
-#: apt-pkg/contrib/fileutl.cc:1156 apt-pkg/contrib/fileutl.cc:1203
+#: apt-pkg/contrib/fileutl.cc:1163 apt-pkg/contrib/fileutl.cc:1210
#, c-format
msgid "Could not open file descriptor %d"
msgstr "无法打开文件描述符 %d"
-#: apt-pkg/contrib/fileutl.cc:1310
+#: apt-pkg/contrib/fileutl.cc:1317
msgid "Failed to create subprocess IPC"
msgstr "无法创建子进程的 IPC 管道"
-#: apt-pkg/contrib/fileutl.cc:1365
+#: apt-pkg/contrib/fileutl.cc:1372
msgid "Failed to exec compressor "
msgstr "无法执行压缩程序"
-#: apt-pkg/contrib/fileutl.cc:1506
+#: apt-pkg/contrib/fileutl.cc:1513
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "读取文件出错,还剩 %lu 字节没有读出"
-#: apt-pkg/contrib/fileutl.cc:1619 apt-pkg/contrib/fileutl.cc:1641
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "写入文件出错,还剩 %lu 字节没有保存"
-#: apt-pkg/contrib/fileutl.cc:1911
+#: apt-pkg/contrib/fileutl.cc:1918
#, c-format
msgid "Problem closing the file %s"
msgstr "关闭文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1923
+#: apt-pkg/contrib/fileutl.cc:1930
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "重命名文件 %s 为 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1934
+#: apt-pkg/contrib/fileutl.cc:1941
#, c-format
msgid "Problem unlinking the file %s"
msgstr "用 unlink 删除文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1947
+#: apt-pkg/contrib/fileutl.cc:1954
msgid "Problem syncing the file"
msgstr "同步文件出错"
-#: apt-pkg/contrib/fileutl.cc:2043 apt-pkg/acquire-item.cc:148
+#: apt-pkg/contrib/fileutl.cc:2050 apt-pkg/acquire-item.cc:148
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件,%s (%s -> %s)。"