Update Chinese (Simplified) translation for -beta2.

1 files changed, 287 insertions, 236 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index eb6e15d9..27719851 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: fetchmail 6.3.15-pre1\n"
+"Project-Id-Version: fetchmail 6.3.15-pre2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-24 01:55+0100\n"
-"PO-Revision-Date: 2010-02-26 08:51+0800\n"
+"POT-Creation-Date: 2010-03-04 09:16+0100\n"
+"PO-Revision-Date: 2010-03-02 15:32+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -55,14 +55,14 @@ msgid "kerberos error %s\n"
 msgstr "kerberos 认证系统出错 %s\n"
 
 #: driver.c:249
-#, fuzzy, c-format
+#, c-format
 msgid "krb5_sendauth: %s [server says '%s']\n"
-msgstr "krb5_sendauth: %s [ 服务器请求 ‘%*s’]\n"
+msgstr "krb5_sendauth: %s [ 服务器响应 \"%s\"]\n"
 
 #: driver.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "krb5_sendauth: %s [server says '%*s']\n"
-msgstr "krb5_sendauth: %s [ 服务器请求 ‘%*s’]\n"
+msgstr "krb5_sendauth: %s [ 服务器响应 \"%*s\"]\n"
 
 #: driver.c:335
 msgid "Subject: Fetchmail oversized-messages warning"
@@ -135,7 +135,8 @@ 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
@@ -153,7 +154,8 @@ 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
@@ -187,7 +189,9 @@ 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
@@ -409,85 +413,85 @@ msgstr "%s 无邮件\n"
 msgid "bogus message count!"
 msgstr "发现无效邮件！"
 
-#: driver.c:1537
+#: driver.c:1536
 msgid "socket"
 msgstr "套接口"
 
-#: driver.c:1540
+#: driver.c:1539
 msgid "missing or bad RFC822 header"
 msgstr "未找到或错误的 RFC822 协议头"
 
-#: driver.c:1543
+#: driver.c:1542
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1546
+#: driver.c:1545
 msgid "client/server synchronization"
 msgstr "客户端/服务器同步"
 
-#: driver.c:1549
+#: driver.c:1548
 msgid "client/server protocol"
 msgstr "客户端/服务器协议"
 
-#: driver.c:1552
+#: driver.c:1551
 msgid "lock busy on server"
 msgstr "服务器死锁"
 
-#: driver.c:1555
+#: driver.c:1554
 msgid "SMTP transaction"
 msgstr "处理 SMTP"
 
-#: driver.c:1558
+#: driver.c:1557
 msgid "DNS lookup"
 msgstr "查询 DNS"
 
-#: driver.c:1561
+#: driver.c:1560
 msgid "undefined"
 msgstr "未定义"
 
-#: driver.c:1567
+#: driver.c:1566
 #, 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:1569
+#: driver.c:1568
 msgid "unknown"
 msgstr "未知"
 
-#: driver.c:1571
+#: driver.c:1570
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "从 %2$s@%3$s 收件时产生错误 %1$s\n"
 
-#: driver.c:1583
+#: driver.c:1582
 #, c-format
 msgid "post-connection command terminated with signal %d\n"
 msgstr "执行后续程序失败，返回信号 %d\n"
 
-#: driver.c:1585
+#: driver.c:1584
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "执行后续程序失败，状态码 %d\n"
 
-#: driver.c:1604
+#: driver.c:1603
 msgid "Kerberos V4 support not linked.\n"
 msgstr "未连接 Kerberos V4 支持\n"
 
-#: driver.c:1612
+#: driver.c:1611
 msgid "Kerberos V5 support not linked.\n"
 msgstr "未连接 Kerberos V5 支持\n"
 
-#: driver.c:1623
+#: driver.c:1622
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "%s 不支持 --flush 选项\n"
 
-#: driver.c:1629
+#: driver.c:1628
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "%s 不支持 --all 选项\n"
 
-#: driver.c:1638
+#: driver.c:1637
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "%s 不支持 --limit 选项\n"
@@ -512,7 +516,8 @@ 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 ""
@@ -544,7 +549,8 @@ 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"
@@ -697,13 +703,17 @@ 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
@@ -711,7 +721,8 @@ 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
@@ -874,669 +885,680 @@ msgstr "在 %s 被唤醒\n"
 msgid "normal termination, status %d\n"
 msgstr "正常结束，返回值 %d\n"
 
-#: fetchmail.c:1039
+#: fetchmail.c:1041
 #, fuzzy
 msgid "couldn't time-check the run-control file\n"
 msgstr "无法对 run-control 文件进行时限检测\n"
 
-#: fetchmail.c:1072
+#: fetchmail.c:1075
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "警告: 在配置文件中多次提及主机 %s\n"
 
-#: fetchmail.c:1105
+#: fetchmail.c:1108
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: 错误: 在配置文件中有多个 “default” 记录。\n"
 
-#: fetchmail.c:1227
+#: fetchmail.c:1230
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL 支持未编译在内\n"
 
-#: fetchmail.c:1234
+#: fetchmail.c:1237
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "设置了 KERBEROS v4 支持，但未编译在内\n"
 
-#: fetchmail.c:1240
+#: fetchmail.c:1243
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "设置了 KERBEROS v5 支持，但未编译在内\n"
 
-#: fetchmail.c:1246
+#: fetchmail.c:1249
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "设置了 GSSAPI 支持，但未编译在内\n"
 
-#: fetchmail.c:1276
+#: fetchmail.c:1279
 #, 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:1287
+#: fetchmail.c:1290
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "警告: %s 设置了多投邮件，需设置 envelope 选项！\n"
 
-#: fetchmail.c:1288
+#: fetchmail.c:1291
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr "警告: 如果所有邮件均被邮件管理员收取，不要寻求支持！\n"
 
-#: fetchmail.c:1305
+#: fetchmail.c:1308
 #, 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:1312
+#: fetchmail.c:1315
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "fetchmail: %s 配置无效，RPOP 要求开放一个特许端口\n"
 
-#: fetchmail.c:1330
+#: fetchmail.c:1333
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "%s 配置无效，LMTP 不能用默认的 SMTP 端口\n"
 
-#: fetchmail.c:1344
+#: fetchmail.c:1347
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "收取所有邮件并保留服务器上的备份或使用 idle 模式是错误的！\n"
 
-#: fetchmail.c:1369
+#: fetchmail.c:1372
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "以信号 %d 终止\n"
 
-#: fetchmail.c:1442
+#: fetchmail.c:1445
 #, 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:1467
+#: fetchmail.c:1470
 msgid "POP2 support is not configured.\n"
 msgstr "未设置 POP2 支持\n"
 
-#: fetchmail.c:1479
+#: fetchmail.c:1482
 msgid "POP3 support is not configured.\n"
 msgstr "未设置 POP3 支持\n"
 
-#: fetchmail.c:1489
+#: fetchmail.c:1492
 msgid "IMAP support is not configured.\n"
 msgstr "未设置 IMAP 支持\n"
 
-#: fetchmail.c:1495
+#: fetchmail.c:1498
 msgid "ETRN support is not configured.\n"
 msgstr "未设置 ETRN 支持\n"
 
-#: fetchmail.c:1503
+#: fetchmail.c:1506
 msgid "ODMR support is not configured.\n"
 msgstr "未设置 ODMR 支持\n"
 
-#: fetchmail.c:1510
+#: fetchmail.c:1513
 msgid "unsupported protocol selected.\n"
 msgstr "选中了不支持的协议\n"
 
-#: fetchmail.c:1520
+#: fetchmail.c:1523
 #, 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:1537
+#: fetchmail.c:1540
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "收件间隔 %d 秒\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1542
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "日志文件为 %s\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1544
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile 文件为 %s\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1547
 msgid "Progress messages will be logged via syslog\n"
 msgstr "邮件情况将通过 syslog 来记录\n"
 
-#: fetchmail.c:1547
+#: fetchmail.c:1550
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail 将进行伪装且不会生成 Receiverd 部分\n"
 
-#: fetchmail.c:1549
+#: fetchmail.c:1552
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail 将在日志文件中显示进度条(以点的形式)\n"
 
-#: fetchmail.c:1551
+#: fetchmail.c:1554
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail 将转发地址错误的多投邮件给 %s。\n"
 
-#: fetchmail.c:1555
+#: fetchmail.c:1558
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail 将把错误邮件转给邮件管理员\n"
 
-#: fetchmail.c:1557
+#: fetchmail.c:1560
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail 将把错误邮件退给发送者\n"
 
-#: fetchmail.c:1560
+#: fetchmail.c:1563
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "Fetchmail 将把长期错误当成不可恢复的错误(删除邮件)。\n"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1565
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail 将把惯性错误当成临时问题(保留邮件)。\n"
 
-#: fetchmail.c:1569
+#: fetchmail.c:1572
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "从 %s@%s 收件时的选项:\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1576
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr " 邮件将通过 %s 收取\n"
 
-#: fetchmail.c:1576
+#: fetchmail.c:1579
 #, 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:1580
+#: fetchmail.c:1583
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr " 服务器的实名为 %s。\n"
 
-#: fetchmail.c:1583
+#: fetchmail.c:1586
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr " 若不指明主机将不查询此主机\n"
 
-#: fetchmail.c:1584
+#: fetchmail.c:1587
 msgid "  This host will be queried when no host is specified.\n"
 msgstr " 若不指明主机将查询此主机\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1591
 msgid "  Password will be prompted for.\n"
 msgstr "密码会被提示\n"
 
-#: fetchmail.c:1592
+#: fetchmail.c:1595
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr " APOP 密码 = “%s”\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1598
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr " RPOP 密码 = “%s”\n"
 
-#: fetchmail.c:1598
+#: fetchmail.c:1601
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr " 密码 = “%s”\n"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1610
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr " 协议是带有 Kerberos %s 认证协议的 KPOP"
 
-#: fetchmail.c:1610
+#: fetchmail.c:1613
 #, c-format
 msgid "  Protocol is %s"
 msgstr " 协议是 %s"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1615
 #, c-format
 msgid " (using service %s)"
 msgstr " (正在使用服务 %s)"
 
-#: fetchmail.c:1614
+#: fetchmail.c:1617
 msgid " (using default port)"
 msgstr " (正在使用默认端口)"
 
-#: fetchmail.c:1616
+#: fetchmail.c:1619
 msgid " (forcing UIDL use)"
 msgstr " (正在强制使用 UIDL)"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1625
 msgid "  All available authentication methods will be tried.\n"
 msgstr " 将尝试所有有效的验证方式\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1628
 msgid "  Password authentication will be forced.\n"
 msgstr " 强制密码验证\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1631
 msgid "  MSN authentication will be forced.\n"
 msgstr " 强制 MSN 验证\n"
 
-#: fetchmail.c:1631
+#: fetchmail.c:1634
 msgid "  NTLM authentication will be forced.\n"
 msgstr " 强制 NTLM 验证\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1637
 msgid "  OTP authentication will be forced.\n"
 msgstr " 强制 OTP 验证\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1640
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr " 强制 CRAM-Md5 验证\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1643
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr " 强制 GSSAPI 验证\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1646
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr " 强制 Kerberos V4 验证\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1649
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr " 强制 Kerberos V5 验证\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1652
 msgid "  End-to-end encryption assumed.\n"
 msgstr " 假设为终端到终端加密\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1656
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr " 邮件服务协议验证方为: %s\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1659
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "启用 SSL 加密会话\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1661
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr " SSL 协议: %s\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1663
 msgid "  SSL server certificate checking enabled.\n"
 msgstr " 启用 SSL 服务器证书检查\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1665
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr " SSL 受信证书目录: %s\n"
 
-#: fetchmail.c:1665
+#: fetchmail.c:1668
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  SSL 服务器名: %s\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1670
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr " SSL 密钥指纹 (与服务器密钥对比过): %s\n"
 
-#: fetchmail.c:1670
+#: fetchmail.c:1673
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr " 服务器未响应，超时 %d 秒"
 
-#: fetchmail.c:1672
+#: fetchmail.c:1675
 msgid " (default).\n"
 msgstr " (默认)。\n"
 
-#: fetchmail.c:1679
+#: fetchmail.c:1682
 msgid "  Default mailbox selected.\n"
 msgstr " 已选中默认邮箱。\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1687
 msgid "  Selected mailboxes are:"
 msgstr " 选中的邮箱是:"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1693
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr " 收取所有邮件( --all 选项开启).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1694
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr " 只收取新邮件( --all 选项关闭).\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1696
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr " 收取的邮件会在服务器上保留副本( --keep 开启).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1697
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr " 收取的邮件不会保留在服务器上( --keep 关闭).\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1699
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr " 在收取新邮件前删除旧邮件(--flush 开启).\n"
 
-#: fetchmail.c:1697
-msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
+#: fetchmail.c:1700
+msgid ""
+"  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr " 在收取新邮件前不删除旧邮件(--flush 关闭).\n"
 
-#: fetchmail.c:1699
-msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+#: fetchmail.c:1702
+msgid ""
+"  Oversized messages will be flushed before message retrieval (--limitflush "
+"on).\n"
 msgstr " 收件前将删除超大的邮件(--limitflush 开启).\n"
 
-#: fetchmail.c:1700
-msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+#: fetchmail.c:1703
+msgid ""
+"  Oversized messages will not be flushed before message retrieval (--"
+"limitflush off).\n"
 msgstr " 收件前将不删除超大的邮件(--limitflush 关闭).\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1705
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr " 本地收件人地址重写(--norewrite 关闭).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1706
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr " 不重写本地收件人地址(--norewrite 开启).\n"
 
-#: fetchmail.c:1705
+#: fetchmail.c:1708
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr " 回车符清除(stripcr 开启).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1709
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr " 不清除回车符(stripcr 关闭).\n"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1711
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr " 强行在换行前插入回车符(forcecr 开启).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1712
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr " 不在换行前强行插入回车符(forcecr 关闭).\n"
 
-#: fetchmail.c:1711
-msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+#: fetchmail.c:1714
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr " 忽略 Content-Transfer-Encoding (pass8bits 开启).\n"
 
-#: fetchmail.c:1712
-msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+#: fetchmail.c:1715
+msgid ""
+"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr " 不忽略 Content-Transfer-Encoding (pass8bits 关闭).\n"
 
-#: fetchmail.c:1714
+#: fetchmail.c:1717
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr " 解开 MIME 编码 (mimedecode 开启).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1718
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr " 不解开 MIME 编码 (mimedecode 关闭).\n"
 
-#: fetchmail.c:1717
+#: fetchmail.c:1720
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr " 收件后回到 idle 模式 (idle 开启).\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1721
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr " 收件后不回到 idle 模式 (idle 关闭).\n"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1723
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr " 删除带有 Status 字样的行 (dropstatus 开启)\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1724
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr " 保留带有 Status 字样的 行 (dropstatus 关闭)\n"
 
-#: fetchmail.c:1723
+#: fetchmail.c:1726
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr " 删除带有 Delivered-to 的行 (dropdelivered 开启)\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1727
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr " 保留带有 Delivered-to 的行 (dropdelivered 关闭)\n"
 
-#: fetchmail.c:1728
+#: fetchmail.c:1731
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr " 邮件大小被限制为 %d 字节 (--limit %d).\n"
 
-#: fetchmail.c:1731
+#: fetchmail.c:1734
 msgid "  No message size limit (--limit 0).\n"
 msgstr " 邮件大小无限制 (--limit 0).\n"
 
-#: fetchmail.c:1733
+#: fetchmail.c:1736
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr " 每隔 %d 秒发出邮件大小警告 (--warnings %d).\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1739
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr " 每次收件都给出邮件大小警告 (--warnings 0).\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1742
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr " 单次收件限制为 %d 封(--fetchlimit %d).\n"
 
-#: fetchmail.c:1742
+#: fetchmail.c:1745
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr " 无收件限制 (--fetchlimit 0).\n"
 
-#: fetchmail.c:1744
+#: fetchmail.c:1747
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr " 限制所收邮件大小为 %d 字节(--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1747
+#: fetchmail.c:1750
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr " 所收邮件大小无限制 (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1751
+#: fetchmail.c:1754
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr " 每次收件期间对 UIDs 进行折半查找 (--fastuidl 1).\n"
 
-#: fetchmail.c:1753
+#: fetchmail.c:1756
 #, 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:1756
+#: fetchmail.c:1759
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr " 每次收件期间对 UIDs 进行线性查找 (--fastuidl 0).\n"
 
-#: fetchmail.c:1758
+#: fetchmail.c:1761
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr " 单次 SMTP 会话中最多传送 %d 封邮件。\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1763
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr " 单次 SMTP 会话中无传送邮件限制 (--batchlimit 0)。\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1767
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr " 两次删除操作之间最多传送 %d 封邮件(--expunge %d)。\n"
 
-#: fetchmail.c:1766
+#: fetchmail.c:1769
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr " 两次删除操作之间无传送邮件限制(--expunge 0)。\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1776
 msgid "  Domains for which mail will be fetched are:"
 msgstr " 要收取的邮件位于服务器:"
 
-#: fetchmail.c:1778 fetchmail.c:1798
+#: fetchmail.c:1781 fetchmail.c:1801
 msgid " (default)"
 msgstr " (默认)"
 
-#: fetchmail.c:1783
+#: fetchmail.c:1786
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr " 邮件作为 BSMTP 附加至 %s\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1788
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr " 邮件通过 “%s” 投递。\n"
 
-#: fetchmail.c:1792
+#: fetchmail.c:1795
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr " 邮件将被 %cMPT 转发到:"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1806
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr " MAIL FROM 这一行的 Host 部分是 %s\n"
 
-#: fetchmail.c:1806
+#: fetchmail.c:1809
 #, 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:1815
+#: fetchmail.c:1818
 msgid "  Recognized listener spam block responses are:"
 msgstr "  识别出的监听端垃圾邮件拒收响应为:"
 
 # fetchmail.c:1809
-#: fetchmail.c:1821
+#: fetchmail.c:1824
 msgid "  Spam-blocking disabled\n"
 msgstr " 关闭垃圾邮件拒收\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1827
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr " 服务器连接将被 “%s” 唤起\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1830
 msgid "  No pre-connection command.\n"
 msgstr " 无连接前要执行的程序。\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1832
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr " 服务器连接将被 “%s” 关闭。\n"
 
-#: fetchmail.c:1832
+#: fetchmail.c:1835
 msgid "  No post-connection command.\n"
 msgstr " 无连接后要执行的程序。\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1838
 msgid "  No localnames declared for this host.\n"
 msgstr " 此服务器没有要关联的本地用户名。\n"
 
-#: fetchmail.c:1845
+#: fetchmail.c:1848
 msgid "  Multi-drop mode: "
 msgstr " 多投模式: "
 
-#: fetchmail.c:1847
+#: fetchmail.c:1850
 msgid "  Single-drop mode: "
 msgstr " 单投模式: "
 
-#: fetchmail.c:1849
+#: fetchmail.c:1852
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "识别出 %d 个本地用户名。\n"
 
-#: fetchmail.c:1864
+#: fetchmail.c:1867
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr " 启用 DNS 搜寻多投地址。\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1868
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr " 关闭 DNS 搜寻多投地址。\n"
 
-#: fetchmail.c:1869
-msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
+#: fetchmail.c:1872
+msgid ""
+"  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr " 服务器昵称将以 IP 地址与多投地址进行比较\n"
 
-#: fetchmail.c:1871
+#: fetchmail.c:1874
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr " 服务器昵称将以名字与多投地址进行比较\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1877
 msgid "  Envelope-address routing is disabled\n"
 msgstr " 禁用 Envelope-address 路由\n"
 
-#: fetchmail.c:1877
+#: fetchmail.c:1880
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr " 邮件头假定为: %s\n"
 
-#: fetchmail.c:1880
+#: fetchmail.c:1883
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr " 跳过的邮件头数目为: %d\n"
 
-#: fetchmail.c:1883
+#: fetchmail.c:1886
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr " 将从用户 id 中移除前缀 %s\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1889
 msgid "  No prefix stripping\n"
 msgstr " 没有要从用户 id 中清除的前缀\n"
 
-#: fetchmail.c:1893
+#: fetchmail.c:1896
 msgid "  Predeclared mailserver aliases:"
 msgstr " 预先声明的邮件服务器昵称: "
 
-#: fetchmail.c:1902
+#: fetchmail.c:1905
 msgid "  Local domains:"
 msgstr " 本地域:"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1915
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr " 必须通过地址 %s 连接\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1917
 msgid "  No interface requirement specified.\n"
 msgstr " 未指定地址要求。\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1919
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr " 收件轮循将监听 %s。\n"
 
-#: fetchmail.c:1918
+#: fetchmail.c:1921
 msgid "  No monitor interface specified.\n"
 msgstr " 未指定监听地址。\n"
 
-#: fetchmail.c:1922
+#: fetchmail.c:1925
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr " 通过外部程序 %s 进行服务器连接 (--plugin %s)。\n"
 
-#: fetchmail.c:1924
+#: fetchmail.c:1927
 msgid "  No plugin command specified.\n"
 msgstr " 未指定外部程序。\n"
 
-#: fetchmail.c:1926
+#: fetchmail.c:1929
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr " 通过外部程序 %s 进行 SMTP 连接(--plugout %s)。\n"
 
-#: fetchmail.c:1928
+#: fetchmail.c:1931
 msgid "  No plugout command specified.\n"
 msgstr " 未指定外部程序。\n"
 
-#: fetchmail.c:1933
+#: fetchmail.c:1936
 msgid "  No UIDs saved from this host.\n"
 msgstr " 未从此主机上保存 UIDs。\n"
 
-#: fetchmail.c:1942
+#: fetchmail.c:1945
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr " 保存了 %d 个UIDs。\n"
 
-#: fetchmail.c:1950
+#: fetchmail.c:1953
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr " 收件跟踪信息将被加入 Received 邮件头。\n"
 
-#: fetchmail.c:1952
+#: fetchmail.c:1955
 msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 " 无收件跟踪信息要被加入 Received 邮件头。\n"
 "。\n"
 
-#: fetchmail.c:1957
+#: fetchmail.c:1960
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr " 邮件头错误的邮件将被拒收。\n"
 
-#: fetchmail.c:1960
+#: fetchmail.c:1963
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr " 邮件头错误的邮件可以接收。\n"
 
-#: fetchmail.c:1965
+#: fetchmail.c:1968
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr " 传送的 properties 选项为 “%s” 。\n"
@@ -1558,50 +1580,50 @@ msgstr ""
 msgid "Couldn't get service name for [%s]\n"
 msgstr "无法获得服务 [%s]\n"
 
-#: gssapi.c:72
+#: gssapi.c:71
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "正在使用服务 [%s]\n"
 
-#: gssapi.c:89
+#: gssapi.c:88
 msgid "Sending credentials\n"
 msgstr "正在发送证书\n"
 
-#: gssapi.c:107
+#: gssapi.c:106
 msgid "Error exchanging credentials\n"
 msgstr "交换证书时出错\n"
 
-#: gssapi.c:152
+#: gssapi.c:151
 msgid "Couldn't unwrap security level data\n"
 msgstr "无法解开加密数据\n"
 
-#: gssapi.c:157
+#: gssapi.c:156
 msgid "Credential exchange complete\n"
 msgstr "证书交换完成\n"
 
-#: gssapi.c:161
+#: gssapi.c:160
 msgid "Server requires integrity and/or privacy\n"
 msgstr "服务器要求完整性和(或)隐私检查\n"
 
-#: gssapi.c:170
+#: gssapi.c:169
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "解开的加密标识: %s%s%s\n"
 
-#: gssapi.c:174
+#: gssapi.c:173
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "最大 GSS 标识大小为 %ld\n"
 
-#: gssapi.c:187
+#: gssapi.c:186
 msgid "Error creating security level request\n"
 msgstr "创建加密请求时出错\n"
 
-#: gssapi.c:198
+#: gssapi.c:197
 msgid "Releasing GSS credentials\n"
 msgstr "正在清空 GSS 证书\n"
 
-#: gssapi.c:201
+#: gssapi.c:200
 msgid "Error releasing credentials\n"
 msgstr "清空证书时出错\n"
 
@@ -1723,7 +1745,8 @@ 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
@@ -1998,7 +2021,9 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr " -L, --logfile\t指定日志文件名\n"
 
 #: options.c:626
-msgid "      --syslog      use syslog(3) for most messages when running as a daemon\n"
+msgid ""
+"      --syslog      use syslog(3) for most messages when running as a "
+"daemon\n"
 msgstr " --syslog\t以后台服务运行时用 syslog(3) 得到更多的信息\n"
 
 #: options.c:627
@@ -2026,11 +2051,14 @@ msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr " --nobounce\t将回送邮件从用户重定向至邮件管理员\n"
 
 #: options.c:633
-msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgid ""
+"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr "      --nosoftbounce\t让 fetchmail 永久删除无法投递的邮件。\n"
 
 #: options.c:634
-msgid "      --softbounce  keep permanently undeliverable messages on server (default).\n"
+msgid ""
+"      --softbounce  keep permanently undeliverable messages on server "
+"(default).\n"
 msgstr "      --softbounce\t将无法投递的邮件长期保留在服务器上(默认)。\n"
 
 #: options.c:636
@@ -2062,11 +2090,14 @@ msgid "      --sslcertpath path to ssl certificates\n"
 msgstr " --sslcertpath\tssl 证书目录\n"
 
 #: options.c:645
-msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgid ""
+"      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr " --sslcommonname\t期望返回服务器名 (不鼓励)\n"
 
 #: options.c:646
-msgid "      --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgid ""
+"      --sslfingerprint fingerprint that must match that of the server's "
+"cert.\n"
 msgstr " --sslfingerprint\t指定一个指纹，它必须与服务器证书的指纹匹配\n"
 
 #: options.c:647
@@ -2083,10 +2114,10 @@ msgstr " --plugout\t指定外部程序打开 smtp 连接\n"
 
 #: options.c:651
 msgid ""
-"      --bad-header {reject|pass}\n"
+"      --bad-header {reject|accept}\n"
 "                    specify policy for handling messages with bad headers\n"
 msgstr ""
-"      --bad-header {reject|pass}\n"
+"      --bad-header {reject|accept}\n"
 "                    设定对邮件头错误的邮件的处理方式\n"
 
 #: options.c:654
@@ -2102,7 +2133,8 @@ msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr " --port\t要连接的 TCP 端口(过时了，用 --service)\n"
 
 #: options.c:657
-msgid "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
+msgid ""
+"  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr " -P, --service\t要连接的 TCP 服务(允许用 TCP 端口的数值来表示)\n"
 
 #: options.c:658
@@ -2226,7 +2258,9 @@ 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
@@ -2304,11 +2338,15 @@ msgid "SDPS not enabled."
 msgstr "SDPS 不可用"
 
 #: rcfile_y.y:218
-msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgid ""
+"fetchmail: interface option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
 msgstr "fetchmail: interface 选项只有 Linux(无 IPv6)和 FreeBSD 支持\n"
 
 #: rcfile_y.y:225
-msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgid ""
+"fetchmail: monitor option is only supported under Linux (without IPv6) and "
+"FreeBSD\n"
 msgstr "fetchmail: monitor 选项只有 Linux(无 IPv6)和 FreeBSD 支持\n"
 
 #: rcfile_y.y:340
@@ -2577,8 +2615,9 @@ msgid "BSMTP file open failed: %s\n"
 msgstr "打开 BSMTP 文件失败: %s\n"
 
 #: sink.c:787
-msgid "BSMTP preamble write failed.\n"
-msgstr "写入 BSMTP 报头失败。\n"
+#, c-format
+msgid "BSMTP preamble write failed: %s.\n"
+msgstr "写入 BSMTP 报头失败: %s。\n"
 
 #: sink.c:1001
 #, c-format
@@ -2609,58 +2648,70 @@ msgstr "无匹配的地址；转发至 %s。\n"
 msgid "about to deliver with: %s\n"
 msgstr "即将用 %s 投递\n"
 
-#: sink.c:1252
+#: sink.c:1239
+#, fuzzy, c-format
+msgid "Cannot switch effective user id to %ld: %s\n"
+msgstr "无法将 fetchids 文件 %s 重命名为 %s: %s\n"
+
+#: sink.c:1251
+#, c-format
+msgid "Cannot switch effective user id back to original %ld: %s\n"
+msgstr ""
+
+#: sink.c:1258
 msgid "MDA open failed\n"
 msgstr "打开 MDA 失败\n"
 
-#: sink.c:1289
+#: sink.c:1297
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP 连接至 %s 失败\n"
 
-#: sink.c:1313
+#: sink.c:1321
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "无法启动 MDA 代理；正在转到 MDA 代理 %s"
 
-#: sink.c:1375
+#: sink.c:1379
+#, c-format
+msgid "Message termination or close of BSMTP file failed: %s\n"
+msgstr "邮件终止或 BSMTP 文件关闭失败: %s\n"
+
+#: sink.c:1406
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "写入 MDA 时出错: %s\n"
 
-#: sink.c:1378
+#: sink.c:1409
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA 被信号 %d 终止\n"
 
-#: sink.c:1381
+#: sink.c:1412
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA 返回非零值 %d\n"
 
-#: sink.c:1384
+#: sink.c:1415
 #, 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
-msgid "Message termination or close of BSMTP file failed\n"
-msgstr "邮件终止或 BSMTP 文件关闭失败\n"
-
-#: sink.c:1428
+#: sink.c:1440
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP 端拒绝投递\n"
 
-#: sink.c:1458
+#: sink.c:1470
 msgid "LMTP delivery error on EOM\n"
 msgstr "邮件结尾时用 LTMP 协议投递错误\n"
 
-#: sink.c:1461
+#: sink.c:1473
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "邮件结尾时 LMTP 协议的未知的非 503 响应: %s\n"
 
-#: sink.c:1616
+#: sink.c:1628
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"