Release 6.3.23.

1 files changed, 242 insertions, 217 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1074b081..e7e1f7a2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.20-rc3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2012-08-14 22:55+0200\n"
+"POT-Creation-Date: 2012-12-10 22:00+0100\n"
 "PO-Revision-Date: 2011-06-14 11:42+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -618,12 +618,13 @@ msgid "Option --check is not supported with ETRN\n"
 msgstr "ETRN 不支持 --check 选项\n"
 
 #: fetchmail.c:137
+#, 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 - 2006, 2010 - 2011 Sunil Shetye\n"
-"Copyright (C) 2005 - 2011 Matthias Andree\n"
+"Copyright (C) 2005 - 2006, 2010 - 2012 Sunil Shetye\n"
+"Copyright (C) 2005 - 2012 Matthias Andree\n"
 msgstr ""
 "版权所有 (C) 2002, 2003 Eric S. Raymond\n"
 "版权所有 (C) 2004 Matthias Andree, Eric S. Raymond,\n"
@@ -658,53 +659,77 @@ msgstr "无法得到当前工作目录\n"
 msgid "This is fetchmail release %s"
 msgstr "这是 fetchmail 发行版 %s"
 
-#: fetchmail.c:408
+#: fetchmail.c:313
+msgid "The nodetach option is in effect, ignoring logfile option.\n"
+msgstr ""
+
+#: fetchmail.c:319
+msgid "Not running in daemon mode, ignoring logfile option.\n"
+msgstr ""
+
+#: fetchmail.c:325
+#, c-format
+msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
+msgstr ""
+
+#: fetchmail.c:331
+#, c-format
+msgid "Logfile \"%s\" is not writable, aborting.\n"
+msgstr ""
+
+#: fetchmail.c:349
+#, c-format
+msgid ""
+"syslog and logfile options are both set, ignoring syslog, and logging to %s"
+msgstr ""
+
+#: fetchmail.c:437
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "正从命令行获得选项 %s%s\n"
 
-#: fetchmail.c:409
+#: fetchmail.c:438
 msgid " and "
 msgstr "和"
 
-#: fetchmail.c:414
+#: fetchmail.c:443
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "未设置邮件服务器 -- 可能未找到 %s？\n"
 
-#: fetchmail.c:435
+#: fetchmail.c:464
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: 未指定邮件服务器\n"
 
-#: fetchmail.c:447
+#: fetchmail.c:476
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: 无其它 fetchmail 正在运行\n"
 
-#: fetchmail.c:453
+#: fetchmail.c:482
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
 msgstr "fetchmail: 终止 %s fetchmail 进程号 %ld 时出错；退出。\n"
 
-#: fetchmail.c:454 fetchmail.c:463
+#: fetchmail.c:483 fetchmail.c:492
 msgid "background"
 msgstr "后台"
 
-#: fetchmail.c:454 fetchmail.c:463
+#: fetchmail.c:483 fetchmail.c:492
 msgid "foreground"
 msgstr "前台"
 
-#: fetchmail.c:462
+#: fetchmail.c:491
 #, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail 进程号 %ld 终止。\n"
 
-#: fetchmail.c:485
+#: fetchmail.c:514
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
 msgstr "fetchmail: 有另一个 fetchmail 在同一主机上运行时无法检查邮件。\n"
 
-#: fetchmail.c:491
+#: fetchmail.c:520
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at "
@@ -712,855 +737,851 @@ msgid ""
 msgstr ""
 "fetchmail: 有另一个 fetchmail 进程号 %ld 在指定主机上运行时无法收邮件。\n"
 
-#: fetchmail.c:498
+#: fetchmail.c:527
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: 另一个前台 fetchmail 进程号 %ld 正在运行。\n"
 
-#: fetchmail.c:508
+#: fetchmail.c:537
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr "fetchmail: 有后台 fetchmail 正在运行时无法接受选项\n"
 
-#: fetchmail.c:514
+#: fetchmail.c:543
 #, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: 后台 fetchmail 进程号 %ld 被唤醒\n"
 
-#: fetchmail.c:526
+#: fetchmail.c:555
 #, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
 msgstr "fetchmail: 上次 fetchmail 进程号 %ld 不明原因的终止\n"
 
-#: fetchmail.c:541
+#: fetchmail.c:570
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: 无法找到 %s@%s 的密码\n"
 
-#: fetchmail.c:545
+#: fetchmail.c:574
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "输入 %s@%s 的密码:"
 
-#: fetchmail.c:587
+#: fetchmail.c:616
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: 无法转入后台。退出\n"
 
-#: fetchmail.c:591
+#: fetchmail.c:620
 #, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "开启 fetchmail %s 后台服务\n"
 
-#: fetchmail.c:607 fetchmail.c:609
+#: fetchmail.c:636 fetchmail.c:638
 #, c-format
 msgid "could not open %s to append logs to\n"
 msgstr "无法打开 %s 添加记录\n"
 
-#: fetchmail.c:611
-msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-msgstr "fetchmail: 警告: 设置了 syslog 和 logfile。通过两者查看记录！\n"
-
-#: fetchmail.c:630
+#: fetchmail.c:657
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "开启 --check 模式, 而非真正取回邮件\n"
 
-#: fetchmail.c:652
+#: fetchmail.c:679
 #, fuzzy, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "无法时限检测 %s (错误号 %d)\n"
 
-#: fetchmail.c:657
+#: fetchmail.c:684
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "正在重启 fetchmail (%s 改变了)\n"
 
-#: fetchmail.c:662
+#: fetchmail.c:689
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "由于目录尚未重置，因此重新执行的尝试可能失败\n"
 
-#: fetchmail.c:689
+#: fetchmail.c:716
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "重新执行 fetchmail 的尝试失败了\n"
 
-#: fetchmail.c:719
+#: fetchmail.c:746
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr "忽略收取 %s 的邮件 (验证失败或多次超时)\n"
 
-#: fetchmail.c:731
+#: fetchmail.c:758
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "时间间隔未到，不查寻 %s \n"
 
-#: fetchmail.c:769
+#: fetchmail.c:796
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "查询状态=0 (成功)\n"
 
-#: fetchmail.c:771
+#: fetchmail.c:798
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "查询状态=1 (无邮件)\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:800
 msgid "Query status=2 (SOCKET)\n"
 msgstr "查询状态=2 (套接字输入输出错误)\n"
 
-#: fetchmail.c:775
+#: fetchmail.c:802
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "查询状态=3 (用户验证失败)\n"
 
-#: fetchmail.c:777
+#: fetchmail.c:804
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "查询状态=4 (协议无效)\n"
 
-#: fetchmail.c:779
+#: fetchmail.c:806
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "查询状态=5 (命令行语法错误)\n"
 
-#: fetchmail.c:781
+#: fetchmail.c:808
 msgid "Query status=6 (IOERR)\n"
 msgstr "查询状态=6 (配置文件权限错误)\n"
 
-#: fetchmail.c:783
+#: fetchmail.c:810
 msgid "Query status=7 (ERROR)\n"
 msgstr "查询状态=7 (协议错误)\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:812
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "查询状态=8 (客户端受到排斥)\n"
 
-#: fetchmail.c:787
+#: fetchmail.c:814
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "查询状态=9 (服务器死锁)\n"
 
-#: fetchmail.c:789
+#: fetchmail.c:816
 msgid "Query status=10 (SMTP)\n"
 msgstr "查询状态=10 (SMTP 错误)\n"
 
-#: fetchmail.c:791
+#: fetchmail.c:818
 msgid "Query status=11 (DNS)\n"
 msgstr "查询状态=11 (DNS 错误)\n"
 
-#: fetchmail.c:793
+#: fetchmail.c:820
 msgid "Query status=12 (BSMTP)\n"
 msgstr "查询状态=12 (无法打开批量输出)\n"
 
-#: fetchmail.c:795
+#: fetchmail.c:822
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "查询状态=13 (到达收件上限)\n"
 
-#: fetchmail.c:797
+#: fetchmail.c:824
 #, c-format
 msgid "Query status=%d\n"
 msgstr "查询状态=%d\n"
 
-#: fetchmail.c:839
+#: fetchmail.c:866
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "所有连接堵塞。退出\n"
 
-#: fetchmail.c:847
+#: fetchmail.c:874
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "在 %s 休眠 %d 秒\n"
 
-#: fetchmail.c:871
+#: fetchmail.c:898
 #, c-format
 msgid "awakened by %s\n"
 msgstr "通过信号 %s 唤醒\n"
 
-#: fetchmail.c:874
+#: fetchmail.c:901
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "通过信号 %d 唤醒\n"
 
-#: fetchmail.c:882
+#: fetchmail.c:909
 #, c-format
 msgid "awakened at %s\n"
 msgstr "在 %s 被唤醒\n"
 
-#: fetchmail.c:887
+#: fetchmail.c:914
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "正常结束，返回值 %d\n"
 
-#: fetchmail.c:1046
+#: fetchmail.c:1073
 #, fuzzy
 msgid "couldn't time-check the run-control file\n"
 msgstr "无法对 run-control 文件进行时限检测\n"
 
-#: fetchmail.c:1080
+#: fetchmail.c:1107
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "警告: 在配置文件中多次提及主机 %s\n"
 
-#: fetchmail.c:1119
+#: fetchmail.c:1146
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: 错误: 在配置文件中有多个 “default” 记录。\n"
 
-#: fetchmail.c:1241
+#: fetchmail.c:1268
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL 支持未编译在内\n"
 
-#: fetchmail.c:1248
+#: fetchmail.c:1275
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "设置了 KERBEROS v4 支持，但未编译在内\n"
 
-#: fetchmail.c:1254
+#: fetchmail.c:1281
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "设置了 KERBEROS v5 支持，但未编译在内\n"
 
-#: fetchmail.c:1260
+#: fetchmail.c:1287
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "设置了 GSSAPI 支持，但未编译在内\n"
 
-#: fetchmail.c:1290
+#: fetchmail.c:1317
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr "fetchmail: 警告: 无可用的 DNS 来检查取自 %s 的多投邮件\n"
 
-#: fetchmail.c:1301
+#: fetchmail.c:1328
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "警告: %s 设置了多投邮件，需设置 envelope 选项！\n"
 
-#: fetchmail.c:1302
+#: fetchmail.c:1329
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr "警告: 如果所有邮件均被邮件管理员收取，不要寻求支持！\n"
 
-#: fetchmail.c:1319
+#: fetchmail.c:1346
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
 "service or port\n"
 msgstr "fetchmail: %s 配置无效，为服务或端口指定大于零的端口\n"
 
-#: fetchmail.c:1326
+#: fetchmail.c:1353
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "fetchmail: %s 配置无效，RPOP 要求开放一个特许端口\n"
 
-#: fetchmail.c:1344
+#: fetchmail.c:1371
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "%s 配置无效，LMTP 不能用默认的 SMTP 端口\n"
 
-#: fetchmail.c:1358
+#: fetchmail.c:1385
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "收取所有邮件并保留服务器上的备份或使用 idle 模式是错误的！\n"
 
-#: fetchmail.c:1383
+#: fetchmail.c:1410
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "以信号 %d 终止\n"
 
-#: fetchmail.c:1456
+#: fetchmail.c:1483
 #, 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:1481
+#: fetchmail.c:1508
 msgid "POP2 support is not configured.\n"
 msgstr "未设置 POP2 支持\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1520
 msgid "POP3 support is not configured.\n"
 msgstr "未设置 POP3 支持\n"
 
-#: fetchmail.c:1503
+#: fetchmail.c:1530
 msgid "IMAP support is not configured.\n"
 msgstr "未设置 IMAP 支持\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1536
 msgid "ETRN support is not configured.\n"
 msgstr "未设置 ETRN 支持\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1544
 msgid "ODMR support is not configured.\n"
 msgstr "未设置 ODMR 支持\n"
 
-#: fetchmail.c:1524
+#: fetchmail.c:1551
 msgid "unsupported protocol selected.\n"
 msgstr "选中了不支持的协议\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1561
 #, 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:1551
+#: fetchmail.c:1578
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "收件间隔 %d 秒\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1580
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "日志文件为 %s\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1582
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile 文件为 %s\n"
 
-#: fetchmail.c:1558
+#: fetchmail.c:1585
 msgid "Progress messages will be logged via syslog\n"
 msgstr "邮件情况将通过 syslog 来记录\n"
 
-#: fetchmail.c:1561
+#: fetchmail.c:1588
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail 将进行伪装且不会生成 Receiverd 部分\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1590
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail 将在日志文件中显示进度条(以点的形式)\n"
 
-#: fetchmail.c:1565
+#: fetchmail.c:1592
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail 将转发地址错误的多投邮件给 %s。\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1596
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail 将把错误邮件转给邮件管理员\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1598
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail 将把错误邮件退给发送者\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1601
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "Fetchmail 将把长期错误当成不可恢复的错误(删除邮件)。\n"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1603
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail 将把惯性错误当成临时问题(保留邮件)。\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1610
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "从 %s@%s 收件时的选项:\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1614
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr " 邮件将通过 %s 收取\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1617
 #, 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:1594
+#: fetchmail.c:1621
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr " 服务器的实名为 %s。\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1624
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr " 若不指明主机将不查询此主机\n"
 
-#: fetchmail.c:1598
+#: fetchmail.c:1625
 msgid "  This host will be queried when no host is specified.\n"
 msgstr " 若不指明主机将查询此主机\n"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1629
 msgid "  Password will be prompted for.\n"
 msgstr "密码会被提示\n"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1633
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr " APOP 密码 = “%s”\n"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1636
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr " RPOP 密码 = “%s”\n"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1639
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr " 密码 = “%s”\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1648
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr " 协议是带有 Kerberos %s 认证协议的 KPOP"
 
-#: fetchmail.c:1624
+#: fetchmail.c:1651
 #, c-format
 msgid "  Protocol is %s"
 msgstr " 协议是 %s"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1653
 #, c-format
 msgid " (using service %s)"
 msgstr " (正在使用服务 %s)"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1655
 msgid " (using default port)"
 msgstr " (正在使用默认端口)"
 
-#: fetchmail.c:1630
+#: fetchmail.c:1657
 msgid " (forcing UIDL use)"
 msgstr " (正在强制使用 UIDL)"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1663
 msgid "  All available authentication methods will be tried.\n"
 msgstr " 将尝试所有有效的验证方式\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1666
 msgid "  Password authentication will be forced.\n"
 msgstr " 强制密码验证\n"
 
-#: fetchmail.c:1642
+#: fetchmail.c:1669
 msgid "  MSN authentication will be forced.\n"
 msgstr " 强制 MSN 验证\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1672
 msgid "  NTLM authentication will be forced.\n"
 msgstr " 强制 NTLM 验证\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1675
 msgid "  OTP authentication will be forced.\n"
 msgstr " 强制 OTP 验证\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1678
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr " 强制 CRAM-MD5 验证\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1681
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr " 强制 GSSAPI 验证\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1684
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr " 强制 Kerberos V4 验证\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1687
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr " 强制 Kerberos V5 验证\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1690
 msgid "  End-to-end encryption assumed.\n"
 msgstr " 假设为终端到终端加密\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1694
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr " 邮件服务协议验证方为: %s\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1697
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "启用 SSL 加密会话\n"
 
-#: fetchmail.c:1672
+#: fetchmail.c:1699
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr " SSL 协议: %s\n"
 
-#: fetchmail.c:1674
+#: fetchmail.c:1701
 msgid "  SSL server certificate checking enabled.\n"
 msgstr " 启用 SSL 服务器证书检查\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1704
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr " SSL 受信证书文件: %s\n"
 
-#: fetchmail.c:1679
+#: fetchmail.c:1706
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr " SSL 受信证书目录: %s\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1708
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  SSL 服务器名: %s\n"
 
-#: fetchmail.c:1683
+#: fetchmail.c:1710
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr " SSL 密钥指纹 (与服务器密钥对比过): %s\n"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1713
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr " 服务器未响应，超时 %d 秒"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1715
 msgid " (default).\n"
 msgstr " (默认)。\n"
 
-#: fetchmail.c:1695
+#: fetchmail.c:1722
 msgid "  Default mailbox selected.\n"
 msgstr " 已选中默认邮箱。\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1727
 msgid "  Selected mailboxes are:"
 msgstr " 选中的邮箱是:"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1733
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr " 收取所有邮件( --all 选项开启).\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1734
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr " 只收取新邮件( --all 选项关闭).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1736
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr " 收取的邮件会在服务器上保留副本( --keep 开启).\n"
 
-#: fetchmail.c:1710
+#: fetchmail.c:1737
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr " 收取的邮件不会保留在服务器上( --keep 关闭).\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1739
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr " 在收取新邮件前删除旧邮件(--flush 开启).\n"
 
-#: fetchmail.c:1713
+#: fetchmail.c:1740
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr " 在收取新邮件前不删除旧邮件(--flush 关闭).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1742
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
 msgstr " 收件前将删除超大的邮件(--limitflush 开启).\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1743
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
 msgstr " 收件前将不删除超大的邮件(--limitflush 关闭).\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1745
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr " 本地收件人地址重写(--norewrite 关闭).\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1746
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr " 不重写本地收件人地址(--norewrite 开启).\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1748
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr " 回车符清除(stripcr 开启).\n"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1749
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr " 不清除回车符(stripcr 关闭).\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1751
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr " 强行在换行前插入回车符(forcecr 开启).\n"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1752
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr " 不在换行前强行插入回车符(forcecr 关闭).\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1754
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr " 忽略 Content-Transfer-Encoding (pass8bits 开启).\n"
 
-#: fetchmail.c:1728
+#: fetchmail.c:1755
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr " 不忽略 Content-Transfer-Encoding (pass8bits 关闭).\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1757
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr " 解开 MIME 编码 (mimedecode 开启).\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1758
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr " 不解开 MIME 编码 (mimedecode 关闭).\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1760
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr " 收件后回到 idle 模式 (idle 开启).\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1761
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr " 收件后不回到 idle 模式 (idle 关闭).\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1763
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr " 删除带有 Status 字样的行 (dropstatus 开启)\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1764
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr " 保留带有 Status 字样的 行 (dropstatus 关闭)\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1766
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr " 删除带有 Delivered-to 的行 (dropdelivered 开启)\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1767
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr " 保留带有 Delivered-to 的行 (dropdelivered 关闭)\n"
 
-#: fetchmail.c:1744
+#: fetchmail.c:1771
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr " 邮件大小被限制为 %d 字节 (--limit %d).\n"
 
-#: fetchmail.c:1747
+#: fetchmail.c:1774
 msgid "  No message size limit (--limit 0).\n"
 msgstr " 邮件大小无限制 (--limit 0).\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1776
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr " 每隔 %d 秒发出邮件大小警告 (--warnings %d).\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1779
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr " 每次收件都给出邮件大小警告 (--warnings 0).\n"
 
-#: fetchmail.c:1755
+#: fetchmail.c:1782
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr " 单次收件限制为 %d 封(--fetchlimit %d).\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1785
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr " 无收件限制 (--fetchlimit 0).\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1787
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr " 限制所收邮件大小为 %d 字节(--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1790
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr " 所收邮件大小无限制 (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1767
+#: fetchmail.c:1794
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr " 每次收件期间对 UIDs 进行折半查找 (--fastuidl 1).\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1796
 #, 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:1772
+#: fetchmail.c:1799
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr " 每次收件期间对 UIDs 进行线性查找 (--fastuidl 0).\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1801
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr " 单次 SMTP 会话中最多传送 %d 封邮件。\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1803
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr " 单次 SMTP 会话中无传送邮件限制 (--batchlimit 0)。\n"
 
-#: fetchmail.c:1780
+#: fetchmail.c:1807
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr " 两次删除操作之间最多传送 %d 封邮件(--expunge %d)。\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1809
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr " 两次删除操作之间无传送邮件限制(--expunge 0)。\n"
 
-#: fetchmail.c:1789
+#: fetchmail.c:1816
 msgid "  Domains for which mail will be fetched are:"
 msgstr " 要收取的邮件位于服务器:"
 
-#: fetchmail.c:1794 fetchmail.c:1814
+#: fetchmail.c:1821 fetchmail.c:1841
 msgid " (default)"
 msgstr " (默认)"
 
-#: fetchmail.c:1799
+#: fetchmail.c:1826
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr " 邮件作为 BSMTP 附加至 %s\n"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1828
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr " 邮件通过 “%s” 投递。\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1835
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr " 邮件将被 %cMPT 转发到:"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1846
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr " MAIL FROM 这一行的 Host 部分是 %s\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1849
 #, 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:1831
+#: fetchmail.c:1858
 msgid "  Recognized listener spam block responses are:"
 msgstr "  识别出的监听端垃圾邮件拒收响应为:"
 
 # fetchmail.c:1809
-#: fetchmail.c:1837
+#: fetchmail.c:1864
 msgid "  Spam-blocking disabled\n"
 msgstr " 关闭垃圾邮件拒收\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1867
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr " 服务器连接将被 “%s” 唤起\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1870
 msgid "  No pre-connection command.\n"
 msgstr " 无连接前要执行的程序。\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1872
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr " 服务器连接将被 “%s” 关闭。\n"
 
-#: fetchmail.c:1848
+#: fetchmail.c:1875
 msgid "  No post-connection command.\n"
 msgstr " 无连接后要执行的程序。\n"
 
-#: fetchmail.c:1851
+#: fetchmail.c:1878
 msgid "  No localnames declared for this host.\n"
 msgstr " 此服务器没有要关联的本地用户名。\n"
 
-#: fetchmail.c:1861
+#: fetchmail.c:1888
 msgid "  Multi-drop mode: "
 msgstr " 多投模式: "
 
-#: fetchmail.c:1863
+#: fetchmail.c:1890
 msgid "  Single-drop mode: "
 msgstr " 单投模式: "
 
-#: fetchmail.c:1865
+#: fetchmail.c:1892
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "识别出 %d 个本地用户名。\n"
 
-#: fetchmail.c:1880
+#: fetchmail.c:1907
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr " 启用 DNS 搜寻多投地址。\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1908
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr " 关闭 DNS 搜寻多投地址。\n"
 
-#: fetchmail.c:1885
+#: fetchmail.c:1912
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr " 服务器昵称将以 IP 地址与多投地址进行比较\n"
 
-#: fetchmail.c:1887
+#: fetchmail.c:1914
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr " 服务器昵称将以名字与多投地址进行比较\n"
 
-#: fetchmail.c:1890
+#: fetchmail.c:1917
 msgid "  Envelope-address routing is disabled\n"
 msgstr " 禁用 Envelope-address 路由\n"
 
-#: fetchmail.c:1893
+#: fetchmail.c:1920
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr " 邮件头假定为: %s\n"
 
-#: fetchmail.c:1896
+#: fetchmail.c:1923
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr " 跳过的邮件头数目为: %d\n"
 
-#: fetchmail.c:1899
+#: fetchmail.c:1926
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr " 将从用户 id 中移除前缀 %s\n"
 
-#: fetchmail.c:1902
+#: fetchmail.c:1929
 msgid "  No prefix stripping\n"
 msgstr " 没有要从用户 id 中清除的前缀\n"
 
-#: fetchmail.c:1907
+#: fetchmail.c:1934
 msgid "  Predeclared mailserver aliases:"
 msgstr " 预先声明的邮件服务器昵称: "
 
-#: fetchmail.c:1915
+#: fetchmail.c:1942
 msgid "  Local domains:"
 msgstr " 本地域:"
 
-#: fetchmail.c:1925
+#: fetchmail.c:1952
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr " 必须通过地址 %s 连接\n"
 
-#: fetchmail.c:1927
+#: fetchmail.c:1954
 msgid "  No interface requirement specified.\n"
 msgstr " 未指定地址要求。\n"
 
-#: fetchmail.c:1929
+#: fetchmail.c:1956
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr " 收件轮循将监听 %s。\n"
 
-#: fetchmail.c:1931
+#: fetchmail.c:1958
 msgid "  No monitor interface specified.\n"
 msgstr " 未指定监听地址。\n"
 
-#: fetchmail.c:1935
+#: fetchmail.c:1962
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr " 通过外部程序 %s 进行服务器连接 (--plugin %s)。\n"
 
-#: fetchmail.c:1937
+#: fetchmail.c:1964
 msgid "  No plugin command specified.\n"
 msgstr " 未指定外部程序。\n"
 
-#: fetchmail.c:1939
+#: fetchmail.c:1966
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr " 通过外部程序 %s 进行 SMTP 连接(--plugout %s)。\n"
 
-#: fetchmail.c:1941
+#: fetchmail.c:1968
 msgid "  No plugout command specified.\n"
 msgstr " 未指定外部程序。\n"
 
-#: fetchmail.c:1946
+#: fetchmail.c:1973
 msgid "  No UIDs saved from this host.\n"
 msgstr " 未从此主机上保存 UIDs。\n"
 
-#: fetchmail.c:1955
+#: fetchmail.c:1982
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr " 保存了 %d 个UIDs。\n"
 
-#: fetchmail.c:1963
+#: fetchmail.c:1990
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr " 收件跟踪信息将被加入 Received 邮件头。\n"
 
-#: fetchmail.c:1965
+#: fetchmail.c:1992
 msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 " 无收件跟踪信息要被加入 Received 邮件头。\n"
 "。\n"
 
-#: fetchmail.c:1970
+#: fetchmail.c:1997
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr " 邮件头错误的邮件将被拒收。\n"
 
-#: fetchmail.c:1973
+#: fetchmail.c:2000
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr " 邮件头错误的邮件可以接收。\n"
 
-#: fetchmail.c:1978
+#: fetchmail.c:2005
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr " 传送的 properties 选项为 “%s” 。\n"
@@ -2293,9 +2314,9 @@ msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr " --showdots\t即使在日志文件中也要显示进度条(以点的形式)\n"
 
 #: pop3.c:327
+#, fuzzy
 msgid ""
-"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
-"of TOP.\n"
+"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
 msgstr "警告: 发现“ POP3 代理服务器”，用 RETR 命令代替 TOP。\n"
 
 #: pop3.c:411
@@ -3007,34 +3028,34 @@ msgstr ""
 "这意味着根证书(为 %s 而颁发)不在 CA 证书受信路径处，或是 c_rehash 需要在证书"
 "目录下运行。详细信息请查看手册页中的 --sslcertpath 和 --sslcertfile 部分。\n"
 
-#: socket.c:869
+#: socket.c:870
 msgid "File descriptor out of range for SSL"
 msgstr "文件描述符超出 SSL 的范围"
 
-#: socket.c:880
+#: socket.c:881
 msgid "Your operating system does not support SSLv2.\n"
 msgstr ""
 
-#: socket.c:890
+#: socket.c:891
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "指定了无效的 SSL 协议 ‘%s’，将用默认的协议(SSLv23)代替。\n"
 
-#: socket.c:989
+#: socket.c:990
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "证书(指纹)验证被不明原因地跳过！\n"
 
-#: socket.c:1006
+#: socket.c:1007
 msgid ""
 "Warning: the connection is insecure, continuing anyways. (Better use --"
 "sslcertck!)\n"
 msgstr "警告:此连接不安全，但会继续运行。(最好使用 --sslcertck！)\n"
 
-#: socket.c:1048
+#: socket.c:1049
 msgid "Cygwin socket read retry\n"
 msgstr "重试读取 Cygwin 接口\n"
 
-#: socket.c:1051
+#: socket.c:1052
 msgid "Cygwin socket read retry failed!\n"
 msgstr "重试读取 Cygwin 接口失败！\n"
 
@@ -3226,6 +3247,10 @@ msgstr "malloc 失败\n"
 msgid "realloc failed\n"
 msgstr "realloc 失败\n"
 
+#~ msgid ""
+#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+#~ msgstr "fetchmail: 警告: 设置了 syslog 和 logfile。通过两者查看记录！\n"
+
 #~ msgid "Subject: Fetchmail unreachable-server warning."
 #~ msgstr "主题: Fetchmail 警告，找不到服务器。"