From d7f33d4ea4484c5a7ec2ad2c9a9b96cce06c947b Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Wed, 5 Aug 2009 23:33:14 +0000
Subject: Bump version for security release.

svn path=/branches/BRANCH_6-3/; revision=5397
---
 po/zh_CN.po | 124 +++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 69 insertions(+), 55 deletions(-)

(limited to 'po/zh_CN.po')

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 47775a55..2e0be0bf 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.10-pre2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2009-07-06 20:14+0200\n"
+"POT-Creation-Date: 2009-08-06 01:21+0200\n"
 "PO-Revision-Date: 2009-07-05 10:01+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -2698,176 +2698,191 @@ msgstr "ESMTP LOGIN 验证...\n"
 msgid "smtp listener protocol error\n"
 msgstr "smtp 端协议错误\n"
 
-#: socket.c:114 socket.c:140
+#: socket.c:115 socket.c:141
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc 失败\n"
 
-#: socket.c:172
+#: socket.c:173
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair 失败\n"
 
-#: socket.c:178
+#: socket.c:179
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork 失败\n"
 
-#: socket.c:185
+#: socket.c:186
 msgid "dup2 failed\n"
 msgstr "dup2 失败\n"
 
-#: socket.c:191
+#: socket.c:192
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "正在运行 %s (主机 %s 服务 %s)\n"
 
-#: socket.c:194
+#: socket.c:195
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) 失败\n"
 
-#: socket.c:285
+#: socket.c:286
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(“%s”，“%s”) 错误: %s\n"
 
-#: socket.c:288
+#: socket.c:289
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr "试着加入 --service 选项(参见 FAQ 条目 R12)。\n"
 
-#: socket.c:299 socket.c:302
+#: socket.c:300 socket.c:303
 #, c-format
 msgid "unknown (%s)"
 msgstr "未知 (%s)"
 
-#: socket.c:305
+#: socket.c:306
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "正在尝试连接至 %s/%s..."
 
-#: socket.c:313
+#: socket.c:314
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "无法创建套接字: %s\n"
 
-#: socket.c:329
+#: socket.c:330
 msgid "connection failed.\n"
 msgstr "连接失败。\n"
 
-#: socket.c:331
+#: socket.c:332
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "连接至 %s:%s [%s/%s] 失败: %s。\n"
 
-#: socket.c:337
+#: socket.c:338
 msgid "connected.\n"
 msgstr "已连接。\n"
 
-#: socket.c:614
+#: socket.c:616
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "发行组织: %s\n"
 
-#: socket.c:616
+#: socket.c:619
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "警告: 发行组织名字太长 (可能截短)。\n"
 
-#: socket.c:618
+#: socket.c:621
 msgid "Unknown Organization\n"
 msgstr "未知的组织\n"
 
-#: socket.c:620
+#: socket.c:623
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "发行者 CommonName: %s\n"
 
-#: socket.c:622
+#: socket.c:626
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "警告: 发行者 CommonName 太长 (可能截短)。\n"
 
-#: socket.c:624
+#: socket.c:628
 msgid "Unknown Issuer CommonName\n"
 msgstr "未知的发行者 CommonName\n"
 
-#: socket.c:628
+#: socket.c:632
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "服务器 CommonName: %s\n"
 
-#: socket.c:632
+#: socket.c:637
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "证书错误: 主 CommonName 太长!\n"
 
-#: socket.c:678
+#: socket.c:643
+#, fuzzy
+msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
+msgstr "证书错误: 主 CommonName 太长!\n"
+
+#: socket.c:664
+#, c-format
+msgid "Subject Alternative Name: %s\n"
+msgstr ""
+
+#: socket.c:670
+#, fuzzy
+msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
+msgstr "证书错误: 主 CommonName 太长!\n"
+
+#: socket.c:698
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "服务器 CommonName 不匹配: %s != %s\n"
 
-#: socket.c:684
+#: socket.c:705
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "未设置服务器名称，无法验证证书！\n"
 
-#: socket.c:689
+#: socket.c:710
 msgid "Unknown Server CommonName\n"
 msgstr "未知的服务器 CommonName\n"
 
-#: socket.c:691
+#: socket.c:712
 msgid "Server name not specified in certificate!\n"
 msgstr "服务器名称未在证书中指定！\n"
 
-#: socket.c:703
+#: socket.c:724
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() 失败！\n"
 
-#: socket.c:707
+#: socket.c:728
 msgid "Out of memory!\n"
 msgstr "超出内存！\n"
 
-#: socket.c:715
+#: socket.c:736
 msgid "Digest text buffer too small!\n"
 msgstr "Digest 文本缓冲区太小！\n"
 
-#: socket.c:721
+#: socket.c:742
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s 密钥指纹: %s\n"
 
-#: socket.c:725
+#: socket.c:746
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s 指纹匹配。\n"
 
-#: socket.c:727
+#: socket.c:748
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s 指纹不匹配！\n"
 
-#: socket.c:736
+#: socket.c:757
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "服务器证书验证错误: %s\n"
 
-#: socket.c:742
+#: socket.c:763
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "未知的发行者　(前 %d 个字符): %s\n"
 
-#: socket.c:829
+#: socket.c:850
 msgid "File descriptor out of range for SSL"
 msgstr "文件描述符超出 SSL 的范围"
 
-#: socket.c:845
-#, c-format
+#: socket.c:866
+#, fuzzy, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "指定了无效的 SSL 协议 ‘%s’，将用默认的协议(SSLv23)代替。\n"
 
-#: socket.c:921
+#: socket.c:942
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "证书(指纹)验证被不明原因地跳过！\n"
 
-#: socket.c:999
+#: socket.c:1020
 msgid "Cygwin socket read retry\n"
 msgstr "重试读取 Cygwin 接口\n"
 
-#: socket.c:1002
+#: socket.c:1023
 msgid "Cygwin socket read retry failed!\n"
 msgstr "重试读取 Cygwin 接口失败！\n"
 
@@ -2914,50 +2929,46 @@ msgstr "找不到 Received 地址\n"
 msgid "found Received address `%s'\n"
 msgstr "找到 Received 地址 ‘%s’\n"
 
-#: transact.c:566
-msgid "message delimiter found while scanning headers\n"
-msgstr "查找邮件头时发现邮件分隔符\n"
-
-#: transact.c:597
+#: transact.c:592
 msgid "incorrect header line found while scanning headers\n"
 msgstr "查找邮件头时发现不正确的行\n"
 
-#: transact.c:599
+#: transact.c:594
 #, c-format
 msgid "line: %s"
 msgstr "行: %s"
 
-#: transact.c:1138
+#: transact.c:1133
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "无本地匹配的收件人，正在转发至 %s\n"
 
-#: transact.c:1153
+#: transact.c:1148
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "正在转发且由于 DNS 错误，删除被取消了\n"
 
-#: transact.c:1263
+#: transact.c:1258
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "正在重写 RFC822 协议中定义的邮件信息块的头部\n"
 
-#: transact.c:1282
+#: transact.c:1277
 msgid "no recipient addresses matched declared local names"
 msgstr "收件人地址与本地已知的用户名不匹配"
 
-#: transact.c:1289
+#: transact.c:1284
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "收到人地址 %s 与本地任何一个用户名均不匹配"
 
-#: transact.c:1298
+#: transact.c:1293
 msgid "message has embedded NULs"
 msgstr "邮件嵌入了 NULs"
 
-#: transact.c:1306
+#: transact.c:1301
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP 端拒绝本地收件人地址:"
 
-#: transact.c:1445
+#: transact.c:1440
 msgid "error writing message text\n"
 msgstr "在写邮件文本时出错\n"
 
@@ -3031,3 +3042,6 @@ msgstr "malloc 失败\n"
 #: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "realloc 失败\n"
+
+#~ msgid "message delimiter found while scanning headers\n"
+#~ msgstr "查找邮件头时发现邮件分隔符\n"
-- 
cgit v1.2.3