X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=po%2Fen_GB.po;h=9f80b273f5766e992399c34a3b1db2c2fcba21f2;hb=527a4077753ff05fccae54c0b68d29ceb548a081;hp=5c16d05af16f57a18243f86127352d5d14f3f983;hpb=62e40d9925446e5bbda7e3a3627b48be5dc83a61;p=~andy%2Ffetchmail

diff --git a/po/en_GB.po b/po/en_GB.po
index 5c16d05a..9f80b273 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,34 +7,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.5\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2007-03-18 02:13+0100\n"
+"POT-Creation-Date: 2013-04-23 23:24+0200\n"
 "PO-Revision-Date: 2006-11-02 06:58-0000\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: English (British) <en_gb@li.org>\n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: checkalias.c:174
+#: checkalias.c:179
 #, c-format
 msgid "Checking if %s is really the same node as %s\n"
 msgstr "Checking if %s is really the same node as %s\n"
 
-#: checkalias.c:178
+#: checkalias.c:183
 msgid "Yes, their IP addresses match\n"
 msgstr "Yes, their IP addresses match\n"
 
-#: checkalias.c:182
+#: checkalias.c:187
 msgid "No, their IP addresses don't match\n"
 msgstr "No, their IP addresses don't match\n"
 
-#: checkalias.c:198
+#: checkalias.c:212
 #, c-format
 msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
 msgstr "nameserver failure while looking for '%s' during poll of %s: %s\n"
 
-#: checkalias.c:223
+#: checkalias.c:237
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr "nameserver failure while looking for `%s' during poll of %s.\n"
@@ -48,107 +49,107 @@ msgstr "could not decode BASE64 challenge\n"
 msgid "decoded as %s\n"
 msgstr "decoded as %s\n"
 
-#: driver.c:191
+#: driver.c:199
 #, c-format
 msgid "kerberos error %s\n"
 msgstr "kerberos error %s\n"
 
-#: driver.c:249 driver.c:254
-#, c-format
-msgid "krb5_sendauth: %s [server says '%*s'] \n"
+#: driver.c:259 driver.c:265
+#, fuzzy, c-format
+msgid "krb5_sendauth: %s [server says '%s']\n"
 msgstr "krb5_sendauth: %s [server says '%*s'] \n"
 
-#: driver.c:335
+#: driver.c:345
 msgid "Subject: Fetchmail oversized-messages warning"
 msgstr "Subject: Fetchmail oversized-messages warning"
 
-#: driver.c:339
+#: driver.c:349
 #, c-format
 msgid "The following oversized messages were deleted on server %s account %s:"
 msgstr "The following oversized messages were deleted on server %s account %s:"
 
-#: driver.c:343
+#: driver.c:353
 #, c-format
 msgid "The following oversized messages remain on server %s account %s:"
 msgstr "The following oversized messages remain on server %s account %s:"
 
-#: driver.c:362
-#, c-format
+#: driver.c:372
+#, fuzzy, c-format
 msgid "  %d message  %d octets long deleted by fetchmail."
 msgid_plural "  %d messages %d octets long deleted by fetchmail."
-msgstr[0] "  %d message  %d octets long deleted by fetchmail."
-msgstr[1] "  %d messages %d octets long deleted by fetchmail."
+msgstr[0] "  %d msg %d octets long deleted by fetchmail."
+msgstr[1] "  %d msg %d octets long deleted by fetchmail."
 
-#: driver.c:367
-#, c-format
+#: driver.c:377
+#, fuzzy, c-format
 msgid "  %d message  %d octets long skipped by fetchmail."
 msgid_plural "  %d messages %d octets long skipped by fetchmail."
-msgstr[0] "  %d message  %d octets long skipped by fetchmail."
-msgstr[1] "  %d messages %d octets long skipped by fetchmail."
+msgstr[0] "  %d msg %d octets long skipped by fetchmail."
+msgstr[1] "  %d msg %d octets long skipped by fetchmail."
 
-#: driver.c:503
+#: driver.c:522
 #, c-format
 msgid "skipping message %s@%s:%d"
 msgstr "skipping message %s@%s:%d"
 
-#: driver.c:557
+#: driver.c:576
 #, c-format
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr "skipping message %s@%s:%d (%d octets)"
 
-#: driver.c:573
+#: driver.c:592
 msgid " (length -1)"
 msgstr " (length -1)"
 
-#: driver.c:576
+#: driver.c:595
 msgid " (oversized)"
 msgstr " (oversized)"
 
-#: driver.c:591
+#: driver.c:613
 #, c-format
 msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 msgstr "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
 
-#: driver.c:608
+#: driver.c:631
 #, c-format
 msgid "reading message %s@%s:%d of %d"
 msgstr "reading message %s@%s:%d of %d"
 
-#: driver.c:613
+#: driver.c:636
 #, c-format
 msgid " (%d octets)"
 msgstr " (%d octets)"
 
-#: driver.c:614
+#: driver.c:637
 #, c-format
 msgid " (%d header octets)"
 msgstr " (%d header octets)"
 
-#: driver.c:682
+#: driver.c:707
 #, c-format
 msgid " (%d body octets)"
 msgstr " (%d body octets)"
 
-#: driver.c:743
+#: driver.c:769
 #, c-format
 msgid ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 msgstr ""
 "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
 
-#: driver.c:774
+#: driver.c:801
 msgid " retained\n"
 msgstr " retained\n"
 
-#: driver.c:784
+#: driver.c:811
 msgid " flushed\n"
 msgstr " flushed\n"
 
-#: driver.c:801
+#: driver.c:823
 msgid " not flushed\n"
 msgstr " not flushed\n"
 
-#: driver.c:819
+#: driver.c:841
 #, c-format
 msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgid_plural ""
@@ -156,45 +157,45 @@ msgid_plural ""
 msgstr[0] "fetchlimit %d reached; %d message left on server %s account %s\n"
 msgstr[1] "fetchlimit %d reached; %d messages left on server %s account %s\n"
 
-#: driver.c:876
+#: driver.c:898
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr "timeout after %d seconds waiting to connect to server %s.\n"
 
-#: driver.c:880
+#: driver.c:902
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr "timeout after %d seconds waiting for server %s.\n"
 
-#: driver.c:884
+#: driver.c:906
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr "timeout after %d seconds waiting for %s.\n"
 
-#: driver.c:889
+#: driver.c:911
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr "timeout after %d seconds waiting for listener to respond.\n"
 
-#: driver.c:892
+#: driver.c:914
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr "timeout after %d seconds.\n"
 
-#: driver.c:904
+#: driver.c:926
 msgid "Subject: fetchmail sees repeated timeouts"
 msgstr "Subject: fetchmail sees repeated timeouts"
 
-#: driver.c:907
+#: driver.c:929
 #, c-format
 msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
-"s.\n"
+"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
+"%s.\n"
 msgstr ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
-"s.\n"
+"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
+"%s.\n"
 
-#: driver.c:911
+#: driver.c:933
 msgid ""
 "This could mean that your mailserver is stuck, or that your SMTP\n"
 "server is wedged, or that your mailbox file on the server has been\n"
@@ -210,73 +211,73 @@ msgstr ""
 "\n"
 "Fetchmail won't poll this mailbox again until you restart it.\n"
 
-#: driver.c:936
+#: driver.c:959
+#, fuzzy, c-format
+msgid "pre-connection command terminated with signal %d\n"
+msgstr "pre-connection command failed with status %d\n"
+
+#: driver.c:962
 #, c-format
 msgid "pre-connection command failed with status %d\n"
 msgstr "pre-connection command failed with status %d\n"
 
-#: driver.c:960
+#: driver.c:986
 #, c-format
 msgid "couldn't find HESIOD pobox for %s\n"
 msgstr "couldn't find HESIOD pobox for %s\n"
 
-#: driver.c:981
+#: driver.c:1007
 msgid "Lead server has no name.\n"
 msgstr "Lead server has no name.\n"
 
-#: driver.c:1005
+#: driver.c:1034
 #, c-format
 msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "couldn't find canonical DNS name of %s (%s): %s\n"
 
-#: driver.c:1052
+#: driver.c:1081
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s connection to %s failed"
 
-#: driver.c:1068
-msgid "Subject: Fetchmail unreachable-server warning."
-msgstr "Subject: Fetchmail unreachable-server warning."
-
-#: driver.c:1070
-#, c-format
-msgid "Fetchmail could not reach the mail server %s:"
-msgstr "Fetchmail could not reach the mail server %s:"
-
-#: driver.c:1096
+#: driver.c:1110
 msgid "SSL connection failed.\n"
 msgstr "SSL connection failed.\n"
 
-#: driver.c:1149
+#: driver.c:1165
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Lock-busy error on %s@%s\n"
 
-#: driver.c:1153
+#: driver.c:1169
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Server busy error on %s@%s\n"
 
-#: driver.c:1158
+#: driver.c:1174
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Authorisation failure on %s@%s%s\n"
 
-#: driver.c:1161
+#: driver.c:1177
 msgid " (previously authorized)"
 msgstr " (previously authorised)"
 
-#: driver.c:1182
+#: driver.c:1180
+msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
+msgstr ""
+
+#: driver.c:1201
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: fetchmail authentication failed on %s@%s"
 
-#: driver.c:1186
+#: driver.c:1205
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail could not get mail from %s@%s.\n"
 
-#: driver.c:1190
+#: driver.c:1209
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -290,7 +291,7 @@ msgstr ""
 "that fetchmail cannot distinguish because the server didn't send a useful\n"
 "error message."
 
-#: driver.c:1196
+#: driver.c:1215
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -310,7 +311,7 @@ msgstr ""
 "at each cycle.  No future notifications will be sent until service\n"
 "is restored."
 
-#: driver.c:1206
+#: driver.c:1225
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -330,172 +331,182 @@ msgstr ""
 "at each cycle.  No future notifications will be sent until service\n"
 "is restored."
 
-#: driver.c:1222
+#: driver.c:1241
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Repoll immediately on %s@%s\n"
 
-#: driver.c:1227
+#: driver.c:1246
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Unknown login or authentication error on %s@%s\n"
 
-#: driver.c:1251
+#: driver.c:1270
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Authorisation OK on %s@%s\n"
 
-#: driver.c:1257
+#: driver.c:1276
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmail authentication OK on %s@%s"
 
-#: driver.c:1261
+#: driver.c:1280
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail was able to log into %s@%s.\n"
 
-#: driver.c:1265
+#: driver.c:1284
 msgid "Service has been restored.\n"
 msgstr "Service has been restored.\n"
 
-#: driver.c:1297
+#: driver.c:1317
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "selecting or re-polling folder %s\n"
 
-#: driver.c:1299
+#: driver.c:1319
 msgid "selecting or re-polling default folder\n"
 msgstr "selecting or re-polling default folder\n"
 
-#: driver.c:1311
+#: driver.c:1331
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s at %s (folder %s)"
 
-#: driver.c:1314 rcfile_y.y:381
+#: driver.c:1334 rcfile_y.y:390
 #, c-format
 msgid "%s at %s"
 msgstr "%s at %s"
 
-#: driver.c:1319
+#: driver.c:1339
 #, c-format
 msgid "Polling %s\n"
 msgstr "Polling %s\n"
 
-#: driver.c:1323
+#: driver.c:1343
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d message (%d %s) for %s"
 msgstr[1] "%d messages (%d %s) for %s"
 
-#: driver.c:1326
+#: driver.c:1346
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "seen"
 msgstr[1] "seen"
 
-#: driver.c:1329
+#: driver.c:1349
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d message for %s"
 msgstr[1] "%d messages for %s"
 
-#: driver.c:1336
+#: driver.c:1356
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octets).\n"
 
-#: driver.c:1342
+#: driver.c:1362
 #, c-format
 msgid "No mail for %s\n"
 msgstr "No mail for %s\n"
 
-#: driver.c:1375 imap.c:90
+#: driver.c:1395
 msgid "bogus message count!"
 msgstr "bogus message count!"
 
-#: driver.c:1517
+#: driver.c:1447
+#, c-format
+msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n"
+msgstr ""
+
+#: driver.c:1548
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1520
+#: driver.c:1551
 msgid "missing or bad RFC822 header"
 msgstr "missing or bad RFC822 header"
 
-#: driver.c:1523
+#: driver.c:1554
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1526
+#: driver.c:1557
 msgid "client/server synchronization"
 msgstr "client/server synchronisation"
 
-#: driver.c:1529
+#: driver.c:1560
 msgid "client/server protocol"
 msgstr "client/server protocol"
 
-#: driver.c:1532
+#: driver.c:1563
 msgid "lock busy on server"
 msgstr "lock busy on server"
 
-#: driver.c:1535
+#: driver.c:1566
 msgid "SMTP transaction"
 msgstr "SMTP transaction"
 
-#: driver.c:1538
+#: driver.c:1569
 msgid "DNS lookup"
 msgstr "DNS lookup"
 
-#: driver.c:1541
+#: driver.c:1572
 msgid "undefined"
 msgstr "undefined"
 
-#: driver.c:1547
+#: driver.c:1578
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 
-#: driver.c:1549
+#: driver.c:1580
 msgid "unknown"
 msgstr "unknown"
 
-#: driver.c:1551
+#: driver.c:1582
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "%s error while fetching from %s@%s\n"
 
-#: driver.c:1562
+#: driver.c:1594
+#, fuzzy, c-format
+msgid "post-connection command terminated with signal %d\n"
+msgstr "post-connection command failed with status %d\n"
+
+#: driver.c:1596
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "post-connection command failed with status %d\n"
 
-#: driver.c:1581
+#: driver.c:1615
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 support not linked.\n"
 
-#: driver.c:1589
+#: driver.c:1623
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 support not linked.\n"
 
-#: driver.c:1600
+#: driver.c:1634
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Option --flush is not supported with %s\n"
 
-#: driver.c:1606
+#: driver.c:1640
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Option --all is not supported with %s\n"
 
-#: driver.c:1615
+#: driver.c:1649
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Option --limit is not supported with %s\n"
 
-#: env.c:59
+#: env.c:61
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -510,7 +521,7 @@ msgstr ""
 "Try \"env QMAILINJECT= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 
-#: env.c:71
+#: env.c:73
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -527,26 +538,26 @@ msgstr ""
 "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
 "%s: Abort.\n"
 
-#: env.c:83
+#: env.c:85
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: You don't exist.  Go away.\n"
 
-#: env.c:145
+#: env.c:149
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: can't determine your host!"
 
-#: env.c:168
+#: env.c:172
 #, c-format
 msgid "gethostbyname failed for %s\n"
 msgstr "gethostbyname failed for %s\n"
 
-#: env.c:170
+#: env.c:174
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr "Cannot find my own host in hosts database to qualify it!\n"
 
-#: env.c:174
+#: env.c:178
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -558,7 +569,7 @@ msgstr ""
 "problems!\n"
 "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
 
-#: etrn.c:49 odmr.c:60
+#: etrn.c:49 odmr.c:61
 #, c-format
 msgid "%s's SMTP listener does not support ESMTP\n"
 msgstr "%s's SMTP listener does not support ESMTP\n"
@@ -623,20 +634,20 @@ msgid "Option --check is not supported with ETRN\n"
 msgstr "Option --check is not supported with ETRN\n"
 
 #: fetchmail.c:137
+#, fuzzy
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
-"Wilson\n"
-"Copyright (C) 2005-2006 Sunil Shetye\n"
-"Copyright (C) 2005-2007 Matthias Andree\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
+"                   Robert M. Funk, Graham Wilson\n"
+"Copyright (C) 2005 - 2012 Sunil Shetye\n"
+"Copyright (C) 2005 - 2013 Matthias Andree\n"
 msgstr ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
 "Wilson\n"
-"Copyright (C) 2005-2006 Sunil Shetye\n"
-"Copyright (C) 2005-2007 Matthias Andree\n"
+"Copyright (C) 2005-2006 Matthias Andree, Sunil Shetye\n"
 
-#: fetchmail.c:142
+#: fetchmail.c:143
 msgid ""
 "Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
 "are welcome to redistribute it under certain conditions. For details,\n"
@@ -646,64 +657,88 @@ msgstr ""
 "are welcome to redistribute it under certain conditions. For details,\n"
 "please see the file COPYING in the source or documentation directory.\n"
 
-#: fetchmail.c:176
+#: fetchmail.c:181
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "WARNING: Running as root is discouraged.\n"
 
-#: fetchmail.c:188
+#: fetchmail.c:193
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: invoked with"
 
-#: fetchmail.c:212
+#: fetchmail.c:217
 msgid "could not get current working directory\n"
 msgstr "could not get current working directory\n"
 
-#: fetchmail.c:280
+#: fetchmail.c:288
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "This is fetchmail release %s"
 
-#: fetchmail.c:395
+#: fetchmail.c:313
+msgid "The nodetach option is in effect, ignoring logfile option.\n"
+msgstr ""
+
+#: fetchmail.c:320
+msgid "Not running in daemon mode, ignoring logfile option.\n"
+msgstr ""
+
+#: fetchmail.c:327
+#, c-format
+msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
+msgstr ""
+
+#: fetchmail.c:333
+#, c-format
+msgid "Logfile \"%s\" is not writable, aborting.\n"
+msgstr ""
+
+#: fetchmail.c:351
+#, c-format
+msgid ""
+"syslog and logfile options are both set, ignoring syslog, and logging to %s"
+msgstr ""
+
+#: fetchmail.c:439
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Taking options from command line%s%s\n"
 
-#: fetchmail.c:396
+#: fetchmail.c:440
 msgid " and "
 msgstr " and "
 
-#: fetchmail.c:401
+#: fetchmail.c:445
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "No mailservers set up -- perhaps %s is missing?\n"
 
-#: fetchmail.c:422
+#: fetchmail.c:466
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: no mailservers have been specified.\n"
 
-#: fetchmail.c:434
+#: fetchmail.c:478
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: no other fetchmail is running\n"
 
-#: fetchmail.c:440
-#, c-format
-msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
+#: fetchmail.c:484
+#, fuzzy, c-format
+msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
 msgstr "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 
-#: fetchmail.c:441 fetchmail.c:450
+#: fetchmail.c:485 fetchmail.c:494
 msgid "background"
 msgstr "background"
 
-#: fetchmail.c:441 fetchmail.c:450
+#: fetchmail.c:485 fetchmail.c:494
 msgid "foreground"
 msgstr "foreground"
 
-#: fetchmail.c:449
-#, c-format
-msgid "fetchmail: %s fetchmail at %d killed.\n"
+#: fetchmail.c:493
+#, fuzzy, c-format
+msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail at %d killed.\n"
 
-#: fetchmail.c:472
+#: fetchmail.c:516
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -711,226 +746,230 @@ msgstr ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
 
-#: fetchmail.c:478
-#, c-format
+#: fetchmail.c:522
+#, fuzzy, c-format
 msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+"fetchmail: can't poll specified hosts with another fetchmail running at "
+"%ld.\n"
 msgstr ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
 
-#: fetchmail.c:485
-#, c-format
-msgid "fetchmail: another foreground fetchmail is running at %d.\n"
+#: fetchmail.c:529
+#, fuzzy, c-format
+msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: another foreground fetchmail is running at %d.\n"
 
-#: fetchmail.c:495
+#: fetchmail.c:539
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 
-#: fetchmail.c:501
-#, c-format
-msgid "fetchmail: background fetchmail at %d awakened.\n"
+#: fetchmail.c:545
+#, fuzzy, c-format
+msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: background fetchmail at %d awakened.\n"
 
-#: fetchmail.c:513
-#, c-format
-msgid "fetchmail: elder sibling at %d died mysteriously.\n"
+#: fetchmail.c:557
+#, fuzzy, c-format
+msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
 msgstr "fetchmail: elder sibling at %d died mysteriously.\n"
 
-#: fetchmail.c:528
+#: fetchmail.c:572
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: can't find a password for %s@%s.\n"
 
-#: fetchmail.c:532
+#: fetchmail.c:576
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Enter password for %s@%s: "
 
-#: fetchmail.c:557 fetchmail.c:593
-msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-msgstr "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-
-#: fetchmail.c:569
+#: fetchmail.c:618
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: Cannot detach into background. Aborting.\n"
 
-#: fetchmail.c:573
-#, c-format
-msgid "starting fetchmail %s daemon \n"
+#: fetchmail.c:622
+#, fuzzy, c-format
+msgid "starting fetchmail %s daemon\n"
 msgstr "starting fetchmail %s daemon \n"
 
-#: fetchmail.c:589 fetchmail.c:591
-#, c-format
-msgid "could not open %s to append logs to \n"
+#: fetchmail.c:638 fetchmail.c:640
+#, fuzzy, c-format
+msgid "could not open %s to append logs to\n"
 msgstr "could not open %s to append logs to \n"
 
-#: fetchmail.c:630
+#: fetchmail.c:659
+msgid "--check mode enabled, not fetching mail\n"
+msgstr ""
+
+#: fetchmail.c:681
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "couldn't time-check %s (error %d)\n"
 
-#: fetchmail.c:635
+#: fetchmail.c:686
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "restarting fetchmail (%s changed)\n"
 
-#: fetchmail.c:640
+#: fetchmail.c:691
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "attempt to re-exec may fail as directory has not been restored\n"
 
-#: fetchmail.c:667
+#: fetchmail.c:718
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "attempt to re-exec fetchmail failed\n"
 
-#: fetchmail.c:711
+#: fetchmail.c:748
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr "poll of %s skipped (failed authentication or too many timeouts)\n"
 
-#: fetchmail.c:723
+#: fetchmail.c:760
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval not reached, not querying %s\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:798
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Query status=0 (SUCCESS)\n"
 
-#: fetchmail.c:763
+#: fetchmail.c:800
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Query status=1 (NOMAIL)\n"
 
-#: fetchmail.c:765
+#: fetchmail.c:802
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Query status=2 (SOCKET)\n"
 
-#: fetchmail.c:767
+#: fetchmail.c:804
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Query status=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:769
+#: fetchmail.c:806
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Query status=4 (PROTOCOL)\n"
 
-#: fetchmail.c:771
+#: fetchmail.c:808
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Query status=5 (SYNTAX)\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:810
 msgid "Query status=6 (IOERR)\n"
 msgstr "Query status=6 (IOERR)\n"
 
-#: fetchmail.c:775
+#: fetchmail.c:812
 msgid "Query status=7 (ERROR)\n"
 msgstr "Query status=7 (ERROR)\n"
 
-#: fetchmail.c:777
+#: fetchmail.c:814
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Query status=8 (EXCLUDE)\n"
 
-#: fetchmail.c:779
+#: fetchmail.c:816
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Query status=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:781
+#: fetchmail.c:818
 msgid "Query status=10 (SMTP)\n"
 msgstr "Query status=10 (SMTP)\n"
 
-#: fetchmail.c:783
+#: fetchmail.c:820
 msgid "Query status=11 (DNS)\n"
 msgstr "Query status=11 (DNS)\n"
 
-#: fetchmail.c:785
+#: fetchmail.c:822
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Query status=12 (BSMTP)\n"
 
-#: fetchmail.c:787
+#: fetchmail.c:824
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Query status=13 (MAXFETCH)\n"
 
-#: fetchmail.c:789
+#: fetchmail.c:826
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Query status=%d\n"
 
-#: fetchmail.c:835
+#: fetchmail.c:868
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "All connections are wedged.  Exiting.\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:876
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "sleeping at %s for %d seconds\n"
 
-#: fetchmail.c:866
+#: fetchmail.c:900
 #, c-format
 msgid "awakened by %s\n"
 msgstr "awakened by %s\n"
 
-#: fetchmail.c:869
+#: fetchmail.c:903
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "awakened by signal %d\n"
 
-#: fetchmail.c:876
+#: fetchmail.c:911
 #, c-format
 msgid "awakened at %s\n"
 msgstr "awakened at %s\n"
 
-#: fetchmail.c:882
+#: fetchmail.c:916
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normal termination, status %d\n"
 
-#: fetchmail.c:1034
+#: fetchmail.c:1075
 msgid "couldn't time-check the run-control file\n"
 msgstr "couldn't time-check the run-control file\n"
 
-#: fetchmail.c:1067
+#: fetchmail.c:1109
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "Warning: multiple mentions of host %s in config file\n"
 
-#: fetchmail.c:1100
+#: fetchmail.c:1148
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 
-#: fetchmail.c:1222
+#: fetchmail.c:1270
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1229
+#: fetchmail.c:1277
+#, fuzzy
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
-msgstr "KERBEROS v4 support is configured, but not compiled in.\n"
+msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1235
+#: fetchmail.c:1283
+#, fuzzy
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
-msgstr "KERBEROS v5 support is configured, but not compiled in.\n"
+msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1241
+#: fetchmail.c:1289
+#, fuzzy
 msgid "GSSAPI support is configured, but not compiled in.\n"
-msgstr "GSSAPI support is configured, but not compiled in.\n"
+msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1271
+#: fetchmail.c:1319
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 
-#: fetchmail.c:1282
+#: fetchmail.c:1330
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "warning: multidrop for %s requires envelope option!\n"
 
-#: fetchmail.c:1283
+#: fetchmail.c:1331
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr "warning: Do not ask for support if all mail goes to postmaster!\n"
 
-#: fetchmail.c:1300
+#: fetchmail.c:1348
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -939,284 +978,305 @@ msgstr ""
 "fetchmail: %s configuration invalid, specify positive port number for "
 "service or port\n"
 
-#: fetchmail.c:1307
+#: fetchmail.c:1355
 #, c-format
 msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 
-#: fetchmail.c:1325
+#: fetchmail.c:1373
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "%s configuration invalid, LMTP can't use default SMTP port\n"
 
-#: fetchmail.c:1339
+#: fetchmail.c:1387
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 
-#: fetchmail.c:1364
+#: fetchmail.c:1412
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminated with signal %d\n"
 
-#: fetchmail.c:1437
+#: fetchmail.c:1485
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%s querying %s (protocol %s) at %s: poll started\n"
 
-#: fetchmail.c:1462
+#: fetchmail.c:1510
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 support is not configured.\n"
 
-#: fetchmail.c:1474
+#: fetchmail.c:1522
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 support is not configured.\n"
 
-#: fetchmail.c:1484
+#: fetchmail.c:1532
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP support is not configured.\n"
 
-#: fetchmail.c:1490
+#: fetchmail.c:1538
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN support is not configured.\n"
 
-#: fetchmail.c:1498
+#: fetchmail.c:1546
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR support is not configured.\n"
 
-#: fetchmail.c:1505
+#: fetchmail.c:1553
 msgid "unsupported protocol selected.\n"
 msgstr "unsupported protocol selected.\n"
 
-#: fetchmail.c:1515
+#: fetchmail.c:1563
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%s querying %s (protocol %s) at %s: poll completed\n"
 
-#: fetchmail.c:1532
+#: fetchmail.c:1580
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Poll interval is %d seconds\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1582
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Logfile is %s\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1584
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile is %s\n"
 
-#: fetchmail.c:1539
+#: fetchmail.c:1587
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Progress messages will be logged via syslog\n"
 
-#: fetchmail.c:1542
+#: fetchmail.c:1590
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail will masquerade and will not generate Received\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1592
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail will show progress dots even in logfiles.\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1594
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 
-#: fetchmail.c:1550
+#: fetchmail.c:1598
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail will direct error mail to the postmaster.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1600
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail will direct error mail to the sender.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1603
+#, fuzzy
+msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
+msgstr "Fetchmail will forward misaddressed multidrop messages to %s.\n"
+
+#: fetchmail.c:1605
+#, fuzzy
+msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
+msgstr "Fetchmail will direct error mail to the sender.\n"
+
+#: fetchmail.c:1612
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Options for retrieving from %s@%s:\n"
 
-#: fetchmail.c:1563
+#: fetchmail.c:1616
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mail will be retrieved via %s\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1619
 #, 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] "  Poll of this server will occur every %d interval.\n"
 msgstr[1] "  Poll of this server will occur every %d intervals.\n"
 
-#: fetchmail.c:1570
+#: fetchmail.c:1623
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  True name of server is %s.\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1626
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  This host will not be queried when no host is specified.\n"
 
-#: fetchmail.c:1574
+#: fetchmail.c:1627
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  This host will be queried when no host is specified.\n"
 
-#: fetchmail.c:1578
+#: fetchmail.c:1631
 msgid "  Password will be prompted for.\n"
 msgstr "  Password will be prompted for.\n"
 
-#: fetchmail.c:1582
+#: fetchmail.c:1635
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP secret = \"%s\".\n"
 
-#: fetchmail.c:1585
+#: fetchmail.c:1638
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1641
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Password = \"%s\".\n"
 
-#: fetchmail.c:1597
+#: fetchmail.c:1650
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protocol is KPOP with Kerberos %s authentication"
 
-#: fetchmail.c:1600
+#: fetchmail.c:1653
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protocol is %s"
 
-#: fetchmail.c:1602
+#: fetchmail.c:1655
 #, c-format
 msgid " (using service %s)"
 msgstr " (using service %s)"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1657
 msgid " (using default port)"
 msgstr " (using default port)"
 
-#: fetchmail.c:1606
+#: fetchmail.c:1659
 msgid " (forcing UIDL use)"
 msgstr " (forcing UIDL use)"
 
-#: fetchmail.c:1612
+#: fetchmail.c:1665
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  All available authentication methods will be tried.\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1668
 msgid "  Password authentication will be forced.\n"
 msgstr "  Password authentication will be forced.\n"
 
-#: fetchmail.c:1618
+#: fetchmail.c:1671
 msgid "  MSN authentication will be forced.\n"
 msgstr "  MSN authentication will be forced.\n"
 
-#: fetchmail.c:1621
+#: fetchmail.c:1674
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM authentication will be forced.\n"
 
-#: fetchmail.c:1624
+#: fetchmail.c:1677
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP authentication will be forced.\n"
 
-#: fetchmail.c:1627
-msgid "  CRAM-Md5 authentication will be forced.\n"
+#: fetchmail.c:1680
+#, fuzzy
+msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  CRAM-Md5 authentication will be forced.\n"
 
-#: fetchmail.c:1630
+#: fetchmail.c:1683
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI authentication will be forced.\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1686
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 authentication will be forced.\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1689
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 authentication will be forced.\n"
 
-#: fetchmail.c:1639
+#: fetchmail.c:1692
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  End-to-end encryption assumed.\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1696
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Mail service principal is: %s\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1699
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL encrypted sessions enabled.\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1701
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL protocol: %s.\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1703
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL server certificate checking enabled.\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1706
+#, fuzzy, c-format
+msgid "  SSL trusted certificate file: %s\n"
+msgstr "  SSL trusted certificate directory: %s\n"
+
+#: fetchmail.c:1708
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL trusted certificate directory: %s\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1710
+#, fuzzy, c-format
+msgid "  SSL server CommonName: %s\n"
+msgstr "Server CommonName: %s\n"
+
+#: fetchmail.c:1712
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  SSL key fingerprint (checked against the server key): %s\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1715
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Server nonresponse timeout is %d seconds"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1717
 msgid " (default).\n"
 msgstr " (default).\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1724
 msgid "  Default mailbox selected.\n"
 msgstr "  Default mailbox selected.\n"
 
-#: fetchmail.c:1672
+#: fetchmail.c:1729
 msgid "  Selected mailboxes are:"
 msgstr "  Selected mailboxes are:"
 
-#: fetchmail.c:1678
+#: fetchmail.c:1735
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  All messages will be retrieved (--all on).\n"
 
-#: fetchmail.c:1679
+#: fetchmail.c:1736
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Only new messages will be retrieved (--all off).\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1738
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  Fetched messages will be kept on the server (--keep on).\n"
 
-#: fetchmail.c:1682
+#: fetchmail.c:1739
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  Fetched messages will not be kept on the server (--keep off).\n"
 
-#: fetchmail.c:1684
+#: fetchmail.c:1741
 msgid "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr ""
 "  Old messages will be flushed before message retrieval (--flush on).\n"
 
-#: fetchmail.c:1685
+#: fetchmail.c:1742
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 
-#: fetchmail.c:1687
+#: fetchmail.c:1744
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1224,7 +1284,7 @@ msgstr ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1745
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1232,327 +1292,334 @@ msgstr ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1747
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 
-#: fetchmail.c:1691
+#: fetchmail.c:1748
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 
-#: fetchmail.c:1693
+#: fetchmail.c:1750
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Carriage-return stripping is enabled (stripcr on).\n"
 
-#: fetchmail.c:1694
+#: fetchmail.c:1751
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Carriage-return stripping is disabled (stripcr off).\n"
 
-#: fetchmail.c:1696
+#: fetchmail.c:1753
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Carriage-return forcing is enabled (forcecr on).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1754
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Carriage-return forcing is disabled (forcecr off).\n"
 
-#: fetchmail.c:1699
+#: fetchmail.c:1756
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1757
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1759
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME decoding is enabled (mimedecode on).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1760
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME decoding is disabled (mimedecode off).\n"
 
-#: fetchmail.c:1705
+#: fetchmail.c:1762
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Idle after poll is enabled (idle on).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1763
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Idle after poll is disabled (idle off).\n"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1765
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Nonempty Status lines will be discarded (dropstatus on)\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1766
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Nonempty Status lines will be kept (dropstatus off)\n"
 
-#: fetchmail.c:1711
+#: fetchmail.c:1768
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To lines will be discarded (dropdelivered on)\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1769
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To lines will be kept (dropdelivered off)\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1773
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Message size limit is %d octets (--limit %d).\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1776
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  No message size limit (--limit 0).\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1778
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr "  Message size warning interval is %d seconds (--warnings %d).\n"
 
-#: fetchmail.c:1724
+#: fetchmail.c:1781
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Size warnings on every poll (--warnings 0).\n"
 
-#: fetchmail.c:1727
+#: fetchmail.c:1784
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Received-message limit is %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1787
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  No received-message limit (--fetchlimit 0).\n"
 
-#: fetchmail.c:1732
+#: fetchmail.c:1789
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1735
+#: fetchmail.c:1792
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  No fetch message size limit (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1796
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 
-#: fetchmail.c:1741
+#: fetchmail.c:1798
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 
-#: fetchmail.c:1744
+#: fetchmail.c:1801
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 
-#: fetchmail.c:1746
+#: fetchmail.c:1803
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP message batch limit is %d.\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1805
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  No SMTP message batch limit (--batchlimit 0).\n"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1809
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 
-#: fetchmail.c:1754
+#: fetchmail.c:1811
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No forced expunges (--expunge 0).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1818
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domains for which mail will be fetched are:"
 
-#: fetchmail.c:1766 fetchmail.c:1786
+#: fetchmail.c:1823 fetchmail.c:1843
 msgid " (default)"
 msgstr " (default)"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1828
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Messages will be appended to %s as BSMTP\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1830
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Messages will be delivered with \"%s\".\n"
 
-#: fetchmail.c:1780
+#: fetchmail.c:1837
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Messages will be %cMTP-forwarded to:"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1848
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  Host part of MAIL FROM line will be %s\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1851
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1860
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Recognized listener spam block responses are:"
 
-#: fetchmail.c:1809
+#: fetchmail.c:1866
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam-blocking disabled\n"
 
-#: fetchmail.c:1812
+#: fetchmail.c:1869
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Server connection will be brought up with \"%s\".\n"
 
-#: fetchmail.c:1815
+#: fetchmail.c:1872
 msgid "  No pre-connection command.\n"
 msgstr "  No pre-connection command.\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1874
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Server connection will be taken down with \"%s\".\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1877
 msgid "  No post-connection command.\n"
 msgstr "  No post-connection command.\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1880
 msgid "  No localnames declared for this host.\n"
 msgstr "  No localnames declared for this host.\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1890
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop mode: "
 
-#: fetchmail.c:1835
+#: fetchmail.c:1892
 msgid "  Single-drop mode: "
 msgstr "  Single-drop mode: "
 
-#: fetchmail.c:1837
+#: fetchmail.c:1894
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "%d local name recognized.\n"
 msgstr[1] "%d local names recognized.\n"
 
-#: fetchmail.c:1852
+#: fetchmail.c:1909
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS lookup for multidrop addresses is enabled.\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1910
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS lookup for multidrop addresses is disabled.\n"
 
-#: fetchmail.c:1857
+#: fetchmail.c:1914
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 
-#: fetchmail.c:1859
+#: fetchmail.c:1916
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  Server aliases will be compared with multidrop addresses by name.\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1919
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelope-address routing is disabled\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1922
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Envelope header is assumed to be: %s\n"
 
-#: fetchmail.c:1868
+#: fetchmail.c:1925
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Number of envelope headers to be skipped over: %d\n"
 
-#: fetchmail.c:1871
+#: fetchmail.c:1928
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefix %s will be removed from user id\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1931
 msgid "  No prefix stripping\n"
 msgstr "  No prefix stripping\n"
 
-#: fetchmail.c:1881
+#: fetchmail.c:1936
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Predeclared mailserver aliases:"
 
-#: fetchmail.c:1890
+#: fetchmail.c:1944
 msgid "  Local domains:"
 msgstr "  Local domains:"
 
-#: fetchmail.c:1900
+#: fetchmail.c:1954
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Connection must be through interface %s.\n"
 
-#: fetchmail.c:1902
+#: fetchmail.c:1956
 msgid "  No interface requirement specified.\n"
 msgstr "  No interface requirement specified.\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1958
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Polling loop will monitor %s.\n"
 
-#: fetchmail.c:1906
+#: fetchmail.c:1960
 msgid "  No monitor interface specified.\n"
 msgstr "  No monitor interface specified.\n"
 
-#: fetchmail.c:1910
+#: fetchmail.c:1964
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  Server connections will be made via plugin %s (--plugin %s).\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1966
 msgid "  No plugin command specified.\n"
 msgstr "  No plugin command specified.\n"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1968
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  Listener connections will be made via plugout %s (--plugout %s).\n"
 
-#: fetchmail.c:1916
+#: fetchmail.c:1970
 msgid "  No plugout command specified.\n"
 msgstr "  No plugout command specified.\n"
 
-#: fetchmail.c:1921
+#: fetchmail.c:1975
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No UIDs saved from this host.\n"
 
-#: fetchmail.c:1930
+#: fetchmail.c:1984
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs saved.\n"
 
-#: fetchmail.c:1938
+#: fetchmail.c:1992
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  Poll trace information will be added to the Received header.\n"
 
-#: fetchmail.c:1940
-msgid ""
-"  No poll trace information will be added to the Received header.\n"
-".\n"
+#: fetchmail.c:1994
+#, fuzzy
+msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
 
-#: fetchmail.c:1943
+#: fetchmail.c:1999
+msgid "  Messages with bad headers will be rejected.\n"
+msgstr ""
+
+#: fetchmail.c:2002
+msgid "  Messages with bad headers will be passed on.\n"
+msgstr ""
+
+#: fetchmail.c:2007
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Pass-through properties \"%s\".\n"
@@ -1569,55 +1636,79 @@ msgstr ""
 "\n"
 "Caught SIGINT... bailing out.\n"
 
-#: gssapi.c:66
+#: gssapi.c:52
+#, c-format
+msgid "GSSAPI error in gss_display_status called from <%s>\n"
+msgstr ""
+
+#: gssapi.c:55
+#, fuzzy, c-format
+msgid "GSSAPI error %s: %.*s\n"
+msgstr "%cMTP error: %s\n"
+
+#: gssapi.c:90
 #, c-format
 msgid "Couldn't get service name for [%s]\n"
 msgstr "Couldn't get service name for [%s]\n"
 
-#: gssapi.c:72
+#: gssapi.c:95
 #, c-format
 msgid "Using service name [%s]\n"
 msgstr "Using service name [%s]\n"
 
-#: gssapi.c:89
+#: gssapi.c:122
+msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
+msgstr ""
+
+#: gssapi.c:123
+msgid ""
+"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
+msgstr ""
+
+#: gssapi.c:159
+#, c-format
+msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
+msgstr ""
+
+#: gssapi.c:169
 msgid "Sending credentials\n"
 msgstr "Sending credentials\n"
 
-#: gssapi.c:107
+#: gssapi.c:200
 msgid "Error exchanging credentials\n"
 msgstr "Error exchanging credentials\n"
 
-#: gssapi.c:152
+#: gssapi.c:242
 msgid "Couldn't unwrap security level data\n"
 msgstr "Couldn't unwrap security level data\n"
 
-#: gssapi.c:157
+#: gssapi.c:247
 msgid "Credential exchange complete\n"
 msgstr "Credential exchange complete\n"
 
-#: gssapi.c:161
+#: gssapi.c:251
 msgid "Server requires integrity and/or privacy\n"
 msgstr "Server requires integrity and/or privacy\n"
 
-#: gssapi.c:170
+#: gssapi.c:260
 #, c-format
 msgid "Unwrapped security level flags: %s%s%s\n"
 msgstr "Unwrapped security level flags: %s%s%s\n"
 
-#: gssapi.c:174
+#: gssapi.c:264
 #, c-format
 msgid "Maximum GSS token size is %ld\n"
 msgstr "Maximum GSS token size is %ld\n"
 
-#: gssapi.c:187
+#: gssapi.c:277
 msgid "Error creating security level request\n"
 msgstr "Error creating security level request\n"
 
-#: gssapi.c:198
+#: gssapi.c:288
 msgid "Releasing GSS credentials\n"
 msgstr "Releasing GSS credentials\n"
 
-#: gssapi.c:201
+#: gssapi.c:292
 msgid "Error releasing credentials\n"
 msgstr "Error releasing credentials\n"
 
@@ -1626,107 +1717,132 @@ msgstr "Error releasing credentials\n"
 msgid "fetchmail: thread sleeping for %d sec.\n"
 msgstr "fetchmail: thread sleeping for %d sec.\n"
 
-#: imap.c:326
+#: imap.c:74
+#, c-format
+msgid "Received BYE response from IMAP server: %s"
+msgstr ""
+
+#: imap.c:92
+#, fuzzy, c-format
+msgid "bogus message count in \"%s\"!"
+msgstr "bogus message count!"
+
+#: imap.c:139
+#, c-format
+msgid "bogus EXPUNGE count in \"%s\"!"
+msgstr ""
+
+#: imap.c:348
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocol identified as IMAP4 rev 1\n"
 
-#: imap.c:332
+#: imap.c:354
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocol identified as IMAP4 rev 0\n"
 
-#: imap.c:339
+#: imap.c:361
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocol identified as IMAP2 or IMAP2BIS\n"
 
-#: imap.c:354
+#: imap.c:378
 msgid "will idle after poll\n"
 msgstr "will idle after poll\n"
 
-#: imap.c:441 pop3.c:505
-#, c-format
+#: imap.c:471 pop3.c:476
+#, fuzzy, c-format
 msgid "%s: upgrade to TLS succeeded.\n"
-msgstr "%s: upgrade to TLS succeeded.\n"
+msgstr "%s: opportunistic upgrade to TLS.\n"
 
-#: imap.c:450 pop3.c:514
-#, c-format
+#: imap.c:477 pop3.c:482
+#, fuzzy, c-format
 msgid "%s: upgrade to TLS failed.\n"
-msgstr "%s: upgrade to TLS failed.\n"
+msgstr "%s: opportunistic upgrade to TLS.\n"
 
-#: imap.c:454
-#, c-format
+#: imap.c:482
+#, fuzzy, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
-msgstr "%s: opportunistic upgrade to TLS failed, trying to continue\n"
+msgstr "%s: opportunistic upgrade to TLS.\n"
 
-#: imap.c:565
+#: imap.c:598
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Required OTP capability not compiled into fetchmail\n"
 
-#: imap.c:587 pop3.c:380
+#: imap.c:618 pop3.c:558
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Required NTLM capability not compiled into fetchmail\n"
 
-#: imap.c:596
+#: imap.c:627
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Required LOGIN capability not supported by server\n"
 
-#: imap.c:662
+#: imap.c:691
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "mail expunge mismatch (%d actual != %d expected)\n"
 
-#: imap.c:768 imap.c:827
+#: imap.c:818
+#, c-format
+msgid "%lu is unseen\n"
+msgstr "%lu is unseen\n"
+
+#: imap.c:868 pop3.c:844 pop3.c:856 pop3.c:1095 pop3.c:1102
+#, c-format
+msgid "%u is unseen\n"
+msgstr "%u is unseen\n"
+
+#: imap.c:903 imap.c:962
 msgid "re-poll failed\n"
 msgstr "re-poll failed\n"
 
-#: imap.c:776 imap.c:832
+#: imap.c:911 imap.c:967
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d message waiting after re-poll\n"
 msgstr[1] "%d messages waiting after re-poll\n"
 
-#: imap.c:793
+#: imap.c:928
 msgid "mailbox selection failed\n"
 msgstr "mailbox selection failed\n"
 
-#: imap.c:797
+#: imap.c:932
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d message waiting after first poll\n"
 msgstr[1] "%d messages waiting after first poll\n"
 
-#: imap.c:811
+#: imap.c:946
 msgid "expunge failed\n"
 msgstr "expunge failed\n"
 
-#: imap.c:815
+#: imap.c:950
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d message waiting after expunge\n"
 msgstr[1] "%d messages waiting after expunge\n"
 
-#: imap.c:857
+#: imap.c:989
 msgid "search for unseen messages failed\n"
 msgstr "search for unseen messages failed\n"
 
-#: imap.c:885
-#, c-format
-msgid "%lu is unseen\n"
-msgstr "%lu is unseen\n"
-
-#: imap.c:897 pop3.c:876
+#: imap.c:994 pop3.c:865
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u is first unseen\n"
 
-#: imap.c:988
+#: imap.c:1078
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 
+#: imap.c:1177 imap.c:1184
+#, c-format
+msgid "Incorrect FETCH response: %s.\n"
+msgstr ""
+
 #: interface.c:256
 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
 msgstr "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
@@ -1763,44 +1879,44 @@ msgstr "No interface found with name %s"
 msgid "No IP address found for %s"
 msgstr "No IP address found for %s"
 
-#: interface.c:589
+#: interface.c:590
 msgid "missing IP interface address\n"
 msgstr "missing IP interface address\n"
 
-#: interface.c:605
+#: interface.c:606
 msgid "invalid IP interface address\n"
 msgstr "invalid IP interface address\n"
 
-#: interface.c:611
+#: interface.c:612
 msgid "invalid IP interface mask\n"
 msgstr "invalid IP interface mask\n"
 
-#: interface.c:650
+#: interface.c:651
 #, c-format
 msgid "activity on %s -noted- as %d\n"
 msgstr "activity on %s -noted- as %d\n"
 
-#: interface.c:665
+#: interface.c:666
 #, c-format
 msgid "skipping poll of %s, %s down\n"
 msgstr "skipping poll of %s, %s down\n"
 
-#: interface.c:684
+#: interface.c:685
 #, c-format
 msgid "skipping poll of %s, %s IP address excluded\n"
 msgstr "skipping poll of %s, %s IP address excluded\n"
 
-#: interface.c:696
+#: interface.c:697
 #, c-format
 msgid "activity on %s checked as %d\n"
 msgstr "activity on %s checked as %d\n"
 
-#: interface.c:722
+#: interface.c:723
 #, c-format
 msgid "skipping poll of %s, %s inactive\n"
 msgstr "skipping poll of %s, %s inactive\n"
 
-#: interface.c:729
+#: interface.c:730
 #, c-format
 msgid "activity on %s was %d, is %d\n"
 msgstr "activity on %s was %d, is %d\n"
@@ -1827,85 +1943,85 @@ msgstr "could not decode BASE64 ready response\n"
 msgid "challenge mismatch\n"
 msgstr "challenge mismatch\n"
 
-#: lock.c:86
+#: lock.c:87
 #, c-format
 msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "fetchmail: error reading lockfile \"%s\": %s\n"
 
-#: lock.c:97
+#: lock.c:98
 msgid "fetchmail: removing stale lockfile\n"
 msgstr "fetchmail: removing stale lockfile\n"
 
-#: lock.c:121
+#: lock.c:122
 #, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "fetchmail: error opening lockfile \"%s\": %s\n"
 
-#: lock.c:168
+#: lock.c:169
 msgid "fetchmail: lock creation failed.\n"
 msgstr "fetchmail: lock creation failed.\n"
 
-#: netrc.c:219
+#: netrc.c:220
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"
 msgstr "%s:%d: warning: found \"%s\" before any host names\n"
 
-#: netrc.c:257
+#: netrc.c:258
 #, c-format
 msgid "%s:%d: warning: unknown token \"%s\"\n"
 msgstr "%s:%d: warning: unknown token \"%s\"\n"
 
-#: odmr.c:66
+#: odmr.c:67
 #, c-format
 msgid "%s's SMTP listener does not support ATRN\n"
 msgstr "%s's SMTP listener does not support ATRN\n"
 
-#: odmr.c:104
+#: odmr.c:105
 msgid "Turnaround now...\n"
 msgstr "Turnaround now...\n"
 
-#: odmr.c:109
+#: odmr.c:110
 msgid "ATRN request refused.\n"
 msgstr "ATRN request refused.\n"
 
-#: odmr.c:113
+#: odmr.c:114
 msgid "Unable to process ATRN request now\n"
 msgstr "Unable to process ATRN request now\n"
 
-#: odmr.c:118
+#: odmr.c:119
 msgid "You have no mail.\n"
 msgstr "You have no mail.\n"
 
-#: odmr.c:122
+#: odmr.c:123
 msgid "Command not implemented\n"
 msgstr "Command not implemented\n"
 
-#: odmr.c:126
+#: odmr.c:127
 msgid "Authentication required.\n"
 msgstr "Authentication required.\n"
 
-#: odmr.c:130
-#, c-format
-msgid "Unknown ODMR error %d\n"
+#: odmr.c:132
+#, fuzzy, c-format
+msgid "Unknown ODMR error \"%s\"\n"
 msgstr "Unknown ODMR error %d\n"
 
-#: odmr.c:189
+#: odmr.c:192
 msgid "receiving message data\n"
 msgstr "receiving message data\n"
 
-#: odmr.c:242
+#: odmr.c:245
 msgid "Option --keep is not supported with ODMR\n"
 msgstr "Option --keep is not supported with ODMR\n"
 
-#: odmr.c:246
+#: odmr.c:249
 msgid "Option --flush is not supported with ODMR\n"
 msgstr "Option --flush is not supported with ODMR\n"
 
-#: odmr.c:250
+#: odmr.c:253
 msgid "Option --folder is not supported with ODMR\n"
 msgstr "Option --folder is not supported with ODMR\n"
 
-#: odmr.c:254
+#: odmr.c:257
 msgid "Option --check is not supported with ODMR\n"
 msgstr "Option --check is not supported with ODMR\n"
 
@@ -1917,83 +2033,88 @@ msgstr "server recv fatal\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Could not decode OTP challenge\n"
 
-#: opie.c:64 pop3.c:597
+#: opie.c:64 pop3.c:585
 msgid "Secret pass phrase: "
 msgstr "Secret pass phrase: "
 
-#: options.c:166 options.c:210
+#: options.c:176 options.c:220
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "String '%s' is not a valid number string.\n"
 
-#: options.c:175
+#: options.c:185
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Value of string '%s' is %s than %d.\n"
 
-#: options.c:176
+#: options.c:186
 msgid "smaller"
 msgstr "smaller"
 
-#: options.c:176
+#: options.c:186
 msgid "larger"
 msgstr "larger"
 
-#: options.c:337
+#: options.c:323
+#, fuzzy, c-format
+msgid "Invalid bad-header policy `%s' specified.\n"
+msgstr "Invalid protocol `%s' specified.\n"
+
+#: options.c:364
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Invalid protocol `%s' specified.\n"
 
-#: options.c:384
+#: options.c:411
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Invalid authentication `%s' specified.\n"
 
-#: options.c:585
+#: options.c:620
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "usage:  fetchmail [options] [server ...]\n"
 
-#: options.c:586
+#: options.c:621
 msgid "  Options are as follows:\n"
 msgstr "  Options are as follows:\n"
 
-#: options.c:587
+#: options.c:622
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        display this option help\n"
 
-#: options.c:588
+#: options.c:623
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     display version info\n"
 
-#: options.c:590
+#: options.c:625
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       check for messages without fetching\n"
 
-#: options.c:591
+#: options.c:626
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      work silently\n"
 
-#: options.c:592
+#: options.c:627
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     work noisily (diagnostic output)\n"
 
-#: options.c:593
+#: options.c:628
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      run as a daemon once per n seconds\n"
 
-#: options.c:594
+#: options.c:629
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    don't detach daemon process\n"
 
-#: options.c:595
+#: options.c:630
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        kill daemon process\n"
 
-#: options.c:596
+#: options.c:631
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     specify logfile name\n"
 
-#: options.c:597
+#: options.c:632
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -2001,59 +2122,81 @@ msgstr ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
 
-#: options.c:598
+#: options.c:633
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   don't write Received & enable host spoofing\n"
 
-#: options.c:599
+#: options.c:634
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc specify alternate run control file\n"
 
-#: options.c:600
+#: options.c:635
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      specify alternate UIDs file\n"
 
-#: options.c:601
+#: options.c:636
 msgid "      --pidfile     specify alternate PID (lock) file\n"
 msgstr "      --pidfile     specify alternate PID (lock) file\n"
 
-#: options.c:602
+#: options.c:637
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  specify recipient of last resort\n"
 
-#: options.c:603
+#: options.c:638
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    redirect bounces from user to postmaster.\n"
 
-#: options.c:605
+#: options.c:639
+msgid ""
+"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
+msgstr ""
+
+#: options.c:640
+msgid ""
+"      --softbounce  keep permanently undeliverable messages on server "
+"(default).\n"
+msgstr ""
+
+#: options.c:642
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   interface required specification\n"
 
-#: options.c:606
+#: options.c:643
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     monitor interface for activity\n"
 
-#: options.c:609
+#: options.c:646
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         enable ssl encrypted session\n"
 
-#: options.c:610
+#: options.c:647
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      ssl private key file\n"
 
-#: options.c:611
+#: options.c:648
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ssl client certificate\n"
 
-#: options.c:612
+#: options.c:649
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
 msgstr "      --sslcertck   do strict server certificate check (recommended)\n"
 
-#: options.c:613
-msgid "      --sslcertpath path to ssl certificates\n"
+#: options.c:650
+#, fuzzy
+msgid "      --sslcertfile path to trusted-CA ssl certificate file\n"
 msgstr "      --sslcertpath path to ssl certificates\n"
 
-#: options.c:614
+#: options.c:651
+#, fuzzy
+msgid "      --sslcertpath path to trusted-CA ssl certificate directory\n"
+msgstr "      --sslcertpath path to ssl certificates\n"
+
+#: options.c:652
+msgid ""
+"      --sslcommonname  expect this CommonName from server (discouraged)\n"
+msgstr ""
+
+#: options.c:653
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
@@ -2061,244 +2204,250 @@ msgstr ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 
-#: options.c:615
+#: options.c:654
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 msgstr "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
 
-#: options.c:617
+#: options.c:656
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      specify external command to open connection\n"
 
-#: options.c:618
+#: options.c:657
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr "      --plugout     specify external command to open smtp connection\n"
 
-#: options.c:620
+#: options.c:658
+msgid ""
+"      --bad-header {reject|accept}\n"
+"                    specify policy for handling messages with bad headers\n"
+msgstr ""
+
+#: options.c:661
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    specify retrieval protocol (see man page)\n"
 
-#: options.c:621
+#: options.c:662
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 
-#: options.c:622
+#: options.c:663
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "      --port        TCP port to connect to (obsolete, use --service)\n"
 
-#: options.c:623
+#: options.c:664
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 msgstr ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
 
-#: options.c:624
+#: options.c:665
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 
-#: options.c:625
+#: options.c:666
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     server nonresponse timeout\n"
 
-#: options.c:626
+#: options.c:667
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    envelope address header\n"
 
-#: options.c:627
+#: options.c:668
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    prefix to remove from local user id\n"
 
-#: options.c:628
+#: options.c:669
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   mail service principal\n"
 
-#: options.c:629
+#: options.c:670
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr "      --tracepolls  add poll-tracing information to Received header\n"
 
-#: options.c:631
+#: options.c:672
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    specify users's login on server\n"
 
-#: options.c:632
+#: options.c:673
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
 msgstr "  -a, --[fetch]all  retrieve old and new messages\n"
 
-#: options.c:633
+#: options.c:674
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      delete new messages after retrieval\n"
 
-#: options.c:634
+#: options.c:675
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        save new messages after retrieval\n"
 
-#: options.c:635
+#: options.c:676
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       delete old messages from server\n"
 
-#: options.c:636
+#: options.c:677
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  delete oversized messages\n"
 
-#: options.c:637
+#: options.c:678
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   don't rewrite header addresses\n"
 
-#: options.c:638
+#: options.c:679
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       don't fetch messages over given size\n"
 
-#: options.c:639
+#: options.c:680
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    interval between warning mail notification\n"
 
-#: options.c:641
+#: options.c:682
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    set SMTP forwarding host\n"
 
-#: options.c:642
+#: options.c:683
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains fetch mail for specified domains\n"
 
-#: options.c:643
+#: options.c:684
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress set SMTP delivery domain to use\n"
 
-#: options.c:644
+#: options.c:685
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    set SMTP full name username@domain\n"
 
-#: options.c:645
+#: options.c:686
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam,   set antispam response values\n"
 
-#: options.c:646
+#: options.c:687
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  set batch limit for SMTP connections\n"
 
-#: options.c:647
+#: options.c:688
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  set fetch limit for server connections\n"
 
-#: options.c:648
+#: options.c:689
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit set fetch message size limit\n"
 
-#: options.c:649
+#: options.c:690
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    do a binary search for UIDLs\n"
 
-#: options.c:650
+#: options.c:691
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     set max deletions between expunges\n"
 
-#: options.c:651
+#: options.c:692
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         set MDA to use for forwarding\n"
 
-#: options.c:652
+#: options.c:693
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       set output BSMTP file\n"
 
-#: options.c:653
+#: options.c:694
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        use LMTP (RFC2033) for delivery\n"
 
-#: options.c:654
+#: options.c:695
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      specify remote folder name\n"
 
-#: options.c:655
+#: options.c:696
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    show progress dots even in logfiles\n"
 
-#: pop3.c:350
+#: pop3.c:327
+#, fuzzy
 msgid ""
-"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
-"of TOP.\n"
+"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
 msgstr ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
 
-#: pop3.c:449
+#: pop3.c:411
 msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
-msgstr "TLS is mandatory for this session, but server refused CAPA command.\n"
+msgstr ""
 
-#: pop3.c:450
+#: pop3.c:412
 msgid "The CAPA command is however necessary for TLS.\n"
-msgstr "The CAPA command is however necessary for TLS.\n"
+msgstr ""
 
-#: pop3.c:525
-#, c-format
+#: pop3.c:494
+#, fuzzy, c-format
 msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
-msgstr "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
+msgstr "%s: opportunistic upgrade to TLS.\n"
 
-#: pop3.c:633
+#: pop3.c:621
 msgid "We've run out of allowed authenticators and cannot continue.\n"
-msgstr "We've run out of allowed authenticators and cannot continue.\n"
+msgstr ""
 
-#: pop3.c:647
+#: pop3.c:635
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Required APOP timestamp not found in greeting\n"
 
-#: pop3.c:656
+#: pop3.c:644
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Timestamp syntax error in greeting\n"
 
-#: pop3.c:672
+#: pop3.c:660
 msgid "Invalid APOP timestamp.\n"
-msgstr "Invalid APOP timestamp.\n"
+msgstr ""
 
-#: pop3.c:696
+#: pop3.c:684
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Undefined protocol request in POP3_auth\n"
 
-#: pop3.c:717
+#: pop3.c:705
 msgid "lock busy!  Is another session active?\n"
 msgstr "lock busy!  Is another session active?\n"
 
-#: pop3.c:796
+#: pop3.c:784
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Cannot handle UIDL response from upstream server.\n"
 
-#: pop3.c:819
+#: pop3.c:807
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Server responded with UID for wrong message.\n"
 
-#: pop3.c:846 pop3.c:1092
-#, c-format
-msgid "id=%s (num=%d) was deleted, but is still present!\n"
+#: pop3.c:835
+#, fuzzy, c-format
+msgid "id=%s (num=%u) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) was deleted, but is still present!\n"
 
-#: pop3.c:855 pop3.c:867 pop3.c:1101 pop3.c:1108
-#, c-format
-msgid "%u is unseen\n"
-msgstr "%u is unseen\n"
-
-#: pop3.c:952
+#: pop3.c:941
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Messages inserted into list on server. Cannot handle this.\n"
 
-#: pop3.c:1044
+#: pop3.c:1037
 msgid "protocol error\n"
 msgstr "protocol error\n"
 
-#: pop3.c:1060
+#: pop3.c:1053
 msgid "protocol error while fetching UIDLs\n"
 msgstr "protocol error while fetching UIDLs\n"
 
-#: pop3.c:1430
+#: pop3.c:1086
+#, c-format
+msgid "id=%s (num=%d) was deleted, but is still present!\n"
+msgstr "id=%s (num=%d) was deleted, but is still present!\n"
+
+#: pop3.c:1424
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Option --folder is not supported with POP3\n"
 
-#: rcfile_y.y:124
+#: rcfile_y.y:131
 msgid "server option after user options"
 msgstr "server option after user options"
 
-#: rcfile_y.y:167
+#: rcfile_y.y:174
 msgid "SDPS not enabled."
 msgstr "SDPS not enabled."
 
-#: rcfile_y.y:213
+#: rcfile_y.y:218
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2306,7 +2455,7 @@ msgstr ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 
-#: rcfile_y.y:220
+#: rcfile_y.y:226
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2314,222 +2463,223 @@ msgstr ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 
-#: rcfile_y.y:333
+#: rcfile_y.y:340
 msgid "SSL is not enabled"
 msgstr "SSL is not enabled"
 
-#: rcfile_y.y:382
+#: rcfile_y.y:391
 msgid "end of input"
 msgstr "end of input"
 
-#: rcfile_y.y:419
+#: rcfile_y.y:429
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "File %s must be a regular file.\n"
 
-#: rcfile_y.y:429
-#, c-format
-msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
+#: rcfile_y.y:439
+#, fuzzy, c-format
+msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 
-#: rcfile_y.y:441
+#: rcfile_y.y:451
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "File %s must be owned by you.\n"
 
-#: report.c:77
+#: report.c:67
 msgid "Unknown system error"
 msgstr "Unknown system error"
 
-#: report.c:104
-#, c-format
-msgid "%s (log message incomplete)"
+#: report.c:92
+#, fuzzy, c-format
+msgid "%s (log message incomplete)\n"
 msgstr "%s (log message incomplete)"
 
-#: rfc822.c:76
-#, c-format
-msgid "About to rewrite %s"
+#: rfc822.c:83
+#, fuzzy, c-format
+msgid "About to rewrite %s...\n"
 msgstr "About to rewrite %s"
 
-#: rfc822.c:212
-#, c-format
-msgid "Rewritten version is %s\n"
+#: rfc822.c:221
+#, fuzzy, c-format
+msgid "...rewritten version is %s.\n"
 msgstr "Rewritten version is %s\n"
 
-#: rpa.c:117
+#: rpa.c:118
 msgid "Success"
 msgstr "Success"
 
-#: rpa.c:118
+#: rpa.c:119
 msgid "Restricted user (something wrong with account)"
 msgstr "Restricted user (something wrong with account)"
 
-#: rpa.c:119
+#: rpa.c:120
 msgid "Invalid userid or passphrase"
 msgstr "Invalid userid or passphrase"
 
-#: rpa.c:120
+#: rpa.c:121
 msgid "Deity error"
 msgstr "Deity error"
 
-#: rpa.c:173
+#: rpa.c:174
 msgid "RPA token 2: Base64 decode error\n"
 msgstr "RPA token 2: Base64 decode error\n"
 
-#: rpa.c:184
+#: rpa.c:185
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr "Service chose RPA version %d.%d\n"
 
-#: rpa.c:190
+#: rpa.c:191
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr "Service challenge (l=%d):\n"
 
-#: rpa.c:199
+#: rpa.c:200
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr "Service timestamp %s\n"
 
-#: rpa.c:204
+#: rpa.c:205
 msgid "RPA token 2 length error\n"
 msgstr "RPA token 2 length error\n"
 
-#: rpa.c:208
+#: rpa.c:209
 #, c-format
 msgid "Realm list: %s\n"
 msgstr "Realm list: %s\n"
 
-#: rpa.c:212
+#: rpa.c:213
 msgid "RPA error in service@realm string\n"
 msgstr "RPA error in service@realm string\n"
 
-#: rpa.c:249
+#: rpa.c:250
 msgid "RPA token 4: Base64 decode error\n"
 msgstr "RPA token 4: Base64 decode error\n"
 
-#: rpa.c:260
+#: rpa.c:261
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr "User authentication (l=%d):\n"
 
-#: rpa.c:274
+#: rpa.c:275
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr "RPA status: %02X\n"
 
-#: rpa.c:280
+#: rpa.c:281
 msgid "RPA token 4 length error\n"
 msgstr "RPA token 4 length error\n"
 
-#: rpa.c:287
+#: rpa.c:288
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr "RPA rejects you: %s\n"
 
-#: rpa.c:289
+#: rpa.c:290
 msgid "RPA rejects you, reason unknown\n"
 msgstr "RPA rejects you, reason unknown\n"
 
-#: rpa.c:297
+#: rpa.c:298
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr "RPA User Authentication length error: %d\n"
 
-#: rpa.c:302
+#: rpa.c:303
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr "RPA Session key length error: %d\n"
 
-#: rpa.c:308
+#: rpa.c:309
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr "RPA _service_ auth fail. Spoof server?\n"
 
-#: rpa.c:313
+#: rpa.c:314
 msgid "Session key established:\n"
 msgstr "Session key established:\n"
 
-#: rpa.c:344
+#: rpa.c:345
 msgid "RPA authorisation complete\n"
 msgstr "RPA authorisation complete\n"
 
-#: rpa.c:371
+#: rpa.c:372
 msgid "Get response\n"
 msgstr "Get response\n"
 
-#: rpa.c:401
+#: rpa.c:402
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr "Get response return %d [%s]\n"
 
-#: rpa.c:462
+#: rpa.c:463
 msgid "Hdr not 60\n"
 msgstr "Hdr not 60\n"
 
-#: rpa.c:483
+#: rpa.c:484
 msgid "Token length error\n"
 msgstr "Token length error\n"
 
-#: rpa.c:488
+#: rpa.c:489
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr "Token Length %d disagrees with rxlen %d\n"
 
-#: rpa.c:494
+#: rpa.c:495
 msgid "Mechanism field incorrect\n"
 msgstr "Mechanism field incorrect\n"
 
-#: rpa.c:530
+#: rpa.c:531
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr "dec64 error at char %d: %x\n"
 
-#: rpa.c:545
+#: rpa.c:546
 msgid "Inbound binary data:\n"
 msgstr "Inbound binary data:\n"
 
-#: rpa.c:581
+#: rpa.c:582
 msgid "Outbound data:\n"
 msgstr "Outbound data:\n"
 
-#: rpa.c:644
+#: rpa.c:645
 msgid "RPA String too long\n"
 msgstr "RPA String too long\n"
 
-#: rpa.c:649
+#: rpa.c:650
 msgid "Unicode:\n"
 msgstr "Unicode:\n"
 
-#: rpa.c:708
+#: rpa.c:709
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr "RPA Failed open of /dev/urandom. This shouldn't\n"
 
-#: rpa.c:709
+#: rpa.c:710
 msgid "    prevent you logging in, but means you\n"
 msgstr "    prevent you logging in, but means you\n"
 
-#: rpa.c:710
+#: rpa.c:711
 msgid "    cannot be sure you are talking to the\n"
 msgstr "    cannot be sure you are talking to the\n"
 
-#: rpa.c:711
+#: rpa.c:712
 msgid "    service that you think you are (replay\n"
 msgstr "    service that you think you are (replay\n"
 
-#: rpa.c:712
+#: rpa.c:713
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr "    attacks by a dishonest service are possible.)\n"
 
-#: rpa.c:723
+#: rpa.c:724
 msgid "User challenge:\n"
 msgstr "User challenge:\n"
 
-#: rpa.c:873
+#: rpa.c:874
 msgid "MD5 being applied to data block:\n"
 msgstr "MD5 being applied to data block:\n"
 
-#: rpa.c:886
-msgid "MD5 result is: \n"
+#: rpa.c:887
+#, fuzzy
+msgid "MD5 result is:\n"
 msgstr "MD5 result is: \n"
 
 #: servport.c:53
@@ -2546,117 +2696,138 @@ msgstr "Cannot resolve service %s to port number.\n"
 msgid "Please specify the service as decimal port number.\n"
 msgstr "Please specify the service as decimal port number.\n"
 
-#: sink.c:220
+#: sink.c:231
 #, c-format
 msgid "forwarding to %s\n"
 msgstr "forwarding to %s\n"
 
-#: sink.c:306
+#: sink.c:318
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (bounce-message body)\n"
 
-#: sink.c:309
+#: sink.c:321
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "mail from %s bounced to %s\n"
 
-#: sink.c:442
+#: sink.c:456
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Saved error is still %d\n"
 
-#: sink.c:502 sink.c:587
+#: sink.c:508 sink.c:607
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP error: %s\n"
 
-#: sink.c:752
-msgid "BSMTP file open or preamble write failed\n"
+#: sink.c:552
+msgid "SMTP server requires STARTTLS, keeping message.\n"
+msgstr ""
+
+#: sink.c:735
+#, fuzzy, c-format
+msgid "BSMTP file open failed: %s\n"
+msgstr "BSMTP file open or preamble write failed\n"
+
+#: sink.c:781
+#, fuzzy, c-format
+msgid "BSMTP preamble write failed: %s.\n"
 msgstr "BSMTP file open or preamble write failed\n"
 
-#: sink.c:966
+#: sink.c:995
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP listener doesn't like recipient address `%s'\n"
 
-#: sink.c:973
+#: sink.c:1002
 #, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
 msgstr "%cMTP listener doesn't really like recipient address `%s'\n"
 
-#: sink.c:1019
+#: sink.c:1048
 msgid "no address matches; no postmaster set.\n"
 msgstr "no address matches; no postmaster set.\n"
 
-#: sink.c:1031
+#: sink.c:1060
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "can't even send to %s!\n"
 
-#: sink.c:1037
+#: sink.c:1066
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "no address matches; forwarding to %s.\n"
 
-#: sink.c:1193
+#: sink.c:1222
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "about to deliver with: %s\n"
 
-#: sink.c:1217
+#: sink.c:1233
+#, fuzzy, c-format
+msgid "Cannot switch effective user id to %ld: %s\n"
+msgstr "Cannot rename fetchids file %s to %s: %s\n"
+
+#: sink.c:1245
+#, c-format
+msgid "Cannot switch effective user id back to original %ld: %s\n"
+msgstr ""
+
+#: sink.c:1252
 msgid "MDA open failed\n"
 msgstr "MDA open failed\n"
 
-#: sink.c:1254
+#: sink.c:1291
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP connect to %s failed\n"
 
-#: sink.c:1278
+#: sink.c:1315
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "can't raise the listener; falling back to %s"
 
-#: sink.c:1340
+#: sink.c:1373
+#, fuzzy, c-format
+msgid "Message termination or close of BSMTP file failed: %s\n"
+msgstr "Message termination or close of BSMTP file failed\n"
+
+#: sink.c:1398
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Error writing to MDA: %s\n"
 
-#: sink.c:1343
+#: sink.c:1401
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA died of signal %d\n"
 
-#: sink.c:1346
+#: sink.c:1404
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA returned nonzero status %d\n"
 
-#: sink.c:1349
+#: sink.c:1407
 #, c-format
 msgid ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 msgstr ""
 "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
 
-#: sink.c:1371
-msgid "Message termination or close of BSMTP file failed\n"
-msgstr "Message termination or close of BSMTP file failed\n"
-
-#: sink.c:1393
+#: sink.c:1432
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP listener refused delivery\n"
 
-#: sink.c:1423
+#: sink.c:1462
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP delivery error on EOM\n"
 
-#: sink.c:1426
+#: sink.c:1465
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Unexpected non-503 response to LMTP EOM: %s\n"
 
-#: sink.c:1581
+#: sink.c:1620
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2664,224 +2835,307 @@ msgstr ""
 "-- \n"
 "The Fetchmail Daemon"
 
-#: smtp.c:79
+#: smtp.c:81
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr "ESMTP CRAM-MD5 Authentication...\n"
 
-#: smtp.c:86 smtp.c:137
+#: smtp.c:87 smtp.c:137
 msgid "Server rejected the AUTH command.\n"
 msgstr "Server rejected the AUTH command.\n"
 
-#: smtp.c:94 smtp.c:144 smtp.c:154 smtp.c:160
+#: smtp.c:95 smtp.c:144 smtp.c:153 smtp.c:159
 msgid "Bad base64 reply from server.\n"
 msgstr "Bad base64 reply from server.\n"
 
-#: smtp.c:98
+#: smtp.c:99
 #, c-format
 msgid "Challenge decoded: %s\n"
 msgstr "Challenge decoded: %s\n"
 
-#: smtp.c:115
+#: smtp.c:116
 msgid "ESMTP PLAIN Authentication...\n"
 msgstr "ESMTP PLAIN Authentication...\n"
 
-#: smtp.c:130
+#: smtp.c:131
 msgid "ESMTP LOGIN Authentication...\n"
 msgstr "ESMTP LOGIN Authentication...\n"
 
-#: smtp.c:331 smtp.c:354
+#: smtp.c:349 smtp.c:377
 msgid "smtp listener protocol error\n"
 msgstr "smtp listener protocol error\n"
 
-#: socket.c:114 socket.c:140
+#: socket.c:110 socket.c:137
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc failed\n"
 
-#: socket.c:172
+#: socket.c:169
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair failed\n"
 
-#: socket.c:178
+#: socket.c:175
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork failed\n"
 
-#: socket.c:185
+#: socket.c:182
 msgid "dup2 failed\n"
 msgstr "dup2 failed\n"
 
-#: socket.c:191
+#: socket.c:188
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "running %s (host %s service %s)\n"
 
-#: socket.c:194
+#: socket.c:193
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) failed\n"
 
-#: socket.c:282
+#: socket.c:268
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 
-#: socket.c:285
+#: socket.c:271
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr "Try adding the --service option (see also FAQ item R12).\n"
 
-#: socket.c:296 socket.c:299
+#: socket.c:285 socket.c:288
 #, c-format
 msgid "unknown (%s)"
 msgstr "unknown (%s)"
 
-#: socket.c:302
+#: socket.c:291
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "Trying to connect to %s/%s..."
 
-#: socket.c:310
+#: socket.c:300
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "cannot create socket: %s\n"
 
-#: socket.c:326
+#: socket.c:302
+#, fuzzy, c-format
+msgid "name %d: cannot create socket family %d type %d: %s\n"
+msgstr "cannot create socket: %s\n"
+
+#: socket.c:320
 msgid "connection failed.\n"
 msgstr "connection failed.\n"
 
-#: socket.c:328
+#: socket.c:322
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "connection to %s:%s [%s/%s] failed: %s.\n"
 
-#: socket.c:334
+#: socket.c:323
+#, fuzzy, c-format
+msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
+msgstr "connection to %s:%s [%s/%s] failed: %s.\n"
+
+#: socket.c:329
 msgid "connected.\n"
 msgstr "connected.\n"
 
-#: socket.c:660
+#: socket.c:342
+#, c-format
+msgid ""
+"Connection errors for this poll:\n"
+"%s"
+msgstr ""
+
+#: socket.c:387
+#, c-format
+msgid "OpenSSL reported: %s\n"
+msgstr ""
+
+#: socket.c:622
+#, fuzzy
+msgid "Server certificate:\n"
+msgstr "Server certificate verification error: %s\n"
+
+#: socket.c:627
+#, c-format
+msgid "Certificate chain, from root to peer, starting at depth %d:\n"
+msgstr ""
+
+#: socket.c:630
+#, c-format
+msgid "Certificate at depth %d:\n"
+msgstr ""
+
+#: socket.c:636
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Issuer Organisation: %s\n"
 
-#: socket.c:662
+#: socket.c:639
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Warning: Issuer Organsation Name too long (possibly truncated).\n"
 
-#: socket.c:664
+#: socket.c:641
 msgid "Unknown Organization\n"
 msgstr "Unknown Organisation\n"
 
-#: socket.c:666
+#: socket.c:643
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Issuer CommonName: %s\n"
 
-#: socket.c:668
+#: socket.c:646
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Warning: Issuer CommonName too long (possibly truncated).\n"
 
-#: socket.c:670
+#: socket.c:648
 msgid "Unknown Issuer CommonName\n"
 msgstr "Unknown Issuer CommonName\n"
 
-#: socket.c:674
-#, c-format
-msgid "Server CommonName: %s\n"
-msgstr "Server CommonName: %s\n"
+#: socket.c:654
+#, fuzzy, c-format
+msgid "Subject CommonName: %s\n"
+msgstr "Issuer CommonName: %s\n"
 
-#: socket.c:678
+#: socket.c:660
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Bad certificate: Subject CommonName too long!\n"
 
-#: socket.c:724
+#: socket.c:666
+#, fuzzy
+msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
+msgstr "Bad certificate: Subject CommonName too long!\n"
+
+#: socket.c:694
+#, c-format
+msgid "Subject Alternative Name: %s\n"
+msgstr ""
+
+#: socket.c:700
+#, fuzzy
+msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
+msgstr "Bad certificate: Subject CommonName too long!\n"
+
+#: socket.c:717
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Server CommonName mismatch: %s != %s\n"
 
-#: socket.c:730
+#: socket.c:724
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Server name not set, could not verify certificate!\n"
 
-#: socket.c:735
+#: socket.c:729
 msgid "Unknown Server CommonName\n"
 msgstr "Unknown Server CommonName\n"
 
-#: socket.c:737
+#: socket.c:731
 msgid "Server name not specified in certificate!\n"
 msgstr "Server name not specified in certificate!\n"
 
-#: socket.c:749
+#: socket.c:743
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() failed!\n"
 
-#: socket.c:753
+#: socket.c:747
 msgid "Out of memory!\n"
 msgstr "Out of memory!\n"
 
-#: socket.c:761
+#: socket.c:755
 msgid "Digest text buffer too small!\n"
 msgstr "Digest text buffer too small!\n"
 
-#: socket.c:767
+#: socket.c:761
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s key fingerprint: %s\n"
 
-#: socket.c:771
+#: socket.c:765
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s fingerprints match.\n"
 
-#: socket.c:773
+#: socket.c:767
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s fingerprints do not match!\n"
 
-#: socket.c:782
+#: socket.c:779
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Server certificate verification error: %s\n"
 
-#: socket.c:788
+#: socket.c:794
+#, fuzzy, c-format
+msgid "Broken certification chain at: %s\n"
+msgstr "Server certificate verification error: %s\n"
+
+#: socket.c:796
+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 ""
+
+#: socket.c:806
 #, c-format
-msgid "unknown issuer (first %d characters): %s\n"
-msgstr "unknown issuer (first %d characters): %s\n"
+msgid "Missing trust anchor certificate: %s\n"
+msgstr ""
 
-#: socket.c:875
+#: socket.c:809
+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.\n"
+msgstr ""
+
+#: socket.c:902
 msgid "File descriptor out of range for SSL"
 msgstr "File descriptor out of range for SSL"
 
-#: socket.c:891
+#: socket.c:913
+msgid "Your operating system does not support SSLv2.\n"
+msgstr ""
+
+#: socket.c:923
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 
-#: socket.c:964
+#: socket.c:1022
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Certificate/fingerprint verification was somehow skipped!\n"
 
-#: socket.c:1042
+#: socket.c:1039
+msgid ""
+"Warning: the connection is insecure, continuing anyways. (Better use --"
+"sslcertck!)\n"
+msgstr ""
+
+#: socket.c:1081
 msgid "Cygwin socket read retry\n"
 msgstr "Cygwin socket read retry\n"
 
-#: socket.c:1045
+#: socket.c:1084
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Cygwin socket read retry failed!\n"
 
-#: transact.c:67
+#: transact.c:79
 #, c-format
 msgid "mapped address %s to local %s\n"
 msgstr "mapped address %s to local %s\n"
 
-#: transact.c:89
+#: transact.c:101
 #, c-format
 msgid "mapped %s to local %s\n"
 msgstr "mapped %s to local %s\n"
 
-#: transact.c:156
+#: transact.c:168
 #, c-format
 msgid "passed through %s matching %s\n"
 msgstr "passed through %s matching %s\n"
 
-#: transact.c:226
+#: transact.c:240
 #, c-format
 msgid ""
 "analyzing Received line:\n"
@@ -2890,78 +3144,101 @@ msgstr ""
 "analyzing Received line:\n"
 "%s"
 
-#: transact.c:265
+#: transact.c:279
 #, c-format
 msgid "line accepted, %s is an alias of the mailserver\n"
 msgstr "line accepted, %s is an alias of the mailserver\n"
 
-#: transact.c:271
+#: transact.c:285
 #, c-format
 msgid "line rejected, %s is not an alias of the mailserver\n"
 msgstr "line rejected, %s is not an alias of the mailserver\n"
 
-#: transact.c:345
+#: transact.c:359
 msgid "no Received address found\n"
 msgstr "no Received address found\n"
 
-#: transact.c:354
+#: transact.c:368
 #, c-format
 msgid "found Received address `%s'\n"
 msgstr "found Received address `%s'\n"
 
-#: transact.c:551
-msgid "message delimiter found while scanning headers\n"
-msgstr "message delimiter found while scanning headers\n"
-
-#: transact.c:582
-msgid "incorrect header line found while scanning headers\n"
+#: transact.c:613
+#, fuzzy
+msgid "incorrect header line found - see manpage for bad-header option\n"
 msgstr "incorrect header line found while scanning headers\n"
 
-#: transact.c:584
+#: transact.c:615
 #, c-format
 msgid "line: %s"
 msgstr "line: %s"
 
-#: transact.c:1130
+#: transact.c:1107 transact.c:1117
+#, c-format
+msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1132
+#, fuzzy, c-format
+msgid "Parsing Received names \"%-.*s\"\n"
+msgstr ""
+"analyzing Received line:\n"
+"%s"
+
+#: transact.c:1144
+msgid "No envelope recipient found, resorting to header guessing.\n"
+msgstr ""
+
+#: transact.c:1162
+#, c-format
+msgid "Guessing from header \"%-.*s\".\n"
+msgstr ""
+
+#: transact.c:1177
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "no local matches, forwarding to %s\n"
 
-#: transact.c:1145
+#: transact.c:1192
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "forwarding and deletion suppressed due to DNS errors\n"
 
-#: transact.c:1255
+#: transact.c:1303
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "writing RFC822 msgblk.headers\n"
 
-#: transact.c:1273
+#: transact.c:1322
 msgid "no recipient addresses matched declared local names"
 msgstr "no recipient addresses matched declared local names"
 
-#: transact.c:1280
+#: transact.c:1329
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "recipient address %s didn't match any local name"
 
-#: transact.c:1289
+#: transact.c:1338
 msgid "message has embedded NULs"
 msgstr "message has embedded NULs"
 
-#: transact.c:1297
+#: transact.c:1346
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "SMTP listener rejected local recipient addresses: "
 
-#: transact.c:1445
+#: transact.c:1396
 msgid "error writing message text\n"
 msgstr "error writing message text\n"
 
-#: uid.c:250
+#: transact.c:1672
+#, c-format
+msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
+msgstr ""
+
+#: uid.c:249
 #, c-format
 msgid "Old UID list from %s:"
 msgstr "Old UID list from %s:"
 
-#: uid.c:255 uid.c:266 uid.c:523 uid.c:573
+#: uid.c:253 uid.c:264 uid.c:309
 msgid " <empty>"
 msgstr " <empty>"
 
@@ -2969,52 +3246,57 @@ msgstr " <empty>"
 msgid "Scratch list of UIDs:"
 msgstr "Scratch list of UIDs:"
 
-#: uid.c:517 uid.c:569
+#: uid.c:325 uid.c:374
 #, c-format
 msgid "Merged UID list from %s:"
 msgstr "Merged UID list from %s:"
 
-#: uid.c:519
+#: uid.c:328
 #, c-format
 msgid "New UID list from %s:"
 msgstr "New UID list from %s:"
 
-#: uid.c:548
+#: uid.c:355
 msgid "swapping UID lists\n"
 msgstr "swapping UID lists\n"
 
-#: uid.c:556
+#: uid.c:363
 msgid "not swapping UID lists, no UIDs seen this query\n"
 msgstr "not swapping UID lists, no UIDs seen this query\n"
 
-#: uid.c:581
+#: uid.c:383
 msgid "discarding new UID list\n"
 msgstr "discarding new UID list\n"
 
-#: uid.c:616
+#: uid.c:419
 msgid "Deleting fetchids file.\n"
 msgstr "Deleting fetchids file.\n"
 
-#: uid.c:618
+#: uid.c:422
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "Error deleting %s: %s\n"
 
-#: uid.c:624
+#: uid.c:428
 msgid "Writing fetchids file.\n"
 msgstr "Writing fetchids file.\n"
 
-#: uid.c:643
+#: uid.c:439 uid.c:447
+#, fuzzy, c-format
+msgid "Write error on fetchids file %s: %s\n"
+msgstr "Writing fetchids file.\n"
+
+#: uid.c:459
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr "Error writing to fetchids file %s, old file left in place.\n"
 
-#: uid.c:647
+#: uid.c:463
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "Cannot rename fetchids file %s to %s: %s\n"
 
-#: uid.c:651
+#: uid.c:467
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "Cannot open fetchids file %s for writing: %s\n"
@@ -3027,6 +3309,19 @@ msgstr "malloc failed\n"
 msgid "realloc failed\n"
 msgstr "realloc failed\n"
 
-#, fuzzy
-#~ msgid "negative size for body: message %s@%s:%d (%d octets)\n"
-#~ msgstr "skipping message %s@%s:%d (%d octets)"
+#~ msgid "Subject: Fetchmail unreachable-server warning."
+#~ msgstr "Subject: Fetchmail unreachable-server warning."
+
+#~ msgid "Fetchmail could not reach the mail server %s:"
+#~ msgstr "Fetchmail could not reach the mail server %s:"
+
+#~ msgid ""
+#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+#~ msgstr ""
+#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+
+#~ msgid "unknown issuer (first %d characters): %s\n"
+#~ msgstr "unknown issuer (first %d characters): %s\n"
+
+#~ msgid "message delimiter found while scanning headers\n"
+#~ msgstr "message delimiter found while scanning headers\n"