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.po865
1 files changed, 449 insertions, 416 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 63cd35a4..b043cd08 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,14 +2,14 @@
# fetchmail 软件包的简体中文翻译.
# Copyright (C) 2008 Eric S. Raymond (msgids)
# This file is distributed under the same license as the fetchmail package.
-# Ji ZhengYu <zhengyuji@gmail.com>, 2008.
+# Ji ZhengYu <zhengyuji@gmail.com>, 2008, 2009
#
msgid ""
msgstr ""
-"Project-Id-Version: fetchmail 6.3.9-rc3\n"
+"Project-Id-Version: fetchmail 6.3.10-pre1\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2008-11-13 15:00+0100\n"
-"PO-Revision-Date: 2008-11-05 22:30+0800\n"
+"POT-Creation-Date: 2009-05-26 15:28+0200\n"
+"PO-Revision-Date: 2009-05-27 22:41中国标准时间\n"
"Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
"Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
"sourceforge.net>\n"
@@ -18,25 +18,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: checkalias.c:174
+#: checkalias.c:179
#, c-format
msgid "Checking if %s is really the same node as %s\n"
msgstr "正在检查 %s 是否与节点 %s 一致\n"
-#: checkalias.c:178
+#: checkalias.c:183
msgid "Yes, their IP addresses match\n"
msgstr "正确,它们的 IP 地址相同\n"
-#: checkalias.c:182
+#: checkalias.c:187
msgid "No, their IP addresses don't match\n"
msgstr "错误,它们的 IP 地址不同\n"
-#: checkalias.c:198
+#: checkalias.c:203
#, 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:223
+#: checkalias.c:228
#, c-format
msgid "nameserver failure while looking for `%s' during poll of %s.\n"
msgstr "收取 %2$s 中邮件并查找 ‘%1$s’ 时 nameserver 出错。\n"
@@ -86,111 +86,111 @@ 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:503
+#: driver.c:511
#, c-format
msgid "skipping message %s@%s:%d"
msgstr "忽略 %s@%s:%d 封邮件"
-#: driver.c:557
+#: driver.c:565
#, c-format
msgid "skipping message %s@%s:%d (%d octets)"
msgstr "跳过 %s@%s:%d 封邮件(%d 字节)"
-#: driver.c:573
+#: driver.c:581
msgid " (length -1)"
msgstr "( 长度 -1)"
-#: driver.c:576
+#: driver.c:584
msgid " (oversized)"
msgstr "(超大)"
-#: driver.c:594
+#: driver.c:602
#, c-format
msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
msgstr "无法获取邮件头,邮件 %s@%s:%d (%d 字节)\n"
-#: driver.c:611
+#: driver.c:619
#, c-format
msgid "reading message %s@%s:%d of %d"
msgstr "读取 %1$s@%2$s:%4$d 封中的 %3$d 封邮件"
-#: driver.c:616
+#: driver.c:624
#, c-format
msgid " (%d octets)"
msgstr " (%d 字节)"
-#: driver.c:617
+#: driver.c:625
#, c-format
msgid " (%d header octets)"
msgstr "(邮件头 %d 字节)"
-#: driver.c:685
+#: driver.c:692
#, c-format
msgid " (%d body octets)"
msgstr "(邮件内容 %d 字节)"
-#: driver.c:746
+#: driver.c:751
#, 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:777
+#: driver.c:783
msgid " retained\n"
msgstr "已保留\n"
-#: driver.c:787
+#: driver.c:793
msgid " flushed\n"
msgstr "已删除\n"
-#: driver.c:804
+#: driver.c:810
msgid " not flushed\n"
msgstr "未删除\n"
-#: driver.c:822
+#: driver.c:828
#, 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:879
+#: driver.c:885
#, c-format
msgid "timeout after %d seconds waiting to connect to server %s.\n"
msgstr "等待连接服务器 %2$s %1$d 秒后超时。\n"
-#: driver.c:883
+#: driver.c:889
#, c-format
msgid "timeout after %d seconds waiting for server %s.\n"
msgstr "等待服务器 %2$s %1$d 秒后超时。\n"
-#: driver.c:887
+#: driver.c:893
#, c-format
msgid "timeout after %d seconds waiting for %s.\n"
msgstr "等待 %2$s %1$d 秒后超时。\n"
-#: driver.c:892
+#: driver.c:898
#, c-format
msgid "timeout after %d seconds waiting for listener to respond.\n"
msgstr "等待接收端 %d 秒无响应超时。\n"
-#: driver.c:895
+#: driver.c:901
#, c-format
msgid "timeout after %d seconds.\n"
msgstr "等待 %d 秒后超时。\n"
-#: driver.c:907
+#: driver.c:913
msgid "Subject: fetchmail sees repeated timeouts"
msgstr "主题: fetchmail 发现反复超时"
-#: driver.c:910
+#: driver.c:916
#, 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:914
+#: driver.c:920
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"
@@ -205,73 +205,78 @@ msgstr ""
"\n"
"Fetchmail 不会再查寻此邮箱中的邮件,除非您重启\n"
-#: driver.c:939
+#: driver.c:946
+#, fuzzy, c-format
+msgid "pre-connection command terminated with signal %d\n"
+msgstr "预连接命令失败,返回状态 %d\n"
+
+#: driver.c:949
#, c-format
msgid "pre-connection command failed with status %d\n"
msgstr "预连接命令失败,返回状态 %d\n"
-#: driver.c:963
+#: driver.c:973
#, c-format
msgid "couldn't find HESIOD pobox for %s\n"
msgstr "HESIOD pobox 中找不到 %s\n"
-#: driver.c:984
+#: driver.c:994
msgid "Lead server has no name.\n"
msgstr "主服务器无名字。\n"
-#: driver.c:1008
+#: driver.c:1018
#, c-format
msgid "couldn't find canonical DNS name of %s (%s): %s\n"
msgstr "无法找到规范的 %s (%s) 的 DNS 名称: %s\n"
-#: driver.c:1055
+#: driver.c:1065
#, c-format
msgid "%s connection to %s failed"
msgstr "%s 连接至 %s 时失败"
-#: driver.c:1071
+#: driver.c:1081
msgid "Subject: Fetchmail unreachable-server warning."
msgstr "主题: Fetchmail 警告,找不到服务器。"
-#: driver.c:1073
+#: driver.c:1083
#, c-format
msgid "Fetchmail could not reach the mail server %s:"
msgstr "Fetchmail 不能找到邮件服务器 %s:"
-#: driver.c:1101
+#: driver.c:1111
msgid "SSL connection failed.\n"
msgstr "SSL 连接失败。\n"
-#: driver.c:1154
+#: driver.c:1164
#, c-format
msgid "Lock-busy error on %s@%s\n"
msgstr "%s@%s 出现死锁错误\n"
-#: driver.c:1158
+#: driver.c:1168
#, c-format
msgid "Server busy error on %s@%s\n"
msgstr "%s@%s 出现服务器繁忙错误\n"
-#: driver.c:1163
+#: driver.c:1173
#, c-format
msgid "Authorization failure on %s@%s%s\n"
msgstr "%s@%s%s 出现授权失败错误\n"
-#: driver.c:1166
+#: driver.c:1176
msgid " (previously authorized)"
msgstr "(事先已授权)"
-#: driver.c:1187
+#: driver.c:1197
#, c-format
msgid "Subject: fetchmail authentication failed on %s@%s"
msgstr "主题: fetchmail 在 %s@%s 上验证失败"
-#: driver.c:1191
+#: driver.c:1201
#, c-format
msgid "Fetchmail could not get mail from %s@%s.\n"
msgstr "Fetchmail 无法从 %s@%s 中获取邮件。\n"
-#: driver.c:1195
+#: driver.c:1205
msgid ""
"The attempt to get authorization failed.\n"
"Since we have already succeeded in getting authorization for this\n"
@@ -284,7 +289,7 @@ msgstr ""
"提示信息,因此这可能是另一种错误情况(比如服务器忙),从而导致\n"
" fetchmail 无法区分这些错误。"
-#: driver.c:1201
+#: driver.c:1211
msgid ""
"\n"
"However, if you HAVE changed your account details since starting the\n"
@@ -302,7 +307,7 @@ msgstr ""
"fetchmail 后台服务会继续运行并在每次被唤醒时尝试进行连接。除非\n"
"服务重置,否则它不会再发送任何提示信息了。"
-#: driver.c:1211
+#: driver.c:1221
msgid ""
"The attempt to get authorization failed.\n"
"This probably means your password is invalid, but some servers have\n"
@@ -320,164 +325,169 @@ msgstr ""
"fetchmail 后台服务会继续运行并在每次被唤醒时尝试进行连接。除非服务\n"
"重置,否则它不会再发送任何提示信息了。"
-#: driver.c:1227
+#: driver.c:1237
#, c-format
msgid "Repoll immediately on %s@%s\n"
msgstr "立即从 %s@%s 中重新收件\n"
-#: driver.c:1232
+#: driver.c:1242
#, c-format
msgid "Unknown login or authentication error on %s@%s\n"
msgstr "%s@%s 有未知的登录或验证错误\n"
-#: driver.c:1256
+#: driver.c:1266
#, c-format
msgid "Authorization OK on %s@%s\n"
msgstr "验证正确 %s@%s\n"
-#: driver.c:1262
+#: driver.c:1272
#, c-format
msgid "Subject: fetchmail authentication OK on %s@%s"
msgstr "主题: fetchmail 验证正确 %s@%s"
-#: driver.c:1266
+#: driver.c:1276
#, c-format
msgid "Fetchmail was able to log into %s@%s.\n"
msgstr "Fetchmail 可登录 %s@%s。\n"
-#: driver.c:1270
+#: driver.c:1280
msgid "Service has been restored.\n"
msgstr "服务已经被重置。\n"
-#: driver.c:1302
+#: driver.c:1312
#, c-format
msgid "selecting or re-polling folder %s\n"
msgstr "正在选择或重新检索邮箱 %s\n"
-#: driver.c:1304
+#: driver.c:1314
msgid "selecting or re-polling default folder\n"
msgstr "正在选择或重检默认邮箱\n"
-#: driver.c:1316
+#: driver.c:1326
#, c-format
msgid "%s at %s (folder %s)"
msgstr "%s 在 %s (邮箱 %s)"
-#: driver.c:1319 rcfile_y.y:382
+#: driver.c:1329 rcfile_y.y:384
#, c-format
msgid "%s at %s"
msgstr "%s 在 %s"
-#: driver.c:1324
+#: driver.c:1334
#, c-format
msgid "Polling %s\n"
msgstr "正在检取 %s\n"
-#: driver.c:1328
+#: driver.c:1338
#, 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:1331
+#: driver.c:1341
msgid "seen"
msgid_plural "seen"
msgstr[0] "已读"
-#: driver.c:1334
+#: driver.c:1344
#, c-format
msgid "%d message for %s"
msgid_plural "%d messages for %s"
msgstr[0] "%2$s 有 %1$d 封邮件"
-#: driver.c:1341
+#: driver.c:1351
#, c-format
msgid " (%d octets).\n"
msgstr "(%d 字节)。\n"
-#: driver.c:1347
+#: driver.c:1357
#, c-format
msgid "No mail for %s\n"
msgstr "%s 无邮件\n"
-#: driver.c:1380 imap.c:90
+#: driver.c:1390 imap.c:90
msgid "bogus message count!"
msgstr "发现无效邮件!"
-#: driver.c:1522
+#: driver.c:1534
msgid "socket"
msgstr "套接口"
-#: driver.c:1525
+#: driver.c:1537
msgid "missing or bad RFC822 header"
msgstr "未找到或错误的 RFC822 协议头"
-#: driver.c:1528
+#: driver.c:1540
msgid "MDA"
msgstr "MDA"
-#: driver.c:1531
+#: driver.c:1543
msgid "client/server synchronization"
msgstr "客户端/服务器同步"
-#: driver.c:1534
+#: driver.c:1546
msgid "client/server protocol"
msgstr "客户端/服务器协议"
-#: driver.c:1537
+#: driver.c:1549
msgid "lock busy on server"
msgstr "服务器死锁"
-#: driver.c:1540
+#: driver.c:1552
msgid "SMTP transaction"
msgstr "处理 SMTP"
-#: driver.c:1543
+#: driver.c:1555
msgid "DNS lookup"
msgstr "查询 DNS"
-#: driver.c:1546
+#: driver.c:1558
msgid "undefined"
msgstr "未定义"
-#: driver.c:1552
+#: driver.c:1564
#, 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:1554
+#: driver.c:1566
msgid "unknown"
msgstr "未知"
-#: driver.c:1556
+#: driver.c:1568
#, c-format
msgid "%s error while fetching from %s@%s\n"
msgstr "从 %2$s@%3$s 收件时产生错误 %1$s\n"
-#: driver.c:1567
-#, c-format
+#: driver.c:1580
+#, fuzzy, c-format
+msgid "post-connection command terminated with signal %d\n"
+msgstr "连接后执行程序失败,错误代码 %d\n"
+
+#: driver.c:1582
+#, fuzzy, c-format
msgid "post-connection command failed with status %d\n"
msgstr "连接后执行程序失败,错误代码 %d\n"
-#: driver.c:1586
+#: driver.c:1601
msgid "Kerberos V4 support not linked.\n"
msgstr "未连接 Kerberos V4 支持\n"
-#: driver.c:1594
+#: driver.c:1609
msgid "Kerberos V5 support not linked.\n"
msgstr "未连接 Kerberos V5 支持\n"
-#: driver.c:1605
+#: driver.c:1620
#, c-format
msgid "Option --flush is not supported with %s\n"
msgstr "%s 不支持 --flush 选项\n"
-#: driver.c:1611
+#: driver.c:1626
#, c-format
msgid "Option --all is not supported with %s\n"
msgstr "%s 不支持 --all 选项\n"
-#: driver.c:1620
+#: driver.c:1635
#, c-format
msgid "Option --limit is not supported with %s\n"
msgstr "%s 不支持 --limit 选项\n"
@@ -613,13 +623,13 @@ msgid ""
"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
"Wilson\n"
"Copyright (C) 2005 - 2006 Sunil Shetye\n"
-"Copyright (C) 2005 - 2008 Matthias Andree\n"
+"Copyright (C) 2005 - 2009 Matthias Andree\n"
msgstr ""
-"Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"版权所有 (C) 2002, 2003 Eric S. Raymond\n"
+"版权所有 (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
"Wilson\n"
-"Copyright (C) 2005 - 2006 Sunil Shetye\n"
-"Copyright (C) 2005 - 2008 Matthias Andree\n"
+"版权所有 (C) 2005 - 2006 Sunil Shetye\n"
+"版权所有 (C) 2005 - 2009 Matthias Andree\n"
#: fetchmail.c:142
msgid ""
@@ -643,886 +653,894 @@ msgstr "fetchmail: 调用参数"
msgid "could not get current working directory\n"
msgstr "无法得到当前工作目录\n"
-#: fetchmail.c:280
+#: fetchmail.c:283
#, c-format
msgid "This is fetchmail release %s"
msgstr "这是 fetchmail 发行版 %s"
-#: fetchmail.c:395
+#: fetchmail.c:398
#, c-format
msgid "Taking options from command line%s%s\n"
msgstr "正从命令行获得选项 %s%s\n"
-#: fetchmail.c:396
+#: fetchmail.c:399
msgid " and "
msgstr "和"
-#: fetchmail.c:401
+#: fetchmail.c:404
#, c-format
msgid "No mailservers set up -- perhaps %s is missing?\n"
msgstr "未设置邮件服务器 -- 可能未找到 %s?\n"
-#: fetchmail.c:422
+#: fetchmail.c:425
msgid "fetchmail: no mailservers have been specified.\n"
msgstr "fetchmail: 未指定邮件服务器\n"
-#: fetchmail.c:434
+#: fetchmail.c:437
msgid "fetchmail: no other fetchmail is running\n"
msgstr "fetchmail: 无其它 fetchmail 正在运行\n"
-#: fetchmail.c:440
+#: fetchmail.c:443
#, c-format
msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
msgstr "fetchmail: 终止 %s fetchmail 进程号 %d 时出错;退出\n"
-#: fetchmail.c:441 fetchmail.c:450
+#: fetchmail.c:444 fetchmail.c:453
msgid "background"
msgstr "后台"
-#: fetchmail.c:441 fetchmail.c:450
+#: fetchmail.c:444 fetchmail.c:453
msgid "foreground"
msgstr "前台"
-#: fetchmail.c:449
+#: fetchmail.c:452
#, c-format
msgid "fetchmail: %s fetchmail at %d killed.\n"
msgstr "fetchmail: %s fetchmail 进程号 %d 终止\n"
-#: fetchmail.c:472
+#: fetchmail.c:475
msgid ""
"fetchmail: can't check mail while another fetchmail to same host is "
"running.\n"
msgstr "fetchmail: 有另一个 fetchmail 在同一主机上运行时无法检查邮件。\n"
-#: fetchmail.c:478
+#: fetchmail.c:481
#, c-format
msgid ""
"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
msgstr ""
"fetchmail: 有另一个 fetchmail 进程号 %d 在指定主机上运行时无法收邮件。\n"
-#: fetchmail.c:485
+#: fetchmail.c:488
#, c-format
msgid "fetchmail: another foreground fetchmail is running at %d.\n"
msgstr "fetchmail: 另一个前台 fetchmail 进程号 %d 正在运行。\n"
-#: fetchmail.c:495
+#: fetchmail.c:498
msgid ""
"fetchmail: can't accept options while a background fetchmail is running.\n"
msgstr "fetchmail: 有后台 fetchmail 正在运行时无法接受选项\n"
-#: fetchmail.c:501
+#: fetchmail.c:504
#, c-format
msgid "fetchmail: background fetchmail at %d awakened.\n"
msgstr "fetchmail: 后台 fetchmail 进程号 %d 被唤醒\n"
-#: fetchmail.c:513
+#: fetchmail.c:516
#, c-format
msgid "fetchmail: elder sibling at %d died mysteriously.\n"
msgstr "fetchmail: 上次 fetchmail 进程号 %d 不明原因的终止\n"
-#: fetchmail.c:528
+#: fetchmail.c:531
#, c-format
msgid "fetchmail: can't find a password for %s@%s.\n"
msgstr "fetchmail: 无法找到 %s@%s 的密码\n"
-#: fetchmail.c:532
+#: fetchmail.c:535
#, c-format
msgid "Enter password for %s@%s: "
msgstr "输入 %s@%s 的密码:"
-#: fetchmail.c:557 fetchmail.c:593
+#: fetchmail.c:560 fetchmail.c:596
msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
msgstr "fetchmail: 警告: 设置了 syslog 和 logfile。通过两者查看记录!\n"
-#: fetchmail.c:569
+#: fetchmail.c:572
msgid "fetchmail: Cannot detach into background. Aborting.\n"
msgstr "fetchmail: 无法转入后台。退出\n"
-#: fetchmail.c:573
+#: fetchmail.c:576
#, c-format
msgid "starting fetchmail %s daemon \n"
msgstr "开启 fetchmail %s 后台服务\n"
-#: fetchmail.c:589 fetchmail.c:591
+#: fetchmail.c:592 fetchmail.c:594
#, c-format
msgid "could not open %s to append logs to \n"
msgstr "无法打开 %s 添加记录\n"
-#: fetchmail.c:612
+#: fetchmail.c:615
msgid "--check mode enabled, not fetching mail\n"
msgstr "开启 --check 模式, 而非真正取回邮件\n"
-#: fetchmail.c:634
+#: fetchmail.c:637
#, fuzzy, c-format
msgid "couldn't time-check %s (error %d)\n"
msgstr "无法时限检测 %s (错误号 %d)\n"
-#: fetchmail.c:639
+#: fetchmail.c:642
#, c-format
msgid "restarting fetchmail (%s changed)\n"
msgstr "正在重启 fetchmail (%s 改变了)\n"
-#: fetchmail.c:644
+#: fetchmail.c:647
msgid "attempt to re-exec may fail as directory has not been restored\n"
msgstr "由于目录尚未重置,因此重新执行的尝试可能失败\n"
-#: fetchmail.c:671
+#: fetchmail.c:674
msgid "attempt to re-exec fetchmail failed\n"
msgstr "重新执行 fetchmail 的尝试失败了\n"
-#: fetchmail.c:701
+#: fetchmail.c:704
#, c-format
msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
msgstr "忽略收取 %s 的邮件 (验证失败或多次超时)\n"
-#: fetchmail.c:713
+#: fetchmail.c:716
#, c-format
msgid "interval not reached, not querying %s\n"
msgstr "时间间隔未到,不查寻 %s \n"
-#: fetchmail.c:751
+#: fetchmail.c:754
msgid "Query status=0 (SUCCESS)\n"
msgstr "查询状态=0 (成功)\n"
-#: fetchmail.c:753
+#: fetchmail.c:756
msgid "Query status=1 (NOMAIL)\n"
msgstr "查询状态=1 (无邮件)\n"
-#: fetchmail.c:755
+#: fetchmail.c:758
msgid "Query status=2 (SOCKET)\n"
msgstr "查询状态=2 (套接字输入输出错误)\n"
-#: fetchmail.c:757
+#: fetchmail.c:760
msgid "Query status=3 (AUTHFAIL)\n"
msgstr "查询状态=3 (用户验证失败)\n"
-#: fetchmail.c:759
+#: fetchmail.c:762
msgid "Query status=4 (PROTOCOL)\n"
msgstr "查询状态=4 (协议无效)\n"
-#: fetchmail.c:761
+#: fetchmail.c:764
msgid "Query status=5 (SYNTAX)\n"
msgstr "查询状态=5 (命令行语法错误)\n"
-#: fetchmail.c:763
+#: fetchmail.c:766
msgid "Query status=6 (IOERR)\n"
msgstr "查询状态=6 (配置文件权限错误)\n"
-#: fetchmail.c:765
+#: fetchmail.c:768
msgid "Query status=7 (ERROR)\n"
msgstr "查询状态=7 (协议错误)\n"
-#: fetchmail.c:767
+#: fetchmail.c:770
msgid "Query status=8 (EXCLUDE)\n"
msgstr "查询状态=8 (客户端受到排斥)\n"
-#: fetchmail.c:769
+#: fetchmail.c:772
msgid "Query status=9 (LOCKBUSY)\n"
msgstr "查询状态=9 (服务器死锁)\n"
-#: fetchmail.c:771
+#: fetchmail.c:774
msgid "Query status=10 (SMTP)\n"
msgstr "查询状态=10 (SMTP 错误)\n"
-#: fetchmail.c:773
+#: fetchmail.c:776
msgid "Query status=11 (DNS)\n"
msgstr "查询状态=11 (DNS 错误)\n"
-#: fetchmail.c:775
+#: fetchmail.c:778
msgid "Query status=12 (BSMTP)\n"
msgstr "查询状态=12 (无法打开批量输出)\n"
-#: fetchmail.c:777
+#: fetchmail.c:780
msgid "Query status=13 (MAXFETCH)\n"
msgstr "查询状态=13 (到达收件上限)\n"
-#: fetchmail.c:779
+#: fetchmail.c:782
#, c-format
msgid "Query status=%d\n"
msgstr "查询状态=%d\n"
-#: fetchmail.c:821
+#: fetchmail.c:824
msgid "All connections are wedged. Exiting.\n"
msgstr "所有连接堵塞。退出\n"
-#: fetchmail.c:828
+#: fetchmail.c:831
#, c-format
msgid "sleeping at %s for %d seconds\n"
msgstr "在 %s 休眠 %d 秒\n"
-#: fetchmail.c:852
+#: fetchmail.c:855
#, c-format
msgid "awakened by %s\n"
msgstr "通过信号 %s 唤醒\n"
-#: fetchmail.c:855
+#: fetchmail.c:858
#, c-format
msgid "awakened by signal %d\n"
msgstr "通过信号 %d 唤醒\n"
-#: fetchmail.c:862
+#: fetchmail.c:865
#, c-format
msgid "awakened at %s\n"
msgstr "在 %s 被唤醒\n"
-#: fetchmail.c:868
+#: fetchmail.c:871
#, c-format
msgid "normal termination, status %d\n"
msgstr "正常结束,返回值 %d\n"
-#: fetchmail.c:1021
+#: fetchmail.c:1025
#, fuzzy
msgid "couldn't time-check the run-control file\n"
msgstr "无法对 run-control 文件进行时限检测\n"
-#: fetchmail.c:1054
+#: fetchmail.c:1058
#, c-format
msgid "Warning: multiple mentions of host %s in config file\n"
msgstr "警告: 在配置文件中多次提及主机 %s\n"
-#: fetchmail.c:1087
+#: fetchmail.c:1091
msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
msgstr "fetchmail: 错误: 在配置文件中有多个 “default” 记录。\n"
-#: fetchmail.c:1209
+#: fetchmail.c:1213
msgid "SSL support is not compiled in.\n"
msgstr "SSL 支持未编译在内\n"
-#: fetchmail.c:1216
+#: fetchmail.c:1220
msgid "KERBEROS v4 support is configured, but not compiled in.\n"
msgstr "设置了 KERBEROS v4 支持,但未编译在内\n"
-#: fetchmail.c:1222
+#: fetchmail.c:1226
msgid "KERBEROS v5 support is configured, but not compiled in.\n"
msgstr "设置了 KERBEROS v5 支持,但未编译在内\n"
-#: fetchmail.c:1228
+#: fetchmail.c:1232
msgid "GSSAPI support is configured, but not compiled in.\n"
msgstr "设置了 GSSAPI 支持,但未编译在内\n"
-#: fetchmail.c:1258
+#: fetchmail.c:1262
#, c-format
msgid ""
"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
msgstr "fetchmail: 警告: 无可用的 DNS 来检查取自 %s 的多投邮件\n"
-#: fetchmail.c:1269
+#: fetchmail.c:1273
#, c-format
msgid "warning: multidrop for %s requires envelope option!\n"
msgstr "警告: %s 设置了多投邮件,需设置 envelope 选项!\n"
-#: fetchmail.c:1270
+#: fetchmail.c:1274
msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
msgstr "警告: 如果所有邮件均被邮件管理员收取,不要寻求支持!\n"
-#: fetchmail.c:1287
+#: fetchmail.c:1291
#, c-format
msgid ""
"fetchmail: %s configuration invalid, specify positive port number for "
"service or port\n"
msgstr "fetchmail: %s 配置无效,为服务或端口指定大于零的端口\n"
-#: fetchmail.c:1294
+#: fetchmail.c:1298
#, c-format
msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
msgstr "fetchmail: %s 配置无效,RPOP 要求开放一个特许端口\n"
-#: fetchmail.c:1312
+#: fetchmail.c:1316
#, c-format
msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
msgstr "%s 配置无效,LMTP 不能用默认的 SMTP 端口\n"
-#: fetchmail.c:1326
+#: fetchmail.c:1330
msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
msgstr "收取所有邮件并保留服务器上的备份或使用 idle 模式是错误的!\n"
-#: fetchmail.c:1351
+#: fetchmail.c:1355
#, c-format
msgid "terminated with signal %d\n"
msgstr "以信号 %d 终止\n"
-#: fetchmail.c:1424
+#: fetchmail.c:1428
#, 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:1449
+#: fetchmail.c:1453
msgid "POP2 support is not configured.\n"
msgstr "未设置 POP2 支持\n"
-#: fetchmail.c:1461
+#: fetchmail.c:1465
msgid "POP3 support is not configured.\n"
msgstr "未设置 POP3 支持\n"
-#: fetchmail.c:1471
+#: fetchmail.c:1475
msgid "IMAP support is not configured.\n"
msgstr "未设置 IMAP 支持\n"
-#: fetchmail.c:1477
+#: fetchmail.c:1481
msgid "ETRN support is not configured.\n"
msgstr "未设置 ETRN 支持\n"
-#: fetchmail.c:1485
+#: fetchmail.c:1489
msgid "ODMR support is not configured.\n"
msgstr "未设置 ODMR 支持\n"
-#: fetchmail.c:1492
+#: fetchmail.c:1496
msgid "unsupported protocol selected.\n"
msgstr "选中了不支持的协议\n"
-#: fetchmail.c:1502
+#: fetchmail.c:1506
#, 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:1519
+#: fetchmail.c:1523
#, c-format
msgid "Poll interval is %d seconds\n"
msgstr "收件间隔 %d 秒\n"
-#: fetchmail.c:1521
+#: fetchmail.c:1525
#, c-format
msgid "Logfile is %s\n"
msgstr "日志文件为 %s\n"
-#: fetchmail.c:1523
+#: fetchmail.c:1527
#, c-format
msgid "Idfile is %s\n"
msgstr "Idfile 文件为 %s\n"
-#: fetchmail.c:1526
+#: fetchmail.c:1530
msgid "Progress messages will be logged via syslog\n"
msgstr "邮件情况将通过 syslog 来记录\n"
-#: fetchmail.c:1529
+#: fetchmail.c:1533
msgid "Fetchmail will masquerade and will not generate Received\n"
msgstr "Fetchmail 将进行伪装且不会生成 Receiverd 部分\n"
-#: fetchmail.c:1531
+#: fetchmail.c:1535
msgid "Fetchmail will show progress dots even in logfiles.\n"
msgstr "Fetchmail 将在日志文件中显示进度条(以点的形式)\n"
-#: fetchmail.c:1533
+#: fetchmail.c:1537
#, c-format
msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
msgstr "Fetchmail 将转发地址错误的多投邮件给 %s。\n"
-#: fetchmail.c:1537
+#: fetchmail.c:1541
msgid "Fetchmail will direct error mail to the postmaster.\n"
msgstr "Fetchmail 将把错误邮件转给邮件管理员\n"
-#: fetchmail.c:1539
+#: fetchmail.c:1543
msgid "Fetchmail will direct error mail to the sender.\n"
msgstr "Fetchmail 将把错误邮件退给发送者\n"
#: fetchmail.c:1546
+msgid "Fetchmail will treat permanent errors as permanent (drop messsages).\n"
+msgstr "Fetchmail 将把惯性错误当成不可恢复的错误(删除邮件)。\n"
+
+#: fetchmail.c:1548
+msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
+msgstr "Fetchmail 将把惯性错误当成临时问题(保留邮件)。\n"
+
+#: fetchmail.c:1555
#, c-format
msgid "Options for retrieving from %s@%s:\n"
msgstr "从 %s@%s 收件时的选项:\n"
-#: fetchmail.c:1550
+#: fetchmail.c:1559
#, c-format
msgid " Mail will be retrieved via %s\n"
msgstr " 邮件将通过 %s 收取\n"
-#: fetchmail.c:1553
+#: fetchmail.c:1562
#, 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:1557
+#: fetchmail.c:1566
#, c-format
msgid " True name of server is %s.\n"
msgstr " 服务器的实名为 %s。\n"
-#: fetchmail.c:1560
+#: fetchmail.c:1569
msgid " This host will not be queried when no host is specified.\n"
msgstr " 若不指明主机将不查询此主机\n"
-#: fetchmail.c:1561
+#: fetchmail.c:1570
msgid " This host will be queried when no host is specified.\n"
msgstr " 若不指明主机将查询此主机\n"
-#: fetchmail.c:1565
+#: fetchmail.c:1574
msgid " Password will be prompted for.\n"
msgstr "密码会被提示\n"
-#: fetchmail.c:1569
+#: fetchmail.c:1578
#, c-format
msgid " APOP secret = \"%s\".\n"
msgstr " APOP 密码 = “%s”\n"
-#: fetchmail.c:1572
+#: fetchmail.c:1581
#, c-format
msgid " RPOP id = \"%s\".\n"
msgstr " RPOP 密码 = “%s”\n"
-#: fetchmail.c:1575
+#: fetchmail.c:1584
#, c-format
msgid " Password = \"%s\".\n"
msgstr " 密码 = “%s”\n"
-#: fetchmail.c:1584
+#: fetchmail.c:1593
#, c-format
msgid " Protocol is KPOP with Kerberos %s authentication"
msgstr " 协议是带有 Kerberos %s 认证协议的 KPOP"
-#: fetchmail.c:1587
+#: fetchmail.c:1596
#, c-format
msgid " Protocol is %s"
msgstr " 协议是 %s"
-#: fetchmail.c:1589
+#: fetchmail.c:1598
#, c-format
msgid " (using service %s)"
msgstr " (正在使用服务 %s)"
-#: fetchmail.c:1591
+#: fetchmail.c:1600
msgid " (using default port)"
msgstr " (正在使用默认端口)"
-#: fetchmail.c:1593
+#: fetchmail.c:1602
msgid " (forcing UIDL use)"
msgstr " (正在强制使用 UIDL)"
-#: fetchmail.c:1599
+#: fetchmail.c:1608
msgid " All available authentication methods will be tried.\n"
msgstr " 将尝试所有有效的验证方式\n"
-#: fetchmail.c:1602
+#: fetchmail.c:1611
msgid " Password authentication will be forced.\n"
msgstr " 强制密码验证\n"
-#: fetchmail.c:1605
+#: fetchmail.c:1614
msgid " MSN authentication will be forced.\n"
msgstr " 强制 MSN 验证\n"
-#: fetchmail.c:1608
+#: fetchmail.c:1617
msgid " NTLM authentication will be forced.\n"
msgstr " 强制 NTLM 验证\n"
-#: fetchmail.c:1611
+#: fetchmail.c:1620
msgid " OTP authentication will be forced.\n"
msgstr " 强制 OTP 验证\n"
-#: fetchmail.c:1614
+#: fetchmail.c:1623
msgid " CRAM-Md5 authentication will be forced.\n"
msgstr " 强制 CRAM-Md5 验证\n"
-#: fetchmail.c:1617
+#: fetchmail.c:1626
msgid " GSSAPI authentication will be forced.\n"
msgstr " 强制 GSSAPI 验证\n"
-#: fetchmail.c:1620
+#: fetchmail.c:1629
msgid " Kerberos V4 authentication will be forced.\n"
msgstr " 强制 Kerberos V4 验证\n"
-#: fetchmail.c:1623
+#: fetchmail.c:1632
msgid " Kerberos V5 authentication will be forced.\n"
msgstr " 强制 Kerberos V5 验证\n"
-#: fetchmail.c:1626
+#: fetchmail.c:1635
msgid " End-to-end encryption assumed.\n"
msgstr " 假设为终端到终端加密\n"
-#: fetchmail.c:1630
+#: fetchmail.c:1639
#, c-format
msgid " Mail service principal is: %s\n"
msgstr " 邮件服务协议验证方为: %s\n"
-#: fetchmail.c:1633
+#: fetchmail.c:1642
msgid " SSL encrypted sessions enabled.\n"
msgstr "启用 SSL 加密会话\n"
-#: fetchmail.c:1635
+#: fetchmail.c:1644
#, c-format
msgid " SSL protocol: %s.\n"
msgstr " SSL 协议: %s\n"
-#: fetchmail.c:1637
+#: fetchmail.c:1646
msgid " SSL server certificate checking enabled.\n"
msgstr " 启用 SSL 服务器证书检查\n"
-#: fetchmail.c:1639
+#: fetchmail.c:1648
#, c-format
msgid " SSL trusted certificate directory: %s\n"
msgstr " SSL 受信证书目录: %s\n"
-#: fetchmail.c:1642
+#: fetchmail.c:1651
#, c-format
msgid " SSL server CommonName: %s\n"
msgstr "服务器的 CommonName: %s\n"
-#: fetchmail.c:1644
+#: fetchmail.c:1653
#, c-format
msgid " SSL key fingerprint (checked against the server key): %s\n"
msgstr " SSL 密钥指纹 (与服务器密钥对比过): %s\n"
-#: fetchmail.c:1647
+#: fetchmail.c:1656
#, c-format
msgid " Server nonresponse timeout is %d seconds"
msgstr " 服务器未响应,超时 %d 秒"
-#: fetchmail.c:1649
+#: fetchmail.c:1658
msgid " (default).\n"
msgstr " (默认)。\n"
-#: fetchmail.c:1656
+#: fetchmail.c:1665
msgid " Default mailbox selected.\n"
msgstr " 已选中默认邮箱。\n"
-#: fetchmail.c:1661
+#: fetchmail.c:1670
msgid " Selected mailboxes are:"
msgstr " 选中的邮箱是:"
-#: fetchmail.c:1667
+#: fetchmail.c:1676
msgid " All messages will be retrieved (--all on).\n"
msgstr " 收取所有邮件( --all 选项开启).\n"
-#: fetchmail.c:1668
+#: fetchmail.c:1677
msgid " Only new messages will be retrieved (--all off).\n"
msgstr " 只收取新邮件( --all 选项关闭).\n"
-#: fetchmail.c:1670
+#: fetchmail.c:1679
msgid " Fetched messages will be kept on the server (--keep on).\n"
msgstr " 收取的邮件会在服务器上保留副本( --keep 开启).\n"
-#: fetchmail.c:1671
+#: fetchmail.c:1680
msgid " Fetched messages will not be kept on the server (--keep off).\n"
msgstr " 收取的邮件不会保留在服务器上( --keep 关闭).\n"
-#: fetchmail.c:1673
+#: fetchmail.c:1682
msgid " Old messages will be flushed before message retrieval (--flush on).\n"
msgstr " 在收取新邮件前删除旧邮件(--flush 开启).\n"
-#: fetchmail.c:1674
+#: fetchmail.c:1683
msgid ""
" Old messages will not be flushed before message retrieval (--flush off).\n"
msgstr " 在收取新邮件前不删除旧邮件(--flush 关闭).\n"
-#: fetchmail.c:1676
+#: fetchmail.c:1685
msgid ""
" Oversized messages will be flushed before message retrieval (--limitflush "
"on).\n"
msgstr " 收件前将删除超大的邮件(--limitflush 开启).\n"
-#: fetchmail.c:1677
+#: fetchmail.c:1686
msgid ""
" Oversized messages will not be flushed before message retrieval (--"
"limitflush off).\n"
msgstr " 收件前将不删除超大的邮件(--limitflush 关闭).\n"
-#: fetchmail.c:1679
+#: fetchmail.c:1688
msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n"
msgstr " 本地收件人地址重写(--norewrite 关闭).\n"
-#: fetchmail.c:1680
+#: fetchmail.c:1689
msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n"
msgstr " 不重写本地收件人地址(--norewrite 开启).\n"
-#: fetchmail.c:1682
+#: fetchmail.c:1691
msgid " Carriage-return stripping is enabled (stripcr on).\n"
msgstr " 回车符清除(stripcr 开启).\n"
-#: fetchmail.c:1683
+#: fetchmail.c:1692
msgid " Carriage-return stripping is disabled (stripcr off).\n"
msgstr " 不清除回车符(stripcr 关闭).\n"
-#: fetchmail.c:1685
+#: fetchmail.c:1694
msgid " Carriage-return forcing is enabled (forcecr on).\n"
msgstr " 强行在换行前插入回车符(forcecr 开启).\n"
-#: fetchmail.c:1686
+#: fetchmail.c:1695
msgid " Carriage-return forcing is disabled (forcecr off).\n"
msgstr " 不在换行前强行插入回车符(forcecr 关闭).\n"
-#: fetchmail.c:1688
+#: fetchmail.c:1697
msgid ""
" Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
msgstr " 忽略 Content-Transfer-Encoding (pass8bits 开启).\n"
-#: fetchmail.c:1689
+#: fetchmail.c:1698
msgid ""
" Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
msgstr " 不忽略 Content-Transfer-Encoding (pass8bits 关闭).\n"
-#: fetchmail.c:1691
+#: fetchmail.c:1700
msgid " MIME decoding is enabled (mimedecode on).\n"
msgstr " 解开 MIME 编码 (mimedecode 开启).\n"
-#: fetchmail.c:1692
+#: fetchmail.c:1701
msgid " MIME decoding is disabled (mimedecode off).\n"
msgstr " 不解开 MIME 编码 (mimedecode 关闭).\n"
-#: fetchmail.c:1694
+#: fetchmail.c:1703
msgid " Idle after poll is enabled (idle on).\n"
msgstr " 收件后回到 idle 模式 (idle 开启).\n"
-#: fetchmail.c:1695
+#: fetchmail.c:1704
msgid " Idle after poll is disabled (idle off).\n"
msgstr " 收件后不回到 idle 模式 (idle 关闭).\n"
-#: fetchmail.c:1697
+#: fetchmail.c:1706
msgid " Nonempty Status lines will be discarded (dropstatus on)\n"
msgstr " 删除带有 Status 字样的行 (dropstatus 开启)\n"
-#: fetchmail.c:1698
+#: fetchmail.c:1707
msgid " Nonempty Status lines will be kept (dropstatus off)\n"
msgstr " 保留带有 Status 字样的 行 (dropstatus 关闭)\n"
-#: fetchmail.c:1700
+#: fetchmail.c:1709
msgid " Delivered-To lines will be discarded (dropdelivered on)\n"
msgstr " 删除带有 Delivered-to 的行 (dropdelivered 开启)\n"
-#: fetchmail.c:1701
+#: fetchmail.c:1710
msgid " Delivered-To lines will be kept (dropdelivered off)\n"
msgstr " 保留带有 Delivered-to 的行 (dropdelivered 关闭)\n"
-#: fetchmail.c:1705
+#: fetchmail.c:1714
#, c-format
msgid " Message size limit is %d octets (--limit %d).\n"
msgstr " 邮件大小被限制为 %d 字节 (--limit %d).\n"
-#: fetchmail.c:1708
+#: fetchmail.c:1717
msgid " No message size limit (--limit 0).\n"
msgstr " 邮件大小无限制 (--limit 0).\n"
-#: fetchmail.c:1710
+#: fetchmail.c:1719
#, c-format
msgid " Message size warning interval is %d seconds (--warnings %d).\n"
msgstr " 每隔 %d 秒发出邮件大小警告 (--warnings %d).\n"
-#: fetchmail.c:1713
+#: fetchmail.c:1722
msgid " Size warnings on every poll (--warnings 0).\n"
msgstr " 每次收件都给出邮件大小警告 (--warnings 0).\n"
-#: fetchmail.c:1716
+#: fetchmail.c:1725
#, c-format
msgid " Received-message limit is %d (--fetchlimit %d).\n"
msgstr " 单次收件限制为 %d 封(--fetchlimit %d).\n"
-#: fetchmail.c:1719
+#: fetchmail.c:1728
msgid " No received-message limit (--fetchlimit 0).\n"
msgstr " 无收件限制 (--fetchlimit 0).\n"
-#: fetchmail.c:1721
+#: fetchmail.c:1730
#, c-format
msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n"
msgstr " 限制所收邮件大小为 %d 字节(--fetchsizelimit %d).\n"
-#: fetchmail.c:1724
+#: fetchmail.c:1733
msgid " No fetch message size limit (--fetchsizelimit 0).\n"
msgstr " 所收邮件大小无限制 (--fetchsizelimit 0).\n"
-#: fetchmail.c:1728
+#: fetchmail.c:1737
msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n"
msgstr " 每次收件期间对 UIDs 进行折半查找 (--fastuidl 1).\n"
-#: fetchmail.c:1730
+#: fetchmail.c:1739
#, 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:1733
+#: fetchmail.c:1742
msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n"
msgstr " 每次收件期间对 UIDs 进行线性查找 (--fastuidl 0).\n"
-#: fetchmail.c:1735
+#: fetchmail.c:1744
#, c-format
msgid " SMTP message batch limit is %d.\n"
msgstr " 单次 SMTP 会话中最多传送 %d 封邮件。\n"
-#: fetchmail.c:1737
+#: fetchmail.c:1746
msgid " No SMTP message batch limit (--batchlimit 0).\n"
msgstr " 单次 SMTP 会话中无传送邮件限制 (--batchlimit 0)。\n"
-#: fetchmail.c:1741
+#: fetchmail.c:1750
#, c-format
msgid " Deletion interval between expunges forced to %d (--expunge %d).\n"
msgstr " 两次删除操作之间最多传送 %d 封邮件(--expunge %d)。\n"
-#: fetchmail.c:1743
+#: fetchmail.c:1752
msgid " No forced expunges (--expunge 0).\n"
msgstr " 两次删除操作之间无传送邮件限制(--expunge 0)。\n"
-#: fetchmail.c:1750
+#: fetchmail.c:1759
msgid " Domains for which mail will be fetched are:"
msgstr " 要收取的邮件位于服务器:"
-#: fetchmail.c:1755 fetchmail.c:1775
+#: fetchmail.c:1764 fetchmail.c:1784
msgid " (default)"
msgstr " (默认)"
-#: fetchmail.c:1760
+#: fetchmail.c:1769
#, c-format
msgid " Messages will be appended to %s as BSMTP\n"
msgstr " 邮件作为 BSMTP 附加至 %s\n"
-#: fetchmail.c:1762
+#: fetchmail.c:1771
#, c-format
msgid " Messages will be delivered with \"%s\".\n"
msgstr " 邮件通过 “%s” 投递。\n"
-#: fetchmail.c:1769
+#: fetchmail.c:1778
#, c-format
msgid " Messages will be %cMTP-forwarded to:"
msgstr " 邮件将被 %cMPT 转发到:"
-#: fetchmail.c:1780
+#: fetchmail.c:1789
#, c-format
msgid " Host part of MAIL FROM line will be %s\n"
msgstr " MAIL FROM 这一行的 Host 部分是 %s\n"
-#: fetchmail.c:1783
+#: fetchmail.c:1792
#, 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:1792
+#: fetchmail.c:1801
msgid " Recognized listener spam block responses are:"
msgstr " 识别出的监听端垃圾邮件拒收响应为:"
# fetchmail.c:1809
-#: fetchmail.c:1798
+#: fetchmail.c:1807
msgid " Spam-blocking disabled\n"
msgstr " 关闭垃圾邮件拒收\n"
-#: fetchmail.c:1801
+#: fetchmail.c:1810
#, c-format
msgid " Server connection will be brought up with \"%s\".\n"
msgstr " 服务器连接将被 “%s” 唤起\n"
-#: fetchmail.c:1804
+#: fetchmail.c:1813
msgid " No pre-connection command.\n"
msgstr " 无连接前要执行的程序。\n"
-#: fetchmail.c:1806
+#: fetchmail.c:1815
#, c-format
msgid " Server connection will be taken down with \"%s\".\n"
msgstr " 服务器连接将被 “%s” 关闭。\n"
-#: fetchmail.c:1809
+#: fetchmail.c:1818
msgid " No post-connection command.\n"
msgstr " 无连接后要执行的程序。\n"
-#: fetchmail.c:1812
+#: fetchmail.c:1821
msgid " No localnames declared for this host.\n"
msgstr " 此服务器没有要关联的本地用户名。\n"
-#: fetchmail.c:1822
+#: fetchmail.c:1831
msgid " Multi-drop mode: "
msgstr " 多投模式: "
-#: fetchmail.c:1824
+#: fetchmail.c:1833
msgid " Single-drop mode: "
msgstr " 单投模式: "
-#: fetchmail.c:1826
+#: fetchmail.c:1835
#, c-format
msgid "%d local name recognized.\n"
msgid_plural "%d local names recognized.\n"
msgstr[0] "识别出 %d 个本地用户名。\n"
-#: fetchmail.c:1841
+#: fetchmail.c:1850
msgid " DNS lookup for multidrop addresses is enabled.\n"
msgstr " 启用 DNS 搜寻多投地址。\n"
-#: fetchmail.c:1842
+#: fetchmail.c:1851
msgid " DNS lookup for multidrop addresses is disabled.\n"
msgstr " 关闭 DNS 搜寻多投地址。\n"
-#: fetchmail.c:1846
+#: fetchmail.c:1855
msgid ""
" Server aliases will be compared with multidrop addresses by IP address.\n"
msgstr " 服务器昵称将以 IP 地址与多投地址进行比较\n"
-#: fetchmail.c:1848
+#: fetchmail.c:1857
msgid " Server aliases will be compared with multidrop addresses by name.\n"
msgstr " 服务器昵称将以名字与多投地址进行比较\n"
-#: fetchmail.c:1851
+#: fetchmail.c:1860
msgid " Envelope-address routing is disabled\n"
msgstr " 禁用 Envelope-address 路由\n"
-#: fetchmail.c:1854
+#: fetchmail.c:1863
#, c-format
msgid " Envelope header is assumed to be: %s\n"
msgstr " 邮件头假定为: %s\n"
-#: fetchmail.c:1857
+#: fetchmail.c:1866
#, c-format
msgid " Number of envelope headers to be skipped over: %d\n"
msgstr " 跳过的邮件头数目为: %d\n"
-#: fetchmail.c:1860
+#: fetchmail.c:1869
#, c-format
msgid " Prefix %s will be removed from user id\n"
msgstr " 将从用户 id 中移除前缀 %s\n"
-#: fetchmail.c:1863
+#: fetchmail.c:1872
msgid " No prefix stripping\n"
msgstr " 没有要从用户 id 中清除的前缀\n"
-#: fetchmail.c:1870
+#: fetchmail.c:1879
msgid " Predeclared mailserver aliases:"
msgstr " 预先声明的邮件服务器昵称: "
-#: fetchmail.c:1879
+#: fetchmail.c:1888
msgid " Local domains:"
msgstr " 本地域:"
-#: fetchmail.c:1889
+#: fetchmail.c:1898
#, c-format
msgid " Connection must be through interface %s.\n"
msgstr " 必须通过地址 %s 连接\n"
-#: fetchmail.c:1891
+#: fetchmail.c:1900
msgid " No interface requirement specified.\n"
msgstr " 未指定地址要求。\n"
-#: fetchmail.c:1893
+#: fetchmail.c:1902
#, c-format
msgid " Polling loop will monitor %s.\n"
msgstr " 收件轮循将监听 %s。\n"
-#: fetchmail.c:1895
+#: fetchmail.c:1904
msgid " No monitor interface specified.\n"
msgstr " 未指定监听地址。\n"
-#: fetchmail.c:1899
+#: fetchmail.c:1908
#, c-format
msgid " Server connections will be made via plugin %s (--plugin %s).\n"
msgstr " 通过外部程序 %s 进行服务器连接 (--plugin %s)。\n"
-#: fetchmail.c:1901
+#: fetchmail.c:1910
msgid " No plugin command specified.\n"
msgstr " 未指定外部程序。\n"
-#: fetchmail.c:1903
+#: fetchmail.c:1912
#, c-format
msgid " Listener connections will be made via plugout %s (--plugout %s).\n"
msgstr " 通过外部程序 %s 进行 SMTP 连接(--plugout %s)。\n"
-#: fetchmail.c:1905
+#: fetchmail.c:1914
msgid " No plugout command specified.\n"
msgstr " 未指定外部程序。\n"
-#: fetchmail.c:1910
+#: fetchmail.c:1919
msgid " No UIDs saved from this host.\n"
msgstr " 未从此主机上保存 UIDs。\n"
-#: fetchmail.c:1919
+#: fetchmail.c:1928
#, c-format
msgid " %d UIDs saved.\n"
msgstr " 保存了 %d 个UIDs。\n"
-#: fetchmail.c:1927
+#: fetchmail.c:1936
msgid " Poll trace information will be added to the Received header.\n"
msgstr " 收件跟踪信息将被加入 Received 邮件头。\n"
-#: fetchmail.c:1929
+#: fetchmail.c:1938
msgid ""
" No poll trace information will be added to the Received header.\n"
".\n"
@@ -1530,7 +1548,7 @@ msgstr ""
" 无收件跟踪信息要被加入 Received 邮件头。\n"
"。\n"
-#: fetchmail.c:1932
+#: fetchmail.c:1941
#, c-format
msgid " Pass-through properties \"%s\".\n"
msgstr " 传送的 properties 选项为 “%s” 。\n"
@@ -1895,293 +1913,304 @@ msgstr "无法解码 OTP 请求\n"
msgid "Secret pass phrase: "
msgstr "密码短语:"
-#: options.c:168 options.c:212
+#: options.c:172 options.c:216
#, c-format
msgid "String '%s' is not a valid number string.\n"
msgstr "字符串 ‘%s’不是一个有效的数字串。\n"
-#: options.c:177
+#: options.c:181
#, c-format
msgid "Value of string '%s' is %s than %d.\n"
msgstr "字符串 ‘%1$s’ 的值比 %3$d %2$s\n"
-#: options.c:178
+#: options.c:182
msgid "smaller"
msgstr "小"
-#: options.c:178
+#: options.c:182
msgid "larger"
msgstr "大"
-#: options.c:339
+#: options.c:349
#, c-format
msgid "Invalid protocol `%s' specified.\n"
msgstr "指定了无效的协议 ‘%s’\n"
-#: options.c:386
+#: options.c:396
#, c-format
msgid "Invalid authentication `%s' specified.\n"
msgstr "指定了无效的认证方式 ‘%s’\n"
-#: options.c:591
+#: options.c:601
msgid "usage: fetchmail [options] [server ...]\n"
msgstr "用法: fetchmail [选项] [服务器...]\n"
-#: options.c:592
+#: options.c:602
msgid " Options are as follows:\n"
msgstr "选项如下:\n"
-#: options.c:593
+#: options.c:603
msgid " -?, --help display this option help\n"
msgstr " -?, --help\t显示此选项帮助\n"
-#: options.c:594
+#: options.c:604
msgid " -V, --version display version info\n"
msgstr " -V, --version\t显示版本信息\n"
-#: options.c:596
+#: options.c:606
msgid " -c, --check check for messages without fetching\n"
msgstr " -c, --check\t只检查邮件而不收取\n"
-#: options.c:597
+#: options.c:607
msgid " -s, --silent work silently\n"
msgstr " -s, --silent\t运行时不要显示多余信息\n"
-#: options.c:598
+#: options.c:608
msgid " -v, --verbose work noisily (diagnostic output)\n"
msgstr " -v, --verbose\t运行时给出信息 (诊断型的输出)\n"
-#: options.c:599
+#: options.c:609
msgid " -d, --daemon run as a daemon once per n seconds\n"
msgstr " -d, --daemon\t每 n 秒运行后台服务一次\n"
-#: options.c:600
+#: options.c:610
msgid " -N, --nodetach don't detach daemon process\n"
msgstr " -N, --nodetach\t不分离后台进程\n"
-#: options.c:601
+#: options.c:611
msgid " -q, --quit kill daemon process\n"
msgstr " -q, --quit\t终止后台进程\n"
-#: options.c:602
+#: options.c:612
msgid " -L, --logfile specify logfile name\n"
msgstr " -L, --logfile\t指定日志文件名\n"
-#: options.c:603
+#: options.c:613
msgid ""
" --syslog use syslog(3) for most messages when running as a "
"daemon\n"
msgstr " --syslog\t以后台服务运行时用 syslog(3) 得到更多的信息\n"
-#: options.c:604
+#: options.c:614
msgid " --invisible don't write Received & enable host spoofing\n"
msgstr " --invisible\t不写 Received 邮件头并允许伪装主机\n"
-#: options.c:605
+#: options.c:615
msgid " -f, --fetchmailrc specify alternate run control file\n"
msgstr " -f, --fetchmailrc\t指定可选的配置文件\n"
-#: options.c:606
+#: options.c:616
msgid " -i, --idfile specify alternate UIDs file\n"
msgstr " -i, --idfile\t指定可选的 UIDs 文件\n"
-#: options.c:607
+#: options.c:617
msgid " --pidfile specify alternate PID (lock) file\n"
msgstr " --pidfile\t指定可选的进程(锁)文件\n"
-#: options.c:608
+#: options.c:618
msgid " --postmaster specify recipient of last resort\n"
msgstr " --postmaster\t指定邮件管理员\n"
-#: options.c:609
+#: options.c:619
msgid " --nobounce redirect bounces from user to postmaster.\n"
msgstr " --nobounce\t将回送邮件从用户重定向至邮件管理员\n"
-#: options.c:611
+#: options.c:620
+msgid ""
+" --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr " --nosoftbounce\t让 fetchmail 永久删除无法投递的邮件。\n"
+
+#: options.c:621
+msgid ""
+" --softbounce keep permanently undeliverable messages on server "
+"(default).\n"
+msgstr " --softbounce\t将无法投递的邮件长期保留在服务器上(默认)。\n"
+
+#: options.c:623
msgid " -I, --interface interface required specification\n"
msgstr " -I, --interface\t指定网络地址\n"
-#: options.c:612
+#: options.c:624
msgid " -M, --monitor monitor interface for activity\n"
msgstr " -M, --moniter\t监控指定网络地址的活跃度\n"
-#: options.c:615
+#: options.c:627
msgid " --ssl enable ssl encrypted session\n"
msgstr " --ssl\t启用 ssl 加密会话\n"
-#: options.c:616
+#: options.c:628
msgid " --sslkey ssl private key file\n"
msgstr " --sslkey\tssl 私钥文件\n"
-#: options.c:617
+#: options.c:629
msgid " --sslcert ssl client certificate\n"
msgstr " --sslcert\tssl 客户端证书\n"
-#: options.c:618
+#: options.c:630
msgid " --sslcertck do strict server certificate check (recommended)\n"
msgstr " --sslcertck\t进行严格的服务器证书检查(推荐)\n"
-#: options.c:619
+#: options.c:631
msgid " --sslcertpath path to ssl certificates\n"
msgstr " --sslcertpath\tssl 证书目录\n"
-#: options.c:620
+#: options.c:632
msgid ""
" --sslcommonname expect this CommonName from server (discouraged)\n"
msgstr " --sslcommonname\t期望服务器返回 CommonName (不鼓励)\n"
-#: options.c:621
+#: options.c:633
msgid ""
" --sslfingerprint fingerprint that must match that of the server's "
"cert.\n"
msgstr " --sslfingerprint\t指定一个指纹,它必须与服务器证书的指纹匹配\n"
-#: options.c:622
+#: options.c:634
msgid " --sslproto force ssl protocol (SSL2/SSL3/TLS1)\n"
msgstr " --sslproto\t指定强制使用的 ssl 协议(SSL2/SSL3/TLS1)\n"
-#: options.c:624
+#: options.c:636
msgid " --plugin specify external command to open connection\n"
msgstr " --plugin\t指定外部程序打开连接\n"
-#: options.c:625
+#: options.c:637
msgid " --plugout specify external command to open smtp connection\n"
msgstr " --plugout\t指定外部程序打开 smtp 连接\n"
-#: options.c:627
+#: options.c:639
msgid " -p, --protocol specify retrieval protocol (see man page)\n"
msgstr " -p, --protocol\t指定收件协议 (看 man 手册页)\n"
-#: options.c:628
+#: options.c:640
msgid " -U, --uidl force the use of UIDLs (pop3 only)\n"
msgstr " -U, --uidl\t强制使用 UIDLs(仅适用于 pop3)\n"
-#: options.c:629
+#: options.c:641
msgid " --port TCP port to connect to (obsolete, use --service)\n"
msgstr " --port\t要连接的 TCP 端口(过时了,用 --service)\n"
-#: options.c:630
+#: options.c:642
msgid ""
" -P, --service TCP service to connect to (can be numeric TCP port)\n"
msgstr " -P, --service\t要连接的 TCP 服务(允许用 TCP 端口的数值来表示)\n"
-#: options.c:631
+#: options.c:643
msgid " --auth authentication type (password/kerberos/ssh/otp)\n"
msgstr " --auth\t指定验证方式(password/kerberos/ssh/otp)\n"
-#: options.c:632
+#: options.c:644
msgid " -t, --timeout server nonresponse timeout\n"
msgstr " -t, --timeout\t指定服务器超时无响应的时间\n"
-#: options.c:633
+#: options.c:645
msgid " -E, --envelope envelope address header\n"
msgstr " -E, --envelope\t指定邮件地址头\n"
-#: options.c:634
+#: options.c:646
msgid " -Q, --qvirtual prefix to remove from local user id\n"
msgstr " -Q, --qvirtual\t从当前用户移除前缀\n"
-#: options.c:635
+#: options.c:647
msgid " --principal mail service principal\n"
msgstr " --principal\t邮件服务验证方\n"
-#: options.c:636
+#: options.c:648
msgid " --tracepolls add poll-tracing information to Received header\n"
msgstr " --tracepolls\tReceived 邮件头中添加收件跟踪信息\n"
-#: options.c:638
+#: options.c:650
msgid " -u, --username specify users's login on server\n"
msgstr " -u, --username\t指定登录服务器的用户名\n"
-#: options.c:639
+#: options.c:651
msgid " -a, --[fetch]all retrieve old and new messages\n"
msgstr " -a, --[fetch]all\t收取所有新旧邮件\n"
-#: options.c:640
+#: options.c:652
msgid " -K, --nokeep delete new messages after retrieval\n"
msgstr " -K, --nokeep\t收件后删除服务器上新邮件\n"
-#: options.c:641
+#: options.c:653
msgid " -k, --keep save new messages after retrieval\n"
msgstr " -k, --keep\t收件后保留服务器上新邮件\n"
-#: options.c:642
+#: options.c:654
msgid " -F, --flush delete old messages from server\n"
msgstr " -F, --flush\t从服务器上删除旧邮件\n"
-#: options.c:643
+#: options.c:655
msgid " --limitflush delete oversized messages\n"
msgstr " --limitflush\t删除过大的邮件\n"
-#: options.c:644
+#: options.c:656
msgid " -n, --norewrite don't rewrite header addresses\n"
msgstr " -n, --norewrite\t不要重写地址头\n"
-#: options.c:645
+#: options.c:657
msgid " -l, --limit don't fetch messages over given size\n"
msgstr " -l, --limit\t不收超过指定大小的邮件\n"
-#: options.c:646
+#: options.c:658
msgid " -w, --warnings interval between warning mail notification\n"
msgstr " -w, --warnings\t邮件通知警告的间隔\n"
-#: options.c:648
+#: options.c:660
msgid " -S, --smtphost set SMTP forwarding host\n"
msgstr " -S, --smtphost\t设置 SMTP 转发主机\n"
-#: options.c:649
+#: options.c:661
msgid " --fetchdomains fetch mail for specified domains\n"
msgstr " --fetchdomains\t收取指定域的邮件\n"
-#: options.c:650
+#: options.c:662
msgid " -D, --smtpaddress set SMTP delivery domain to use\n"
msgstr " -D, --smtpaddress\t设置 SMTP 投递域\n"
-#: options.c:651
+#: options.c:663
msgid " --smtpname set SMTP full name username@domain\n"
msgstr " --smtpname\t设置 SMTP 全名,用户名@域\n"
-#: options.c:652
+#: options.c:664
msgid " -Z, --antispam, set antispam response values\n"
msgstr " -Z, --antispam,\t设置 antispam 响应值\n"
-#: options.c:653
+#: options.c:665
msgid " -b, --batchlimit set batch limit for SMTP connections\n"
msgstr " -b, --bathlimit\t为 SMTP 连接设置批量处理限制\n"
-#: options.c:654
+#: options.c:666
msgid " -B, --fetchlimit set fetch limit for server connections\n"
msgstr " -B, --fetchlimit\t为服务器连接设置收取限制\n"
-#: options.c:655
+#: options.c:667
msgid " --fetchsizelimit set fetch message size limit\n"
msgstr " --fetchsizelimit\t设置收件大小限制\n"
-#: options.c:656
+#: options.c:668
msgid " --fastuidl do a binary search for UIDLs\n"
msgstr " --fastuidl\t对 UIDLs 进行折半查找\n"
-#: options.c:657
+#: options.c:669
msgid " -e, --expunge set max deletions between expunges\n"
msgstr " -e, --expunge\t设置删除操作发生在多少封邮件之后\n"
-#: options.c:658
+#: options.c:670
msgid " -m, --mda set MDA to use for forwarding\n"
msgstr " -m, --mda\t设置用于转发的 MDA\n"
-#: options.c:659
+#: options.c:671
msgid " --bsmtp set output BSMTP file\n"
msgstr " --bsmtp\t设置 BSMTP 文件输出\n"
-#: options.c:660
+#: options.c:672
msgid " --lmtp use LMTP (RFC2033) for delivery\n"
msgstr " --lmtp\t用 LMTP 协议(RFC2033) 投递邮件\n"
-#: options.c:661
+#: options.c:673
msgid " -r, --folder specify remote folder name\n"
msgstr " -r, --folder\t指定远程邮箱名\n"
-#: options.c:662
+#: options.c:674
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots\t即使在日志文件中也要显示进度条(以点的形式)\n"
@@ -2262,57 +2291,57 @@ msgstr "正在读取 UIDLs 时协议出错\n"
msgid "Option --folder is not supported with POP3\n"
msgstr "POP3 不支持 --folder 选项\n"
-#: rcfile_y.y:124
+#: rcfile_y.y:126
msgid "server option after user options"
msgstr "服务器选项在用户选项后"
-#: rcfile_y.y:167
+#: rcfile_y.y:169
msgid "SDPS not enabled."
msgstr "SDPS 不可用"
-#: rcfile_y.y:213
+#: rcfile_y.y:215
msgid ""
"fetchmail: interface option is only supported under Linux (without IPv6) and "
"FreeBSD\n"
msgstr "fetchmail: interface 选项只有 Linux(无 IPv6)和 FreeBSD 支持\n"
-#: rcfile_y.y:220
+#: rcfile_y.y:222
msgid ""
"fetchmail: monitor option is only supported under Linux (without IPv6) and "
"FreeBSD\n"
msgstr "fetchmail: monitor 选项只有 Linux(无 IPv6)和 FreeBSD 支持\n"
-#: rcfile_y.y:333
+#: rcfile_y.y:335
msgid "SSL is not enabled"
msgstr "SSL 不可用"
-#: rcfile_y.y:383
+#: rcfile_y.y:385
msgid "end of input"
msgstr "输入结束"
-#: rcfile_y.y:421
+#: rcfile_y.y:423
#, c-format
msgid "File %s must be a regular file.\n"
msgstr "文件 %s 必须是个普通文件。\n"
-#: rcfile_y.y:431
+#: rcfile_y.y:433
#, c-format
msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
msgstr "文件 %s 不允许拥有高于 -rwx------ (0700) 的权限。\n"
-#: rcfile_y.y:443
+#: rcfile_y.y:445
#, c-format
msgid "File %s must be owned by you.\n"
msgstr "文件 %s 必须归您所有。\n"
-#: report.c:77
+#: report.c:67
msgid "Unknown system error"
msgstr "未知的系统错误"
-#: report.c:104
+#: report.c:92
#, c-format
-msgid "%s (log message incomplete)"
-msgstr "%s (日志信息不完整)"
+msgid "%s (log message incomplete)\n"
+msgstr "%s (日志信息不完整)\n"
#: rfc822.c:76
#, c-format
@@ -2528,107 +2557,111 @@ msgstr "SMTP: (回送邮件内容)\n"
msgid "mail from %s bounced to %s\n"
msgstr "邮件从 %s 回送至 %s\n"
-#: sink.c:442
+#: sink.c:446
#, c-format
msgid "Saved error is still %d\n"
msgstr "保留的错误仍然为 %d\n"
-#: sink.c:502 sink.c:587
+#: sink.c:506 sink.c:605
#, c-format
msgid "%cMTP error: %s\n"
msgstr "%cMTP 出错: %s\n"
-#: sink.c:712
+#: sink.c:550
+msgid "SMTP server requires STARTTLS, keeping message.\n"
+msgstr "SMTP 服务器需要 STARTTLS 认证,正在保存邮件。\n"
+
+#: sink.c:730
#, c-format
msgid "BSMTP file open failed: %s\n"
msgstr "打开 BSMTP 文件失败: %s\n"
-#: sink.c:758
+#: sink.c:776
msgid "BSMTP preamble write failed.\n"
msgstr "写入 BSMTP 报头失败。\n"
-#: sink.c:972
+#: sink.c:990
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr "%cMTP 端不认可收件人地址 “%s”\n"
-#: sink.c:979
+#: sink.c:997
#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr "%cMTP 端不是真的认可收件人地址 “%s”\n"
-#: sink.c:1025
+#: sink.c:1043
msgid "no address matches; no postmaster set.\n"
msgstr "无匹配的地址;也无 postmaster 设置\n"
-#: sink.c:1037
+#: sink.c:1055
#, c-format
msgid "can't even send to %s!\n"
msgstr "无法稳定发送至 %s!\n"
-#: sink.c:1043
+#: sink.c:1061
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr "无匹配的地址;转发至 %s。\n"
-#: sink.c:1199
+#: sink.c:1217
#, c-format
msgid "about to deliver with: %s\n"
msgstr "即将用 %s 投递\n"
-#: sink.c:1223
+#: sink.c:1241
msgid "MDA open failed\n"
msgstr "打开 MDA 失败\n"
-#: sink.c:1260
+#: sink.c:1278
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "%cMTP 连接至 %s 失败\n"
-#: sink.c:1284
+#: sink.c:1302
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr "无法启动 MDA 代理;正在转到 MDA 代理 %s"
-#: sink.c:1346
+#: sink.c:1364
#, c-format
msgid "Error writing to MDA: %s\n"
msgstr "写入 MDA 时出错: %s\n"
-#: sink.c:1349
+#: sink.c:1367
#, c-format
msgid "MDA died of signal %d\n"
msgstr "MDA 被信号 %d 终止\n"
-#: sink.c:1352
+#: sink.c:1370
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "MDA 返回非零值 %d\n"
-#: sink.c:1355
+#: sink.c:1373
#, 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:1377
+#: sink.c:1395
msgid "Message termination or close of BSMTP file failed\n"
msgstr "邮件终止或 BSMTP 文件关闭失败\n"
-#: sink.c:1399
+#: sink.c:1417
msgid "SMTP listener refused delivery\n"
msgstr "SMTP 端拒绝投递\n"
-#: sink.c:1429
+#: sink.c:1447
msgid "LMTP delivery error on EOM\n"
msgstr "邮件结尾时用 LTMP 协议投递错误\n"
-#: sink.c:1432
+#: sink.c:1450
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "邮件结尾时 LMTP 协议的未知的非 503 响应: %s\n"
-#: sink.c:1587
+#: sink.c:1605
msgid ""
"-- \n"
"The Fetchmail Daemon"
@@ -2636,32 +2669,32 @@ msgstr ""
"-- \n"
"Fetchmail 后台服务"
-#: smtp.c:79
+#: smtp.c:80
msgid "ESMTP CRAM-MD5 Authentication...\n"
msgstr "ESMTP CRAM-MD5 验证...\n"
-#: smtp.c:86 smtp.c:137
+#: smtp.c:87 smtp.c:138
msgid "Server rejected the AUTH command.\n"
msgstr "服务器拒绝 AUTH 命令。\n"
-#: smtp.c:94 smtp.c:144 smtp.c:154 smtp.c:160
+#: smtp.c:95 smtp.c:145 smtp.c:155 smtp.c:161
msgid "Bad base64 reply from server.\n"
msgstr "来自服务器的错误的 base64 响应。\n"
-#: smtp.c:98
+#: smtp.c:99
#, c-format
msgid "Challenge decoded: %s\n"
msgstr "请求解码: %s\n"
-#: smtp.c:115
+#: smtp.c:116
msgid "ESMTP PLAIN Authentication...\n"
msgstr "ESMTP PLAIN 验证...\n"
-#: smtp.c:130
+#: smtp.c:131
msgid "ESMTP LOGIN Authentication...\n"
msgstr "ESMTP LOGIN 验证...\n"
-#: smtp.c:331 smtp.c:354
+#: smtp.c:339 smtp.c:362
msgid "smtp listener protocol error\n"
msgstr "smtp 端协议错误\n"
@@ -2838,22 +2871,22 @@ msgstr "重试读取 Cygwin 接口\n"
msgid "Cygwin socket read retry failed!\n"
msgstr "重试读取 Cygwin 接口失败!\n"
-#: transact.c:67
+#: transact.c:65
#, c-format
msgid "mapped address %s to local %s\n"
msgstr "地址 %s 被映射至本地 %s\n"
-#: transact.c:89
+#: transact.c:87
#, c-format
msgid "mapped %s to local %s\n"
msgstr "映射 %s 至本地 %s\n"
-#: transact.c:156
+#: transact.c:154
#, c-format
msgid "passed through %s matching %s\n"
msgstr "传送过来的 %s 正与 %s 进行比较\n"
-#: transact.c:226
+#: transact.c:224
#, c-format
msgid ""
"analyzing Received line:\n"
@@ -2862,65 +2895,65 @@ msgstr ""
"正在分析 Received 行:\n"
"%s"
-#: transact.c:265
+#: transact.c:263
#, c-format
msgid "line accepted, %s is an alias of the mailserver\n"
msgstr "收到的行中 %s 是邮件服务器的一个昵称\n"
-#: transact.c:271
+#: transact.c:269
#, c-format
msgid "line rejected, %s is not an alias of the mailserver\n"
msgstr "拒收的行中 %s 非邮件服务器的昵称\n"
-#: transact.c:345
+#: transact.c:343
msgid "no Received address found\n"
msgstr "找不到 Received 地址\n"
-#: transact.c:354
+#: transact.c:352
#, c-format
msgid "found Received address `%s'\n"
msgstr "找到 Received 地址 ‘%s’\n"
-#: transact.c:551
+#: transact.c:566
msgid "message delimiter found while scanning headers\n"
msgstr "查找邮件头时发现邮件分隔符\n"
-#: transact.c:582
+#: transact.c:597
msgid "incorrect header line found while scanning headers\n"
msgstr "查找邮件头时发现不正确的行\n"
-#: transact.c:584
+#: transact.c:599
#, c-format
msgid "line: %s"
msgstr "行: %s"
-#: transact.c:1130
+#: transact.c:1138
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "无本地匹配的收件人,正在转发至 %s\n"
-#: transact.c:1145
+#: transact.c:1153
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "正在转发且由于 DNS 错误,删除被取消了\n"
-#: transact.c:1255
+#: transact.c:1263
msgid "writing RFC822 msgblk.headers\n"
msgstr "正在重写 RFC822 协议中定义的邮件信息块的头部\n"
-#: transact.c:1273
+#: transact.c:1282
msgid "no recipient addresses matched declared local names"
msgstr "收件人地址与本地已知的用户名不匹配"
-#: transact.c:1280
+#: transact.c:1289
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "收到人地址 %s 与本地任何一个用户名均不匹配"
-#: transact.c:1289
+#: transact.c:1298
msgid "message has embedded NULs"
msgstr "邮件嵌入了 NULs"
-#: transact.c:1297
+#: transact.c:1306
msgid "SMTP listener rejected local recipient addresses: "
msgstr "SMTP 端拒绝本地收件人地址:"