Update translations (German); to -beta1/2 (Chinese/Dutch, Italian).

1 files changed, 313 insertions, 335 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index b936f78c..eb6e15d9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,14 +2,14 @@
 # fetchmail 软件包的简体中文翻译.
 # Copyright (C) 2008 Eric S. Raymond (msgids)
 # This file is distributed under the same license as the fetchmail package.
-# Ji ZhengYu <zhengyuji@gmail.com>, 2008, 2009
+# Ji ZhengYu <zhengyuji@gmail.com>, 2008, 2009, 2010
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: fetchmail 6.3.12\n"
+"Project-Id-Version: fetchmail 6.3.15-pre1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-04 14:52+0100\n"
-"PO-Revision-Date: 2009-10-12 11:45中国标准时间\n"
+"POT-Creation-Date: 2010-02-24 01:55+0100\n"
+"PO-Revision-Date: 2010-02-26 08:51+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -56,12 +56,12 @@ msgstr "kerberos 认证系统出错 %s\n"
 
 #: driver.c:249
 #, fuzzy, c-format
-msgid "krb5_sendauth: %s [server says '%s'] \n"
+msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [ 服务器请求 ‘%*s’]\n"
 
 #: driver.c:254
-#, c-format
-msgid "krb5_sendauth: %s [server says '%*s'] \n"
+#, fuzzy, c-format
+msgid "krb5_sendauth: %s [server says '%*s']\n"
 msgstr "krb5_sendauth: %s [ 服务器请求 ‘%*s’]\n"
 
 #: driver.c:335
@@ -135,8 +135,7 @@ msgstr "(邮件内容 %d 字节)"
 
 #: driver.c:751
 #, c-format
-msgid ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr "%s@%s:%d 邮件非所需大小 (实际 %d 字节!= 所要求的 %d 字节)\n"
 
 #: driver.c:783
@@ -154,8 +153,7 @@ msgstr "未删除\n"
 #: 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"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr[0] "到达收件上限 %d；%d 封邮件留在服务器 %s 帐号为 %s\n"
 
 #: driver.c:885
@@ -189,9 +187,7 @@ msgstr "主题: fetchmail 发现反复超时"
 
 #: driver.c:916
 #, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
-"s.\n"
+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:920
@@ -372,7 +368,7 @@ msgstr "正在选择或重检默认邮箱\n"
 msgid "%s at %s (folder %s)"
 msgstr "%s 在 %s (邮箱 %s)"
 
-#: driver.c:1332 rcfile_y.y:384
+#: driver.c:1332 rcfile_y.y:389
 #, c-format
 msgid "%s at %s"
 msgstr "%s 在 %s"
@@ -516,8 +512,7 @@ msgstr ""
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
 "This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
-"headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 msgstr ""
@@ -549,8 +544,7 @@ msgstr "无法在主机数据库中找到自己的主机来验证它！\n"
 #: env.c:174
 msgid ""
 "Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
-"problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 msgstr ""
 "正在尝试用未验证的主机名继续操作。\n"
@@ -622,7 +616,6 @@ 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"
@@ -630,11 +623,11 @@ msgid ""
 "Copyright (C) 2005 - 2006, 2010 Sunil Shetye\n"
 "Copyright (C) 2005 - 2010 Matthias Andree\n"
 msgstr ""
-"版权所有 (C) 2002, 2003 Eric S. Raymond\n"
-"版权所有 (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
-"Wilson\n"
-"版权所有 (C) 2005 - 2006 Sunil Shetye\n"
-"版权所有 (C) 2005 - 2009 Matthias Andree\n"
+"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 Sunil Shetye\n"
+"Copyright (C) 2005 - 2010 Matthias Andree\n"
 
 #: fetchmail.c:143
 msgid ""
@@ -704,17 +697,13 @@ msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail 进程号 %d 终止\n"
 
 #: fetchmail.c:481
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
 msgstr "fetchmail: 有另一个 fetchmail 在同一主机上运行时无法检查邮件。\n"
 
 #: fetchmail.c:487
 #, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
-msgstr ""
-"fetchmail: 有另一个 fetchmail 进程号 %d 在指定主机上运行时无法收邮件。\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr "fetchmail: 有另一个 fetchmail 进程号 %d 在指定主机上运行时无法收邮件。\n"
 
 #: fetchmail.c:494
 #, c-format
@@ -722,8 +711,7 @@ msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: 另一个前台 fetchmail 进程号 %d 正在运行。\n"
 
 #: fetchmail.c:504
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr "fetchmail: 有后台 fetchmail 正在运行时无法接受选项\n"
 
 #: fetchmail.c:510
@@ -752,12 +740,12 @@ msgstr "fetchmail: 无法转入后台。退出\n"
 
 #: fetchmail.c:587
 #, c-format
-msgid "starting fetchmail %s daemon \n"
+msgid "starting fetchmail %s daemon\n"
 msgstr "开启 fetchmail %s 后台服务\n"
 
 #: fetchmail.c:603 fetchmail.c:605
 #, c-format
-msgid "could not open %s to append logs to \n"
+msgid "could not open %s to append logs to\n"
 msgstr "无法打开 %s 添加记录\n"
 
 #: fetchmail.c:607
@@ -886,675 +874,669 @@ msgstr "在 %s 被唤醒\n"
 msgid "normal termination, status %d\n"
 msgstr "正常结束，返回值 %d\n"
 
-#: fetchmail.c:1037
+#: fetchmail.c:1039
 #, fuzzy
 msgid "couldn't time-check the run-control file\n"
 msgstr "无法对 run-control 文件进行时限检测\n"
 
-#: fetchmail.c:1070
+#: fetchmail.c:1072
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "警告: 在配置文件中多次提及主机 %s\n"
 
-#: fetchmail.c:1103
+#: fetchmail.c:1105
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: 错误: 在配置文件中有多个 “default” 记录。\n"
 
-#: fetchmail.c:1225
+#: fetchmail.c:1227
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL 支持未编译在内\n"
 
-#: fetchmail.c:1232
+#: fetchmail.c:1234
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "设置了 KERBEROS v4 支持，但未编译在内\n"
 
-#: fetchmail.c:1238
+#: fetchmail.c:1240
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "设置了 KERBEROS v5 支持，但未编译在内\n"
 
-#: fetchmail.c:1244
+#: fetchmail.c:1246
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "设置了 GSSAPI 支持，但未编译在内\n"
 
-#: fetchmail.c:1274
+#: fetchmail.c:1276
 #, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr "fetchmail: 警告: 无可用的 DNS 来检查取自 %s 的多投邮件\n"
 
-#: fetchmail.c:1285
+#: fetchmail.c:1287
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "警告: %s 设置了多投邮件，需设置 envelope 选项！\n"
 
-#: fetchmail.c:1286
+#: fetchmail.c:1288
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr "警告: 如果所有邮件均被邮件管理员收取，不要寻求支持！\n"
 
-#: fetchmail.c:1303
+#: fetchmail.c:1305
 #, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
 msgstr "fetchmail: %s 配置无效，为服务或端口指定大于零的端口\n"
 
-#: fetchmail.c:1310
+#: fetchmail.c:1312
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "fetchmail: %s 配置无效，RPOP 要求开放一个特许端口\n"
 
-#: fetchmail.c:1328
+#: fetchmail.c:1330
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "%s 配置无效，LMTP 不能用默认的 SMTP 端口\n"
 
-#: fetchmail.c:1342
+#: fetchmail.c:1344
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "收取所有邮件并保留服务器上的备份或使用 idle 模式是错误的！\n"
 
-#: fetchmail.c:1367
+#: fetchmail.c:1369
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "以信号 %d 终止\n"
 
-#: fetchmail.c:1440
+#: fetchmail.c:1442
 #, 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:1465
+#: fetchmail.c:1467
 msgid "POP2 support is not configured.\n"
 msgstr "未设置 POP2 支持\n"
 
-#: fetchmail.c:1477
+#: fetchmail.c:1479
 msgid "POP3 support is not configured.\n"
 msgstr "未设置 POP3 支持\n"
 
-#: fetchmail.c:1487
+#: fetchmail.c:1489
 msgid "IMAP support is not configured.\n"
 msgstr "未设置 IMAP 支持\n"
 
-#: fetchmail.c:1493
+#: fetchmail.c:1495
 msgid "ETRN support is not configured.\n"
 msgstr "未设置 ETRN 支持\n"
 
-#: fetchmail.c:1501
+#: fetchmail.c:1503
 msgid "ODMR support is not configured.\n"
 msgstr "未设置 ODMR 支持\n"
 
-#: fetchmail.c:1508
+#: fetchmail.c:1510
 msgid "unsupported protocol selected.\n"
 msgstr "选中了不支持的协议\n"
 
-#: fetchmail.c:1518
+#: fetchmail.c:1520
 #, 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:1535
+#: fetchmail.c:1537
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "收件间隔 %d 秒\n"
 
-#: fetchmail.c:1537
+#: fetchmail.c:1539
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "日志文件为 %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1541
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile 文件为 %s\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1544
 msgid "Progress messages will be logged via syslog\n"
 msgstr "邮件情况将通过 syslog 来记录\n"
 
-#: fetchmail.c:1545
+#: fetchmail.c:1547
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail 将进行伪装且不会生成 Receiverd 部分\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1549
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail 将在日志文件中显示进度条(以点的形式)\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1551
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail 将转发地址错误的多投邮件给 %s。\n"
 
-#: fetchmail.c:1553
+#: fetchmail.c:1555
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail 将把错误邮件转给邮件管理员\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1557
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail 将把错误邮件退给发送者\n"
 
-#: fetchmail.c:1558
-#, fuzzy
+#: fetchmail.c:1560
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr "Fetchmail 将把惯性错误当成不可恢复的错误(删除邮件)。\n"
+msgstr "Fetchmail 将把长期错误当成不可恢复的错误(删除邮件)。\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1562
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail 将把惯性错误当成临时问题(保留邮件)。\n"
 
-#: fetchmail.c:1567
+#: fetchmail.c:1569
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "从 %s@%s 收件时的选项:\n"
 
-#: fetchmail.c:1571
+#: fetchmail.c:1573
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr " 邮件将通过 %s 收取\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1576
 #, 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:1578
+#: fetchmail.c:1580
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr " 服务器的实名为 %s。\n"
 
-#: fetchmail.c:1581
+#: fetchmail.c:1583
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr " 若不指明主机将不查询此主机\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1584
 msgid "  This host will be queried when no host is specified.\n"
 msgstr " 若不指明主机将查询此主机\n"
 
-#: fetchmail.c:1586
+#: fetchmail.c:1588
 msgid "  Password will be prompted for.\n"
 msgstr "密码会被提示\n"
 
-#: fetchmail.c:1590
+#: fetchmail.c:1592
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr " APOP 密码 = “%s”\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1595
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr " RPOP 密码 = “%s”\n"
 
-#: fetchmail.c:1596
+#: fetchmail.c:1598
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr " 密码 = “%s”\n"
 
-#: fetchmail.c:1605
+#: fetchmail.c:1607
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr " 协议是带有 Kerberos %s 认证协议的 KPOP"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1610
 #, c-format
 msgid "  Protocol is %s"
 msgstr " 协议是 %s"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1612
 #, c-format
 msgid " (using service %s)"
 msgstr " (正在使用服务 %s)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1614
 msgid " (using default port)"
 msgstr " (正在使用默认端口)"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1616
 msgid " (forcing UIDL use)"
 msgstr " (正在强制使用 UIDL)"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1622
 msgid "  All available authentication methods will be tried.\n"
 msgstr " 将尝试所有有效的验证方式\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1625
 msgid "  Password authentication will be forced.\n"
 msgstr " 强制密码验证\n"
 
-#: fetchmail.c:1626
+#: fetchmail.c:1628
 msgid "  MSN authentication will be forced.\n"
 msgstr " 强制 MSN 验证\n"
 
-#: fetchmail.c:1629
+#: fetchmail.c:1631
 msgid "  NTLM authentication will be forced.\n"
 msgstr " 强制 NTLM 验证\n"
 
-#: fetchmail.c:1632
+#: fetchmail.c:1634
 msgid "  OTP authentication will be forced.\n"
 msgstr " 强制 OTP 验证\n"
 
-#: fetchmail.c:1635
+#: fetchmail.c:1637
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr " 强制 CRAM-Md5 验证\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1640
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr " 强制 GSSAPI 验证\n"
 
-#: fetchmail.c:1641
+#: fetchmail.c:1643
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr " 强制 Kerberos V4 验证\n"
 
-#: fetchmail.c:1644
+#: fetchmail.c:1646
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr " 强制 Kerberos V5 验证\n"
 
-#: fetchmail.c:1647
+#: fetchmail.c:1649
 msgid "  End-to-end encryption assumed.\n"
 msgstr " 假设为终端到终端加密\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1653
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr " 邮件服务协议验证方为: %s\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1656
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "启用 SSL 加密会话\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1658
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr " SSL 协议: %s\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1660
 msgid "  SSL server certificate checking enabled.\n"
 msgstr " 启用 SSL 服务器证书检查\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1662
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr " SSL 受信证书目录: %s\n"
 
-#: fetchmail.c:1663
+#: fetchmail.c:1665
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  SSL 服务器名: %s\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1667
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr " SSL 密钥指纹 (与服务器密钥对比过): %s\n"
 
-#: fetchmail.c:1668
+#: fetchmail.c:1670
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr " 服务器未响应，超时 %d 秒"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1672
 msgid " (default).\n"
 msgstr " (默认)。\n"
 
-#: fetchmail.c:1677
+#: fetchmail.c:1679
 msgid "  Default mailbox selected.\n"
 msgstr " 已选中默认邮箱。\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1684
 msgid "  Selected mailboxes are:"
 msgstr " 选中的邮箱是:"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1690
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr " 收取所有邮件( --all 选项开启).\n"
 
-#: fetchmail.c:1689
+#: fetchmail.c:1691
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr " 只收取新邮件( --all 选项关闭).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1693
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr " 收取的邮件会在服务器上保留副本( --keep 开启).\n"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1694
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr " 收取的邮件不会保留在服务器上( --keep 关闭).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1696
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr " 在收取新邮件前删除旧邮件(--flush 开启).\n"
 
-#: fetchmail.c:1695
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
+#: fetchmail.c:1697
+msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr " 在收取新邮件前不删除旧邮件(--flush 关闭).\n"
 
-#: fetchmail.c:1697
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
+#: fetchmail.c:1699
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
 msgstr " 收件前将删除超大的邮件(--limitflush 开启).\n"
 
-#: fetchmail.c:1698
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
+#: fetchmail.c:1700
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
 msgstr " 收件前将不删除超大的邮件(--limitflush 关闭).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1702
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr " 本地收件人地址重写(--norewrite 关闭).\n"
 
-#: fetchmail.c:1701
+#: fetchmail.c:1703
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr " 不重写本地收件人地址(--norewrite 开启).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1705
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr " 回车符清除(stripcr 开启).\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1706
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr " 不清除回车符(stripcr 关闭).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1708
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr " 强行在换行前插入回车符(forcecr 开启).\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1709
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr " 不在换行前强行插入回车符(forcecr 关闭).\n"
 
-#: fetchmail.c:1709
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+#: fetchmail.c:1711
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr " 忽略 Content-Transfer-Encoding (pass8bits 开启).\n"
 
-#: fetchmail.c:1710
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+#: fetchmail.c:1712
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr " 不忽略 Content-Transfer-Encoding (pass8bits 关闭).\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1714
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr " 解开 MIME 编码 (mimedecode 开启).\n"
 
-#: fetchmail.c:1713
+#: fetchmail.c:1715
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr " 不解开 MIME 编码 (mimedecode 关闭).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1717
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr " 收件后回到 idle 模式 (idle 开启).\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1718
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr " 收件后不回到 idle 模式 (idle 关闭).\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1720
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr " 删除带有 Status 字样的行 (dropstatus 开启)\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1721
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr " 保留带有 Status 字样的 行 (dropstatus 关闭)\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1723
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr " 删除带有 Delivered-to 的行 (dropdelivered 开启)\n"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1724
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr " 保留带有 Delivered-to 的行 (dropdelivered 关闭)\n"
 
-#: fetchmail.c:1726
+#: fetchmail.c:1728
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr " 邮件大小被限制为 %d 字节 (--limit %d).\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1731
 msgid "  No message size limit (--limit 0).\n"
 msgstr " 邮件大小无限制 (--limit 0).\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1733
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr " 每隔 %d 秒发出邮件大小警告 (--warnings %d).\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1736
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr " 每次收件都给出邮件大小警告 (--warnings 0).\n"
 
-#: fetchmail.c:1737
+#: fetchmail.c:1739
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr " 单次收件限制为 %d 封(--fetchlimit %d).\n"
 
-#: fetchmail.c:1740
+#: fetchmail.c:1742
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr " 无收件限制 (--fetchlimit 0).\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1744
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr " 限制所收邮件大小为 %d 字节(--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1747
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr " 所收邮件大小无限制 (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1749
+#: fetchmail.c:1751
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr " 每次收件期间对 UIDs 进行折半查找 (--fastuidl 1).\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1753
 #, 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:1754
+#: fetchmail.c:1756
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr " 每次收件期间对 UIDs 进行线性查找 (--fastuidl 0).\n"
 
-#: fetchmail.c:1756
+#: fetchmail.c:1758
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr " 单次 SMTP 会话中最多传送 %d 封邮件。\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1760
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr " 单次 SMTP 会话中无传送邮件限制 (--batchlimit 0)。\n"
 
-#: fetchmail.c:1762
+#: fetchmail.c:1764
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr " 两次删除操作之间最多传送 %d 封邮件(--expunge %d)。\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1766
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr " 两次删除操作之间无传送邮件限制(--expunge 0)。\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1773
 msgid "  Domains for which mail will be fetched are:"
 msgstr " 要收取的邮件位于服务器:"
 
-#: fetchmail.c:1776 fetchmail.c:1796
+#: fetchmail.c:1778 fetchmail.c:1798
 msgid " (default)"
 msgstr " (默认)"
 
-#: fetchmail.c:1781
+#: fetchmail.c:1783
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr " 邮件作为 BSMTP 附加至 %s\n"
 
-#: fetchmail.c:1783
+#: fetchmail.c:1785
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr " 邮件通过 “%s” 投递。\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1792
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr " 邮件将被 %cMPT 转发到:"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1803
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr " MAIL FROM 这一行的 Host 部分是 %s\n"
 
-#: fetchmail.c:1804
+#: fetchmail.c:1806
 #, 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:1813
+#: fetchmail.c:1815
 msgid "  Recognized listener spam block responses are:"
 msgstr "  识别出的监听端垃圾邮件拒收响应为:"
 
 # fetchmail.c:1809
-#: fetchmail.c:1819
+#: fetchmail.c:1821
 msgid "  Spam-blocking disabled\n"
 msgstr " 关闭垃圾邮件拒收\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1824
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr " 服务器连接将被 “%s” 唤起\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1827
 msgid "  No pre-connection command.\n"
 msgstr " 无连接前要执行的程序。\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1829
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr " 服务器连接将被 “%s” 关闭。\n"
 
-#: fetchmail.c:1830
+#: fetchmail.c:1832
 msgid "  No post-connection command.\n"
 msgstr " 无连接后要执行的程序。\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1835
 msgid "  No localnames declared for this host.\n"
 msgstr " 此服务器没有要关联的本地用户名。\n"
 
-#: fetchmail.c:1843
+#: fetchmail.c:1845
 msgid "  Multi-drop mode: "
 msgstr " 多投模式: "
 
-#: fetchmail.c:1845
+#: fetchmail.c:1847
 msgid "  Single-drop mode: "
 msgstr " 单投模式: "
 
-#: fetchmail.c:1847
+#: fetchmail.c:1849
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "识别出 %d 个本地用户名。\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1864
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr " 启用 DNS 搜寻多投地址。\n"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1865
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr " 关闭 DNS 搜寻多投地址。\n"
 
-#: fetchmail.c:1867
-msgid ""
-"  Server aliases will be compared with multidrop addresses by IP address.\n"
+#: fetchmail.c:1869
+msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr " 服务器昵称将以 IP 地址与多投地址进行比较\n"
 
-#: fetchmail.c:1869
+#: fetchmail.c:1871
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr " 服务器昵称将以名字与多投地址进行比较\n"
 
-#: fetchmail.c:1872
+#: fetchmail.c:1874
 msgid "  Envelope-address routing is disabled\n"
 msgstr " 禁用 Envelope-address 路由\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1877
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr " 邮件头假定为: %s\n"
 
-#: fetchmail.c:1878
+#: fetchmail.c:1880
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr " 跳过的邮件头数目为: %d\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1883
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr " 将从用户 id 中移除前缀 %s\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1886
 msgid "  No prefix stripping\n"
 msgstr " 没有要从用户 id 中清除的前缀\n"
 
-#: fetchmail.c:1891
+#: fetchmail.c:1893
 msgid "  Predeclared mailserver aliases:"
 msgstr " 预先声明的邮件服务器昵称: "
 
-#: fetchmail.c:1900
+#: fetchmail.c:1902
 msgid "  Local domains:"
 msgstr " 本地域:"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1912
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr " 必须通过地址 %s 连接\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1914
 msgid "  No interface requirement specified.\n"
 msgstr " 未指定地址要求。\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1916
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr " 收件轮循将监听 %s。\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1918
 msgid "  No monitor interface specified.\n"
 msgstr " 未指定监听地址。\n"
 
-#: fetchmail.c:1920
+#: fetchmail.c:1922
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr " 通过外部程序 %s 进行服务器连接 (--plugin %s)。\n"
 
-#: fetchmail.c:1922
+#: fetchmail.c:1924
 msgid "  No plugin command specified.\n"
 msgstr " 未指定外部程序。\n"
 
-#: fetchmail.c:1924
+#: fetchmail.c:1926
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr " 通过外部程序 %s 进行 SMTP 连接(--plugout %s)。\n"
 
-#: fetchmail.c:1926
+#: fetchmail.c:1928
 msgid "  No plugout command specified.\n"
 msgstr " 未指定外部程序。\n"
 
-#: fetchmail.c:1931
+#: fetchmail.c:1933
 msgid "  No UIDs saved from this host.\n"
 msgstr " 未从此主机上保存 UIDs。\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1942
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr " 保存了 %d 个UIDs。\n"
 
-#: fetchmail.c:1948
+#: fetchmail.c:1950
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr " 收件跟踪信息将被加入 Received 邮件头。\n"
 
-#: fetchmail.c:1950
-msgid ""
-"  No poll trace information will be added to the Received header.\n"
-".\n"
+#: fetchmail.c:1952
+msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 " 无收件跟踪信息要被加入 Received 邮件头。\n"
 "。\n"
 
-#: fetchmail.c:1953
+#: fetchmail.c:1957
+msgid "  Messages with bad headers will be rejected.\n"
+msgstr " 邮件头错误的邮件将被拒收。\n"
+
+#: fetchmail.c:1960
+msgid "  Messages with bad headers will be passed on.\n"
+msgstr " 邮件头错误的邮件可以接收。\n"
+
+#: fetchmail.c:1965
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr " 传送的 properties 选项为 “%s” 。\n"
@@ -1631,17 +1613,17 @@ msgstr "fetchmail: 线程休眠 %d 秒。\n"
 #: imap.c:73
 #, c-format
 msgid "Received BYE response from IMAP server: %s"
-msgstr ""
+msgstr "从IMAP 服务器收到 BYE 指令: %s"
 
 #: imap.c:91
-#, fuzzy, c-format
+#, c-format
 msgid "bogus message count in \"%s\"!"
-msgstr "发现无效邮件！"
+msgstr "发现伪造邮件\"%s\"！"
 
 #: imap.c:138
 #, c-format
 msgid "bogus EXPUNGE count in \"%s\"!"
-msgstr ""
+msgstr "发现伪造的EXPUNGE \"%s\"！"
 
 #: imap.c:387
 msgid "Protocol identified as IMAP4 rev 1\n"
@@ -1741,8 +1723,7 @@ msgid "%u is first unseen\n"
 msgstr "%u 是首个未读邮件\n"
 
 #: imap.c:1144
-msgid ""
-"Warning: ignoring bogus data for message sizes returned by the server.\n"
+msgid "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr "警告: 忽略服务器返回的邮件大小的无效数据。\n"
 
 #: interface.c:256
@@ -1939,311 +1920,313 @@ msgstr "无法解码 OTP 请求\n"
 msgid "Secret pass phrase: "
 msgstr "密码短语:"
 
-#: options.c:172 options.c:216
+#: options.c:174 options.c:218
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "字符串 ‘%s’不是一个有效的数字串。\n"
 
-#: options.c:181
+#: options.c:183
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "字符串 ‘%1$s’ 的值比 %3$d %2$s\n"
 
-#: options.c:182
+#: options.c:184
 msgid "smaller"
 msgstr "小"
 
-#: options.c:182
+#: options.c:184
 msgid "larger"
 msgstr "大"
 
-#: options.c:349
+#: options.c:321
+#, c-format
+msgid "Invalid bad-header policy `%s' specified.\n"
+msgstr "设定的错误邮件头处理方式‘%s’无效。\n"
+
+#: options.c:362
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "指定了无效的协议 ‘%s’\n"
 
-#: options.c:396
+#: options.c:409
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "指定了无效的认证方式 ‘%s’\n"
 
-#: options.c:601
+#: options.c:614
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "用法: fetchmail [选项] [服务器...]\n"
 
-#: options.c:602
+#: options.c:615
 msgid "  Options are as follows:\n"
 msgstr "选项如下:\n"
 
-#: options.c:603
+#: options.c:616
 msgid "  -?, --help        display this option help\n"
 msgstr " -?, --help\t显示此选项帮助\n"
 
-#: options.c:604
+#: options.c:617
 msgid "  -V, --version     display version info\n"
 msgstr " -V, --version\t显示版本信息\n"
 
-#: options.c:606
+#: options.c:619
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr " -c, --check\t只检查邮件而不收取\n"
 
-#: options.c:607
+#: options.c:620
 msgid "  -s, --silent      work silently\n"
 msgstr " -s, --silent\t运行时不要显示多余信息\n"
 
-#: options.c:608
+#: options.c:621
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr " -v, --verbose\t运行时给出信息 (诊断型的输出)\n"
 
-#: options.c:609
+#: options.c:622
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr " -d, --daemon\t每 n 秒运行后台服务一次\n"
 
-#: options.c:610
+#: options.c:623
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr " -N, --nodetach\t不分离后台进程\n"
 
-#: options.c:611
+#: options.c:624
 msgid "  -q, --quit        kill daemon process\n"
 msgstr " -q, --quit\t终止后台进程\n"
 
-#: options.c:612
+#: options.c:625
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr " -L, --logfile\t指定日志文件名\n"
 
-#: options.c:613
-msgid ""
-"      --syslog      use syslog(3) for most messages when running as a "
-"daemon\n"
+#: options.c:626
+msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
 msgstr " --syslog\t以后台服务运行时用 syslog(3) 得到更多的信息\n"
 
-#: options.c:614
+#: options.c:627
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr " --invisible\t不写 Received 邮件头并允许伪装主机\n"
 
-#: options.c:615
+#: options.c:628
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr " -f, --fetchmailrc\t指定可选的配置文件\n"
 
-#: options.c:616
+#: options.c:629
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr " -i, --idfile\t指定可选的 UIDs 文件\n"
 
-#: options.c:617
+#: options.c:630
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr " --pidfile\t指定可选的进程(锁)文件\n"
 
-#: options.c:618
+#: options.c:631
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr " --postmaster\t指定邮件管理员\n"
 
-#: options.c:619
+#: options.c:632
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr " --nobounce\t将回送邮件从用户重定向至邮件管理员\n"
 
-#: options.c:620
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+#: options.c:633
+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"
+#: options.c:634
+msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
 msgstr "      --softbounce\t将无法投递的邮件长期保留在服务器上(默认)。\n"
 
-#: options.c:623
+#: options.c:636
 msgid "  -I, --interface   interface required specification\n"
 msgstr " -I, --interface\t指定网络地址\n"
 
-#: options.c:624
+#: options.c:637
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr " -M, --moniter\t监控指定网络地址的活跃度\n"
 
-#: options.c:627
+#: options.c:640
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr " --ssl\t启用 ssl 加密会话\n"
 
-#: options.c:628
+#: options.c:641
 msgid "      --sslkey      ssl private key file\n"
 msgstr " --sslkey\tssl 私钥文件\n"
 
-#: options.c:629
+#: options.c:642
 msgid "      --sslcert     ssl client certificate\n"
 msgstr " --sslcert\tssl 客户端证书\n"
 
-#: options.c:630
+#: options.c:643
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr " --sslcertck\t进行严格的服务器证书检查(推荐)\n"
 
-#: options.c:631
+#: options.c:644
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr " --sslcertpath\tssl 证书目录\n"
 
-#: options.c:632
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+#: options.c:645
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr " --sslcommonname\t期望返回服务器名 (不鼓励)\n"
 
-#: options.c:633
-msgid ""
-"      --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
+#: options.c:646
+msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
 msgstr " --sslfingerprint\t指定一个指纹，它必须与服务器证书的指纹匹配\n"
 
-#: options.c:634
+#: options.c:647
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr " --sslproto\t指定强制使用的 ssl 协议(SSL2/SSL3/TLS1)\n"
 
-#: options.c:636
+#: options.c:649
 msgid "      --plugin      specify external command to open connection\n"
 msgstr " --plugin\t指定外部程序打开连接\n"
 
-#: options.c:637
+#: options.c:650
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr " --plugout\t指定外部程序打开 smtp 连接\n"
 
-#: options.c:639
+#: options.c:651
+msgid ""
+"      --bad-header {reject|pass}\n"
+"                    specify policy for handling messages with bad headers\n"
+msgstr ""
+"      --bad-header {reject|pass}\n"
+"                    设定对邮件头错误的邮件的处理方式\n"
+
+#: options.c:654
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr " -p, --protocol\t指定收件协议 (看 man 手册页)\n"
 
-#: options.c:640
+#: options.c:655
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr " -U, --uidl\t强制使用 UIDLs(仅适用于 pop3)\n"
 
-#: options.c:641
+#: options.c:656
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr " --port\t要连接的 TCP 端口(过时了，用 --service)\n"
 
-#: options.c:642
-msgid ""
-"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+#: options.c:657
+msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr " -P, --service\t要连接的 TCP 服务(允许用 TCP 端口的数值来表示)\n"
 
-#: options.c:643
+#: options.c:658
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr " --auth\t指定验证方式(password/kerberos/ssh/otp)\n"
 
-#: options.c:644
+#: options.c:659
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr " -t, --timeout\t指定服务器超时无响应的时间\n"
 
-#: options.c:645
+#: options.c:660
 msgid "  -E, --envelope    envelope address header\n"
 msgstr " -E, --envelope\t指定邮件地址头\n"
 
-#: options.c:646
+#: options.c:661
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr " -Q, --qvirtual\t从当前用户移除前缀\n"
 
-#: options.c:647
+#: options.c:662
 msgid "      --principal   mail service principal\n"
 msgstr " --principal\t邮件服务验证方\n"
 
-#: options.c:648
+#: options.c:663
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr " --tracepolls\tReceived 邮件头中添加收件跟踪信息\n"
 
-#: options.c:650
+#: options.c:665
 msgid "  -u, --username    specify users's login on server\n"
 msgstr " -u, --username\t指定登录服务器的用户名\n"
 
-#: options.c:651
+#: options.c:666
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr " -a, --[fetch]all\t收取所有新旧邮件\n"
 
-#: options.c:652
+#: options.c:667
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr " -K, --nokeep\t收件后删除服务器上新邮件\n"
 
-#: options.c:653
+#: options.c:668
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr " -k, --keep\t收件后保留服务器上新邮件\n"
 
-#: options.c:654
+#: options.c:669
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr " -F, --flush\t从服务器上删除旧邮件\n"
 
-#: options.c:655
+#: options.c:670
 msgid "      --limitflush  delete oversized messages\n"
 msgstr " --limitflush\t删除过大的邮件\n"
 
-#: options.c:656
+#: options.c:671
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr " -n, --norewrite\t不要重写地址头\n"
 
-#: options.c:657
+#: options.c:672
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr " -l, --limit\t不收超过指定大小的邮件\n"
 
-#: options.c:658
+#: options.c:673
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr " -w, --warnings\t邮件通知警告的间隔\n"
 
-#: options.c:660
+#: options.c:675
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr " -S, --smtphost\t设置 SMTP 转发主机\n"
 
-#: options.c:661
+#: options.c:676
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr " --fetchdomains\t收取指定域的邮件\n"
 
-#: options.c:662
+#: options.c:677
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr " -D, --smtpaddress\t设置 SMTP 投递域\n"
 
-#: options.c:663
+#: options.c:678
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr " --smtpname\t设置 SMTP 全名，用户名@域\n"
 
-#: options.c:664
+#: options.c:679
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr " -Z, --antispam,\t设置 antispam 响应值\n"
 
-#: options.c:665
+#: options.c:680
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr " -b, --bathlimit\t为 SMTP 连接设置批量处理限制\n"
 
-#: options.c:666
+#: options.c:681
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr " -B, --fetchlimit\t为服务器连接设置收取限制\n"
 
-#: options.c:667
+#: options.c:682
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr " --fetchsizelimit\t设置收件大小限制\n"
 
-#: options.c:668
+#: options.c:683
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr " --fastuidl\t对 UIDLs 进行折半查找\n"
 
-#: options.c:669
+#: options.c:684
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr " -e, --expunge\t设置删除操作发生在多少封邮件之后\n"
 
-#: options.c:670
+#: options.c:685
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr " -m, --mda\t设置用于转发的 MDA\n"
 
-#: options.c:671
+#: options.c:686
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr " --bsmtp\t设置 BSMTP 文件输出\n"
 
-#: options.c:672
+#: options.c:687
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr " --lmtp\t用 LMTP 协议(RFC2033) 投递邮件\n"
 
-#: options.c:673
+#: options.c:688
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr " -r, --folder\t指定远程邮箱名\n"
 
-#: options.c:674
+#: options.c:689
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr " --showdots\t即使在日志文件中也要显示进度条(以点的形式)\n"
 
 #: pop3.c:355
-msgid ""
-"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
-"of TOP.\n"
+msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
 msgstr "警告: 发现“ POP3 代理服务器”，用 RETR 命令代替 TOP。\n"
 
 #: pop3.c:454
@@ -2312,45 +2295,41 @@ msgstr "正在读取 UIDLs 时协议出错\n"
 msgid "Option --folder is not supported with POP3\n"
 msgstr "POP3 不支持 --folder 选项\n"
 
-#: rcfile_y.y:126
+#: rcfile_y.y:129
 msgid "server option after user options"
 msgstr "服务器选项在用户选项后"
 
-#: rcfile_y.y:169
+#: rcfile_y.y:172
 msgid "SDPS not enabled."
 msgstr "SDPS 不可用"
 
-#: rcfile_y.y:215
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
+#: rcfile_y.y:218
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
 msgstr "fetchmail: interface 选项只有 Linux(无 IPv6)和 FreeBSD 支持\n"
 
-#: rcfile_y.y:222
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
+#: rcfile_y.y:225
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
 msgstr "fetchmail: monitor 选项只有 Linux(无 IPv6)和 FreeBSD 支持\n"
 
-#: rcfile_y.y:335
+#: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr "SSL 不可用"
 
-#: rcfile_y.y:385
+#: rcfile_y.y:390
 msgid "end of input"
 msgstr "输入结束"
 
-#: rcfile_y.y:423
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "文件 %s 必须是个普通文件。\n"
 
-#: rcfile_y.y:433
+#: rcfile_y.y:438
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "文件 %s 不允许拥有高于 -rwx------ (0700) 的权限。\n"
 
-#: rcfile_y.y:445
+#: rcfile_y.y:450
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "文件 %s 必须归您所有。\n"
@@ -2547,8 +2526,8 @@ msgid "MD5 being applied to data block:\n"
 msgstr "数据块使用了 MD5:\n"
 
 #: rpa.c:886
-msgid "MD5 result is: \n"
-msgstr "MD5 值: \n"
+msgid "MD5 result is:\n"
+msgstr "MD5 值:\n"
 
 #: servport.c:53
 #, c-format
@@ -2661,8 +2640,7 @@ msgstr "MDA 返回非零值 %d\n"
 
 #: sink.c:1384
 #, c-format
-msgid ""
-"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
+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:1406
@@ -2948,46 +2926,46 @@ msgstr "找不到 Received 地址\n"
 msgid "found Received address `%s'\n"
 msgstr "找到 Received 地址 ‘%s’\n"
 
-#: transact.c:592
+#: transact.c:595
 msgid "incorrect header line found while scanning headers\n"
 msgstr "查找邮件头时发现不正确的行\n"
 
-#: transact.c:594
+#: transact.c:597
 #, c-format
 msgid "line: %s"
 msgstr "行: %s"
 
-#: transact.c:1133
+#: transact.c:1136
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "无本地匹配的收件人，正在转发至 %s\n"
 
-#: transact.c:1148
+#: transact.c:1151
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "正在转发且由于 DNS 错误，删除被取消了\n"
 
-#: transact.c:1258
+#: transact.c:1261
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "正在重写 RFC822 协议中定义的邮件信息块的头部\n"
 
-#: transact.c:1277
+#: transact.c:1280
 msgid "no recipient addresses matched declared local names"
 msgstr "收件人地址与本地已知的用户名不匹配"
 
-#: transact.c:1284
+#: transact.c:1287
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "收到人地址 %s 与本地任何一个用户名均不匹配"
 
-#: transact.c:1293
+#: transact.c:1296
 msgid "message has embedded NULs"
 msgstr "邮件嵌入了 NULs"
 
-#: transact.c:1301
+#: transact.c:1304
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP 端拒绝本地收件人地址:"
 
-#: transact.c:1440
+#: transact.c:1443
 msgid "error writing message text\n"
 msgstr "在写邮件文本时出错\n"