aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorMatthias Andree <matthias.andree@gmx.de>2019-05-14 21:17:53 +0200
committerMatthias Andree <matthias.andree@gmx.de>2019-05-14 21:17:53 +0200
commite166622afaaf78158a0a852ac445b8abd4b3f020 (patch)
tree41a1d3981fea2cff220439011bfc89ae92364be5 /po/zh_CN.po
parentdd5a40908191e728f483f329fa5f54bd06bcc52c (diff)
downloadfetchmail-e166622afaaf78158a0a852ac445b8abd4b3f020.tar.gz
fetchmail-e166622afaaf78158a0a852ac445b8abd4b3f020.tar.bz2
fetchmail-e166622afaaf78158a0a852ac445b8abd4b3f020.zip
Freeze po/*.po files.
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po1080
1 files changed, 598 insertions, 482 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 862c6b17..1da322ed 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.3.22.2\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2014-05-21 22:46+0200\n"
+"POT-Creation-Date: 2019-05-14 20:52+0200\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"
@@ -18,25 +18,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: checkalias.c:179
+#: checkalias.c:174
#, c-format
msgid "Checking if %s is really the same node as %s\n"
msgstr "正在检查 %s 是否与节点 %s 一致\n"
-#: checkalias.c:183
+#: checkalias.c:178
msgid "Yes, their IP addresses match\n"
msgstr "正确,它们的 IP 地址相同\n"
-#: checkalias.c:187
+#: checkalias.c:182
msgid "No, their IP addresses don't match\n"
msgstr "错误,它们的 IP 地址不同\n"
-#: checkalias.c:212
+#: checkalias.c:207
#, 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:237
+#: checkalias.c:230
#, c-format
msgid "nameserver failure while looking for `%s' during poll of %s.\n"
msgstr "收取 %2$s 中邮件并查找 ‘%1$s’ 时 nameserver 出错。\n"
@@ -365,7 +365,7 @@ msgstr "正在选择或重检默认邮箱\n"
msgid "%s at %s (folder %s)"
msgstr "%s 在 %s (邮箱 %s)"
-#: driver.c:1334 rcfile_y.y:390
+#: driver.c:1334 rcfile_y.y:391
#, c-format
msgid "%s at %s"
msgstr "%s 在 %s"
@@ -536,8 +536,8 @@ msgid "%s: can't determine your host!"
msgstr "%s: 无法确认您的主机!"
#: env.c:172
-#, c-format
-msgid "gethostbyname failed for %s\n"
+#, fuzzy, c-format
+msgid "getaddrinfo failed for %s\n"
msgstr "%s 主机上 gethostbyname 函数出错\n"
#: env.c:174
@@ -619,14 +619,14 @@ msgstr "ETRN 不支持 --folder 选项\n"
msgid "Option --check is not supported with ETRN\n"
msgstr "ETRN 不支持 --check 选项\n"
-#: fetchmail.c:137
+#: fetchmail.c:141
#, fuzzy
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 - 2012 Sunil Shetye\n"
-"Copyright (C) 2005 - 2013 Matthias Andree\n"
+"Copyright (C) 2005 - 2019 Matthias Andree\n"
msgstr ""
"Copyright (C) 2002, 2003 Eric S. Raymond\n"
"Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
@@ -634,7 +634,7 @@ msgstr ""
"Copyright (C) 2005 - 2006, 2010 - 2012 Sunil Shetye\n"
"Copyright (C) 2005 - 2012 Matthias Andree\n"
-#: fetchmail.c:143
+#: fetchmail.c:147
msgid ""
"Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
"are welcome to redistribute it under certain conditions. For details,\n"
@@ -644,94 +644,94 @@ msgstr ""
"重新分发它。\n"
"详情请看源文件或是文档目录中的 COPYING 部分。\n"
-#: fetchmail.c:181
+#: fetchmail.c:187
msgid "WARNING: Running as root is discouraged.\n"
msgstr "警告: 不提倡以 root 身份运行\n"
-#: fetchmail.c:193
+#: fetchmail.c:199
msgid "fetchmail: invoked with"
msgstr "fetchmail: 调用参数"
-#: fetchmail.c:217
+#: fetchmail.c:223
msgid "could not get current working directory\n"
msgstr "无法得到当前工作目录\n"
-#: fetchmail.c:288
+#: fetchmail.c:298
#, c-format
msgid "This is fetchmail release %s"
msgstr "这是 fetchmail 发行版 %s"
-#: fetchmail.c:313
+#: fetchmail.c:323
msgid "The nodetach option is in effect, ignoring logfile option.\n"
msgstr "nodetach 选项在起作用,忽略 logfile 选项。\n"
-#: fetchmail.c:320
+#: fetchmail.c:330
msgid "Not running in daemon mode, ignoring logfile option.\n"
msgstr "未以 daemon 模式运行,忽略 logfile 选项。\n"
-#: fetchmail.c:327
+#: fetchmail.c:337
#, c-format
msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
msgstr "日志文件 \"%s\" 不存在,忽略 logfile 选项。\n"
-#: fetchmail.c:333
+#: fetchmail.c:343
#, c-format
msgid "Logfile \"%s\" is not writable, aborting.\n"
msgstr "日志文件 \"%s\" 不可写,退出。\n"
-#: fetchmail.c:351
+#: fetchmail.c:361
#, c-format
msgid ""
"syslog and logfile options are both set, ignoring syslog, and logging to %s"
msgstr "同时指定了 syslog 和 logfile 选项,忽略 syslog 并登录至 %s"
-#: fetchmail.c:439
+#: fetchmail.c:449
#, c-format
msgid "Taking options from command line%s%s\n"
msgstr "正从命令行获得选项 %s%s\n"
-#: fetchmail.c:440
+#: fetchmail.c:450
msgid " and "
msgstr "和"
-#: fetchmail.c:445
+#: fetchmail.c:455
#, c-format
msgid "No mailservers set up -- perhaps %s is missing?\n"
msgstr "未设置邮件服务器 -- 可能未找到 %s?\n"
-#: fetchmail.c:466
+#: fetchmail.c:476
msgid "fetchmail: no mailservers have been specified.\n"
msgstr "fetchmail: 未指定邮件服务器\n"
-#: fetchmail.c:478
+#: fetchmail.c:488
msgid "fetchmail: no other fetchmail is running\n"
msgstr "fetchmail: 无其它 fetchmail 正在运行\n"
-#: fetchmail.c:484
+#: fetchmail.c:494
#, c-format
msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
msgstr "fetchmail: 终止 %s fetchmail 进程号 %ld 时出错;退出。\n"
-#: fetchmail.c:485 fetchmail.c:494
+#: fetchmail.c:495 fetchmail.c:504
msgid "background"
msgstr "后台"
-#: fetchmail.c:485 fetchmail.c:494
+#: fetchmail.c:495 fetchmail.c:504
msgid "foreground"
msgstr "前台"
-#: fetchmail.c:493
+#: fetchmail.c:503
#, c-format
msgid "fetchmail: %s fetchmail at %ld killed.\n"
msgstr "fetchmail: %s fetchmail 进程号 %ld 终止。\n"
-#: fetchmail.c:516
+#: fetchmail.c:526
msgid ""
"fetchmail: can't check mail while another fetchmail to same host is "
"running.\n"
msgstr "fetchmail: 有另一个 fetchmail 在同一主机上运行时无法检查邮件。\n"
-#: fetchmail.c:522
+#: fetchmail.c:532
#, c-format
msgid ""
"fetchmail: can't poll specified hosts with another fetchmail running at "
@@ -739,851 +739,861 @@ msgid ""
msgstr ""
"fetchmail: 有另一个 fetchmail 进程号 %ld 在指定主机上运行时无法收邮件。\n"
-#: fetchmail.c:529
+#: fetchmail.c:539
#, c-format
msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
msgstr "fetchmail: 另一个前台 fetchmail 进程号 %ld 正在运行。\n"
-#: fetchmail.c:539
+#: fetchmail.c:549
msgid ""
"fetchmail: can't accept options while a background fetchmail is running.\n"
msgstr "fetchmail: 有后台 fetchmail 正在运行时无法接受选项\n"
-#: fetchmail.c:545
+#: fetchmail.c:561
#, c-format
msgid "fetchmail: background fetchmail at %ld awakened.\n"
msgstr "fetchmail: 后台 fetchmail 进程号 %ld 被唤醒\n"
-#: fetchmail.c:557
+#: fetchmail.c:573
#, c-format
msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
msgstr "fetchmail: 上次 fetchmail 进程号 %ld 不明原因的终止\n"
-#: fetchmail.c:572
+#: fetchmail.c:588
#, c-format
msgid "fetchmail: can't find a password for %s@%s.\n"
msgstr "fetchmail: 无法找到 %s@%s 的密码\n"
-#: fetchmail.c:576
+#: fetchmail.c:592
#, c-format
msgid "Enter password for %s@%s: "
msgstr "输入 %s@%s 的密码:"
-#: fetchmail.c:618
+#: fetchmail.c:634
msgid "fetchmail: Cannot detach into background. Aborting.\n"
msgstr "fetchmail: 无法转入后台。退出\n"
-#: fetchmail.c:622
+#: fetchmail.c:638
#, c-format
msgid "starting fetchmail %s daemon\n"
msgstr "开启 fetchmail %s 后台服务\n"
-#: fetchmail.c:638 fetchmail.c:640
+#: fetchmail.c:654 fetchmail.c:656
#, c-format
msgid "could not open %s to append logs to\n"
msgstr "无法打开 %s 添加记录\n"
-#: fetchmail.c:659
+#: fetchmail.c:675
msgid "--check mode enabled, not fetching mail\n"
msgstr "开启 --check 模式, 而非真正取回邮件\n"
-#: fetchmail.c:681
+#: fetchmail.c:697
#, fuzzy, c-format
msgid "couldn't time-check %s (error %d)\n"
msgstr "无法时限检测 %s (错误号 %d)\n"
-#: fetchmail.c:686
+#: fetchmail.c:702
#, c-format
msgid "restarting fetchmail (%s changed)\n"
msgstr "正在重启 fetchmail (%s 改变了)\n"
-#: fetchmail.c:691
+#: fetchmail.c:707
msgid "attempt to re-exec may fail as directory has not been restored\n"
msgstr "由于目录尚未重置,因此重新执行的尝试可能失败\n"
-#: fetchmail.c:718
+#: fetchmail.c:734
msgid "attempt to re-exec fetchmail failed\n"
msgstr "重新执行 fetchmail 的尝试失败了\n"
-#: fetchmail.c:748
+#: fetchmail.c:764
#, c-format
msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
msgstr "忽略收取 %s 的邮件 (验证失败或多次超时)\n"
-#: fetchmail.c:760
+#: fetchmail.c:776
#, c-format
msgid "interval not reached, not querying %s\n"
msgstr "时间间隔未到,不查寻 %s \n"
-#: fetchmail.c:798
+#: fetchmail.c:814
msgid "Query status=0 (SUCCESS)\n"
msgstr "查询状态=0 (成功)\n"
-#: fetchmail.c:800
+#: fetchmail.c:816
msgid "Query status=1 (NOMAIL)\n"
msgstr "查询状态=1 (无邮件)\n"
-#: fetchmail.c:802
+#: fetchmail.c:818
msgid "Query status=2 (SOCKET)\n"
msgstr "查询状态=2 (套接字输入输出错误)\n"
-#: fetchmail.c:804
+#: fetchmail.c:820
msgid "Query status=3 (AUTHFAIL)\n"
msgstr "查询状态=3 (用户验证失败)\n"
-#: fetchmail.c:806
+#: fetchmail.c:822
msgid "Query status=4 (PROTOCOL)\n"
msgstr "查询状态=4 (协议无效)\n"
-#: fetchmail.c:808
+#: fetchmail.c:824
msgid "Query status=5 (SYNTAX)\n"
msgstr "查询状态=5 (命令行语法错误)\n"
-#: fetchmail.c:810
+#: fetchmail.c:826
msgid "Query status=6 (IOERR)\n"
msgstr "查询状态=6 (配置文件权限错误)\n"
-#: fetchmail.c:812
+#: fetchmail.c:828
msgid "Query status=7 (ERROR)\n"
msgstr "查询状态=7 (协议错误)\n"
-#: fetchmail.c:814
+#: fetchmail.c:830
msgid "Query status=8 (EXCLUDE)\n"
msgstr "查询状态=8 (客户端受到排斥)\n"
-#: fetchmail.c:816
+#: fetchmail.c:832
msgid "Query status=9 (LOCKBUSY)\n"
msgstr "查询状态=9 (服务器死锁)\n"
-#: fetchmail.c:818
+#: fetchmail.c:834
msgid "Query status=10 (SMTP)\n"
msgstr "查询状态=10 (SMTP 错误)\n"
-#: fetchmail.c:820
+#: fetchmail.c:836
msgid "Query status=11 (DNS)\n"
msgstr "查询状态=11 (DNS 错误)\n"
-#: fetchmail.c:822
+#: fetchmail.c:838
msgid "Query status=12 (BSMTP)\n"
msgstr "查询状态=12 (无法打开批量输出)\n"
-#: fetchmail.c:824
+#: fetchmail.c:840
msgid "Query status=13 (MAXFETCH)\n"
msgstr "查询状态=13 (到达收件上限)\n"
-#: fetchmail.c:826
+#: fetchmail.c:842
#, c-format
msgid "Query status=%d\n"
msgstr "查询状态=%d\n"
-#: fetchmail.c:868
+#: fetchmail.c:884
msgid "All connections are wedged. Exiting.\n"
msgstr "所有连接堵塞。退出\n"
-#: fetchmail.c:876
+#: fetchmail.c:892
#, c-format
msgid "sleeping at %s for %d seconds\n"
msgstr "在 %s 休眠 %d 秒\n"
-#: fetchmail.c:900
+#: fetchmail.c:916
#, c-format
msgid "awakened by %s\n"
msgstr "通过信号 %s 唤醒\n"
-#: fetchmail.c:903
+#: fetchmail.c:919
#, c-format
msgid "awakened by signal %d\n"
msgstr "通过信号 %d 唤醒\n"
-#: fetchmail.c:911
+#: fetchmail.c:927
#, c-format
msgid "awakened at %s\n"
msgstr "在 %s 被唤醒\n"
-#: fetchmail.c:916
+#: fetchmail.c:932
#, c-format
msgid "normal termination, status %d\n"
msgstr "正常结束,返回值 %d\n"
-#: fetchmail.c:1075
+#: fetchmail.c:1093
#, fuzzy
msgid "couldn't time-check the run-control file\n"
msgstr "无法对 run-control 文件进行时限检测\n"
-#: fetchmail.c:1109
+#: fetchmail.c:1127
#, c-format
msgid "Warning: multiple mentions of host %s in config file\n"
msgstr "警告: 在配置文件中多次提及主机 %s\n"
-#: fetchmail.c:1148
+#: fetchmail.c:1166
msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
msgstr "fetchmail: 错误: 在配置文件中有多个 “default” 记录。\n"
-#: fetchmail.c:1270
+#: fetchmail.c:1288
msgid "SSL support is not compiled in.\n"
msgstr "SSL 支持未编译在内\n"
-#: fetchmail.c:1277
+#: fetchmail.c:1295
msgid "KERBEROS v4 support is configured, but not compiled in.\n"
msgstr "设置了 KERBEROS v4 支持,但未编译在内\n"
-#: fetchmail.c:1283
+#: fetchmail.c:1301
msgid "KERBEROS v5 support is configured, but not compiled in.\n"
msgstr "设置了 KERBEROS v5 支持,但未编译在内\n"
-#: fetchmail.c:1289
+#: fetchmail.c:1307
msgid "GSSAPI support is configured, but not compiled in.\n"
msgstr "设置了 GSSAPI 支持,但未编译在内\n"
-#: fetchmail.c:1319
+#: fetchmail.c:1337
#, c-format
msgid ""
"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
msgstr "fetchmail: 警告: 无可用的 DNS 来检查取自 %s 的多投邮件\n"
-#: fetchmail.c:1330
+#: fetchmail.c:1348
#, c-format
msgid "warning: multidrop for %s requires envelope option!\n"
msgstr "警告: %s 设置了多投邮件,需设置 envelope 选项!\n"
-#: fetchmail.c:1331
+#: fetchmail.c:1349
msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
msgstr "警告: 如果所有邮件均被邮件管理员收取,不要寻求支持!\n"
-#: fetchmail.c:1348
+#: fetchmail.c:1366
#, c-format
msgid ""
"fetchmail: %s configuration invalid, specify positive port number for "
"service or port\n"
msgstr "fetchmail: %s 配置无效,为服务或端口指定大于零的端口\n"
-#: fetchmail.c:1355
+#: fetchmail.c:1373
#, c-format
msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
msgstr "fetchmail: %s 配置无效,RPOP 要求开放一个特许端口\n"
-#: fetchmail.c:1373
+#: fetchmail.c:1391
#, c-format
msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
msgstr "%s 配置无效,LMTP 不能用默认的 SMTP 端口\n"
-#: fetchmail.c:1387
+#: fetchmail.c:1405
msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
msgstr "收取所有邮件并保留服务器上的备份或使用 idle 模式是错误的!\n"
-#: fetchmail.c:1412
+#: fetchmail.c:1415
+msgid ""
+"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
+msgstr ""
+
+#: fetchmail.c:1439
#, c-format
msgid "terminated with signal %d\n"
msgstr "以信号 %d 终止\n"
-#: fetchmail.c:1485
+#: fetchmail.c:1512
#, 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:1510
+#: fetchmail.c:1537
msgid "POP2 support is not configured.\n"
msgstr "未设置 POP2 支持\n"
-#: fetchmail.c:1522
+#: fetchmail.c:1549
msgid "POP3 support is not configured.\n"
msgstr "未设置 POP3 支持\n"
-#: fetchmail.c:1532
+#: fetchmail.c:1559
msgid "IMAP support is not configured.\n"
msgstr "未设置 IMAP 支持\n"
-#: fetchmail.c:1538
+#: fetchmail.c:1565
msgid "ETRN support is not configured.\n"
msgstr "未设置 ETRN 支持\n"
-#: fetchmail.c:1546
+#: fetchmail.c:1573
msgid "ODMR support is not configured.\n"
msgstr "未设置 ODMR 支持\n"
-#: fetchmail.c:1553
+#: fetchmail.c:1580
msgid "unsupported protocol selected.\n"
msgstr "选中了不支持的协议\n"
-#: fetchmail.c:1563
+#: fetchmail.c:1590
#, 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:1580
+#: fetchmail.c:1615
#, c-format
msgid "Poll interval is %d seconds\n"
msgstr "收件间隔 %d 秒\n"
-#: fetchmail.c:1582
+#: fetchmail.c:1617
#, c-format
msgid "Logfile is %s\n"
msgstr "日志文件为 %s\n"
-#: fetchmail.c:1584
+#: fetchmail.c:1619
#, c-format
msgid "Idfile is %s\n"
msgstr "Idfile 文件为 %s\n"
-#: fetchmail.c:1587
+#: fetchmail.c:1622
msgid "Progress messages will be logged via syslog\n"
msgstr "邮件情况将通过 syslog 来记录\n"
-#: fetchmail.c:1590
+#: fetchmail.c:1625
msgid "Fetchmail will masquerade and will not generate Received\n"
msgstr "Fetchmail 将进行伪装且不会生成 Receiverd 部分\n"
-#: fetchmail.c:1592
+#: fetchmail.c:1627
msgid "Fetchmail will show progress dots even in logfiles.\n"
msgstr "Fetchmail 将在日志文件中显示进度条(以点的形式)\n"
-#: fetchmail.c:1594
+#: fetchmail.c:1629
#, c-format
msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
msgstr "Fetchmail 将转发地址错误的多投邮件给 %s。\n"
-#: fetchmail.c:1598
+#: fetchmail.c:1633
msgid "Fetchmail will direct error mail to the postmaster.\n"
msgstr "Fetchmail 将把错误邮件转给邮件管理员\n"
-#: fetchmail.c:1600
+#: fetchmail.c:1635
msgid "Fetchmail will direct error mail to the sender.\n"
msgstr "Fetchmail 将把错误邮件退给发送者\n"
-#: fetchmail.c:1603
+#: fetchmail.c:1638
msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
msgstr "Fetchmail 将把长期错误当成不可恢复的错误(删除邮件)。\n"
-#: fetchmail.c:1605
+#: fetchmail.c:1640
msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
msgstr "Fetchmail 将把惯性错误当成临时问题(保留邮件)。\n"
-#: fetchmail.c:1612
+#: fetchmail.c:1647
#, c-format
msgid "Options for retrieving from %s@%s:\n"
msgstr "从 %s@%s 收件时的选项:\n"
-#: fetchmail.c:1616
+#: fetchmail.c:1651
#, c-format
msgid " Mail will be retrieved via %s\n"
msgstr " 邮件将通过 %s 收取\n"
-#: fetchmail.c:1619
+#: fetchmail.c:1654
#, 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:1623
+#: fetchmail.c:1658
#, c-format
msgid " True name of server is %s.\n"
msgstr " 服务器的实名为 %s。\n"
-#: fetchmail.c:1626
+#: fetchmail.c:1661
msgid " This host will not be queried when no host is specified.\n"
msgstr " 若不指明主机将不查询此主机\n"
-#: fetchmail.c:1627
+#: fetchmail.c:1662
msgid " This host will be queried when no host is specified.\n"
msgstr " 若不指明主机将查询此主机\n"
-#: fetchmail.c:1631
+#: fetchmail.c:1666
msgid " Password will be prompted for.\n"
msgstr "密码会被提示\n"
-#: fetchmail.c:1635
+#: fetchmail.c:1670
#, c-format
msgid " APOP secret = \"%s\".\n"
msgstr " APOP 密码 = “%s”\n"
-#: fetchmail.c:1638
+#: fetchmail.c:1673
#, c-format
msgid " RPOP id = \"%s\".\n"
msgstr " RPOP 密码 = “%s”\n"
-#: fetchmail.c:1641
+#: fetchmail.c:1676
#, c-format
msgid " Password = \"%s\".\n"
msgstr " 密码 = “%s”\n"
-#: fetchmail.c:1650
+#: fetchmail.c:1685
#, c-format
msgid " Protocol is KPOP with Kerberos %s authentication"
msgstr " 协议是带有 Kerberos %s 认证协议的 KPOP"
-#: fetchmail.c:1653
+#: fetchmail.c:1688
#, c-format
msgid " Protocol is %s"
msgstr " 协议是 %s"
-#: fetchmail.c:1655
+#: fetchmail.c:1690
#, c-format
msgid " (using service %s)"
msgstr " (正在使用服务 %s)"
-#: fetchmail.c:1657
+#: fetchmail.c:1692
msgid " (using default port)"
msgstr " (正在使用默认端口)"
-#: fetchmail.c:1659
+#: fetchmail.c:1694
msgid " (forcing UIDL use)"
msgstr " (正在强制使用 UIDL)"
-#: fetchmail.c:1665
+#: fetchmail.c:1700
msgid " All available authentication methods will be tried.\n"
msgstr " 将尝试所有有效的验证方式\n"
-#: fetchmail.c:1668
+#: fetchmail.c:1703
msgid " Password authentication will be forced.\n"
msgstr " 强制密码验证\n"
-#: fetchmail.c:1671
+#: fetchmail.c:1706
msgid " MSN authentication will be forced.\n"
msgstr " 强制 MSN 验证\n"
-#: fetchmail.c:1674
+#: fetchmail.c:1709
msgid " NTLM authentication will be forced.\n"
msgstr " 强制 NTLM 验证\n"
-#: fetchmail.c:1677
+#: fetchmail.c:1712
msgid " OTP authentication will be forced.\n"
msgstr " 强制 OTP 验证\n"
-#: fetchmail.c:1680
+#: fetchmail.c:1715
msgid " CRAM-MD5 authentication will be forced.\n"
msgstr " 强制 CRAM-MD5 验证\n"
-#: fetchmail.c:1683
+#: fetchmail.c:1718
msgid " GSSAPI authentication will be forced.\n"
msgstr " 强制 GSSAPI 验证\n"
-#: fetchmail.c:1686
+#: fetchmail.c:1721
msgid " Kerberos V4 authentication will be forced.\n"
msgstr " 强制 Kerberos V4 验证\n"
-#: fetchmail.c:1689
+#: fetchmail.c:1724
msgid " Kerberos V5 authentication will be forced.\n"
msgstr " 强制 Kerberos V5 验证\n"
-#: fetchmail.c:1692
+#: fetchmail.c:1727
msgid " End-to-end encryption assumed.\n"
msgstr " 假设为终端到终端加密\n"
-#: fetchmail.c:1696
+#: fetchmail.c:1731
#, c-format
msgid " Mail service principal is: %s\n"
msgstr " 邮件服务协议验证方为: %s\n"
-#: fetchmail.c:1699
+#: fetchmail.c:1734
msgid " SSL encrypted sessions enabled.\n"
msgstr "启用 SSL 加密会话\n"
-#: fetchmail.c:1701
+#: fetchmail.c:1736
#, c-format
msgid " SSL protocol: %s.\n"
msgstr " SSL 协议: %s\n"
-#: fetchmail.c:1703
+#: fetchmail.c:1738
msgid " SSL server certificate checking enabled.\n"
msgstr " 启用 SSL 服务器证书检查\n"
-#: fetchmail.c:1706
+#: fetchmail.c:1740
+#, fuzzy
+msgid " SSL server certificate checking disabled.\n"
+msgstr " 启用 SSL 服务器证书检查\n"
+
+#: fetchmail.c:1743
#, c-format
msgid " SSL trusted certificate file: %s\n"
msgstr " SSL 受信证书文件: %s\n"
-#: fetchmail.c:1708
+#: fetchmail.c:1745
#, c-format
msgid " SSL trusted certificate directory: %s\n"
msgstr " SSL 受信证书目录: %s\n"
-#: fetchmail.c:1710
+#: fetchmail.c:1747
#, c-format
msgid " SSL server CommonName: %s\n"
msgstr " SSL 服务器名: %s\n"
-#: fetchmail.c:1712
+#: fetchmail.c:1749
#, c-format
msgid " SSL key fingerprint (checked against the server key): %s\n"
msgstr " SSL 密钥指纹 (与服务器密钥对比过): %s\n"
-#: fetchmail.c:1715
+#: fetchmail.c:1752
#, c-format
msgid " Server nonresponse timeout is %d seconds"
msgstr " 服务器未响应,超时 %d 秒"
-#: fetchmail.c:1717
+#: fetchmail.c:1754
msgid " (default).\n"
msgstr " (默认)。\n"
-#: fetchmail.c:1724
+#: fetchmail.c:1761
msgid " Default mailbox selected.\n"
msgstr " 已选中默认邮箱。\n"
-#: fetchmail.c:1729
+#: fetchmail.c:1766
msgid " Selected mailboxes are:"
msgstr " 选中的邮箱是:"
-#: fetchmail.c:1735
+#: fetchmail.c:1772
msgid " All messages will be retrieved (--all on).\n"
msgstr " 收取所有邮件( --all 选项开启).\n"
-#: fetchmail.c:1736
+#: fetchmail.c:1773
msgid " Only new messages will be retrieved (--all off).\n"
msgstr " 只收取新邮件( --all 选项关闭).\n"
-#: fetchmail.c:1738
+#: fetchmail.c:1775
msgid " Fetched messages will be kept on the server (--keep on).\n"
msgstr " 收取的邮件会在服务器上保留副本( --keep 开启).\n"
-#: fetchmail.c:1739
+#: fetchmail.c:1776
msgid " Fetched messages will not be kept on the server (--keep off).\n"
msgstr " 收取的邮件不会保留在服务器上( --keep 关闭).\n"
-#: fetchmail.c:1741
+#: fetchmail.c:1778
msgid " Old messages will be flushed before message retrieval (--flush on).\n"
msgstr " 在收取新邮件前删除旧邮件(--flush 开启).\n"
-#: fetchmail.c:1742
+#: fetchmail.c:1779
msgid ""
" Old messages will not be flushed before message retrieval (--flush off).\n"
msgstr " 在收取新邮件前不删除旧邮件(--flush 关闭).\n"
-#: fetchmail.c:1744
+#: fetchmail.c:1781
msgid ""
" Oversized messages will be flushed before message retrieval (--limitflush "
"on).\n"
msgstr " 收件前将删除超大的邮件(--limitflush 开启).\n"
-#: fetchmail.c:1745
+#: fetchmail.c:1782
msgid ""
" Oversized messages will not be flushed before message retrieval (--"
"limitflush off).\n"
msgstr " 收件前将不删除超大的邮件(--limitflush 关闭).\n"
-#: fetchmail.c:1747
+#: fetchmail.c:1784
msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n"
msgstr " 本地收件人地址重写(--norewrite 关闭).\n"
-#: fetchmail.c:1748
+#: fetchmail.c:1785
msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n"
msgstr " 不重写本地收件人地址(--norewrite 开启).\n"
-#: fetchmail.c:1750
+#: fetchmail.c:1787
msgid " Carriage-return stripping is enabled (stripcr on).\n"
msgstr " 回车符清除(stripcr 开启).\n"
-#: fetchmail.c:1751
+#: fetchmail.c:1788
msgid " Carriage-return stripping is disabled (stripcr off).\n"
msgstr " 不清除回车符(stripcr 关闭).\n"
-#: fetchmail.c:1753
+#: fetchmail.c:1790
msgid " Carriage-return forcing is enabled (forcecr on).\n"
msgstr " 强行在换行前插入回车符(forcecr 开启).\n"
-#: fetchmail.c:1754
+#: fetchmail.c:1791
msgid " Carriage-return forcing is disabled (forcecr off).\n"
msgstr " 不在换行前强行插入回车符(forcecr 关闭).\n"
-#: fetchmail.c:1756
+#: fetchmail.c:1793
msgid ""
" Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
msgstr " 忽略 Content-Transfer-Encoding (pass8bits 开启).\n"
-#: fetchmail.c:1757
+#: fetchmail.c:1794
msgid ""
" Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
msgstr " 不忽略 Content-Transfer-Encoding (pass8bits 关闭).\n"
-#: fetchmail.c:1759
+#: fetchmail.c:1796
msgid " MIME decoding is enabled (mimedecode on).\n"
msgstr " 解开 MIME 编码 (mimedecode 开启).\n"
-#: fetchmail.c:1760
+#: fetchmail.c:1797
msgid " MIME decoding is disabled (mimedecode off).\n"
msgstr " 不解开 MIME 编码 (mimedecode 关闭).\n"
-#: fetchmail.c:1762
+#: fetchmail.c:1799
msgid " Idle after poll is enabled (idle on).\n"
msgstr " 收件后回到 idle 模式 (idle 开启).\n"
-#: fetchmail.c:1763
+#: fetchmail.c:1800
msgid " Idle after poll is disabled (idle off).\n"
msgstr " 收件后不回到 idle 模式 (idle 关闭).\n"
-#: fetchmail.c:1765
+#: fetchmail.c:1802
msgid " Nonempty Status lines will be discarded (dropstatus on)\n"
msgstr " 删除带有 Status 字样的行 (dropstatus 开启)\n"
-#: fetchmail.c:1766
+#: fetchmail.c:1803
msgid " Nonempty Status lines will be kept (dropstatus off)\n"
msgstr " 保留带有 Status 字样的 行 (dropstatus 关闭)\n"
-#: fetchmail.c:1768
+#: fetchmail.c:1805
msgid " Delivered-To lines will be discarded (dropdelivered on)\n"
msgstr " 删除带有 Delivered-to 的行 (dropdelivered 开启)\n"
-#: fetchmail.c:1769
+#: fetchmail.c:1806
msgid " Delivered-To lines will be kept (dropdelivered off)\n"
msgstr " 保留带有 Delivered-to 的行 (dropdelivered 关闭)\n"
-#: fetchmail.c:1773
+#: fetchmail.c:1810
#, c-format
msgid " Message size limit is %d octets (--limit %d).\n"
msgstr " 邮件大小被限制为 %d 字节 (--limit %d).\n"
-#: fetchmail.c:1776
+#: fetchmail.c:1813
msgid " No message size limit (--limit 0).\n"
msgstr " 邮件大小无限制 (--limit 0).\n"
-#: fetchmail.c:1778
+#: fetchmail.c:1815
#, c-format
msgid " Message size warning interval is %d seconds (--warnings %d).\n"
msgstr " 每隔 %d 秒发出邮件大小警告 (--warnings %d).\n"
-#: fetchmail.c:1781
+#: fetchmail.c:1818
msgid " Size warnings on every poll (--warnings 0).\n"
msgstr " 每次收件都给出邮件大小警告 (--warnings 0).\n"
-#: fetchmail.c:1784
+#: fetchmail.c:1821
#, c-format
msgid " Received-message limit is %d (--fetchlimit %d).\n"
msgstr " 单次收件限制为 %d 封(--fetchlimit %d).\n"
-#: fetchmail.c:1787
+#: fetchmail.c:1824
msgid " No received-message limit (--fetchlimit 0).\n"
msgstr " 无收件限制 (--fetchlimit 0).\n"
-#: fetchmail.c:1789
+#: fetchmail.c:1826
#, c-format
msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n"
msgstr " 限制所收邮件大小为 %d 字节(--fetchsizelimit %d).\n"
-#: fetchmail.c:1792
+#: fetchmail.c:1829
msgid " No fetch message size limit (--fetchsizelimit 0).\n"
msgstr " 所收邮件大小无限制 (--fetchsizelimit 0).\n"
-#: fetchmail.c:1796
+#: fetchmail.c:1833
msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n"
msgstr " 每次收件期间对 UIDs 进行折半查找 (--fastuidl 1).\n"
-#: fetchmail.c:1798
+#: fetchmail.c:1835
#, 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:1801
+#: fetchmail.c:1838
msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n"
msgstr " 每次收件期间对 UIDs 进行线性查找 (--fastuidl 0).\n"
-#: fetchmail.c:1803
+#: fetchmail.c:1840
#, c-format
msgid " SMTP message batch limit is %d.\n"
msgstr " 单次 SMTP 会话中最多传送 %d 封邮件。\n"
-#: fetchmail.c:1805
+#: fetchmail.c:1842
msgid " No SMTP message batch limit (--batchlimit 0).\n"
msgstr " 单次 SMTP 会话中无传送邮件限制 (--batchlimit 0)。\n"
-#: fetchmail.c:1809
+#: fetchmail.c:1846
#, c-format
msgid " Deletion interval between expunges forced to %d (--expunge %d).\n"
msgstr " 两次删除操作之间最多传送 %d 封邮件(--expunge %d)。\n"
-#: fetchmail.c:1811
+#: fetchmail.c:1848
msgid " No forced expunges (--expunge 0).\n"
msgstr " 两次删除操作之间无传送邮件限制(--expunge 0)。\n"
-#: fetchmail.c:1818
+#: fetchmail.c:1855
msgid " Domains for which mail will be fetched are:"
msgstr " 要收取的邮件位于服务器:"
-#: fetchmail.c:1823 fetchmail.c:1843
+#: fetchmail.c:1860 fetchmail.c:1880
msgid " (default)"
msgstr " (默认)"
-#: fetchmail.c:1828
+#: fetchmail.c:1865
#, c-format
msgid " Messages will be appended to %s as BSMTP\n"
msgstr " 邮件作为 BSMTP 附加至 %s\n"
-#: fetchmail.c:1830
+#: fetchmail.c:1867
#, c-format
msgid " Messages will be delivered with \"%s\".\n"
msgstr " 邮件通过 “%s” 投递。\n"
-#: fetchmail.c:1837
+#: fetchmail.c:1874
#, c-format
msgid " Messages will be %cMTP-forwarded to:"
msgstr " 邮件将被 %cMPT 转发到:"
-#: fetchmail.c:1848
+#: fetchmail.c:1885
#, c-format
msgid " Host part of MAIL FROM line will be %s\n"
msgstr " MAIL FROM 这一行的 Host 部分是 %s\n"
-#: fetchmail.c:1851
+#: fetchmail.c:1888
#, 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:1860
+#: fetchmail.c:1897
msgid " Recognized listener spam block responses are:"
msgstr " 识别出的监听端垃圾邮件拒收响应为:"
# fetchmail.c:1809
-#: fetchmail.c:1866
+#: fetchmail.c:1903
msgid " Spam-blocking disabled\n"
msgstr " 关闭垃圾邮件拒收\n"
-#: fetchmail.c:1869
+#: fetchmail.c:1906
#, c-format
msgid " Server connection will be brought up with \"%s\".\n"
msgstr " 服务器连接将被 “%s” 唤起\n"
-#: fetchmail.c:1872
+#: fetchmail.c:1909
msgid " No pre-connection command.\n"
msgstr " 无连接前要执行的程序。\n"
-#: fetchmail.c:1874
+#: fetchmail.c:1911
#, c-format
msgid " Server connection will be taken down with \"%s\".\n"
msgstr " 服务器连接将被 “%s” 关闭。\n"
-#: fetchmail.c:1877
+#: fetchmail.c:1914
msgid " No post-connection command.\n"
msgstr " 无连接后要执行的程序。\n"
-#: fetchmail.c:1880
+#: fetchmail.c:1917
msgid " No localnames declared for this host.\n"
msgstr " 此服务器没有要关联的本地用户名。\n"
-#: fetchmail.c:1890
+#: fetchmail.c:1927
msgid " Multi-drop mode: "
msgstr " 多投模式: "
-#: fetchmail.c:1892
+#: fetchmail.c:1929
msgid " Single-drop mode: "
msgstr " 单投模式: "
-#: fetchmail.c:1894
+#: fetchmail.c:1931
#, c-format
msgid "%d local name recognized.\n"
msgid_plural "%d local names recognized.\n"
msgstr[0] "识别出 %d 个本地用户名。\n"
-#: fetchmail.c:1909
+#: fetchmail.c:1946
msgid " DNS lookup for multidrop addresses is enabled.\n"
msgstr " 启用 DNS 搜寻多投地址。\n"
-#: fetchmail.c:1910
+#: fetchmail.c:1947
msgid " DNS lookup for multidrop addresses is disabled.\n"
msgstr " 关闭 DNS 搜寻多投地址。\n"
-#: fetchmail.c:1914
+#: fetchmail.c:1951
msgid ""
" Server aliases will be compared with multidrop addresses by IP address.\n"
msgstr " 服务器昵称将以 IP 地址与多投地址进行比较\n"
-#: fetchmail.c:1916
+#: fetchmail.c:1953
msgid " Server aliases will be compared with multidrop addresses by name.\n"
msgstr " 服务器昵称将以名字与多投地址进行比较\n"
-#: fetchmail.c:1919
+#: fetchmail.c:1956
msgid " Envelope-address routing is disabled\n"
msgstr " 禁用 Envelope-address 路由\n"
-#: fetchmail.c:1922
+#: fetchmail.c:1959
#, c-format
msgid " Envelope header is assumed to be: %s\n"
msgstr " 邮件头假定为: %s\n"
-#: fetchmail.c:1925
+#: fetchmail.c:1962
#, c-format
msgid " Number of envelope headers to be skipped over: %d\n"
msgstr " 跳过的邮件头数目为: %d\n"
-#: fetchmail.c:1928
+#: fetchmail.c:1965
#, c-format
msgid " Prefix %s will be removed from user id\n"
msgstr " 将从用户 id 中移除前缀 %s\n"
-#: fetchmail.c:1931
+#: fetchmail.c:1968
msgid " No prefix stripping\n"
msgstr " 没有要从用户 id 中清除的前缀\n"
-#: fetchmail.c:1936
+#: fetchmail.c:1973
msgid " Predeclared mailserver aliases:"
msgstr " 预先声明的邮件服务器昵称: "
-#: fetchmail.c:1944
+#: fetchmail.c:1981
msgid " Local domains:"
msgstr " 本地域:"
-#: fetchmail.c:1954
+#: fetchmail.c:1991
#, c-format
msgid " Connection must be through interface %s.\n"
msgstr " 必须通过地址 %s 连接\n"
-#: fetchmail.c:1956
+#: fetchmail.c:1993
msgid " No interface requirement specified.\n"
msgstr " 未指定地址要求。\n"
-#: fetchmail.c:1958
+#: fetchmail.c:1995
#, c-format
msgid " Polling loop will monitor %s.\n"
msgstr " 收件轮循将监听 %s。\n"
-#: fetchmail.c:1960
+#: fetchmail.c:1997
msgid " No monitor interface specified.\n"
msgstr " 未指定监听地址。\n"
-#: fetchmail.c:1964
+#: fetchmail.c:2001
#, c-format
msgid " Server connections will be made via plugin %s (--plugin %s).\n"
msgstr " 通过外部程序 %s 进行服务器连接 (--plugin %s)。\n"
-#: fetchmail.c:1966
+#: fetchmail.c:2003
msgid " No plugin command specified.\n"
msgstr " 未指定外部程序。\n"
-#: fetchmail.c:1968
+#: fetchmail.c:2005
#, c-format
msgid " Listener connections will be made via plugout %s (--plugout %s).\n"
msgstr " 通过外部程序 %s 进行 SMTP 连接(--plugout %s)。\n"
-#: fetchmail.c:1970
+#: fetchmail.c:2007
msgid " No plugout command specified.\n"
msgstr " 未指定外部程序。\n"
-#: fetchmail.c:1975
+#: fetchmail.c:2014
msgid " No UIDs saved from this host.\n"
msgstr " 未从此主机上保存 UIDs。\n"
-#: fetchmail.c:1984
+#: fetchmail.c:2017
#, c-format
msgid " %d UIDs saved.\n"
msgstr " 保存了 %d 个UIDs。\n"
-#: fetchmail.c:1992
+#: fetchmail.c:2023
msgid " Poll trace information will be added to the Received header.\n"
msgstr " 收件跟踪信息将被加入 Received 邮件头。\n"
-#: fetchmail.c:1994
+#: fetchmail.c:2025
msgid " No poll trace information will be added to the Received header.\n"
msgstr ""
" 无收件跟踪信息要被加入 Received 邮件头。\n"
"。\n"
-#: fetchmail.c:1999
+#: fetchmail.c:2030
msgid " Messages with bad headers will be rejected.\n"
msgstr " 邮件头错误的邮件将被拒收。\n"
-#: fetchmail.c:2002
+#: fetchmail.c:2033
msgid " Messages with bad headers will be passed on.\n"
msgstr " 邮件头错误的邮件可以接收。\n"
-#: fetchmail.c:2007
+#: fetchmail.c:2038
#, c-format
msgid " Pass-through properties \"%s\".\n"
msgstr " 传送的 properties 选项为 “%s” 。\n"
@@ -1664,15 +1674,24 @@ msgstr "解开的加密标识: %s%s%s\n"
msgid "Maximum GSS token size is %ld\n"
msgstr "最大 GSS 标识大小为 %ld\n"
-#: gssapi.c:277
+#: gssapi.c:273
+msgid "GSSAPI username too long for static buffer.\n"
+msgstr ""
+
+#: gssapi.c:282
msgid "Error creating security level request\n"
msgstr "创建加密请求时出错\n"
-#: gssapi.c:288
+#: gssapi.c:286
+#, c-format
+msgid "GSSAPI send_token too large (%lu) while sending username.\n"
+msgstr ""
+
+#: gssapi.c:297
msgid "Releasing GSS credentials\n"
msgstr "正在清空 GSS 证书\n"
-#: gssapi.c:292
+#: gssapi.c:301
msgid "Error releasing credentials\n"
msgstr "清空证书时出错\n"
@@ -1682,123 +1701,128 @@ msgid "fetchmail: thread sleeping for %d sec.\n"
msgstr "fetchmail: 线程休眠 %d 秒。\n"
#: imap.c:74
-#, c-format
-msgid "Received BYE response from IMAP server: %s"
+#, fuzzy, c-format
+msgid "Received BYE response from IMAP server: %s\n"
msgstr "从IMAP 服务器收到 BYE 指令: %s"
-#: imap.c:92
+#: imap.c:96
#, c-format
msgid "bogus message count in \"%s\"!"
msgstr "发现伪造邮件\"%s\"!"
-#: imap.c:139
+#: imap.c:143
#, c-format
msgid "bogus EXPUNGE count in \"%s\"!"
msgstr "发现伪造的EXPUNGE \"%s\"!"
-#: imap.c:348
+#: imap.c:352
msgid "Protocol identified as IMAP4 rev 1\n"
msgstr "协议被识别为 IMAP4 版本 1\n"
-#: imap.c:354
+#: imap.c:358
msgid "Protocol identified as IMAP4 rev 0\n"
msgstr "协议被识别为 IMAP4 版本 0\n"
-#: imap.c:361
+#: imap.c:365
msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
msgstr "协议被识别为 IMAP2 或 IMAP2BIS\n"
-#: imap.c:378
+#: imap.c:382
msgid "will idle after poll\n"
msgstr "收件后恢复至 idle 模式\n"
-#: imap.c:471 pop3.c:476
+#: imap.c:473 pop3.c:473
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr "%s: 成功升级至 TLS 协议。\n"
-#: imap.c:477 pop3.c:482
+#: imap.c:479 pop3.c:479
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr "%s: 升级至 TLS 协议失败。\n"
-#: imap.c:482
+#: imap.c:484
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr "%s: 即时升级至 TLS 协议失败,继续尝试\n"
-#: imap.c:598
+#: imap.c:499
+#, c-format
+msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
+msgstr ""
+
+#: imap.c:604
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "需要的 OTP 功能未被编译进 fetchmail\n"
-#: imap.c:618 pop3.c:558
+#: imap.c:624 pop3.c:559
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "需要的 NTLM 功能未被编译进 fetchmail\n"
-#: imap.c:627
+#: imap.c:633
msgid "Required LOGIN capability not supported by server\n"
msgstr "需要的 LOGIN 功能未被编译进 fetchmail\n"
-#: imap.c:691
+#: imap.c:697
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "邮件删除数不相等 (实际删除 %d 封!= 已删除 %d 封)\n"
-#: imap.c:818
+#: imap.c:824
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu 封未读\n"
-#: imap.c:868 pop3.c:844 pop3.c:856 pop3.c:1095 pop3.c:1102
+#: imap.c:874 pop3.c:846 pop3.c:858 pop3.c:1103 pop3.c:1110
#, c-format
msgid "%u is unseen\n"
msgstr "%u 未读\n"
-#: imap.c:903 imap.c:962
+#: imap.c:909 imap.c:968
msgid "re-poll failed\n"
msgstr "重新收件失败\n"
-#: imap.c:911 imap.c:967
+#: imap.c:917 imap.c:973
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "重新收件后又有 %d 封邮件等待收取\n"
-#: imap.c:928
+#: imap.c:934
msgid "mailbox selection failed\n"
msgstr "邮箱选择失败\n"
-#: imap.c:932
+#: imap.c:938
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "首次收件后又有 %d 封邮件等待收取\n"
-#: imap.c:946
+#: imap.c:952
msgid "expunge failed\n"
msgstr "删除操作失败\n"
-#: imap.c:950
+#: imap.c:956
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "删除操作后有 %d 封邮件等待收取\n"
-#: imap.c:989
+#: imap.c:995
msgid "search for unseen messages failed\n"
msgstr "查找未读邮件失败\n"
-#: imap.c:994 pop3.c:865
+#: imap.c:1000 pop3.c:867
#, c-format
msgid "%u is first unseen\n"
msgstr "%u 是首个未读邮件\n"
-#: imap.c:1078
+#: imap.c:1084
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr "警告: 忽略服务器返回的邮件大小的无效数据。\n"
-#: imap.c:1177 imap.c:1184
+#: imap.c:1183 imap.c:1190
#, c-format
msgid "Incorrect FETCH response: %s.\n"
msgstr "FETCH 响应不正确: %s。\n"
@@ -1885,21 +1909,21 @@ msgstr "%s 的活跃度以前是 %d,现在是 %d\n"
msgid "could not decode initial BASE64 challenge\n"
msgstr "无法解码起始部分的 BASE64 编码请求\n"
-#: kerberos.c:139
+#: kerberos.c:137
#, c-format
msgid "principal %s in ticket does not match -u %s\n"
msgstr "证书中的验证方 %s 与 -u 选项中的 %s 不匹配\n"
-#: kerberos.c:147
+#: kerberos.c:145
#, c-format
msgid "non-null instance (%s) might cause strange behavior\n"
msgstr "非空情况 (%s) 可能导致奇怪的行为\n"
-#: kerberos.c:213
+#: kerberos.c:211
msgid "could not decode BASE64 ready response\n"
msgstr "无法解码 BASE64 ready 响应\n"
-#: kerberos.c:220
+#: kerberos.c:218
msgid "challenge mismatch\n"
msgstr "请求不匹配\n"
@@ -1993,184 +2017,193 @@ msgstr "服务器 recv 错\n"
msgid "Could not decode OTP challenge\n"
msgstr "无法解码 OTP 请求\n"
-#: opie.c:64 pop3.c:585
+#: opie.c:64 pop3.c:586
msgid "Secret pass phrase: "
msgstr "密码短语:"
-#: options.c:176 options.c:220
+#: options.c:178 options.c:222
#, c-format
msgid "String '%s' is not a valid number string.\n"
msgstr "字符串 ‘%s’不是一个有效的数字串。\n"
-#: options.c:185
+#: options.c:187
#, c-format
msgid "Value of string '%s' is %s than %d.\n"
msgstr "字符串 ‘%1$s’ 的值比 %3$d %2$s\n"
-#: options.c:186
+#: options.c:188
msgid "smaller"
msgstr "小"
-#: options.c:186
+#: options.c:188
msgid "larger"
msgstr "大"
-#: options.c:323
+#: options.c:336
#, c-format
msgid "Invalid bad-header policy `%s' specified.\n"
msgstr "设定的错误邮件头处理方式‘%s’无效。\n"
-#: options.c:364
+#: options.c:377
#, c-format
msgid "Invalid protocol `%s' specified.\n"
msgstr "指定了无效的协议 ‘%s’\n"
-#: options.c:411
+#: options.c:424
#, c-format
msgid "Invalid authentication `%s' specified.\n"
msgstr "指定了无效的认证方式 ‘%s’\n"
-#: options.c:620
+#: options.c:640
msgid "usage: fetchmail [options] [server ...]\n"
msgstr "用法: fetchmail [选项] [服务器...]\n"
-#: options.c:621
+#: options.c:641
msgid " Options are as follows:\n"
msgstr "选项如下:\n"
-#: options.c:622
+#: options.c:642
msgid " -?, --help display this option help\n"
msgstr " -?, --help\t显示此选项帮助\n"
-#: options.c:623
+#: options.c:643
msgid " -V, --version display version info\n"
msgstr " -V, --version\t显示版本信息\n"
-#: options.c:625
+#: options.c:645
msgid " -c, --check check for messages without fetching\n"
msgstr " -c, --check\t只检查邮件而不收取\n"
-#: options.c:626
+#: options.c:646
msgid " -s, --silent work silently\n"
msgstr " -s, --silent\t运行时不要显示多余信息\n"
-#: options.c:627
+#: options.c:647
msgid " -v, --verbose work noisily (diagnostic output)\n"
msgstr " -v, --verbose\t运行时给出信息 (诊断型的输出)\n"
-#: options.c:628
+#: options.c:648
msgid " -d, --daemon run as a daemon once per n seconds\n"
msgstr " -d, --daemon\t每 n 秒运行后台服务一次\n"
-#: options.c:629
+#: options.c:649
msgid " -N, --nodetach don't detach daemon process\n"
msgstr " -N, --nodetach\t不分离后台进程\n"
-#: options.c:630
+#: options.c:650
msgid " -q, --quit kill daemon process\n"
msgstr " -q, --quit\t终止后台进程\n"
-#: options.c:631
+#: options.c:651
msgid " -L, --logfile specify logfile name\n"
msgstr " -L, --logfile\t指定日志文件名\n"
-#: options.c:632
+#: options.c:652
msgid ""
" --syslog use syslog(3) for most messages when running as a "
"daemon\n"
msgstr " --syslog\t以后台服务运行时用 syslog(3) 得到更多的信息\n"
-#: options.c:633
+#: options.c:653
+msgid " --nosyslog turns off use of syslog(3)\n"
+msgstr ""
+
+#: options.c:654
msgid " --invisible don't write Received & enable host spoofing\n"
msgstr " --invisible\t不写 Received 邮件头并允许伪装主机\n"
-#: options.c:634
+#: options.c:655
msgid " -f, --fetchmailrc specify alternate run control file\n"
msgstr " -f, --fetchmailrc\t指定可选的配置文件\n"
-#: options.c:635
+#: options.c:656
msgid " -i, --idfile specify alternate UIDs file\n"
msgstr " -i, --idfile\t指定可选的 UIDs 文件\n"
-#: options.c:636
+#: options.c:657
msgid " --pidfile specify alternate PID (lock) file\n"
msgstr " --pidfile\t指定可选的进程(锁)文件\n"
-#: options.c:637
+#: options.c:658
msgid " --postmaster specify recipient of last resort\n"
msgstr " --postmaster\t指定邮件管理员\n"
-#: options.c:638
+#: options.c:659
msgid " --nobounce redirect bounces from user to postmaster.\n"
msgstr " --nobounce\t将回送邮件从用户重定向至邮件管理员\n"
-#: options.c:639
+#: options.c:660
msgid ""
" --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
msgstr " --nosoftbounce\t让 fetchmail 永久删除无法投递的邮件。\n"
-#: options.c:640
+#: options.c:661
msgid ""
" --softbounce keep permanently undeliverable messages on server "
"(default).\n"
msgstr " --softbounce\t将无法投递的邮件长期保留在服务器上(默认)。\n"
-#: options.c:642
+#: options.c:663
msgid " -I, --interface interface required specification\n"
msgstr " -I, --interface\t指定网络地址\n"
-#: options.c:643
+#: options.c:664
msgid " -M, --monitor monitor interface for activity\n"
msgstr " -M, --moniter\t监控指定网络地址的活跃度\n"
-#: options.c:646
+#: options.c:667
msgid " --ssl enable ssl encrypted session\n"
msgstr " --ssl\t启用 ssl 加密会话\n"
-#: options.c:647
+#: options.c:668
msgid " --sslkey ssl private key file\n"
msgstr " --sslkey\tssl 私钥文件\n"
-#: options.c:648
+#: options.c:669
msgid " --sslcert ssl client certificate\n"
msgstr " --sslcert\tssl 客户端证书\n"
-#: options.c:649
+#: options.c:670
msgid " --sslcertck do strict server certificate check (recommended)\n"
msgstr " --sslcertck\t进行严格的服务器证书检查(推荐)\n"
-#: options.c:650
+#: options.c:671
+#, fuzzy
+msgid " --nosslcertck skip strict server certificate check (insecure)\n"
+msgstr " --sslcertck\t进行严格的服务器证书检查(推荐)\n"
+
+#: options.c:672
msgid " --sslcertfile path to trusted-CA ssl certificate file\n"
msgstr " --sslcertfile 受信 CA ssl 证书文件名\n"
-#: options.c:651
+#: options.c:673
msgid " --sslcertpath path to trusted-CA ssl certificate directory\n"
msgstr " --sslcertpath 受信 CA ssl 证书文件的目录\n"
-#: options.c:652
+#: options.c:674
msgid ""
" --sslcommonname expect this CommonName from server (discouraged)\n"
msgstr " --sslcommonname\t期望返回服务器名 (不鼓励)\n"
-#: options.c:653
+#: options.c:675
msgid ""
" --sslfingerprint fingerprint that must match that of the server's "
"cert.\n"
msgstr " --sslfingerprint\t指定一个指纹,它必须与服务器证书的指纹匹配\n"
-#: options.c:654
+#: options.c:676
msgid " --sslproto force ssl protocol (SSL2/SSL3/TLS1)\n"
msgstr " --sslproto\t指定强制使用的 ssl 协议(SSL2/SSL3/TLS1)\n"
-#: options.c:656
+#: options.c:678
msgid " --plugin specify external command to open connection\n"
msgstr " --plugin\t指定外部程序打开连接\n"
-#: options.c:657
+#: options.c:679
msgid " --plugout specify external command to open smtp connection\n"
msgstr " --plugout\t指定外部程序打开 smtp 连接\n"
-#: options.c:658
+#: options.c:680
msgid ""
" --bad-header {reject|accept}\n"
" specify policy for handling messages with bad headers\n"
@@ -2178,216 +2211,228 @@ msgstr ""
" --bad-header {reject|accept}\n"
" 设定对邮件头错误的邮件的处理方式\n"
-#: options.c:661
-msgid " -p, --protocol specify retrieval protocol (see man page)\n"
+#: options.c:683
+#, fuzzy
+msgid " -p, --proto[col] specify retrieval protocol (see man page)\n"
msgstr " -p, --protocol\t指定收件协议 (看 man 手册页)\n"
-#: options.c:662
+#: options.c:684
msgid " -U, --uidl force the use of UIDLs (pop3 only)\n"
msgstr " -U, --uidl\t强制使用 UIDLs(仅适用于 pop3)\n"
-#: options.c:663
+#: options.c:685
+msgid ""
+" --idle tells the IMAP server to send notice of new messages\n"
+msgstr ""
+
+#: options.c:686
msgid " --port TCP port to connect to (obsolete, use --service)\n"
msgstr " --port\t要连接的 TCP 端口(过时了,用 --service)\n"
-#: options.c:664
+#: options.c:687
msgid ""
" -P, --service TCP service to connect to (can be numeric TCP port)\n"
msgstr " -P, --service\t要连接的 TCP 服务(允许用 TCP 端口的数值来表示)\n"
-#: options.c:665
+#: options.c:688
msgid " --auth authentication type (password/kerberos/ssh/otp)\n"
msgstr " --auth\t指定验证方式(password/kerberos/ssh/otp)\n"
-#: options.c:666
+#: options.c:689
msgid " -t, --timeout server nonresponse timeout\n"
msgstr " -t, --timeout\t指定服务器超时无响应的时间\n"
-#: options.c:667
+#: options.c:690
msgid " -E, --envelope envelope address header\n"
msgstr " -E, --envelope\t指定邮件地址头\n"
-#: options.c:668
+#: options.c:691
msgid " -Q, --qvirtual prefix to remove from local user id\n"
msgstr " -Q, --qvirtual\t从当前用户移除前缀\n"
-#: options.c:669
+#: options.c:692
msgid " --principal mail service principal\n"
msgstr " --principal\t邮件服务验证方\n"
-#: options.c:670
+#: options.c:693
msgid " --tracepolls add poll-tracing information to Received header\n"
msgstr " --tracepolls\tReceived 邮件头中添加收件跟踪信息\n"
-#: options.c:672
-msgid " -u, --username specify users's login on server\n"
+#: options.c:695
+#, fuzzy
+msgid " -u, --user[name] specify users's login on server\n"
msgstr " -u, --username\t指定登录服务器的用户名\n"
-#: options.c:673
+#: options.c:696
msgid " -a, --[fetch]all retrieve old and new messages\n"
msgstr " -a, --[fetch]all\t收取所有新旧邮件\n"
-#: options.c:674
+#: options.c:697
msgid " -K, --nokeep delete new messages after retrieval\n"
msgstr " -K, --nokeep\t收件后删除服务器上新邮件\n"
-#: options.c:675
+#: options.c:698
msgid " -k, --keep save new messages after retrieval\n"
msgstr " -k, --keep\t收件后保留服务器上新邮件\n"
-#: options.c:676
+#: options.c:699
msgid " -F, --flush delete old messages from server\n"
msgstr " -F, --flush\t从服务器上删除旧邮件\n"
-#: options.c:677
+#: options.c:700
msgid " --limitflush delete oversized messages\n"
msgstr " --limitflush\t删除过大的邮件\n"
-#: options.c:678
+#: options.c:701
msgid " -n, --norewrite don't rewrite header addresses\n"
msgstr " -n, --norewrite\t不要重写地址头\n"
-#: options.c:679
+#: options.c:702
msgid " -l, --limit don't fetch messages over given size\n"
msgstr " -l, --limit\t不收超过指定大小的邮件\n"
-#: options.c:680
+#: options.c:703
msgid " -w, --warnings interval between warning mail notification\n"
msgstr " -w, --warnings\t邮件通知警告的间隔\n"
-#: options.c:682
+#: options.c:705
msgid " -S, --smtphost set SMTP forwarding host\n"
msgstr " -S, --smtphost\t设置 SMTP 转发主机\n"
-#: options.c:683
+#: options.c:706
msgid " --fetchdomains fetch mail for specified domains\n"
msgstr " --fetchdomains\t收取指定域的邮件\n"
-#: options.c:684
+#: options.c:707
msgid " -D, --smtpaddress set SMTP delivery domain to use\n"
msgstr " -D, --smtpaddress\t设置 SMTP 投递域\n"
-#: options.c:685
+#: options.c:708
msgid " --smtpname set SMTP full name username@domain\n"
msgstr " --smtpname\t设置 SMTP 全名,用户名@域\n"
-#: options.c:686
+#: options.c:709
msgid " -Z, --antispam, set antispam response values\n"
msgstr " -Z, --antispam,\t设置 antispam 响应值\n"
-#: options.c:687
+#: options.c:710
msgid " -b, --batchlimit set batch limit for SMTP connections\n"
msgstr " -b, --bathlimit\t为 SMTP 连接设置批量处理限制\n"
-#: options.c:688
+#: options.c:711
msgid " -B, --fetchlimit set fetch limit for server connections\n"
msgstr " -B, --fetchlimit\t为服务器连接设置收取限制\n"
-#: options.c:689
+#: options.c:712
msgid " --fetchsizelimit set fetch message size limit\n"
msgstr " --fetchsizelimit\t设置收件大小限制\n"
-#: options.c:690
+#: options.c:713
msgid " --fastuidl do a binary search for UIDLs\n"
msgstr " --fastuidl\t对 UIDLs 进行折半查找\n"
-#: options.c:691
+#: options.c:714
msgid " -e, --expunge set max deletions between expunges\n"
msgstr " -e, --expunge\t设置删除操作发生在多少封邮件之后\n"
-#: options.c:692
+#: options.c:715
msgid " -m, --mda set MDA to use for forwarding\n"
msgstr " -m, --mda\t设置用于转发的 MDA\n"
-#: options.c:693
+#: options.c:716
msgid " --bsmtp set output BSMTP file\n"
msgstr " --bsmtp\t设置 BSMTP 文件输出\n"
-#: options.c:694
+#: options.c:717
msgid " --lmtp use LMTP (RFC2033) for delivery\n"
msgstr " --lmtp\t用 LMTP 协议(RFC2033) 投递邮件\n"
-#: options.c:695
+#: options.c:718
msgid " -r, --folder specify remote folder name\n"
msgstr " -r, --folder\t指定远程邮箱名\n"
-#: options.c:696
+#: options.c:719
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots\t即使在日志文件中也要显示进度条(以点的形式)\n"
-#: pop3.c:327
+#: pop3.c:329
msgid ""
"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
msgstr "警告: 发现\"Maillennium POP3\",用 RETR 命令代替 TOP。\n"
-#: pop3.c:411
+#: pop3.c:413
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
msgstr "强制使用 TLS 会话,但服务器拒绝 CAPA 命令。\n"
-#: pop3.c:412
+#: pop3.c:414
msgid "The CAPA command is however necessary for TLS.\n"
msgstr "而 CPAC 命令对于 TLS 协议来说是必须要有的。\n"
-#: pop3.c:494
+#: pop3.c:491
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr "%s: 升级到 TLS 协议失败了,继续尝试。\n"
-#: pop3.c:621
+#: pop3.c:497
+#, c-format
+msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
+msgstr ""
+
+#: pop3.c:622
msgid "We've run out of allowed authenticators and cannot continue.\n"
msgstr "我们已经用完了可用的验证方式,无法继续\n"
-#: pop3.c:635
+#: pop3.c:636
msgid "Required APOP timestamp not found in greeting\n"
msgstr "在 greeting 中未发现所需的 APOP 时间戳\n"
-#: pop3.c:644
+#: pop3.c:645
msgid "Timestamp syntax error in greeting\n"
msgstr "greeting 中时间戳语法错误\n"
-#: pop3.c:660
+#: pop3.c:661
msgid "Invalid APOP timestamp.\n"
msgstr "无效的 APOP 时间戳\n"
-#: pop3.c:684
+#: pop3.c:685
msgid "Undefined protocol request in POP3_auth\n"
msgstr "POP3_auth 中有未定义的协议请求\n"
-#: pop3.c:705
+#: pop3.c:706
msgid "lock busy! Is another session active?\n"
msgstr "死锁!是否有另一个会话在运行?\n"
-#: pop3.c:784
+#: pop3.c:785
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "无法操作来自上游服务器的 UIDL 响应。\n"
-#: pop3.c:807
+#: pop3.c:808
msgid "Server responded with UID for wrong message.\n"
msgstr "响应的服务器带有错误消息的 UID。\n"
-#: pop3.c:835
+#: pop3.c:837
#, c-format
msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr "id=%s (数量=%u 封)已被删除,但仍然存在!\n"
-#: pop3.c:941
+#: pop3.c:949
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr "邮件被插入服务器列表。无法处理。\n"
-#: pop3.c:1037
+#: pop3.c:1047
msgid "protocol error\n"
msgstr "协议错\n"
-#: pop3.c:1053
+#: pop3.c:1063
msgid "protocol error while fetching UIDLs\n"
msgstr "正在读取 UIDLs 时协议出错\n"
-#: pop3.c:1086
+#: pop3.c:1094
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id = %s (数量 = %d 封) 已被删除,但仍然存在!\n"
-#: pop3.c:1424
+#: pop3.c:1445
msgid "Option --folder is not supported with POP3\n"
msgstr "POP3 不支持 --folder 选项\n"
@@ -2415,21 +2460,21 @@ msgstr "fetchmail: monitor 选项只有 Linux(无 IPv6)和 FreeBSD 支持\n"
msgid "SSL is not enabled"
msgstr "SSL 不可用"
-#: rcfile_y.y:391
+#: rcfile_y.y:392
msgid "end of input"
msgstr "输入结束"
-#: rcfile_y.y:429
+#: rcfile_y.y:430
#, c-format
msgid "File %s must be a regular file.\n"
msgstr "文件 %s 必须是个普通文件。\n"
-#: rcfile_y.y:439
+#: rcfile_y.y:440
#, c-format
msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
msgstr "文件 %s 不允许拥有高于 -rwx------ (0700) 的权限。\n"
-#: rcfile_y.y:451
+#: rcfile_y.y:452
#, c-format
msgid "File %s must be owned by you.\n"
msgstr "文件 %s 必须归您所有。\n"
@@ -2648,132 +2693,132 @@ msgstr "请把服务指定为十进制的端口号\n"
msgid "forwarding to %s\n"
msgstr "正在转发至 %s\n"
-#: sink.c:318
+#: sink.c:319
msgid "SMTP: (bounce-message body)\n"
msgstr "SMTP: (回送邮件内容)\n"
-#: sink.c:321
+#: sink.c:322
#, c-format
msgid "mail from %s bounced to %s\n"
msgstr "邮件从 %s 回送至 %s\n"
-#: sink.c:456
+#: sink.c:457
#, c-format
msgid "Saved error is still %d\n"
msgstr "保留的错误仍然为 %d\n"
-#: sink.c:508 sink.c:607
+#: sink.c:509 sink.c:608
#, c-format
msgid "%cMTP error: %s\n"
msgstr "%cMTP 出错: %s\n"
-#: sink.c:552
+#: sink.c:553
msgid "SMTP server requires STARTTLS, keeping message.\n"
msgstr "SMTP 服务器需要 STARTTLS 认证,正在保存邮件。\n"
-#: sink.c:735
+#: sink.c:736
#, c-format
msgid "BSMTP file open failed: %s\n"
msgstr "打开 BSMTP 文件失败: %s\n"
-#: sink.c:781
+#: sink.c:782
#, c-format
msgid "BSMTP preamble write failed: %s.\n"
msgstr "写入 BSMTP 报头失败: %s。\n"
-#: sink.c:995
+#: sink.c:996
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr "%cMTP 端不认可收件人地址 “%s”\n"
-#: sink.c:1002
+#: sink.c:1003
#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr "%cMTP 端不是真的认可收件人地址 “%s”\n"
-#: sink.c:1048
+#: sink.c:1049
msgid "no address matches; no postmaster set.\n"
msgstr "无匹配的地址;也无 postmaster 设置\n"
-#: sink.c:1060
+#: sink.c:1061
#, c-format
msgid "can't even send to %s!\n"
msgstr "无法稳定发送至 %s!\n"
-#: sink.c:1066
+#: sink.c:1067
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr "无匹配的地址;转发至 %s。\n"
-#: sink.c:1222
+#: sink.c:1223
#, c-format
msgid "about to deliver with: %s\n"
msgstr "即将用 %s 投递\n"
-#: sink.c:1233
+#: sink.c:1234
#, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
msgstr "无法将当前用户名切换为 %ld: %s\n"
-#: sink.c:1245
+#: sink.c:1246
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
msgstr "无法将当前用户名切换回之前的用户名 %ld: %s\n"
-#: sink.c:1252
+#: sink.c:1253
msgid "MDA open failed\n"
msgstr "打开 MDA 失败\n"
-#: sink.c:1291
+#: sink.c:1292
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "%cMTP 连接至 %s 失败\n"
-#: sink.c:1315
+#: sink.c:1316
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr "无法启动 MDA 代理;正在转到 MDA 代理 %s"
-#: sink.c:1373
+#: sink.c:1374
#, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
msgstr "邮件终止或 BSMTP 文件关闭失败: %s\n"
-#: sink.c:1398
+#: sink.c:1399
#, c-format
msgid "Error writing to MDA: %s\n"
msgstr "写入 MDA 时出错: %s\n"
-#: sink.c:1401
+#: sink.c:1402
#, c-format
msgid "MDA died of signal %d\n"
msgstr "MDA 被信号 %d 终止\n"
-#: sink.c:1404
+#: sink.c:1405
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "MDA 返回非零值 %d\n"
-#: sink.c:1407
+#: sink.c:1408
#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
msgstr "奇怪: MDA pclose 返回 %d 且 errno 为 %d/%s,在 %s:%d 无法处理\n"
-#: sink.c:1432
+#: sink.c:1433
msgid "SMTP listener refused delivery\n"
msgstr "SMTP 端拒绝投递\n"
-#: sink.c:1462
+#: sink.c:1463
msgid "LMTP delivery error on EOM\n"
msgstr "邮件结尾时用 LTMP 协议投递错误\n"
-#: sink.c:1465
+#: sink.c:1466
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "邮件结尾时 LMTP 协议的未知的非 503 响应: %s\n"
-#: sink.c:1623
+#: sink.c:1632
#, fuzzy
msgid "The Fetchmail Daemon"
msgstr ""
@@ -2805,84 +2850,84 @@ msgstr "ESMTP PLAIN 验证...\n"
msgid "ESMTP LOGIN Authentication...\n"
msgstr "ESMTP LOGIN 验证...\n"
-#: smtp.c:349 smtp.c:377
+#: smtp.c:348 smtp.c:376
msgid "smtp listener protocol error\n"
msgstr "smtp 端协议错误\n"
-#: socket.c:110 socket.c:137
+#: socket.c:110 socket.c:139
msgid "fetchmail: malloc failed\n"
msgstr "fetchmail: malloc 失败\n"
-#: socket.c:169
+#: socket.c:171
msgid "fetchmail: socketpair failed\n"
msgstr "fetchmail: socketpair 失败\n"
-#: socket.c:175
+#: socket.c:177
msgid "fetchmail: fork failed\n"
msgstr "fetchmail: fork 失败\n"
-#: socket.c:182
+#: socket.c:184
msgid "dup2 failed\n"
msgstr "dup2 失败\n"
-#: socket.c:188
+#: socket.c:190
#, c-format
msgid "running %s (host %s service %s)\n"
msgstr "正在运行 %s (主机 %s 服务 %s)\n"
-#: socket.c:193
+#: socket.c:195
#, c-format
msgid "execvp(%s) failed\n"
msgstr "execvp(%s) 失败\n"
-#: socket.c:268
+#: socket.c:270
#, c-format
msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
msgstr "getaddrinfo(“%s”,“%s”) 错误: %s\n"
-#: socket.c:271
+#: socket.c:273
msgid "Try adding the --service option (see also FAQ item R12).\n"
msgstr "试着加入 --service 选项(参见 FAQ 条目 R12)。\n"
-#: socket.c:285 socket.c:288
+#: socket.c:287 socket.c:290
#, c-format
msgid "unknown (%s)"
msgstr "未知 (%s)"
-#: socket.c:291
+#: socket.c:293
#, c-format
msgid "Trying to connect to %s/%s..."
msgstr "正在尝试连接至 %s/%s..."
-#: socket.c:300
+#: socket.c:302
#, c-format
msgid "cannot create socket: %s\n"
msgstr "无法创建套接字: %s\n"
-#: socket.c:302
+#: socket.c:304
#, c-format
msgid "name %d: cannot create socket family %d type %d: %s\n"
msgstr "名称 %d: 无法创建套接字 %d 类型 %d: %s\n"
-#: socket.c:320
+#: socket.c:322
msgid "connection failed.\n"
msgstr "连接失败。\n"
-#: socket.c:322
+#: socket.c:324
#, c-format
msgid "connection to %s:%s [%s/%s] failed: %s.\n"
msgstr "连接至 %s:%s [%s/%s] 失败: %s。\n"
-#: socket.c:323
+#: socket.c:325
#, c-format
msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
msgstr "名称 %d: 连接至 %s:%s [%s/%s] 失败: %s。\n"
-#: socket.c:329
+#: socket.c:331
msgid "connected.\n"
msgstr "已连接。\n"
-#: socket.c:342
+#: socket.c:344
#, c-format
msgid ""
"Connection errors for this poll:\n"
@@ -2891,128 +2936,133 @@ msgstr ""
"此服务器连接错误:\n"
"%s"
-#: socket.c:387
+#: socket.c:406
#, c-format
msgid "OpenSSL reported: %s\n"
msgstr ""
-#: socket.c:622
+#: socket.c:641
+#, c-format
+msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
+msgstr ""
+
+#: socket.c:647
msgid "Server certificate:\n"
msgstr "服务器认证:\n"
-#: socket.c:627
+#: socket.c:652
#, c-format
msgid "Certificate chain, from root to peer, starting at depth %d:\n"
msgstr "验证链从根到节点,在 %d 开始:\n"
-#: socket.c:630
+#: socket.c:655
#, c-format
msgid "Certificate at depth %d:\n"
msgstr "验证处于 %d 层:\n"
-#: socket.c:636
+#: socket.c:661
#, c-format
msgid "Issuer Organization: %s\n"
msgstr "发行组织: %s\n"
-#: socket.c:639
+#: socket.c:664
msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
msgstr "警告: 发行组织名字太长 (可能截短)。\n"
-#: socket.c:641
+#: socket.c:666
msgid "Unknown Organization\n"
msgstr "未知的组织\n"
-#: socket.c:643
+#: socket.c:668
#, c-format
msgid "Issuer CommonName: %s\n"
msgstr "发行者: %s\n"
-#: socket.c:646
+#: socket.c:671
msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
msgstr "警告: 发行者名称太长 (可能截短)。\n"
-#: socket.c:648
+#: socket.c:673
msgid "Unknown Issuer CommonName\n"
msgstr "未知的发行者名称\n"
-#: socket.c:654
+#: socket.c:679
#, c-format
msgid "Subject CommonName: %s\n"
msgstr "邮件标题: %s\n"
-#: socket.c:660
+#: socket.c:685
msgid "Bad certificate: Subject CommonName too long!\n"
msgstr "证书错误: 邮件标题太长!\n"
-#: socket.c:666
+#: socket.c:691
msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
msgstr "证书错误: 邮件标题名中带有 NUL 字符,退出!\n"
-#: socket.c:694
+#: socket.c:719
#, c-format
msgid "Subject Alternative Name: %s\n"
msgstr "邮件标题别名: %s\n"
-#: socket.c:700
+#: socket.c:725
msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
msgstr "证书错误: 邮件标题别名带有 NUL 字符,退出!\n"
-#: socket.c:717
+#: socket.c:742
#, c-format
msgid "Server CommonName mismatch: %s != %s\n"
msgstr "服务器名不匹配: %s != %s\n"
-#: socket.c:724
+#: socket.c:749
msgid "Server name not set, could not verify certificate!\n"
msgstr "未设置服务器名称,无法验证证书!\n"
-#: socket.c:729
+#: socket.c:754
msgid "Unknown Server CommonName\n"
msgstr "未知的服务器名\n"
-#: socket.c:731
+#: socket.c:756
msgid "Server name not specified in certificate!\n"
msgstr "服务器名称未在证书中指定!\n"
-#: socket.c:743
+#: socket.c:768
msgid "EVP_md5() failed!\n"
msgstr "EVP_md5() 失败!\n"
-#: socket.c:747
+#: socket.c:772
msgid "Out of memory!\n"
msgstr "超出内存!\n"
-#: socket.c:755
+#: socket.c:780
msgid "Digest text buffer too small!\n"
msgstr "Digest 文本缓冲区太小!\n"
-#: socket.c:761
+#: socket.c:786
#, c-format
msgid "%s key fingerprint: %s\n"
msgstr "%s 密钥指纹: %s\n"
-#: socket.c:765
+#: socket.c:790
#, c-format
msgid "%s fingerprints match.\n"
msgstr "%s 指纹匹配。\n"
-#: socket.c:767
+#: socket.c:792
#, c-format
msgid "%s fingerprints do not match!\n"
msgstr "%s 指纹不匹配!\n"
-#: socket.c:779
+#: socket.c:804
#, c-format
msgid "Server certificate verification error: %s\n"
msgstr "服务器证书验证错误: %s\n"
-#: socket.c:794
+#: socket.c:819
#, fuzzy, c-format
msgid "Broken certification chain at: %s\n"
msgstr "服务器证书验证错误: %s\n"
-#: socket.c:796
+#: socket.c:821
#, fuzzy
msgid ""
"This could mean that the server did not provide the intermediate CA's "
@@ -3023,12 +3073,12 @@ msgstr ""
"此错误通常出现在服务器提供了一个不完整的验证链,fetchmain 对此无能为力。详细"
"信息请查看随同 fetchmail 发行的 README.SSL-SERVER 文档。\n"
-#: socket.c:806
+#: socket.c:831
#, fuzzy, c-format
msgid "Missing trust anchor certificate: %s\n"
msgstr " SSL 受信证书文件: %s\n"
-#: socket.c:809
+#: socket.c:834
#, fuzzy
msgid ""
"This could mean that the root CA's signing certificate is not in the trusted "
@@ -3039,34 +3089,100 @@ msgstr ""
"这意味着根证书(为 %s 而颁发)不在 CA 证书受信路径处,或是 c_rehash 需要在证书"
"目录下运行。详细信息请查看手册页中的 --sslcertpath 和 --sslcertfile 部分。\n"
-#: socket.c:902
+#: socket.c:907 socket.c:985
+#, fuzzy
+msgid "Your OpenSSL version does not support SSLv3.\n"
+msgstr "您的系统不支持 SSLv2。\n"
+
+#: socket.c:925 socket.c:1003
+#, fuzzy
+msgid "Your OpenSSL version does not support TLS v1.1.\n"
+msgstr "您的系统不支持 SSLv2。\n"
+
+#: socket.c:936 socket.c:1014
+#, fuzzy
+msgid "Your OpenSSL version does not support TLS v1.2.\n"
+msgstr "您的系统不支持 SSLv2。\n"
+
+#: socket.c:947 socket.c:1025
+#, fuzzy
+msgid "Your OpenSSL version does not support TLS v1.3.\n"
+msgstr "您的系统不支持 SSLv2。\n"
+
+#: socket.c:956 socket.c:1035
+#, fuzzy, c-format
+msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
+msgstr "指定了无效的 SSL 协议 ‘%s’,将用默认的协议(SSLv23)代替。\n"
+
+#: socket.c:1070
+#, c-format
+msgid ""
+"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
+msgstr ""
+
+#: socket.c:1075
+#, c-format
+msgid ""
+"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
+msgstr ""
+
+#: socket.c:1095
msgid "File descriptor out of range for SSL"
msgstr "文件描述符超出 SSL 的范围"
-#: socket.c:913
-msgid "Your operating system does not support SSLv2.\n"
-msgstr "您的系统不支持 SSLv2。\n"
+#: socket.c:1115
+msgid ""
+"Note that some distributions disable older protocol versions in weird non-"
+"standard ways. Try a newer protocol version.\n"
+msgstr ""
-#: socket.c:923
+#: socket.c:1183
#, c-format
-msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
-msgstr "指定了无效的 SSL 协议 ‘%s’,将用默认的协议(SSLv23)代替。\n"
+msgid ""
+"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
+"continue.\n"
+msgstr ""
+
+#: socket.c:1198
+#, c-format
+msgid ""
+"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
+"to continue.\n"
+msgstr ""
+
+#: socket.c:1233
+msgid "Server shut down connection prematurely during SSL_connect().\n"
+msgstr ""
+
+#: socket.c:1235
+#, c-format
+msgid "System error during SSL_connect(): %s\n"
+msgstr ""
+
+#: socket.c:1255
+msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
+msgstr ""
-#: socket.c:1022
+#: socket.c:1258
+#, c-format
+msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
+msgstr ""
+
+#: socket.c:1265
msgid "Certificate/fingerprint verification was somehow skipped!\n"
msgstr "证书(指纹)验证被不明原因地跳过!\n"
-#: socket.c:1039
+#: socket.c:1282
msgid ""
"Warning: the connection is insecure, continuing anyways. (Better use --"
"sslcertck!)\n"
msgstr "警告:此连接不安全,但会继续运行。(最好使用 --sslcertck!)\n"
-#: socket.c:1081
+#: socket.c:1324
msgid "Cygwin socket read retry\n"
msgstr "重试读取 Cygwin 接口\n"
-#: socket.c:1084
+#: socket.c:1327
msgid "Cygwin socket read retry failed!\n"
msgstr "重试读取 Cygwin 接口失败!\n"
@@ -3122,142 +3238,142 @@ msgstr "发现不正确的 header 行,查看手册页中的 bad-header 选项\
msgid "line: %s"
msgstr "行: %s"
-#: transact.c:1107 transact.c:1117
+#: transact.c:1105 transact.c:1115
#, c-format
msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
msgstr "正在解析邮件\"%s\",名称\"%-.*s\"\n"
-#: transact.c:1132
+#: transact.c:1130
#, c-format
msgid "Parsing Received names \"%-.*s\"\n"
msgstr "正在解析 Received 信息\"%-.*s\"\n"
-#: transact.c:1144
+#: transact.c:1142
msgid "No envelope recipient found, resorting to header guessing.\n"
msgstr "未发现邮件接收人,采用猜测邮件头的方式。\n"
-#: transact.c:1162
+#: transact.c:1160
#, c-format
msgid "Guessing from header \"%-.*s\".\n"
msgstr "正在从邮件头\"%-.*s\"猜测。\n"
-#: transact.c:1177
+#: transact.c:1175
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "无本地匹配的收件人,正在转发至 %s\n"
-#: transact.c:1192
+#: transact.c:1190
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "正在转发且由于 DNS 错误,删除被取消了\n"
-#: transact.c:1303
+#: transact.c:1301
msgid "writing RFC822 msgblk.headers\n"
msgstr "正在重写 RFC822 协议中定义的邮件信息块的头部\n"
-#: transact.c:1322
+#: transact.c:1320
msgid "no recipient addresses matched declared local names"
msgstr "收件人地址与本地已知的用户名不匹配"
-#: transact.c:1329
+#: transact.c:1327
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "收到人地址 %s 与本地任何一个用户名均不匹配"
-#: transact.c:1338
+#: transact.c:1336
msgid "message has embedded NULs"
msgstr "邮件嵌入了 NULs"
-#: transact.c:1346
+#: transact.c:1344
msgid "SMTP listener rejected local recipient addresses: "
msgstr "SMTP 端拒绝本地收件人地址:"
-#: transact.c:1396
+#: transact.c:1394
msgid "error writing message text\n"
msgstr "在写邮件文本时出错\n"
-#: transact.c:1672
+#: transact.c:1670
#, c-format
msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
msgstr ""
"缓冲区太小。这是 %s:%lu 调用的一个错误。\n"
"\n"
-#: uid.c:249
-#, c-format
-msgid "Old UID list from %s:"
+#: uid.c:262
+#, fuzzy, c-format
+msgid "Old UID list from %s:\n"
msgstr "来自 %s 的旧 UID 列表:"
-#: uid.c:253 uid.c:264 uid.c:309
+#: uid.c:266 uid.c:275 uid.c:343
msgid " <empty>"
msgstr " <空>"
-#: uid.c:262
-msgid "Scratch list of UIDs:"
+#: uid.c:273
+#, fuzzy
+msgid "Scratch list of UIDs:\n"
msgstr "抓取 UIDs 列表:"
-#: uid.c:325 uid.c:374
-#, c-format
-msgid "Merged UID list from %s:"
+#: uid.c:357 uid.c:401
+#, fuzzy, c-format
+msgid "Merged UID list from %s:\n"
msgstr "从 %s 合并 UID 列表:"
-#: uid.c:328
-#, c-format
-msgid "New UID list from %s:"
+#: uid.c:360
+#, fuzzy, c-format
+msgid "New UID list from %s:\n"
msgstr "来自 %s 的新 UID 列表:"
-#: uid.c:355
-msgid "swapping UID lists\n"
-msgstr "正在转储 UID 列表\n"
-
-#: uid.c:363
+#: uid.c:390
msgid "not swapping UID lists, no UIDs seen this query\n"
msgstr "不转储 UID 列表,本次查寻无 UIDs 读取\n"
-#: uid.c:383
+#: uid.c:410
msgid "discarding new UID list\n"
msgstr "正在撤消新的 UID 列表\n"
-#: uid.c:419
+#: uid.c:466
msgid "Deleting fetchids file.\n"
msgstr "正在删除 fetchids 文件\n"
-#: uid.c:422
+#: uid.c:469
#, c-format
msgid "Error deleting %s: %s\n"
msgstr "删除 %s 时出错: %s\n"
-#: uid.c:428
+#: uid.c:476
msgid "Writing fetchids file.\n"
msgstr "正在写入 fetchids 文件。\n"
-#: uid.c:439 uid.c:447
+#: uid.c:490 uid.c:499
#, c-format
msgid "Write error on fetchids file %s: %s\n"
msgstr "将错误写入 fetchids 文件 %s: %s\n"
-#: uid.c:459
+#: uid.c:511
#, c-format
msgid "Error writing to fetchids file %s, old file left in place.\n"
msgstr "写入 fetchids 文件 %s 时出错,存在旧文件。\n"
-#: uid.c:463
+#: uid.c:515
#, c-format
msgid "Cannot rename fetchids file %s to %s: %s\n"
msgstr "无法将 fetchids 文件 %s 重命名为 %s: %s\n"
-#: uid.c:467
+#: uid.c:519
#, c-format
msgid "Cannot open fetchids file %s for writing: %s\n"
msgstr "无法打开 fetchids 文件 %s 写入: %s\n"
-#: xmalloc.c:33
+#: xmalloc.c:28
msgid "malloc failed\n"
msgstr "malloc 失败\n"
-#: xmalloc.c:47
+#: xmalloc.c:42
msgid "realloc failed\n"
msgstr "realloc 失败\n"
+#~ msgid "swapping UID lists\n"
+#~ msgstr "正在转储 UID 列表\n"
+
#~ msgid "unknown issuer (first %d characters): %s\n"
#~ msgstr "未知的发行者 (前 %d 个字符): %s\n"