aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po907
1 files changed, 484 insertions, 423 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bb765b76..3b64324d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: fetchmail 6.3.15-pre2\n"
+"Project-Id-Version: fetchmail 6.3.16\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-04-06 21:17+0200\n"
-"PO-Revision-Date: 2010-03-02 15:32+0800\n"
+"POT-Creation-Date: 2010-05-05 23:49+0200\n"
+"PO-Revision-Date: 2010-04-20 16:09中国标准时间\n"
"Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"MIME-Version: 1.0\n"
@@ -49,152 +49,147 @@ msgstr "无法解析 BASE64 编码请求\n"
msgid "decoded as %s\n"
msgstr "以 %s 解码\n"
-#: driver.c:191
+#: driver.c:193
#, c-format
msgid "kerberos error %s\n"
msgstr "kerberos 认证系统出错 %s\n"
-#: driver.c:249
+#: driver.c:253 driver.c:259
#, c-format
msgid "krb5_sendauth: %s [server says '%s']\n"
msgstr "krb5_sendauth: %s [ 服务器响应 \"%s\"]\n"
-#: driver.c:254
-#, c-format
-msgid "krb5_sendauth: %s [server says '%*s']\n"
-msgstr "krb5_sendauth: %s [ 服务器响应 \"%*s\"]\n"
-
-#: driver.c:335
+#: driver.c:339
msgid "Subject: Fetchmail oversized-messages warning"
msgstr "主题: Fetchmail 超大邮件警告"
-#: driver.c:339
+#: driver.c:343
#, c-format
msgid "The following oversized messages were deleted on server %s account %s:"
msgstr "以下超大邮件从服务器 %s 上删除,帐号为 %s:"
-#: driver.c:343
+#: driver.c:347
#, c-format
msgid "The following oversized messages remain on server %s account %s:"
msgstr "以下超大邮件留在了服务器 %s 上,帐号为 %s:"
-#: driver.c:362
+#: driver.c:366
#, c-format
msgid " %d message %d octets long deleted by fetchmail."
msgid_plural " %d messages %d octets long deleted by fetchmail."
msgstr[0] "fetchmail 删除 %d 封邮件, %d 字节。"
-#: driver.c:367
+#: driver.c:371
#, c-format
msgid " %d message %d octets long skipped by fetchmail."
msgid_plural " %d messages %d octets long skipped by fetchmail."
msgstr[0] "fetchmail 跳过 %d 封邮件,%d octets。"
-#: driver.c:514
+#: driver.c:518
#, c-format
msgid "skipping message %s@%s:%d"
msgstr "忽略 %s@%s:%d 封邮件"
-#: driver.c:568
+#: driver.c:572
#, c-format
msgid "skipping message %s@%s:%d (%d octets)"
msgstr "跳过 %s@%s:%d 封邮件(%d 字节)"
-#: driver.c:584
+#: driver.c:588
msgid " (length -1)"
msgstr "( 长度 -1)"
-#: driver.c:587
+#: driver.c:591
msgid " (oversized)"
msgstr "(超大)"
-#: driver.c:605
+#: driver.c:609
#, c-format
msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
msgstr "无法获取邮件头,邮件 %s@%s:%d (%d 字节)\n"
-#: driver.c:622
+#: driver.c:626
#, c-format
msgid "reading message %s@%s:%d of %d"
msgstr "读取 %1$s@%2$s:%4$d 封中的 %3$d 封邮件"
-#: driver.c:627
+#: driver.c:631
#, c-format
msgid " (%d octets)"
msgstr " (%d 字节)"
-#: driver.c:628
+#: driver.c:632
#, c-format
msgid " (%d header octets)"
msgstr "(邮件头 %d 字节)"
-#: driver.c:695
+#: driver.c:699
#, c-format
msgid " (%d body octets)"
msgstr "(邮件内容 %d 字节)"
-#: driver.c:754
+#: driver.c:758
#, c-format
msgid ""
"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
msgstr "%s@%s:%d 邮件非所需大小 (实际 %d 字节!= 所要求的 %d 字节)\n"
-#: driver.c:786
+#: driver.c:790
msgid " retained\n"
msgstr "已保留\n"
-#: driver.c:796
+#: driver.c:800
msgid " flushed\n"
msgstr "已删除\n"
-#: driver.c:813
+#: driver.c:817
msgid " not flushed\n"
msgstr "未删除\n"
-#: driver.c:831
+#: driver.c:835
#, c-format
msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
msgid_plural ""
"fetchlimit %d reached; %d messages left on server %s account %s\n"
msgstr[0] "到达收件上限 %d;%d 封邮件留在服务器 %s 帐号为 %s\n"
-#: driver.c:888
+#: driver.c:892
#, c-format
msgid "timeout after %d seconds waiting to connect to server %s.\n"
msgstr "等待连接服务器 %2$s %1$d 秒后超时。\n"
-#: driver.c:892
+#: driver.c:896
#, c-format
msgid "timeout after %d seconds waiting for server %s.\n"
msgstr "等待服务器 %2$s %1$d 秒后超时。\n"
-#: driver.c:896
+#: driver.c:900
#, c-format
msgid "timeout after %d seconds waiting for %s.\n"
msgstr "等待 %2$s %1$d 秒后超时。\n"
-#: driver.c:901
+#: driver.c:905
#, c-format
msgid "timeout after %d seconds waiting for listener to respond.\n"
msgstr "等待接收端 %d 秒无响应超时。\n"
-#: driver.c:904
+#: driver.c:908
#, c-format
msgid "timeout after %d seconds.\n"
msgstr "等待 %d 秒后超时。\n"
-#: driver.c:916
+#: driver.c:920
msgid "Subject: fetchmail sees repeated timeouts"
msgstr "主题: fetchmail 发现反复超时"
-#: driver.c:919
+#: driver.c:923
#, c-format
msgid ""
"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
"s.\n"
msgstr "Fetchmail 尝试从 %2$s@%3$s 收取邮件时发现多于 %1$d 次超时。\n"
-#: driver.c:923
+#: driver.c:927
msgid ""
"This could mean that your mailserver is stuck, or that your SMTP\n"
"server is wedged, or that your mailbox file on the server has been\n"
@@ -209,78 +204,78 @@ msgstr ""
"\n"
"Fetchmail 不会再查寻此邮箱中的邮件,除非您重启\n"
-#: driver.c:949
+#: driver.c:953
#, c-format
msgid "pre-connection command terminated with signal %d\n"
msgstr "预连接命令终止,返回信号 %d\n"
-#: driver.c:952
+#: driver.c:956
#, c-format
msgid "pre-connection command failed with status %d\n"
msgstr "预连接命令失败,状态码 %d\n"
-#: driver.c:976
+#: driver.c:980
#, c-format
msgid "couldn't find HESIOD pobox for %s\n"
msgstr "HESIOD pobox 中找不到 %s\n"
-#: driver.c:997
+#: driver.c:1001
msgid "Lead server has no name.\n"
msgstr "主服务器无名字。\n"
-#: driver.c:1024
+#: driver.c:1028
#, c-format
msgid "couldn't find canonical DNS name of %s (%s): %s\n"
msgstr "无法找到规范的 %s (%s) 的 DNS 名称: %s\n"
-#: driver.c:1071
+#: driver.c:1075
#, c-format
msgid "%s connection to %s failed"
msgstr "%s 连接至 %s 时失败"
-#: driver.c:1087
+#: driver.c:1091
msgid "Subject: Fetchmail unreachable-server warning."
msgstr "主题: Fetchmail 警告,找不到服务器。"
-#: driver.c:1089
+#: driver.c:1093
#, c-format
msgid "Fetchmail could not reach the mail server %s:"
msgstr "Fetchmail 不能找到邮件服务器 %s:"
-#: driver.c:1117
+#: driver.c:1122
msgid "SSL connection failed.\n"
msgstr "SSL 连接失败。\n"
-#: driver.c:1170
+#: driver.c:1175
#, c-format
msgid "Lock-busy error on %s@%s\n"
msgstr "%s@%s 出现死锁错误\n"
-#: driver.c:1174
+#: driver.c:1179
#, c-format
msgid "Server busy error on %s@%s\n"
msgstr "%s@%s 出现服务器繁忙错误\n"
-#: driver.c:1179
+#: driver.c:1184
#, c-format
msgid "Authorization failure on %s@%s%s\n"
msgstr "%s@%s%s 出现授权失败错误\n"
-#: driver.c:1182
+#: driver.c:1187
msgid " (previously authorized)"
msgstr "(事先已授权)"
-#: driver.c:1203
+#: driver.c:1208
#, c-format
msgid "Subject: fetchmail authentication failed on %s@%s"
msgstr "主题: fetchmail 在 %s@%s 上验证失败"
-#: driver.c:1207
+#: driver.c:1212
#, c-format
msgid "Fetchmail could not get mail from %s@%s.\n"
msgstr "Fetchmail 无法从 %s@%s 中获取邮件。\n"
-#: driver.c:1211
+#: driver.c:1216
msgid ""
"The attempt to get authorization failed.\n"
"Since we have already succeeded in getting authorization for this\n"
@@ -293,7 +288,7 @@ msgstr ""
"提示信息,因此这可能是另一种错误情况(比如服务器忙),从而导致\n"
" fetchmail 无法区分这些错误。"
-#: driver.c:1217
+#: driver.c:1222
msgid ""
"\n"
"However, if you HAVE changed your account details since starting the\n"
@@ -311,7 +306,7 @@ msgstr ""
"fetchmail 后台服务会继续运行并在每次被唤醒时尝试进行连接。除非\n"
"服务重置,否则它不会再发送任何提示信息了。"
-#: driver.c:1227
+#: driver.c:1232
msgid ""
"The attempt to get authorization failed.\n"
"This probably means your password is invalid, but some servers have\n"
@@ -329,169 +324,169 @@ msgstr ""
"fetchmail 后台服务会继续运行并在每次被唤醒时尝试进行连接。除非服务\n"
"重置,否则它不会再发送任何提示信息了。"
-#: driver.c:1243
+#: driver.c:1248
#, c-format
msgid "Repoll immediately on %s@%s\n"
msgstr "立即从 %s@%s 中重新收件\n"
-#: driver.c:1248
+#: driver.c:1253
#, c-format
msgid "Unknown login or authentication error on %s@%s\n"
msgstr "%s@%s 有未知的登录或验证错误\n"
-#: driver.c:1272
+#: driver.c:1277
#, c-format
msgid "Authorization OK on %s@%s\n"
msgstr "验证正确 %s@%s\n"
-#: driver.c:1278
+#: driver.c:1283
#, c-format
msgid "Subject: fetchmail authentication OK on %s@%s"
msgstr "主题: fetchmail 验证正确 %s@%s"
-#: driver.c:1282
+#: driver.c:1287
#, c-format
msgid "Fetchmail was able to log into %s@%s.\n"
msgstr "Fetchmail 可登录 %s@%s。\n"
-#: driver.c:1286
+#: driver.c:1291
msgid "Service has been restored.\n"
msgstr "服务已经被重置。\n"
-#: driver.c:1318
+#: driver.c:1323
#, c-format
msgid "selecting or re-polling folder %s\n"
msgstr "正在选择或重新检索邮箱 %s\n"
-#: driver.c:1320
+#: driver.c:1325
msgid "selecting or re-polling default folder\n"
msgstr "正在选择或重检默认邮箱\n"
-#: driver.c:1332
+#: driver.c:1337
#, c-format
msgid "%s at %s (folder %s)"
msgstr "%s 在 %s (邮箱 %s)"
-#: driver.c:1335 rcfile_y.y:389
+#: driver.c:1340 rcfile_y.y:390
#, c-format
msgid "%s at %s"
msgstr "%s 在 %s"
-#: driver.c:1340
+#: driver.c:1345
#, c-format
msgid "Polling %s\n"
msgstr "正在检取 %s\n"
-#: driver.c:1344
+#: driver.c:1349
#, c-format
msgid "%d message (%d %s) for %s"
msgid_plural "%d messages (%d %s) for %s"
msgstr[0] "%4$s 有 %1$d 封邮件 (%2$d %3$s)"
-#: driver.c:1347
+#: driver.c:1352
msgid "seen"
msgid_plural "seen"
msgstr[0] "已读"
-#: driver.c:1350
+#: driver.c:1355
#, c-format
msgid "%d message for %s"
msgid_plural "%d messages for %s"
msgstr[0] "%2$s 有 %1$d 封邮件"
-#: driver.c:1357
+#: driver.c:1362
#, c-format
msgid " (%d octets).\n"
msgstr "(%d 字节)。\n"
-#: driver.c:1363
+#: driver.c:1368
#, c-format
msgid "No mail for %s\n"
msgstr "%s 无邮件\n"
-#: driver.c:1396
+#: driver.c:1401
msgid "bogus message count!"
msgstr "发现无效邮件!"
-#: driver.c:1539
+#: driver.c:1544
msgid "socket"
msgstr "套接口"
-#: driver.c:1542
+#: driver.c:1547
msgid "missing or bad RFC822 header"
msgstr "未找到或错误的 RFC822 协议头"
-#: driver.c:1545
+#: driver.c:1550
msgid "MDA"
msgstr "MDA"
-#: driver.c:1548
+#: driver.c:1553
msgid "client/server synchronization"
msgstr "客户端/服务器同步"
-#: driver.c:1551
+#: driver.c:1556
msgid "client/server protocol"
msgstr "客户端/服务器协议"
-#: driver.c:1554
+#: driver.c:1559
msgid "lock busy on server"
msgstr "服务器死锁"
-#: driver.c:1557
+#: driver.c:1562
msgid "SMTP transaction"
msgstr "处理 SMTP"
-#: driver.c:1560
+#: driver.c:1565
msgid "DNS lookup"
msgstr "查询 DNS"
-#: driver.c:1563
+#: driver.c:1568
msgid "undefined"
msgstr "未定义"
-#: driver.c:1569
+#: driver.c:1574
#, c-format
msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
msgstr "从 %2$s@%3$s 收邮件并投递至 SMTP 主机 %4$s 时出现错误 %1$s\n"
-#: driver.c:1571
+#: driver.c:1576
msgid "unknown"
msgstr "未知"
-#: driver.c:1573
+#: driver.c:1578
#, c-format
msgid "%s error while fetching from %s@%s\n"
msgstr "从 %2$s@%3$s 收件时产生错误 %1$s\n"
-#: driver.c:1585
+#: driver.c:1590
#, c-format
msgid "post-connection command terminated with signal %d\n"
msgstr "执行后续程序失败,返回信号 %d\n"
-#: driver.c:1587
+#: driver.c:1592
#, c-format
msgid "post-connection command failed with status %d\n"
msgstr "执行后续程序失败,状态码 %d\n"
-#: driver.c:1606
+#: driver.c:1611
msgid "Kerberos V4 support not linked.\n"
msgstr "未连接 Kerberos V4 支持\n"
-#: driver.c:1614
+#: driver.c:1619
msgid "Kerberos V5 support not linked.\n"
msgstr "未连接 Kerberos V5 支持\n"
-#: driver.c:1625
+#: driver.c:1630
#, c-format
msgid "Option --flush is not supported with %s\n"
msgstr "%s 不支持 --flush 选项\n"
-#: driver.c:1631
+#: driver.c:1636
#, c-format
msgid "Option --all is not supported with %s\n"
msgstr "%s 不支持 --all 选项\n"
-#: driver.c:1640
+#: driver.c:1645
#, c-format
msgid "Option --limit is not supported with %s\n"
msgstr "%s 不支持 --limit 选项\n"
@@ -532,21 +527,21 @@ msgstr ""
msgid "%s: You don't exist. Go away.\n"
msgstr "%s: 不存在您的用户名,退出\n"
-#: env.c:147
+#: env.c:149
#, c-format
msgid "%s: can't determine your host!"
msgstr "%s: 无法确认您的主机!"
-#: env.c:170
+#: env.c:172
#, c-format
msgid "gethostbyname failed for %s\n"
msgstr "%s 主机上 gethostbyname 函数出错\n"
-#: env.c:172
+#: env.c:174
msgid "Cannot find my own host in hosts database to qualify it!\n"
msgstr "无法在主机数据库中找到自己的主机来验证它!\n"
-#: env.c:176
+#: env.c:178
msgid ""
"Trying to continue with unqualified hostname.\n"
"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -557,7 +552,7 @@ msgstr ""
"不要报告类似于 Received:,HELO/EHLO 邮件头损坏等问题!\n"
"确保您已修正了 /etc/hosts,DNS,NIS 或者 LDAP。\n"
-#: etrn.c:49 odmr.c:60
+#: etrn.c:49 odmr.c:61
#, c-format
msgid "%s's SMTP listener does not support ESMTP\n"
msgstr "%s 的 SMTP 端不支持 ESMTP\n"
@@ -685,8 +680,8 @@ msgid "fetchmail: no other fetchmail is running\n"
msgstr "fetchmail: 无其它 fetchmail 正在运行\n"
#: fetchmail.c:449
-#, c-format
-msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
+#, fuzzy, c-format
+msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
msgstr "fetchmail: 终止 %s fetchmail 进程号 %d 时出错;退出\n"
#: fetchmail.c:450 fetchmail.c:459
@@ -698,8 +693,8 @@ msgid "foreground"
msgstr "前台"
#: fetchmail.c:458
-#, c-format
-msgid "fetchmail: %s fetchmail at %d killed.\n"
+#, fuzzy, c-format
+msgid "fetchmail: %s fetchmail at %ld killed.\n"
msgstr "fetchmail: %s fetchmail 进程号 %d 终止\n"
#: fetchmail.c:481
@@ -709,15 +704,16 @@ msgid ""
msgstr "fetchmail: 有另一个 fetchmail 在同一主机上运行时无法检查邮件。\n"
#: fetchmail.c:487
-#, c-format
+#, fuzzy, c-format
msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+"fetchmail: can't poll specified hosts with another fetchmail running at %"
+"ld.\n"
msgstr ""
"fetchmail: 有另一个 fetchmail 进程号 %d 在指定主机上运行时无法收邮件。\n"
#: fetchmail.c:494
-#, c-format
-msgid "fetchmail: another foreground fetchmail is running at %d.\n"
+#, fuzzy, c-format
+msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
msgstr "fetchmail: 另一个前台 fetchmail 进程号 %d 正在运行。\n"
#: fetchmail.c:504
@@ -726,13 +722,13 @@ msgid ""
msgstr "fetchmail: 有后台 fetchmail 正在运行时无法接受选项\n"
#: fetchmail.c:510
-#, c-format
-msgid "fetchmail: background fetchmail at %d awakened.\n"
+#, fuzzy, c-format
+msgid "fetchmail: background fetchmail at %ld awakened.\n"
msgstr "fetchmail: 后台 fetchmail 进程号 %d 被唤醒\n"
#: fetchmail.c:522
-#, c-format
-msgid "fetchmail: elder sibling at %d died mysteriously.\n"
+#, fuzzy, c-format
+msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
msgstr "fetchmail: 上次 fetchmail 进程号 %d 不明原因的终止\n"
#: fetchmail.c:537
@@ -885,680 +881,685 @@ msgstr "在 %s 被唤醒\n"
msgid "normal termination, status %d\n"
msgstr "正常结束,返回值 %d\n"
-#: fetchmail.c:1041
+#: fetchmail.c:1042
#, fuzzy
msgid "couldn't time-check the run-control file\n"
msgstr "无法对 run-control 文件进行时限检测\n"
-#: fetchmail.c:1075
+#: fetchmail.c:1076
#, c-format
msgid "Warning: multiple mentions of host %s in config file\n"
msgstr "警告: 在配置文件中多次提及主机 %s\n"
-#: fetchmail.c:1108
+#: fetchmail.c:1115
msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
msgstr "fetchmail: 错误: 在配置文件中有多个 “default” 记录。\n"
-#: fetchmail.c:1230
+#: fetchmail.c:1237
msgid "SSL support is not compiled in.\n"
msgstr "SSL 支持未编译在内\n"
-#: fetchmail.c:1237
+#: fetchmail.c:1244
msgid "KERBEROS v4 support is configured, but not compiled in.\n"
msgstr "设置了 KERBEROS v4 支持,但未编译在内\n"
-#: fetchmail.c:1243
+#: fetchmail.c:1250
msgid "KERBEROS v5 support is configured, but not compiled in.\n"
msgstr "设置了 KERBEROS v5 支持,但未编译在内\n"
-#: fetchmail.c:1249
+#: fetchmail.c:1256
msgid "GSSAPI support is configured, but not compiled in.\n"
msgstr "设置了 GSSAPI 支持,但未编译在内\n"
-#: fetchmail.c:1279
+#: fetchmail.c:1286
#, c-format
msgid ""
"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
msgstr "fetchmail: 警告: 无可用的 DNS 来检查取自 %s 的多投邮件\n"
-#: fetchmail.c:1290
+#: fetchmail.c:1297
#, c-format
msgid "warning: multidrop for %s requires envelope option!\n"
msgstr "警告: %s 设置了多投邮件,需设置 envelope 选项!\n"
-#: fetchmail.c:1291
+#: fetchmail.c:1298
msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
msgstr "警告: 如果所有邮件均被邮件管理员收取,不要寻求支持!\n"
-#: fetchmail.c:1308
+#: fetchmail.c:1315
#, c-format
msgid ""
"fetchmail: %s configuration invalid, specify positive port number for "
"service or port\n"
msgstr "fetchmail: %s 配置无效,为服务或端口指定大于零的端口\n"
-#: fetchmail.c:1315
+#: fetchmail.c:1322
#, c-format
msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
msgstr "fetchmail: %s 配置无效,RPOP 要求开放一个特许端口\n"
-#: fetchmail.c:1333
+#: fetchmail.c:1340
#, c-format
msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
msgstr "%s 配置无效,LMTP 不能用默认的 SMTP 端口\n"
-#: fetchmail.c:1347
+#: fetchmail.c:1354
msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
msgstr "收取所有邮件并保留服务器上的备份或使用 idle 模式是错误的!\n"
-#: fetchmail.c:1372
+#: fetchmail.c:1379
#, c-format
msgid "terminated with signal %d\n"
msgstr "以信号 %d 终止\n"
-#: fetchmail.c:1445
+#: fetchmail.c:1452
#, c-format
msgid "%s querying %s (protocol %s) at %s: poll started\n"
msgstr "%1$s 在 %4$s 查寻 %2$s (协议 %3$s): 收件开始\n"
-#: fetchmail.c:1470
+#: fetchmail.c:1477
msgid "POP2 support is not configured.\n"
msgstr "未设置 POP2 支持\n"
-#: fetchmail.c:1482
+#: fetchmail.c:1489
msgid "POP3 support is not configured.\n"
msgstr "未设置 POP3 支持\n"
-#: fetchmail.c:1492
+#: fetchmail.c:1499
msgid "IMAP support is not configured.\n"
msgstr "未设置 IMAP 支持\n"
-#: fetchmail.c:1498
+#: fetchmail.c:1505
msgid "ETRN support is not configured.\n"
msgstr "未设置 ETRN 支持\n"
-#: fetchmail.c:1506
+#: fetchmail.c:1513
msgid "ODMR support is not configured.\n"
msgstr "未设置 ODMR 支持\n"
-#: fetchmail.c:1513
+#: fetchmail.c:1520
msgid "unsupported protocol selected.\n"
msgstr "选中了不支持的协议\n"
-#: fetchmail.c:1523
+#: fetchmail.c:1530
#, c-format
msgid "%s querying %s (protocol %s) at %s: poll completed\n"
msgstr "%1$s 在 %4$s 查询 %2$s (协议 %3$s): 收件完成\n"
-#: fetchmail.c:1540
+#: fetchmail.c:1547
#, c-format
msgid "Poll interval is %d seconds\n"
msgstr "收件间隔 %d 秒\n"
-#: fetchmail.c:1542
+#: fetchmail.c:1549
#, c-format
msgid "Logfile is %s\n"
msgstr "日志文件为 %s\n"
-#: fetchmail.c:1544
+#: fetchmail.c:1551
#, c-format
msgid "Idfile is %s\n"
msgstr "Idfile 文件为 %s\n"
-#: fetchmail.c:1547
+#: fetchmail.c:1554
msgid "Progress messages will be logged via syslog\n"
msgstr "邮件情况将通过 syslog 来记录\n"
-#: fetchmail.c:1550
+#: fetchmail.c:1557
msgid "Fetchmail will masquerade and will not generate Received\n"
msgstr "Fetchmail 将进行伪装且不会生成 Receiverd 部分\n"
-#: fetchmail.c:1552
+#: fetchmail.c:1559
msgid "Fetchmail will show progress dots even in logfiles.\n"
msgstr "Fetchmail 将在日志文件中显示进度条(以点的形式)\n"
-#: fetchmail.c:1554
+#: fetchmail.c:1561
#, c-format
msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
msgstr "Fetchmail 将转发地址错误的多投邮件给 %s。\n"
-#: fetchmail.c:1558
+#: fetchmail.c:1565
msgid "Fetchmail will direct error mail to the postmaster.\n"
msgstr "Fetchmail 将把错误邮件转给邮件管理员\n"
-#: fetchmail.c:1560
+#: fetchmail.c:1567
msgid "Fetchmail will direct error mail to the sender.\n"
msgstr "Fetchmail 将把错误邮件退给发送者\n"
-#: fetchmail.c:1563
+#: fetchmail.c:1570
msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
msgstr "Fetchmail 将把长期错误当成不可恢复的错误(删除邮件)。\n"
-#: fetchmail.c:1565
+#: fetchmail.c:1572
msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
msgstr "Fetchmail 将把惯性错误当成临时问题(保留邮件)。\n"
-#: fetchmail.c:1572
+#: fetchmail.c:1579
#, c-format
msgid "Options for retrieving from %s@%s:\n"
msgstr "从 %s@%s 收件时的选项:\n"
-#: fetchmail.c:1576
+#: fetchmail.c:1583
#, c-format
msgid " Mail will be retrieved via %s\n"
msgstr " 邮件将通过 %s 收取\n"
-#: fetchmail.c:1579
+#: fetchmail.c:1586
#, c-format
msgid " Poll of this server will occur every %d interval.\n"
msgid_plural " Poll of this server will occur every %d intervals.\n"
msgstr[0] "每隔 %d 秒将收取此服务器中的邮件\n"
-#: fetchmail.c:1583
+#: fetchmail.c:1590
#, c-format
msgid " True name of server is %s.\n"
msgstr " 服务器的实名为 %s。\n"
-#: fetchmail.c:1586
+#: fetchmail.c:1593
msgid " This host will not be queried when no host is specified.\n"
msgstr " 若不指明主机将不查询此主机\n"
-#: fetchmail.c:1587
+#: fetchmail.c:1594
msgid " This host will be queried when no host is specified.\n"
msgstr " 若不指明主机将查询此主机\n"
-#: fetchmail.c:1591
+#: fetchmail.c:1598
msgid " Password will be prompted for.\n"
msgstr "密码会被提示\n"
-#: fetchmail.c:1595
+#: fetchmail.c:1602
#, c-format
msgid " APOP secret = \"%s\".\n"
msgstr " APOP 密码 = “%s”\n"
-#: fetchmail.c:1598
+#: fetchmail.c:1605
#, c-format
msgid " RPOP id = \"%s\".\n"
msgstr " RPOP 密码 = “%s”\n"
-#: fetchmail.c:1601
+#: fetchmail.c:1608
#, c-format
msgid " Password = \"%s\".\n"
msgstr " 密码 = “%s”\n"
-#: fetchmail.c:1610
+#: fetchmail.c:1617
#, c-format
msgid " Protocol is KPOP with Kerberos %s authentication"
msgstr " 协议是带有 Kerberos %s 认证协议的 KPOP"
-#: fetchmail.c:1613
+#: fetchmail.c:1620
#, c-format
msgid " Protocol is %s"
msgstr " 协议是 %s"
-#: fetchmail.c:1615
+#: fetchmail.c:1622
#, c-format
msgid " (using service %s)"
msgstr " (正在使用服务 %s)"
-#: fetchmail.c:1617
+#: fetchmail.c:1624
msgid " (using default port)"
msgstr " (正在使用默认端口)"
-#: fetchmail.c:1619
+#: fetchmail.c:1626
msgid " (forcing UIDL use)"
msgstr " (正在强制使用 UIDL)"
-#: fetchmail.c:1625
+#: fetchmail.c:1632
msgid " All available authentication methods will be tried.\n"
msgstr " 将尝试所有有效的验证方式\n"
-#: fetchmail.c:1628
+#: fetchmail.c:1635
msgid " Password authentication will be forced.\n"
msgstr " 强制密码验证\n"
-#: fetchmail.c:1631
+#: fetchmail.c:1638
msgid " MSN authentication will be forced.\n"
msgstr " 强制 MSN 验证\n"
-#: fetchmail.c:1634
+#: fetchmail.c:1641
msgid " NTLM authentication will be forced.\n"
msgstr " 强制 NTLM 验证\n"
-#: fetchmail.c:1637
+#: fetchmail.c:1644
msgid " OTP authentication will be forced.\n"
msgstr " 强制 OTP 验证\n"
-#: fetchmail.c:1640
+#: fetchmail.c:1647
msgid " CRAM-Md5 authentication will be forced.\n"
msgstr " 强制 CRAM-Md5 验证\n"
-#: fetchmail.c:1643
+#: fetchmail.c:1650
msgid " GSSAPI authentication will be forced.\n"
msgstr " 强制 GSSAPI 验证\n"
-#: fetchmail.c:1646
+#: fetchmail.c:1653
msgid " Kerberos V4 authentication will be forced.\n"
msgstr " 强制 Kerberos V4 验证\n"
-#: fetchmail.c:1649
+#: fetchmail.c:1656
msgid " Kerberos V5 authentication will be forced.\n"
msgstr " 强制 Kerberos V5 验证\n"
-#: fetchmail.c:1652
+#: fetchmail.c:1659
msgid " End-to-end encryption assumed.\n"
msgstr " 假设为终端到终端加密\n"
-#: fetchmail.c:1656
+#: fetchmail.c:1663
#, c-format
msgid " Mail service principal is: %s\n"
msgstr " 邮件服务协议验证方为: %s\n"
-#: fetchmail.c:1659
+#: fetchmail.c:1666
msgid " SSL encrypted sessions enabled.\n"
msgstr "启用 SSL 加密会话\n"
-#: fetchmail.c:1661
+#: fetchmail.c:1668
#, c-format
msgid " SSL protocol: %s.\n"
msgstr " SSL 协议: %s\n"
-#: fetchmail.c:1663
+#: fetchmail.c:1670
msgid " SSL server certificate checking enabled.\n"
msgstr " 启用 SSL 服务器证书检查\n"
-#: fetchmail.c:1665
+#: fetchmail.c:1673
+#, fuzzy, c-format
+msgid " SSL trusted certificate file: %s\n"
+msgstr " SSL 受信证书目录: %s\n"
+
+#: fetchmail.c:1675
#, c-format
msgid " SSL trusted certificate directory: %s\n"
msgstr " SSL 受信证书目录: %s\n"
-#: fetchmail.c:1668
+#: fetchmail.c:1677
#, c-format
msgid " SSL server CommonName: %s\n"
msgstr " SSL 服务器名: %s\n"
-#: fetchmail.c:1670
+#: fetchmail.c:1679
#, c-format
msgid " SSL key fingerprint (checked against the server key): %s\n"
msgstr " SSL 密钥指纹 (与服务器密钥对比过): %s\n"
-#: fetchmail.c:1673
+#: fetchmail.c:1682
#, c-format
msgid " Server nonresponse timeout is %d seconds"
msgstr " 服务器未响应,超时 %d 秒"
-#: fetchmail.c:1675
+#: fetchmail.c:1684
msgid " (default).\n"
msgstr " (默认)。\n"
-#: fetchmail.c:1682
+#: fetchmail.c:1691
msgid " Default mailbox selected.\n"
msgstr " 已选中默认邮箱。\n"
-#: fetchmail.c:1687
+#: fetchmail.c:1696
msgid " Selected mailboxes are:"
msgstr " 选中的邮箱是:"
-#: fetchmail.c:1693
+#: fetchmail.c:1702
msgid " All messages will be retrieved (--all on).\n"
msgstr " 收取所有邮件( --all 选项开启).\n"
-#: fetchmail.c:1694
+#: fetchmail.c:1703
msgid " Only new messages will be retrieved (--all off).\n"
msgstr " 只收取新邮件( --all 选项关闭).\n"
-#: fetchmail.c:1696
+#: fetchmail.c:1705
msgid " Fetched messages will be kept on the server (--keep on).\n"
msgstr " 收取的邮件会在服务器上保留副本( --keep 开启).\n"
-#: fetchmail.c:1697
+#: fetchmail.c:1706
msgid " Fetched messages will not be kept on the server (--keep off).\n"
msgstr " 收取的邮件不会保留在服务器上( --keep 关闭).\n"
-#: fetchmail.c:1699
+#: fetchmail.c:1708
msgid " Old messages will be flushed before message retrieval (--flush on).\n"
msgstr " 在收取新邮件前删除旧邮件(--flush 开启).\n"
-#: fetchmail.c:1700
+#: fetchmail.c:1709
msgid ""
" Old messages will not be flushed before message retrieval (--flush off).\n"
msgstr " 在收取新邮件前不删除旧邮件(--flush 关闭).\n"
-#: fetchmail.c:1702
+#: fetchmail.c:1711
msgid ""
" Oversized messages will be flushed before message retrieval (--limitflush "
"on).\n"
msgstr " 收件前将删除超大的邮件(--limitflush 开启).\n"
-#: fetchmail.c:1703
+#: fetchmail.c:1712
msgid ""
" Oversized messages will not be flushed before message retrieval (--"
"limitflush off).\n"
msgstr " 收件前将不删除超大的邮件(--limitflush 关闭).\n"
-#: fetchmail.c:1705
+#: fetchmail.c:1714
msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n"
msgstr " 本地收件人地址重写(--norewrite 关闭).\n"
-#: fetchmail.c:1706
+#: fetchmail.c:1715
msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n"
msgstr " 不重写本地收件人地址(--norewrite 开启).\n"
-#: fetchmail.c:1708
+#: fetchmail.c:1717
msgid " Carriage-return stripping is enabled (stripcr on).\n"
msgstr " 回车符清除(stripcr 开启).\n"
-#: fetchmail.c:1709
+#: fetchmail.c:1718
msgid " Carriage-return stripping is disabled (stripcr off).\n"
msgstr " 不清除回车符(stripcr 关闭).\n"
-#: fetchmail.c:1711
+#: fetchmail.c:1720
msgid " Carriage-return forcing is enabled (forcecr on).\n"
msgstr " 强行在换行前插入回车符(forcecr 开启).\n"
-#: fetchmail.c:1712
+#: fetchmail.c:1721
msgid " Carriage-return forcing is disabled (forcecr off).\n"
msgstr " 不在换行前强行插入回车符(forcecr 关闭).\n"
-#: fetchmail.c:1714
+#: fetchmail.c:1723
msgid ""
" Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
msgstr " 忽略 Content-Transfer-Encoding (pass8bits 开启).\n"
-#: fetchmail.c:1715
+#: fetchmail.c:1724
msgid ""
" Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
msgstr " 不忽略 Content-Transfer-Encoding (pass8bits 关闭).\n"
-#: fetchmail.c:1717
+#: fetchmail.c:1726
msgid " MIME decoding is enabled (mimedecode on).\n"
msgstr " 解开 MIME 编码 (mimedecode 开启).\n"
-#: fetchmail.c:1718
+#: fetchmail.c:1727
msgid " MIME decoding is disabled (mimedecode off).\n"
msgstr " 不解开 MIME 编码 (mimedecode 关闭).\n"
-#: fetchmail.c:1720
+#: fetchmail.c:1729
msgid " Idle after poll is enabled (idle on).\n"
msgstr " 收件后回到 idle 模式 (idle 开启).\n"
-#: fetchmail.c:1721
+#: fetchmail.c:1730
msgid " Idle after poll is disabled (idle off).\n"
msgstr " 收件后不回到 idle 模式 (idle 关闭).\n"
-#: fetchmail.c:1723
+#: fetchmail.c:1732
msgid " Nonempty Status lines will be discarded (dropstatus on)\n"
msgstr " 删除带有 Status 字样的行 (dropstatus 开启)\n"
-#: fetchmail.c:1724
+#: fetchmail.c:1733
msgid " Nonempty Status lines will be kept (dropstatus off)\n"
msgstr " 保留带有 Status 字样的 行 (dropstatus 关闭)\n"
-#: fetchmail.c:1726
+#: fetchmail.c:1735
msgid " Delivered-To lines will be discarded (dropdelivered on)\n"
msgstr " 删除带有 Delivered-to 的行 (dropdelivered 开启)\n"
-#: fetchmail.c:1727
+#: fetchmail.c:1736
msgid " Delivered-To lines will be kept (dropdelivered off)\n"
msgstr " 保留带有 Delivered-to 的行 (dropdelivered 关闭)\n"
-#: fetchmail.c:1731
+#: fetchmail.c:1740
#, c-format
msgid " Message size limit is %d octets (--limit %d).\n"
msgstr " 邮件大小被限制为 %d 字节 (--limit %d).\n"
-#: fetchmail.c:1734
+#: fetchmail.c:1743
msgid " No message size limit (--limit 0).\n"
msgstr " 邮件大小无限制 (--limit 0).\n"
-#: fetchmail.c:1736
+#: fetchmail.c:1745
#, c-format
msgid " Message size warning interval is %d seconds (--warnings %d).\n"
msgstr " 每隔 %d 秒发出邮件大小警告 (--warnings %d).\n"
-#: fetchmail.c:1739
+#: fetchmail.c:1748
msgid " Size warnings on every poll (--warnings 0).\n"
msgstr " 每次收件都给出邮件大小警告 (--warnings 0).\n"
-#: fetchmail.c:1742
+#: fetchmail.c:1751
#, c-format
msgid " Received-message limit is %d (--fetchlimit %d).\n"
msgstr " 单次收件限制为 %d 封(--fetchlimit %d).\n"
-#: fetchmail.c:1745
+#: fetchmail.c:1754
msgid " No received-message limit (--fetchlimit 0).\n"
msgstr " 无收件限制 (--fetchlimit 0).\n"
-#: fetchmail.c:1747
+#: fetchmail.c:1756
#, c-format
msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n"
msgstr " 限制所收邮件大小为 %d 字节(--fetchsizelimit %d).\n"
-#: fetchmail.c:1750
+#: fetchmail.c:1759
msgid " No fetch message size limit (--fetchsizelimit 0).\n"
msgstr " 所收邮件大小无限制 (--fetchsizelimit 0).\n"
-#: fetchmail.c:1754
+#: fetchmail.c:1763
msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n"
msgstr " 每次收件期间对 UIDs 进行折半查找 (--fastuidl 1).\n"
-#: fetchmail.c:1756
+#: fetchmail.c:1765
#, c-format
msgid " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
msgstr " 每 %2$d 次收件中有 %1$d 次对 UIDs 进行折半查找 (--fastuidl %3$d).\n"
-#: fetchmail.c:1759
+#: fetchmail.c:1768
msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n"
msgstr " 每次收件期间对 UIDs 进行线性查找 (--fastuidl 0).\n"
-#: fetchmail.c:1761
+#: fetchmail.c:1770
#, c-format
msgid " SMTP message batch limit is %d.\n"
msgstr " 单次 SMTP 会话中最多传送 %d 封邮件。\n"
-#: fetchmail.c:1763
+#: fetchmail.c:1772
msgid " No SMTP message batch limit (--batchlimit 0).\n"
msgstr " 单次 SMTP 会话中无传送邮件限制 (--batchlimit 0)。\n"
-#: fetchmail.c:1767
+#: fetchmail.c:1776
#, c-format
msgid " Deletion interval between expunges forced to %d (--expunge %d).\n"
msgstr " 两次删除操作之间最多传送 %d 封邮件(--expunge %d)。\n"
-#: fetchmail.c:1769
+#: fetchmail.c:1778
msgid " No forced expunges (--expunge 0).\n"
msgstr " 两次删除操作之间无传送邮件限制(--expunge 0)。\n"
-#: fetchmail.c:1776
+#: fetchmail.c:1785
msgid " Domains for which mail will be fetched are:"
msgstr " 要收取的邮件位于服务器:"
-#: fetchmail.c:1781 fetchmail.c:1801
+#: fetchmail.c:1790 fetchmail.c:1810
msgid " (default)"
msgstr " (默认)"
-#: fetchmail.c:1786
+#: fetchmail.c:1795
#, c-format
msgid " Messages will be appended to %s as BSMTP\n"
msgstr " 邮件作为 BSMTP 附加至 %s\n"
-#: fetchmail.c:1788
+#: fetchmail.c:1797
#, c-format
msgid " Messages will be delivered with \"%s\".\n"
msgstr " 邮件通过 “%s” 投递。\n"
-#: fetchmail.c:1795
+#: fetchmail.c:1804
#, c-format
msgid " Messages will be %cMTP-forwarded to:"
msgstr " 邮件将被 %cMPT 转发到:"
-#: fetchmail.c:1806
+#: fetchmail.c:1815
#, c-format
msgid " Host part of MAIL FROM line will be %s\n"
msgstr " MAIL FROM 这一行的 Host 部分是 %s\n"
-#: fetchmail.c:1809
+#: fetchmail.c:1818
#, c-format
msgid " Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
msgstr " RCPT TO 这一行中将要被送往 SMTP 的地址是 %s\n"
-#: fetchmail.c:1818
+#: fetchmail.c:1827
msgid " Recognized listener spam block responses are:"
msgstr " 识别出的监听端垃圾邮件拒收响应为:"
# fetchmail.c:1809
-#: fetchmail.c:1824
+#: fetchmail.c:1833
msgid " Spam-blocking disabled\n"
msgstr " 关闭垃圾邮件拒收\n"
-#: fetchmail.c:1827
+#: fetchmail.c:1836
#, c-format
msgid " Server connection will be brought up with \"%s\".\n"
msgstr " 服务器连接将被 “%s” 唤起\n"
-#: fetchmail.c:1830
+#: fetchmail.c:1839
msgid " No pre-connection command.\n"
msgstr " 无连接前要执行的程序。\n"
-#: fetchmail.c:1832
+#: fetchmail.c:1841
#, c-format
msgid " Server connection will be taken down with \"%s\".\n"
msgstr " 服务器连接将被 “%s” 关闭。\n"
-#: fetchmail.c:1835
+#: fetchmail.c:1844
msgid " No post-connection command.\n"
msgstr " 无连接后要执行的程序。\n"
-#: fetchmail.c:1838
+#: fetchmail.c:1847
msgid " No localnames declared for this host.\n"
msgstr " 此服务器没有要关联的本地用户名。\n"
-#: fetchmail.c:1848
+#: fetchmail.c:1857
msgid " Multi-drop mode: "
msgstr " 多投模式: "
-#: fetchmail.c:1850
+#: fetchmail.c:1859
msgid " Single-drop mode: "
msgstr " 单投模式: "
-#: fetchmail.c:1852
+#: fetchmail.c:1861
#, c-format
msgid "%d local name recognized.\n"
msgid_plural "%d local names recognized.\n"
msgstr[0] "识别出 %d 个本地用户名。\n"
-#: fetchmail.c:1867
+#: fetchmail.c:1876
msgid " DNS lookup for multidrop addresses is enabled.\n"
msgstr " 启用 DNS 搜寻多投地址。\n"
-#: fetchmail.c:1868
+#: fetchmail.c:1877
msgid " DNS lookup for multidrop addresses is disabled.\n"
msgstr " 关闭 DNS 搜寻多投地址。\n"
-#: fetchmail.c:1872
+#: fetchmail.c:1881
msgid ""
" Server aliases will be compared with multidrop addresses by IP address.\n"
msgstr " 服务器昵称将以 IP 地址与多投地址进行比较\n"
-#: fetchmail.c:1874
+#: fetchmail.c:1883
msgid " Server aliases will be compared with multidrop addresses by name.\n"
msgstr " 服务器昵称将以名字与多投地址进行比较\n"
-#: fetchmail.c:1877
+#: fetchmail.c:1886
msgid " Envelope-address routing is disabled\n"
msgstr " 禁用 Envelope-address 路由\n"
-#: fetchmail.c:1880
+#: fetchmail.c:1889
#, c-format
msgid " Envelope header is assumed to be: %s\n"
msgstr " 邮件头假定为: %s\n"
-#: fetchmail.c:1883
+#: fetchmail.c:1892
#, c-format
msgid " Number of envelope headers to be skipped over: %d\n"
msgstr " 跳过的邮件头数目为: %d\n"
-#: fetchmail.c:1886
+#: fetchmail.c:1895
#, c-format
msgid " Prefix %s will be removed from user id\n"
msgstr " 将从用户 id 中移除前缀 %s\n"
-#: fetchmail.c:1889
+#: fetchmail.c:1898
msgid " No prefix stripping\n"
msgstr " 没有要从用户 id 中清除的前缀\n"
-#: fetchmail.c:1896
+#: fetchmail.c:1903
msgid " Predeclared mailserver aliases:"
msgstr " 预先声明的邮件服务器昵称: "
-#: fetchmail.c:1905
+#: fetchmail.c:1911
msgid " Local domains:"
msgstr " 本地域:"
-#: fetchmail.c:1915
+#: fetchmail.c:1921
#, c-format
msgid " Connection must be through interface %s.\n"
msgstr " 必须通过地址 %s 连接\n"
-#: fetchmail.c:1917
+#: fetchmail.c:1923
msgid " No interface requirement specified.\n"
msgstr " 未指定地址要求。\n"
-#: fetchmail.c:1919
+#: fetchmail.c:1925
#, c-format
msgid " Polling loop will monitor %s.\n"
msgstr " 收件轮循将监听 %s。\n"
-#: fetchmail.c:1921
+#: fetchmail.c:1927
msgid " No monitor interface specified.\n"
msgstr " 未指定监听地址。\n"
-#: fetchmail.c:1925
+#: fetchmail.c:1931
#, c-format
msgid " Server connections will be made via plugin %s (--plugin %s).\n"
msgstr " 通过外部程序 %s 进行服务器连接 (--plugin %s)。\n"
-#: fetchmail.c:1927
+#: fetchmail.c:1933
msgid " No plugin command specified.\n"
msgstr " 未指定外部程序。\n"
-#: fetchmail.c:1929
+#: fetchmail.c:1935
#, c-format
msgid " Listener connections will be made via plugout %s (--plugout %s).\n"
msgstr " 通过外部程序 %s 进行 SMTP 连接(--plugout %s)。\n"
-#: fetchmail.c:1931
+#: fetchmail.c:1937
msgid " No plugout command specified.\n"
msgstr " 未指定外部程序。\n"
-#: fetchmail.c:1936
+#: fetchmail.c:1942
msgid " No UIDs saved from this host.\n"
msgstr " 未从此主机上保存 UIDs。\n"
-#: fetchmail.c:1945
+#: fetchmail.c:1951
#, c-format
msgid " %d UIDs saved.\n"
msgstr " 保存了 %d 个UIDs。\n"
-#: fetchmail.c:1953
+#: fetchmail.c:1959
msgid " Poll trace information will be added to the Received header.\n"
msgstr " 收件跟踪信息将被加入 Received 邮件头。\n"
-#: fetchmail.c:1955
+#: fetchmail.c:1961
msgid " No poll trace information will be added to the Received header.\n"
msgstr ""
" 无收件跟踪信息要被加入 Received 邮件头。\n"
"。\n"
-#: fetchmail.c:1960
+#: fetchmail.c:1966
msgid " Messages with bad headers will be rejected.\n"
msgstr " 邮件头错误的邮件将被拒收。\n"
-#: fetchmail.c:1963
+#: fetchmail.c:1969
msgid " Messages with bad headers will be passed on.\n"
msgstr " 邮件头错误的邮件可以接收。\n"
-#: fetchmail.c:1968
+#: fetchmail.c:1974
#, c-format
msgid " Pass-through properties \"%s\".\n"
msgstr " 传送的 properties 选项为 “%s” 。\n"
@@ -1700,7 +1701,7 @@ msgstr "邮件删除数不相等 (实际删除 %d 封!= 已删除 %d 封)\n"
msgid "%lu is unseen\n"
msgstr "%lu 封未读\n"
-#: imap.c:937 pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121
+#: imap.c:937 pop3.c:869 pop3.c:881 pop3.c:1120 pop3.c:1127
#, c-format
msgid "%u is unseen\n"
msgstr "%u 未读\n"
@@ -1739,7 +1740,7 @@ msgstr[0] "删除操作后有 %d 封邮件等待收取\n"
msgid "search for unseen messages failed\n"
msgstr "查找未读邮件失败\n"
-#: imap.c:1063 pop3.c:889
+#: imap.c:1063 pop3.c:890
#, c-format
msgid "%u is first unseen\n"
msgstr "%u 是首个未读邮件\n"
@@ -1849,85 +1850,85 @@ msgstr "无法解码 BASE64 ready 响应\n"
msgid "challenge mismatch\n"
msgstr "请求不匹配\n"
-#: lock.c:86
+#: lock.c:87
#, c-format
msgid "fetchmail: error reading lockfile \"%s\": %s\n"
msgstr "fetchmail: 读取锁文件 “%s” 时发生错误: %s\n"
-#: lock.c:97
+#: lock.c:98
msgid "fetchmail: removing stale lockfile\n"
msgstr "fetchmail: 正在删除过时的锁文件\n"
-#: lock.c:121
+#: lock.c:122
#, c-format
msgid "fetchmail: error opening lockfile \"%s\": %s\n"
msgstr "fetchmail: 打开锁文件 “%s” 时发生错误: %s\n"
-#: lock.c:168
+#: lock.c:169
msgid "fetchmail: lock creation failed.\n"
msgstr "fetchmail: 锁文件创建失败。\n"
-#: netrc.c:219
+#: netrc.c:220
#, c-format
msgid "%s:%d: warning: found \"%s\" before any host names\n"
msgstr "%s:%d: 警告: 在任意主机名前发现 “%s”\n"
-#: netrc.c:257
+#: netrc.c:258
#, c-format
msgid "%s:%d: warning: unknown token \"%s\"\n"
msgstr "%s:%d: 警告: 未知标识“%s”\n"
-#: odmr.c:66
+#: odmr.c:67
#, c-format
msgid "%s's SMTP listener does not support ATRN\n"
msgstr "%s 的 SMTP 端不支持 ATRN\n"
-#: odmr.c:104
+#: odmr.c:105
msgid "Turnaround now...\n"
msgstr "正在转向 ...\n"
-#: odmr.c:109
+#: odmr.c:110
msgid "ATRN request refused.\n"
msgstr "拒绝 ATRN 请求\n"
-#: odmr.c:113
+#: odmr.c:114
msgid "Unable to process ATRN request now\n"
msgstr "现在无法处理 ATRN 请求\n"
-#: odmr.c:118
+#: odmr.c:119
msgid "You have no mail.\n"
msgstr "您没有邮件\n"
-#: odmr.c:122
+#: odmr.c:123
msgid "Command not implemented\n"
msgstr "指令未执行\n"
-#: odmr.c:126
+#: odmr.c:127
msgid "Authentication required.\n"
msgstr "要求验证\n"
-#: odmr.c:130
-#, c-format
-msgid "Unknown ODMR error %d\n"
+#: odmr.c:132
+#, fuzzy, c-format
+msgid "Unknown ODMR error \"%s\"\n"
msgstr "未知的 ODMR 错误 %d\n"
-#: odmr.c:189
+#: odmr.c:192
msgid "receiving message data\n"
msgstr "正在接收邮件数据\n"
-#: odmr.c:242
+#: odmr.c:245
msgid "Option --keep is not supported with ODMR\n"
msgstr "ODMR 不支持 --keep 选项\n"
-#: odmr.c:246
+#: odmr.c:249
msgid "Option --flush is not supported with ODMR\n"
msgstr "ODMR 不支持 --flush 选项\n"
-#: odmr.c:250
+#: odmr.c:253
msgid "Option --folder is not supported with ODMR\n"
msgstr "ODMR 不支持 --folder 选项\n"
-#: odmr.c:254
+#: odmr.c:257
msgid "Option --check is not supported with ODMR\n"
msgstr "ODMR 不支持 --check 选项\n"
@@ -1943,176 +1944,182 @@ msgstr "无法解码 OTP 请求\n"
msgid "Secret pass phrase: "
msgstr "密码短语:"
-#: options.c:174 options.c:218
+#: options.c:176 options.c:220
#, c-format
msgid "String '%s' is not a valid number string.\n"
msgstr "字符串 ‘%s’不是一个有效的数字串。\n"
-#: options.c:183
+#: options.c:185
#, c-format
msgid "Value of string '%s' is %s than %d.\n"
msgstr "字符串 ‘%1$s’ 的值比 %3$d %2$s\n"
-#: options.c:184
+#: options.c:186
msgid "smaller"
msgstr "小"
-#: options.c:184
+#: options.c:186
msgid "larger"
msgstr "大"
-#: options.c:321
+#: options.c:323
#, c-format
msgid "Invalid bad-header policy `%s' specified.\n"
msgstr "设定的错误邮件头处理方式‘%s’无效。\n"
-#: options.c:362
+#: options.c:364
#, c-format
msgid "Invalid protocol `%s' specified.\n"
msgstr "指定了无效的协议 ‘%s’\n"
-#: options.c:409
+#: options.c:411
#, c-format
msgid "Invalid authentication `%s' specified.\n"
msgstr "指定了无效的认证方式 ‘%s’\n"
-#: options.c:614
+#: options.c:620
msgid "usage: fetchmail [options] [server ...]\n"
msgstr "用法: fetchmail [选项] [服务器...]\n"
-#: options.c:615
+#: options.c:621
msgid " Options are as follows:\n"
msgstr "选项如下:\n"
-#: options.c:616
+#: options.c:622
msgid " -?, --help display this option help\n"
msgstr " -?, --help\t显示此选项帮助\n"
-#: options.c:617
+#: options.c:623
msgid " -V, --version display version info\n"
msgstr " -V, --version\t显示版本信息\n"
-#: options.c:619
+#: options.c:625
msgid " -c, --check check for messages without fetching\n"
msgstr " -c, --check\t只检查邮件而不收取\n"
-#: options.c:620
+#: options.c:626
msgid " -s, --silent work silently\n"
msgstr " -s, --silent\t运行时不要显示多余信息\n"
-#: options.c:621
+#: options.c:627
msgid " -v, --verbose work noisily (diagnostic output)\n"
msgstr " -v, --verbose\t运行时给出信息 (诊断型的输出)\n"
-#: options.c:622
+#: options.c:628
msgid " -d, --daemon run as a daemon once per n seconds\n"
msgstr " -d, --daemon\t每 n 秒运行后台服务一次\n"
-#: options.c:623
+#: options.c:629
msgid " -N, --nodetach don't detach daemon process\n"
msgstr " -N, --nodetach\t不分离后台进程\n"
-#: options.c:624
+#: options.c:630
msgid " -q, --quit kill daemon process\n"
msgstr " -q, --quit\t终止后台进程\n"
-#: options.c:625
+#: options.c:631
msgid " -L, --logfile specify logfile name\n"
msgstr " -L, --logfile\t指定日志文件名\n"
-#: options.c:626
+#: options.c:632
msgid ""
" --syslog use syslog(3) for most messages when running as a "
"daemon\n"
msgstr " --syslog\t以后台服务运行时用 syslog(3) 得到更多的信息\n"
-#: options.c:627
+#: options.c:633
msgid " --invisible don't write Received & enable host spoofing\n"
msgstr " --invisible\t不写 Received 邮件头并允许伪装主机\n"
-#: options.c:628
+#: options.c:634
msgid " -f, --fetchmailrc specify alternate run control file\n"
msgstr " -f, --fetchmailrc\t指定可选的配置文件\n"
-#: options.c:629
+#: options.c:635
msgid " -i, --idfile specify alternate UIDs file\n"
msgstr " -i, --idfile\t指定可选的 UIDs 文件\n"
-#: options.c:630
+#: options.c:636
msgid " --pidfile specify alternate PID (lock) file\n"
msgstr " --pidfile\t指定可选的进程(锁)文件\n"
-#: options.c:631
+#: options.c:637
msgid " --postmaster specify recipient of last resort\n"
msgstr " --postmaster\t指定邮件管理员\n"
-#: options.c:632
+#: options.c:638
msgid " --nobounce redirect bounces from user to postmaster.\n"
msgstr " --nobounce\t将回送邮件从用户重定向至邮件管理员\n"
-#: options.c:633
+#: options.c:639
msgid ""
" --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
msgstr " --nosoftbounce\t让 fetchmail 永久删除无法投递的邮件。\n"
-#: options.c:634
+#: options.c:640
msgid ""
" --softbounce keep permanently undeliverable messages on server "
"(default).\n"
msgstr " --softbounce\t将无法投递的邮件长期保留在服务器上(默认)。\n"
-#: options.c:636
+#: options.c:642
msgid " -I, --interface interface required specification\n"
msgstr " -I, --interface\t指定网络地址\n"
-#: options.c:637
+#: options.c:643
msgid " -M, --monitor monitor interface for activity\n"
msgstr " -M, --moniter\t监控指定网络地址的活跃度\n"
-#: options.c:640
+#: options.c:646
msgid " --ssl enable ssl encrypted session\n"
msgstr " --ssl\t启用 ssl 加密会话\n"
-#: options.c:641
+#: options.c:647
msgid " --sslkey ssl private key file\n"
msgstr " --sslkey\tssl 私钥文件\n"
-#: options.c:642
+#: options.c:648
msgid " --sslcert ssl client certificate\n"
msgstr " --sslcert\tssl 客户端证书\n"
-#: options.c:643
+#: options.c:649
msgid " --sslcertck do strict server certificate check (recommended)\n"
msgstr " --sslcertck\t进行严格的服务器证书检查(推荐)\n"
-#: options.c:644
-msgid " --sslcertpath path to ssl certificates\n"
+#: options.c:650
+#, fuzzy
+msgid " --sslcertfile path to trusted-CA ssl certificate file\n"
+msgstr " --sslcertpath\tssl 证书目录\n"
+
+#: options.c:651
+#, fuzzy
+msgid " --sslcertpath path to trusted-CA ssl certificate directory\n"
msgstr " --sslcertpath\tssl 证书目录\n"
-#: options.c:645
+#: options.c:652
msgid ""
" --sslcommonname expect this CommonName from server (discouraged)\n"
msgstr " --sslcommonname\t期望返回服务器名 (不鼓励)\n"
-#: options.c:646
+#: options.c:653
msgid ""
" --sslfingerprint fingerprint that must match that of the server's "
"cert.\n"
msgstr " --sslfingerprint\t指定一个指纹,它必须与服务器证书的指纹匹配\n"
-#: options.c:647
+#: options.c:654
msgid " --sslproto force ssl protocol (SSL2/SSL3/TLS1)\n"
msgstr " --sslproto\t指定强制使用的 ssl 协议(SSL2/SSL3/TLS1)\n"
-#: options.c:649
+#: options.c:656
msgid " --plugin specify external command to open connection\n"
msgstr " --plugin\t指定外部程序打开连接\n"
-#: options.c:650
+#: options.c:657
msgid " --plugout specify external command to open smtp connection\n"
msgstr " --plugout\t指定外部程序打开 smtp 连接\n"
-#: options.c:651
+#: options.c:658
msgid ""
" --bad-header {reject|accept}\n"
" specify policy for handling messages with bad headers\n"
@@ -2120,140 +2127,140 @@ msgstr ""
" --bad-header {reject|accept}\n"
" 设定对邮件头错误的邮件的处理方式\n"
-#: options.c:654
+#: options.c:661
msgid " -p, --protocol specify retrieval protocol (see man page)\n"
msgstr " -p, --protocol\t指定收件协议 (看 man 手册页)\n"
-#: options.c:655
+#: options.c:662
msgid " -U, --uidl force the use of UIDLs (pop3 only)\n"
msgstr " -U, --uidl\t强制使用 UIDLs(仅适用于 pop3)\n"
-#: options.c:656
+#: options.c:663
msgid " --port TCP port to connect to (obsolete, use --service)\n"
msgstr " --port\t要连接的 TCP 端口(过时了,用 --service)\n"
-#: options.c:657
+#: options.c:664
msgid ""
" -P, --service TCP service to connect to (can be numeric TCP port)\n"
msgstr " -P, --service\t要连接的 TCP 服务(允许用 TCP 端口的数值来表示)\n"
-#: options.c:658
+#: options.c:665
msgid " --auth authentication type (password/kerberos/ssh/otp)\n"
msgstr " --auth\t指定验证方式(password/kerberos/ssh/otp)\n"
-#: options.c:659
+#: options.c:666
msgid " -t, --timeout server nonresponse timeout\n"
msgstr " -t, --timeout\t指定服务器超时无响应的时间\n"
-#: options.c:660
+#: options.c:667
msgid " -E, --envelope envelope address header\n"
msgstr " -E, --envelope\t指定邮件地址头\n"
-#: options.c:661
+#: options.c:668
msgid " -Q, --qvirtual prefix to remove from local user id\n"
msgstr " -Q, --qvirtual\t从当前用户移除前缀\n"
-#: options.c:662
+#: options.c:669
msgid " --principal mail service principal\n"
msgstr " --principal\t邮件服务验证方\n"
-#: options.c:663
+#: options.c:670
msgid " --tracepolls add poll-tracing information to Received header\n"
msgstr " --tracepolls\tReceived 邮件头中添加收件跟踪信息\n"
-#: options.c:665
+#: options.c:672
msgid " -u, --username specify users's login on server\n"
msgstr " -u, --username\t指定登录服务器的用户名\n"
-#: options.c:666
+#: options.c:673
msgid " -a, --[fetch]all retrieve old and new messages\n"
msgstr " -a, --[fetch]all\t收取所有新旧邮件\n"
-#: options.c:667
+#: options.c:674
msgid " -K, --nokeep delete new messages after retrieval\n"
msgstr " -K, --nokeep\t收件后删除服务器上新邮件\n"
-#: options.c:668
+#: options.c:675
msgid " -k, --keep save new messages after retrieval\n"
msgstr " -k, --keep\t收件后保留服务器上新邮件\n"
-#: options.c:669
+#: options.c:676
msgid " -F, --flush delete old messages from server\n"
msgstr " -F, --flush\t从服务器上删除旧邮件\n"
-#: options.c:670
+#: options.c:677
msgid " --limitflush delete oversized messages\n"
msgstr " --limitflush\t删除过大的邮件\n"
-#: options.c:671
+#: options.c:678
msgid " -n, --norewrite don't rewrite header addresses\n"
msgstr " -n, --norewrite\t不要重写地址头\n"
-#: options.c:672
+#: options.c:679
msgid " -l, --limit don't fetch messages over given size\n"
msgstr " -l, --limit\t不收超过指定大小的邮件\n"
-#: options.c:673
+#: options.c:680
msgid " -w, --warnings interval between warning mail notification\n"
msgstr " -w, --warnings\t邮件通知警告的间隔\n"
-#: options.c:675
+#: options.c:682
msgid " -S, --smtphost set SMTP forwarding host\n"
msgstr " -S, --smtphost\t设置 SMTP 转发主机\n"
-#: options.c:676
+#: options.c:683
msgid " --fetchdomains fetch mail for specified domains\n"
msgstr " --fetchdomains\t收取指定域的邮件\n"
-#: options.c:677
+#: options.c:684
msgid " -D, --smtpaddress set SMTP delivery domain to use\n"
msgstr " -D, --smtpaddress\t设置 SMTP 投递域\n"
-#: options.c:678
+#: options.c:685
msgid " --smtpname set SMTP full name username@domain\n"
msgstr " --smtpname\t设置 SMTP 全名,用户名@域\n"
-#: options.c:679
+#: options.c:686
msgid " -Z, --antispam, set antispam response values\n"
msgstr " -Z, --antispam,\t设置 antispam 响应值\n"
-#: options.c:680
+#: options.c:687
msgid " -b, --batchlimit set batch limit for SMTP connections\n"
msgstr " -b, --bathlimit\t为 SMTP 连接设置批量处理限制\n"
-#: options.c:681
+#: options.c:688
msgid " -B, --fetchlimit set fetch limit for server connections\n"
msgstr " -B, --fetchlimit\t为服务器连接设置收取限制\n"
-#: options.c:682
+#: options.c:689
msgid " --fetchsizelimit set fetch message size limit\n"
msgstr " --fetchsizelimit\t设置收件大小限制\n"
-#: options.c:683
+#: options.c:690
msgid " --fastuidl do a binary search for UIDLs\n"
msgstr " --fastuidl\t对 UIDLs 进行折半查找\n"
-#: options.c:684
+#: options.c:691
msgid " -e, --expunge set max deletions between expunges\n"
msgstr " -e, --expunge\t设置删除操作发生在多少封邮件之后\n"
-#: options.c:685
+#: options.c:692
msgid " -m, --mda set MDA to use for forwarding\n"
msgstr " -m, --mda\t设置用于转发的 MDA\n"
-#: options.c:686
+#: options.c:693
msgid " --bsmtp set output BSMTP file\n"
msgstr " --bsmtp\t设置 BSMTP 文件输出\n"
-#: options.c:687
+#: options.c:694
msgid " --lmtp use LMTP (RFC2033) for delivery\n"
msgstr " --lmtp\t用 LMTP 协议(RFC2033) 投递邮件\n"
-#: options.c:688
+#: options.c:695
msgid " -r, --folder specify remote folder name\n"
msgstr " -r, --folder\t指定远程邮箱名\n"
-#: options.c:689
+#: options.c:696
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots\t即使在日志文件中也要显示进度条(以点的形式)\n"
@@ -2308,32 +2315,37 @@ msgstr "无法操作来自上游服务器的 UIDL 响应。\n"
msgid "Server responded with UID for wrong message.\n"
msgstr "响应的服务器带有错误消息的 UID。\n"
-#: pop3.c:859 pop3.c:1105
-#, c-format
-msgid "id=%s (num=%d) was deleted, but is still present!\n"
+#: pop3.c:860
+#, fuzzy, c-format
+msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr "id = %s (数量 = %d 封) 已被删除,但仍然存在!\n"
-#: pop3.c:965
+#: pop3.c:966
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr "邮件被插入服务器列表。无法处理。\n"
-#: pop3.c:1057
+#: pop3.c:1062
msgid "protocol error\n"
msgstr "协议错\n"
-#: pop3.c:1073
+#: pop3.c:1078
msgid "protocol error while fetching UIDLs\n"
msgstr "正在读取 UIDLs 时协议出错\n"
-#: pop3.c:1443
+#: pop3.c:1111
+#, c-format
+msgid "id=%s (num=%d) was deleted, but is still present!\n"
+msgstr "id = %s (数量 = %d 封) 已被删除,但仍然存在!\n"
+
+#: pop3.c:1449
msgid "Option --folder is not supported with POP3\n"
msgstr "POP3 不支持 --folder 选项\n"
-#: rcfile_y.y:129
+#: rcfile_y.y:131
msgid "server option after user options"
msgstr "服务器选项在用户选项后"
-#: rcfile_y.y:172
+#: rcfile_y.y:174
msgid "SDPS not enabled."
msgstr "SDPS 不可用"
@@ -2343,7 +2355,7 @@ msgid ""
"FreeBSD\n"
msgstr "fetchmail: interface 选项只有 Linux(无 IPv6)和 FreeBSD 支持\n"
-#: rcfile_y.y:225
+#: rcfile_y.y:226
msgid ""
"fetchmail: monitor option is only supported under Linux (without IPv6) and "
"FreeBSD\n"
@@ -2353,21 +2365,21 @@ msgstr "fetchmail: monitor 选项只有 Linux(无 IPv6)和 FreeBSD 支持\n"
msgid "SSL is not enabled"
msgstr "SSL 不可用"
-#: rcfile_y.y:390
+#: rcfile_y.y:391
msgid "end of input"
msgstr "输入结束"
-#: rcfile_y.y:428
+#: rcfile_y.y:429
#, c-format
msgid "File %s must be a regular file.\n"
msgstr "文件 %s 必须是个普通文件。\n"
-#: rcfile_y.y:438
+#: rcfile_y.y:439
#, c-format
msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
msgstr "文件 %s 不允许拥有高于 -rwx------ (0700) 的权限。\n"
-#: rcfile_y.y:450
+#: rcfile_y.y:451
#, c-format
msgid "File %s must be owned by you.\n"
msgstr "文件 %s 必须归您所有。\n"
@@ -2381,15 +2393,15 @@ msgstr "未知的系统错误"
msgid "%s (log message incomplete)\n"
msgstr "%s (日志信息不完整)\n"
-#: rfc822.c:78
+#: rfc822.c:83
#, fuzzy, c-format
-msgid "About to rewrite %.*s...\n"
-msgstr "正要重写 %s"
+msgid "About to rewrite %s...\n"
+msgstr "正要重写 %.*s...\n"
-#: rfc822.c:215
+#: rfc822.c:221
#, fuzzy, c-format
-msgid "...rewritten version is %.*s.\n"
-msgstr "重写版本为 %s\n"
+msgid "...rewritten version is %s.\n"
+msgstr "...重写版本为 %.*s。\n"
#: rpa.c:118
msgid "Success"
@@ -2649,14 +2661,14 @@ msgid "about to deliver with: %s\n"
msgstr "即将用 %s 投递\n"
#: sink.c:1240
-#, fuzzy, c-format
+#, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
-msgstr "无法将 fetchids 文件 %s 重命名为 %s: %s\n"
+msgstr "无法将当前用户名切换为 %ld: %s\n"
#: sink.c:1252
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
-msgstr ""
+msgstr "无法将当前用户名切换回之前的用户名 %ld: %s\n"
#: sink.c:1259
msgid "MDA open failed\n"
@@ -2812,125 +2824,163 @@ msgid "connected.\n"
msgstr "已连接。\n"
#: socket.c:611
+#, fuzzy
+msgid "Server certificate:\n"
+msgstr "服务器证书验证错误: %s\n"
+
+#: socket.c:616
+#, c-format
+msgid "Certificate chain, from root to peer, starting at depth %d:\n"
+msgstr ""
+
+#: socket.c:619
+#, c-format
+msgid "Certificate at depth %d:\n"
+msgstr ""
+
+#: socket.c:625
#, c-format
msgid "Issuer Organization: %s\n"
msgstr "发行组织: %s\n"
-#: socket.c:614
+#: socket.c:628
msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
msgstr "警告: 发行组织名字太长 (可能截短)。\n"
-#: socket.c:616
+#: socket.c:630
msgid "Unknown Organization\n"
msgstr "未知的组织\n"
-#: socket.c:618
+#: socket.c:632
#, c-format
msgid "Issuer CommonName: %s\n"
msgstr "发行者: %s\n"
-#: socket.c:621
+#: socket.c:635
msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
msgstr "警告: 发行者名称太长 (可能截短)。\n"
-#: socket.c:623
+#: socket.c:637
msgid "Unknown Issuer CommonName\n"
msgstr "未知的发行者名称\n"
-#: socket.c:627
-#, c-format
-msgid "Server CommonName: %s\n"
-msgstr "服务器名: %s\n"
+#: socket.c:643
+#, fuzzy, c-format
+msgid "Subject CommonName: %s\n"
+msgstr "发行者: %s\n"
-#: socket.c:633
+#: socket.c:649
msgid "Bad certificate: Subject CommonName too long!\n"
msgstr "证书错误: 邮件标题太长!\n"
-#: socket.c:639
+#: socket.c:655
msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
msgstr "证书错误: 邮件标题名中带有 NUL 字符,退出!\n"
-#: socket.c:660
+#: socket.c:684
#, c-format
msgid "Subject Alternative Name: %s\n"
msgstr "邮件标题别名: %s\n"
-#: socket.c:666
+#: socket.c:690
msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
msgstr "证书错误: 邮件标题别名带有 NUL 字符,退出!\n"
-#: socket.c:694
+#: socket.c:719
#, c-format
msgid "Server CommonName mismatch: %s != %s\n"
msgstr "服务器名不匹配: %s != %s\n"
-#: socket.c:701
+#: socket.c:726
msgid "Server name not set, could not verify certificate!\n"
msgstr "未设置服务器名称,无法验证证书!\n"
-#: socket.c:706
+#: socket.c:731
msgid "Unknown Server CommonName\n"
msgstr "未知的服务器名\n"
-#: socket.c:708
+#: socket.c:733
msgid "Server name not specified in certificate!\n"
msgstr "服务器名称未在证书中指定!\n"
-#: socket.c:720
+#: socket.c:745
msgid "EVP_md5() failed!\n"
msgstr "EVP_md5() 失败!\n"
-#: socket.c:724
+#: socket.c:749
msgid "Out of memory!\n"
msgstr "超出内存!\n"
-#: socket.c:732
+#: socket.c:757
msgid "Digest text buffer too small!\n"
msgstr "Digest 文本缓冲区太小!\n"
-#: socket.c:738
+#: socket.c:763
#, c-format
msgid "%s key fingerprint: %s\n"
msgstr "%s 密钥指纹: %s\n"
-#: socket.c:742
+#: socket.c:767
#, c-format
msgid "%s fingerprints match.\n"
msgstr "%s 指纹匹配。\n"
-#: socket.c:744
+#: socket.c:769
#, c-format
msgid "%s fingerprints do not match!\n"
msgstr "%s 指纹不匹配!\n"
-#: socket.c:753
+#: socket.c:779
#, c-format
msgid "Server certificate verification error: %s\n"
msgstr "服务器证书验证错误: %s\n"
-#: socket.c:759
+#: socket.c:786
#, c-format
msgid "unknown issuer (first %d characters): %s\n"
msgstr "未知的发行者 (前 %d 个字符): %s\n"
-#: socket.c:844
+#: socket.c:787
+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 "
+"fetchmail.\n"
+msgstr ""
+
+#: socket.c:796
+#, c-format
+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"
+msgstr ""
+
+#: socket.c:888
msgid "File descriptor out of range for SSL"
msgstr "文件描述符超出 SSL 的范围"
-#: socket.c:860
+#: socket.c:904
#, c-format
msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
msgstr "指定了无效的 SSL 协议 ‘%s’,将用默认的协议(SSLv23)代替。\n"
-#: socket.c:936
+#: socket.c:997
msgid "Certificate/fingerprint verification was somehow skipped!\n"
msgstr "证书(指纹)验证被不明原因地跳过!\n"
#: socket.c:1014
+msgid ""
+"Warning: the connection is insecure, continuing anyways. (Better use --"
+"sslcertck!)\n"
+msgstr ""
+
+#: socket.c:1080
msgid "Cygwin socket read retry\n"
msgstr "重试读取 Cygwin 接口\n"
-#: socket.c:1017
+#: socket.c:1083
msgid "Cygwin socket read retry failed!\n"
msgstr "重试读取 Cygwin 接口失败!\n"
@@ -3020,12 +3070,12 @@ msgstr "SMTP 端拒绝本地收件人地址:"
msgid "error writing message text\n"
msgstr "在写邮件文本时出错\n"
-#: uid.c:250
+#: uid.c:249
#, c-format
msgid "Old UID list from %s:"
msgstr "来自 %s 的旧 UID 列表:"
-#: uid.c:255 uid.c:266 uid.c:523 uid.c:573
+#: uid.c:253 uid.c:264 uid.c:309
msgid " <empty>"
msgstr " <空>"
@@ -3033,52 +3083,57 @@ msgstr " <空>"
msgid "Scratch list of UIDs:"
msgstr "抓取 UIDs 列表:"
-#: uid.c:517 uid.c:569
+#: uid.c:325 uid.c:374
#, c-format
msgid "Merged UID list from %s:"
msgstr "从 %s 合并 UID 列表:"
-#: uid.c:519
+#: uid.c:328
#, c-format
msgid "New UID list from %s:"
msgstr "来自 %s 的新 UID 列表:"
-#: uid.c:548
+#: uid.c:355
msgid "swapping UID lists\n"
msgstr "正在转储 UID 列表\n"
-#: uid.c:556
+#: uid.c:363
msgid "not swapping UID lists, no UIDs seen this query\n"
msgstr "不转储 UID 列表,本次查寻无 UIDs 读取\n"
-#: uid.c:581
+#: uid.c:383
msgid "discarding new UID list\n"
msgstr "正在撤消新的 UID 列表\n"
-#: uid.c:617
+#: uid.c:419
msgid "Deleting fetchids file.\n"
msgstr "正在删除 fetchids 文件\n"
-#: uid.c:620
+#: uid.c:422
#, c-format
msgid "Error deleting %s: %s\n"
msgstr "删除 %s 时出错: %s\n"
-#: uid.c:626
+#: uid.c:428
msgid "Writing fetchids file.\n"
msgstr "正在写入 fetchids 文件。\n"
-#: uid.c:645
+#: uid.c:439 uid.c:447
+#, fuzzy, c-format
+msgid "Write error on fetchids file %s: %s\n"
+msgstr "正在写入 fetchids 文件。\n"
+
+#: uid.c:459
#, c-format
msgid "Error writing to fetchids file %s, old file left in place.\n"
msgstr "写入 fetchids 文件 %s 时出错,存在旧文件。\n"
-#: uid.c:649
+#: uid.c:463
#, c-format
msgid "Cannot rename fetchids file %s to %s: %s\n"
msgstr "无法将 fetchids 文件 %s 重命名为 %s: %s\n"
-#: uid.c:653
+#: uid.c:467
#, c-format
msgid "Cannot open fetchids file %s for writing: %s\n"
msgstr "无法打开 fetchids 文件 %s 写入: %s\n"
@@ -3090,3 +3145,9 @@ msgstr "malloc 失败\n"
#: xmalloc.c:47
msgid "realloc failed\n"
msgstr "realloc 失败\n"
+
+#~ msgid "krb5_sendauth: %s [server says '%*s']\n"
+#~ msgstr "krb5_sendauth: %s [ 服务器响应 \"%*s\"]\n"
+
+#~ msgid "Server CommonName: %s\n"
+#~ msgstr "服务器名: %s\n"