Prepare 6.3.25 release.

1 files changed, 97 insertions, 84 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index e3074e55..101f57b0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,14 +2,14 @@
 # fetchmail 软件包的简体中文翻译.
 # Copyright (C) 2008 Eric S. Raymond (msgids)
 # This file is distributed under the same license as the fetchmail package.
-# Ji ZhengYu <zhengyuji@gmail.com>, 2008, 2009, 2010, 2011
+# Ji ZhengYu <zhengyuji@gmail.com>, 2008, 2009, 2010, 2011, 2012, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: fetchmail 6.3.20-rc3\n"
+"Project-Id-Version: fetchmail 6.3.22.2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2012-12-23 16:30+0100\n"
-"PO-Revision-Date: 2011-06-14 11:42+0800\n"
+"POT-Creation-Date: 2013-03-10 13:45+0100\n"
+"PO-Revision-Date: 2013-03-08 09:33+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -31,12 +31,12 @@ msgstr "正确，它们的 IP 地址相同\n"
 msgid "No, their IP addresses don't match\n"
 msgstr "错误，它们的 IP 地址不同\n"
 
-#: checkalias.c:203
+#: checkalias.c:212
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
 msgstr "收取 %2$s 中邮件并查找 ‘%1$s’ 时 nameserver 出错: %3$s\n"
 
-#: checkalias.c:228
+#: checkalias.c:237
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "收取 %2$s 中邮件并查找 ‘%1$s’ 时 nameserver 出错。\n"
@@ -407,7 +407,7 @@ msgstr "发现无效邮件！"
 #: driver.c:1447
 #, c-format
 msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n"
-msgstr ""
+msgstr "跳过了太多的邮件( %d > %d)，%s 传送错误\n"
 
 #: driver.c:1548
 msgid "socket"
@@ -623,14 +623,14 @@ msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
 "                   Robert M. Funk, Graham Wilson\n"
-"Copyright (C) 2005 - 2006, 2010 - 2012 Sunil Shetye\n"
-"Copyright (C) 2005 - 2012 Matthias Andree\n"
+"Copyright (C) 2005 - 2012 Sunil Shetye\n"
+"Copyright (C) 2005 - 2013 Matthias Andree\n"
 msgstr ""
-"版权所有 (C) 2002, 2003 Eric S. Raymond\n"
-"版权所有 (C) 2004 Matthias Andree, Eric S. Raymond,\n"
+"Copyright (C) 2002, 2003 Eric S. Raymond\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
 "                   Robert M. Funk, Graham Wilson\n"
-"版权所有 (C) 2005 - 2006, 2010 Sunil Shetye\n"
-"版权所有 (C) 2005 - 2010 Matthias Andree\n"
+"Copyright (C) 2005 - 2006, 2010 - 2012 Sunil Shetye\n"
+"Copyright (C) 2005 - 2012 Matthias Andree\n"
 
 #: fetchmail.c:143
 msgid ""
@@ -661,27 +661,27 @@ msgstr "这是 fetchmail 发行版 %s"
 
 #: fetchmail.c:313
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
-msgstr ""
+msgstr "nodetach 选项在起作用，忽略 logfile 选项。\n"
 
 #: fetchmail.c:320
 msgid "Not running in daemon mode, ignoring logfile option.\n"
-msgstr ""
+msgstr "未以 daemon 模式运行，忽略 logfile 选项。\n"
 
 #: fetchmail.c:327
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
-msgstr ""
+msgstr "日志文件 \"%s\" 不存在，忽略 logfile 选项。\n"
 
 #: fetchmail.c:333
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
-msgstr ""
+msgstr "日志文件 \"%s\" 不可写，退出。\n"
 
 #: fetchmail.c:351
 #, c-format
 msgid ""
 "syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
+msgstr "同时指定了 syslog 和 logfile 选项，忽略 syslog 并登录至 %s"
 
 #: fetchmail.c:439
 #, c-format
@@ -2314,10 +2314,9 @@ msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr " --showdots\t即使在日志文件中也要显示进度条(以点的形式)\n"
 
 #: pop3.c:327
-#, fuzzy
 msgid ""
 "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr "警告: 发现“ POP3 代理服务器”，用 RETR 命令代替 TOP。\n"
+msgstr "警告: 发现\"Maillennium POP3\"，用 RETR 命令代替 TOP。\n"
 
 #: pop3.c:411
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
@@ -2809,80 +2808,80 @@ msgstr "ESMTP LOGIN 验证...\n"
 msgid "smtp listener protocol error\n"
 msgstr "smtp 端协议错误\n"
 
-#: socket.c:110 socket.c:136
+#: socket.c:110 socket.c:137
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc 失败\n"
 
-#: socket.c:168
+#: socket.c:169
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair 失败\n"
 
-#: socket.c:174
+#: socket.c:175
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork 失败\n"
 
-#: socket.c:181
+#: socket.c:182
 msgid "dup2 failed\n"
 msgstr "dup2 失败\n"
 
-#: socket.c:187
+#: socket.c:188
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "正在运行 %s (主机 %s 服务 %s)\n"
 
-#: socket.c:190
+#: socket.c:193
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) 失败\n"
 
-#: socket.c:265
+#: socket.c:268
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(“%s”，“%s”) 错误: %s\n"
 
-#: socket.c:268
+#: socket.c:271
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr "试着加入 --service 选项(参见 FAQ 条目 R12)。\n"
 
-#: socket.c:282 socket.c:285
+#: socket.c:285 socket.c:288
 #, c-format
 msgid "unknown (%s)"
 msgstr "未知 (%s)"
 
-#: socket.c:288
+#: socket.c:291
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "正在尝试连接至 %s/%s..."
 
-#: socket.c:297
+#: socket.c:300
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "无法创建套接字: %s\n"
 
-#: socket.c:299
+#: socket.c:302
 #, c-format
 msgid "name %d: cannot create socket family %d type %d: %s\n"
 msgstr "名称 %d: 无法创建套接字 %d 类型 %d: %s\n"
 
-#: socket.c:317
+#: socket.c:320
 msgid "connection failed.\n"
 msgstr "连接失败。\n"
 
-#: socket.c:319
+#: socket.c:322
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "连接至 %s:%s [%s/%s] 失败: %s。\n"
 
-#: socket.c:320
+#: socket.c:323
 #, c-format
 msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "名称 %d: 连接至 %s:%s [%s/%s] 失败: %s。\n"
 
-#: socket.c:326
+#: socket.c:329
 msgid "connected.\n"
 msgstr "已连接。\n"
 
-#: socket.c:339
+#: socket.c:342
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
@@ -2891,171 +2890,182 @@ msgstr ""
 "此服务器连接错误:\n"
 "%s"
 
-#: socket.c:605
+#: socket.c:387
+#, c-format
+msgid "OpenSSL reported: %s\n"
+msgstr ""
+
+#: socket.c:622
 msgid "Server certificate:\n"
 msgstr "服务器认证:\n"
 
-#: socket.c:610
+#: socket.c:627
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
 msgstr "验证链从根到节点，在 %d 开始:\n"
 
-#: socket.c:613
+#: socket.c:630
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr "验证处于 %d 层:\n"
 
-#: socket.c:619
+#: socket.c:636
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "发行组织: %s\n"
 
-#: socket.c:622
+#: socket.c:639
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "警告: 发行组织名字太长 (可能截短)。\n"
 
-#: socket.c:624
+#: socket.c:641
 msgid "Unknown Organization\n"
 msgstr "未知的组织\n"
 
-#: socket.c:626
+#: socket.c:643
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "发行者: %s\n"
 
-#: socket.c:629
+#: socket.c:646
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "警告: 发行者名称太长 (可能截短)。\n"
 
-#: socket.c:631
+#: socket.c:648
 msgid "Unknown Issuer CommonName\n"
 msgstr "未知的发行者名称\n"
 
-#: socket.c:637
+#: socket.c:654
 #, c-format
 msgid "Subject CommonName: %s\n"
 msgstr "邮件标题: %s\n"
 
-#: socket.c:643
+#: socket.c:660
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "证书错误: 邮件标题太长!\n"
 
-#: socket.c:649
+#: socket.c:666
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "证书错误: 邮件标题名中带有 NUL 字符，退出！\n"
 
-#: socket.c:677
+#: socket.c:694
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "邮件标题别名: %s\n"
 
-#: socket.c:683
+#: socket.c:700
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr "证书错误: 邮件标题别名带有 NUL 字符，退出！\n"
 
-#: socket.c:700
+#: socket.c:717
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "服务器名不匹配: %s != %s\n"
 
-#: socket.c:707
+#: socket.c:724
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "未设置服务器名称，无法验证证书！\n"
 
-#: socket.c:712
+#: socket.c:729
 msgid "Unknown Server CommonName\n"
 msgstr "未知的服务器名\n"
 
-#: socket.c:714
+#: socket.c:731
 msgid "Server name not specified in certificate!\n"
 msgstr "服务器名称未在证书中指定！\n"
 
-#: socket.c:726
+#: socket.c:743
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() 失败！\n"
 
-#: socket.c:730
+#: socket.c:747
 msgid "Out of memory!\n"
 msgstr "超出内存！\n"
 
-#: socket.c:738
+#: socket.c:755
 msgid "Digest text buffer too small!\n"
 msgstr "Digest 文本缓冲区太小！\n"
 
-#: socket.c:744
+#: socket.c:761
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s 密钥指纹: %s\n"
 
-#: socket.c:748
+#: socket.c:765
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s 指纹匹配。\n"
 
-#: socket.c:750
+#: socket.c:767
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s 指纹不匹配！\n"
 
-#: socket.c:760
+#: socket.c:779
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "服务器证书验证错误: %s\n"
 
-#: socket.c:767
-#, c-format
-msgid "unknown issuer (first %d characters): %s\n"
-msgstr "未知的发行者　(前 %d 个字符): %s\n"
+#: socket.c:794
+#, fuzzy, c-format
+msgid "Broken certification chain at: %s\n"
+msgstr "服务器证书验证错误: %s\n"
 
-#: socket.c:768
+#: socket.c:796
+#, fuzzy
 msgid ""
-"This error usually happens when the server provides an incomplete "
-"certificate chain, which is nothing fetchmail could do anything about.  For "
-"details, please see the README.SSL-SERVER document that comes with "
+"This could mean that the server did not provide the intermediate CA's "
+"certificate(s), which is nothing fetchmail could do anything about.  For "
+"details, please see the README.SSL-SERVER document that ships with "
 "fetchmail.\n"
 msgstr ""
 "此错误通常出现在服务器提供了一个不完整的验证链，fetchmain 对此无能为力。详细"
 "信息请查看随同 fetchmail 发行的 README.SSL-SERVER 文档。\n"
 
-#: socket.c:777
-#, c-format
+#: socket.c:806
+#, fuzzy, c-format
+msgid "Missing trust anchor certificate: %s\n"
+msgstr " SSL 受信证书文件: %s\n"
+
+#: socket.c:809
+#, fuzzy
 msgid ""
-"This means that the root signing certificate (issued for %s) is not in the "
-"trusted CA certificate locations, or that c_rehash needs to be run on the "
-"certificate directory. For details, please see the documentation of --"
-"sslcertpath and --sslcertfile in the manual page.\n"
+"This could mean that the root CA's signing certificate is not in the trusted "
+"CA certificate location, or that c_rehash needs to be run on the certificate "
+"directory. For details, please see the documentation of --sslcertpath and --"
+"sslcertfile in the manual page.\n"
 msgstr ""
 "这意味着根证书(为 %s 而颁发)不在 CA 证书受信路径处，或是 c_rehash 需要在证书"
 "目录下运行。详细信息请查看手册页中的 --sslcertpath 和 --sslcertfile 部分。\n"
 
-#: socket.c:870
+#: socket.c:902
 msgid "File descriptor out of range for SSL"
 msgstr "文件描述符超出 SSL 的范围"
 
-#: socket.c:881
+#: socket.c:913
 msgid "Your operating system does not support SSLv2.\n"
-msgstr ""
+msgstr "您的系统不支持 SSLv2。\n"
 
-#: socket.c:891
+#: socket.c:923
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "指定了无效的 SSL 协议 ‘%s’，将用默认的协议(SSLv23)代替。\n"
 
-#: socket.c:990
+#: socket.c:1022
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "证书(指纹)验证被不明原因地跳过！\n"
 
-#: socket.c:1007
+#: socket.c:1039
 msgid ""
 "Warning: the connection is insecure, continuing anyways. (Better use --"
 "sslcertck!)\n"
 msgstr "警告:此连接不安全，但会继续运行。(最好使用 --sslcertck！)\n"
 
-#: socket.c:1049
+#: socket.c:1081
 msgid "Cygwin socket read retry\n"
 msgstr "重试读取 Cygwin 接口\n"
 
-#: socket.c:1052
+#: socket.c:1084
 msgid "Cygwin socket read retry failed!\n"
 msgstr "重试读取 Cygwin 接口失败！\n"
 
@@ -3247,6 +3257,9 @@ msgstr "malloc 失败\n"
 msgid "realloc failed\n"
 msgstr "realloc 失败\n"
 
+#~ msgid "unknown issuer (first %d characters): %s\n"
+#~ msgstr "未知的发行者　(前 %d 个字符): %s\n"
+
 #~ msgid ""
 #~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
 #~ msgstr "fetchmail: 警告: 设置了 syslog 和 logfile。通过两者查看记录！\n"