Record 'make distcheck' and po/update-po changes.

1 files changed, 58 insertions, 137 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 96b356fe..ecf2b84b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.4.13-rc1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2021-01-03 13:50+0100\n"
+"POT-Creation-Date: 2020-10-14 00:44+0200\n"
 "PO-Revision-Date: 2020-10-15 09:14-0400\n"
 "Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -134,8 +134,7 @@ msgstr "(邮件内容 %d 字节)"
 
 #: driver.c:770
 #, 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:802
@@ -153,8 +152,7 @@ msgstr "未删除\n"
 #: driver.c:842
 #, 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:899
@@ -188,9 +186,7 @@ msgstr "fetchmail 发现反复超时"
 
 #: driver.c:930
 #, 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:934
@@ -515,8 +511,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 ""
@@ -556,8 +551,7 @@ msgstr "无法在主机数据库中找到自己的主机来验证它！\n"
 #: env.c:229
 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"
@@ -675,8 +669,7 @@ msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
 msgstr "警告：您的 SSL/TLS 库不支持 TLS v1.3。\n"
 
 #: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
+msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
 msgstr "警告：使用 LibreSSL 编译，该配置不受支持。\n"
 
 #: fetchmail.c:314
@@ -703,8 +696,7 @@ msgstr "日志文件 \"%s\" 不可写，退出。\n"
 
 #: fetchmail.c:378
 #, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
+msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s"
 msgstr "同时指定了 syslog 和 logfile 选项，忽略 syslog 并登录至 %s"
 
 #: fetchmail.c:469
@@ -748,18 +740,13 @@ msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail 进程号 %ld 终止。\n"
 
 #: fetchmail.c:546
-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:552
 #, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: 有另一个 fetchmail 进程号 %ld 在指定主机上运行时无法收邮件。\n"
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"
+msgstr "fetchmail: 有另一个 fetchmail 进程号 %ld 在指定主机上运行时无法收邮件。\n"
 
 #: fetchmail.c:559
 #, c-format
@@ -767,8 +754,7 @@ msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: 另一个前台 fetchmail 进程号 %ld 正在运行。\n"
 
 #: fetchmail.c:569
-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:581
@@ -937,12 +923,8 @@ msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "警告: 在配置文件中多次提及主机 %s\n"
 
 #: fetchmail.c:1187
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
-msgstr ""
-"fetchmail: 错误: 在配置文件中有多个 “defaults” 记录，或者“defaults”不是第一个"
-"记录。\n"
+msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n"
+msgstr "fetchmail: 错误: 在配置文件中有多个 “defaults” 记录，或者“defaults”不是第一个记录。\n"
 
 #: fetchmail.c:1317
 msgid "SSL support is not compiled in.\n"
@@ -962,8 +944,7 @@ msgstr "配置了 GSSAPI 支持，但该功能未编译在内。\n"
 
 #: fetchmail.c:1366
 #, 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:1377
@@ -977,9 +958,7 @@ msgstr "警告: 如果所有邮件均被邮件管理员收取，不要寻求支�
 
 #: fetchmail.c:1395
 #, 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:1402
@@ -997,8 +976,7 @@ msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "收取所有邮件并保留服务器上的备份或使用 idle 模式是错误的！\n"
 
 #: fetchmail.c:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
+msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
 msgstr "fetchmail: 错误：idle 模式对多个文件夹或账号不可用！\n"
 
 #: fetchmail.c:1468
@@ -1279,20 +1257,15 @@ msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr " 在收取新邮件前删除旧邮件(--flush 开启).\n"
 
 #: fetchmail.c:1809
-msgid ""
-"  Old messages will not be flushed before message retrieval (--flush off).\n"
+msgid "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr " 在收取新邮件前不删除旧邮件(--flush 关闭).\n"
 
 #: fetchmail.c:1811
-msgid ""
-"  Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
+msgid "  Oversized messages will be flushed before message retrieval (--limitflush on).\n"
 msgstr " 收件前将删除超大的邮件(--limitflush 开启).\n"
 
 #: fetchmail.c:1812
-msgid ""
-"  Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
+msgid "  Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
 msgstr " 收件前将不删除超大的邮件(--limitflush 关闭).\n"
 
 #: fetchmail.c:1814
@@ -1320,13 +1293,11 @@ msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr " 不在换行前强行插入回车符(forcecr 关闭).\n"
 
 #: fetchmail.c:1823
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr " 忽略 Content-Transfer-Encoding (pass8bits 开启).\n"
 
 #: fetchmail.c:1824
-msgid ""
-"  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgid "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr " 不忽略 Content-Transfer-Encoding (pass8bits 关闭).\n"
 
 #: fetchmail.c:1826
@@ -1515,8 +1486,7 @@ msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr " 关闭 DNS 搜寻多投地址。\n"
 
 #: fetchmail.c:1981
-msgid ""
-"  Server aliases will be compared with multidrop addresses by IP address.\n"
+msgid "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr " 服务器昵称将以 IP 地址与多投地址进行比较\n"
 
 #: fetchmail.c:1983
@@ -1628,9 +1598,7 @@ msgid "Cannot modify signal mask: %s"
 msgstr "无法修改信号 mask：%s"
 
 #: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
+msgid "Your operating system neither defines PATH_MAX nor will it accept realpath(f, NULL). Aborting.\n"
 msgstr "您的操作系统既未定义 PATH_MAX 也不接受 realpath(f, NULL)。中止操作。\n"
 
 #: getpass.c:71
@@ -1670,8 +1638,7 @@ msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
 msgstr "未找到合适的 GSSAPI 证书。忽略 GSSAPI 认证。\n"
 
 #: gssapi.c:124
-msgid ""
-"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
+msgid "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
 msgstr "如您想使用 GSSAPI，您首先需要证书，也许来自 kinit。\n"
 
 #: gssapi.c:160
@@ -1849,8 +1816,7 @@ msgid "%u is first unseen\n"
 msgstr "%u 是首个未读邮件\n"
 
 #: imap.c:1078
-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"
 
 #: imap.c:1177 imap.c:1184
@@ -2155,9 +2121,7 @@ msgid "  -L, --logfile     specify logfile name\n"
 msgstr " -L, --logfile\t指定日志文件名\n"
 
 #: options.c:653
-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:654
@@ -2189,14 +2153,11 @@ msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr " --nobounce\t将回送邮件从用户重定向至邮件管理员\n"
 
 #: options.c:661
-msgid ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgid "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr "      --nosoftbounce\t让 fetchmail 永久删除无法投递的邮件。\n"
 
 #: options.c:662
-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:664
@@ -2236,14 +2197,11 @@ msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
 msgstr "      --sslcertpath     受信 CA ssl 证书文件的目录\n"
 
 #: options.c:675
-msgid ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgid "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr " --sslcommonname\t期望返回服务器名 (不鼓励)\n"
 
 #: options.c:676
-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:677
@@ -2275,8 +2233,7 @@ msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr " -U, --uidl\t强制使用 UIDLs(仅适用于 pop3)\n"
 
 #: options.c:686
-msgid ""
-"      --idle        tells the IMAP server to send notice of new messages\n"
+msgid "      --idle        tells the IMAP server to send notice of new messages\n"
 msgstr "      --idle        告知 IMAP 服务器为新邮件发送通知\n"
 
 #: options.c:687
@@ -2284,8 +2241,7 @@ msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr " --port\t要连接的 TCP 端口(过时了，用 --service)\n"
 
 #: options.c:688
-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:689
@@ -2417,8 +2373,7 @@ msgid "POP2 only supports password authentication. Giving up.\n"
 msgstr "POP2 只支持密码验证。放弃操作。\n"
 
 #: pop3.c:330
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
+msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
 msgstr "警告: 发现\"Maillennium POP3\"，用 RETR 命令代替 TOP。\n"
 
 #: pop3.c:414
@@ -2506,15 +2461,11 @@ msgid "SDPS not enabled."
 msgstr "SDPS 不可用"
 
 #: rcfile_y.y:217
-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:339
@@ -2866,8 +2817,7 @@ msgstr "MDA 返回非零值 %d\n"
 
 #: sink.c:1396
 #, 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:1421
@@ -2887,32 +2837,32 @@ msgstr "邮件结尾时 LMTP 协议的未知的非 503 响应: %s\n"
 msgid "The Fetchmail Daemon"
 msgstr "Fetchmail 后台服务"
 
-#: smtp.c:84
+#: smtp.c:81
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "ESMTP CRAM-MD5 验证...\n"
 
-#: smtp.c:90 smtp.c:143
+#: smtp.c:87 smtp.c:137
 msgid "Server rejected the AUTH command.\n"
 msgstr "服务器拒绝 AUTH 命令。\n"
 
-#: smtp.c:98 smtp.c:150 smtp.c:159 smtp.c:165
+#: smtp.c:95 smtp.c:144 smtp.c:153 smtp.c:159
 msgid "Bad base64 reply from server.\n"
 msgstr "来自服务器的错误的 base64 响应。\n"
 
-#: smtp.c:102
+#: smtp.c:99
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "请求解码: %s\n"
 
-#: smtp.c:119
+#: smtp.c:116
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "ESMTP PLAIN 验证...\n"
 
-#: smtp.c:137
+#: smtp.c:131
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "ESMTP LOGIN 验证...\n"
 
-#: smtp.c:354 smtp.c:382
+#: smtp.c:348 smtp.c:376
 msgid "smtp listener protocol error\n"
 msgstr "smtp 端协议错误\n"
 
@@ -3125,14 +3075,8 @@ msgid "Broken certification chain at: %s\n"
 msgstr "证书链错误，位于: %s\n"
 
 #: socket.c:831
-msgid ""
-"This could mean that the server did not provide the intermediate CA's "
-"certificate(s), which is nothing fetchmail could do anything about.  For "
-"details, please see the README.SSL-SERVER document that ships with "
-"fetchmail.\n"
-msgstr ""
-"这可能意味着服务器未提供中间 CA 证书，fetchmain 对此无能为力。详细信息请查看"
-"随同 fetchmail 发行的 README.SSL-SERVER 文档。\n"
+msgid "This could mean that the server did not provide the intermediate CA's certificate(s), which is nothing fetchmail could do anything about.  For details, please see the README.SSL-SERVER document that ships with fetchmail.\n"
+msgstr "这可能意味着服务器未提供中间 CA 证书，fetchmain 对此无能为力。详细信息请查看随同 fetchmail 发行的 README.SSL-SERVER 文档。\n"
 
 #: socket.c:841
 #, c-format
@@ -3140,14 +3084,8 @@ msgid "Missing trust anchor certificate: %s\n"
 msgstr "缺失信任锚（trust anchor）证书：%s\n"
 
 #: socket.c:844
-msgid ""
-"This could mean that the root CA's signing certificate is not in the trusted "
-"CA certificate location, or that c_rehash needs to be run on the certificate "
-"directory. For details, please see the documentation of --sslcertpath and --"
-"sslcertfile in the manual page. See README.SSL for details.\n"
-msgstr ""
-"这意味着根证书不在 CA 证书受信路径处，或是需要在证书目录下运行 c_rehash。详细"
-"信息请查看手册页中的 --sslcertpath 和 --sslcertfile 部分。\n"
+msgid "This could mean that the root CA's signing certificate is not in the trusted CA certificate location, or that c_rehash needs to be run on the certificate directory. For details, please see the documentation of --sslcertpath and --sslcertfile in the manual page. See README.SSL for details.\n"
+msgstr "这意味着根证书不在 CA 证书受信路径处，或是需要在证书目录下运行 c_rehash。详细信息请查看手册页中的 --sslcertpath 和 --sslcertfile 部分。\n"
 
 #: socket.c:918 socket.c:996
 msgid "Your OpenSSL version does not support SSLv3.\n"
@@ -3172,14 +3110,12 @@ msgstr "指定了无效的 SSL 协议“%s”，将用默认的自动选择（au
 
 #: socket.c:1081
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
+msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
 msgstr "已加载的 OpenSSL 库 %#lx 比头文件 %#lx 更旧，拒绝工作。\n"
 
 #: socket.c:1086
 #, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
+msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
 msgstr "已加载的 OpenSSL 库 %#lx 比头文件 %#lx 更新，尝试继续工作。\n"
 
 #: socket.c:1106
@@ -3187,30 +3123,18 @@ msgid "File descriptor out of range for SSL"
 msgstr "文件描述符超出 SSL 的范围"
 
 #: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-"请注意，某些发行版以非标准的方式禁用了较旧的协议版本。请尝试更新的协议版"
-"本。\n"
+msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n"
+msgstr "请注意，某些发行版以非标准的方式禁用了较旧的协议版本。请尝试更新的协议版本。\n"
 
 #: socket.c:1195
 #, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-"警告：SSL_set_tlsext_host_name(%p, \"%s\") 失败（代码 %#lx），尝试继续操"
-"作。\n"
+msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n"
+msgstr "警告：SSL_set_tlsext_host_name(%p, \"%s\") 失败（代码 %#lx），尝试继续操作。\n"
 
 #: socket.c:1210
 #, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-"警告：X509_VERIFY_PARAM_set1_host(%p, \"%s\") 失败（代码 %#x），尝试继续操"
-"作。\n"
+msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n"
+msgstr "警告：X509_VERIFY_PARAM_set1_host(%p, \"%s\") 失败（代码 %#x），尝试继续操作。\n"
 
 #: socket.c:1247
 msgid "Server shut down connection prematurely during SSL_connect().\n"
@@ -3239,9 +3163,7 @@ msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "证书/指纹验证被不明原因地跳过！\n"
 
 #: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
+msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"
 msgstr "警告:此连接不安全，但会继续运行。(最好使用 --sslcertck！)\n"
 
 #: socket.c:1339
@@ -3453,8 +3375,7 @@ msgstr "realloc 失败\n"
 #~ msgid "swapping UID lists\n"
 #~ msgstr "正在转储 UID 列表\n"
 
-#~ msgid ""
-#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\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."