Update .po translations from TP.

svn path=/branches/BRANCH_6-3/; revision=5479

1 files changed, 342 insertions, 325 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index ba5c4caa..6821619c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,16 +1,14 @@
 # English (British) translation for fetchmail.
 # Copyright (C) 2006 Eric S. Raymond
-#
 # This file is distributed under the same license as the fetchmail package.
 # David Lodge <dave@cirt.net>, 2006.
-# Matthias Andree <matthias.andree@gmx.de>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: fetchmail 6.3.10-beta1\n"
+"Project-Id-Version: fetchmail 6.3.5\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2009-08-24 21:16+0200\n"
-"PO-Revision-Date: 2009-05-26 18:57+0200\n"
+"POT-Creation-Date: 2010-02-04 14:52+0100\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"
 "MIME-Version: 1.0\n"
@@ -56,9 +54,9 @@ msgid "kerberos error %s\n"
 msgstr "kerberos error %s\n"
 
 #: driver.c:249
-#, c-format
+#, fuzzy, c-format
 msgid "krb5_sendauth: %s [server says '%s'] \n"
-msgstr "krb5_sendauth: %s [server says '%s'] \n"
+msgstr "krb5_sendauth: %s [server says '%*s'] \n"
 
 #: driver.c:254
 #, c-format
@@ -80,18 +78,18 @@ 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
+#, 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
+#, 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:511
 #, c-format
@@ -218,9 +216,9 @@ msgstr ""
 "Fetchmail won't poll this mailbox again until you restart it.\n"
 
 #: driver.c:946
-#, c-format
+#, fuzzy, c-format
 msgid "pre-connection command terminated with signal %d\n"
-msgstr "pre-connection command terminated with signal %d\n"
+msgstr "pre-connection command failed with status %d\n"
 
 #: driver.c:949
 #, c-format
@@ -297,7 +295,7 @@ msgid ""
 "error message."
 msgstr ""
 "The attempt to get authorisation failed.\n"
-"Since we have already succeeded in getting authorisation for this\n"
+"Since we have already succeeded in getting authorization for this\n"
 "connection, this is probably another failure mode (such as busy server)\n"
 "that fetchmail cannot distinguish because the server didn't send a useful\n"
 "error message."
@@ -425,7 +423,7 @@ msgstr " (%d octets).\n"
 msgid "No mail for %s\n"
 msgstr "No mail for %s\n"
 
-#: driver.c:1393 imap.c:90
+#: driver.c:1393
 msgid "bogus message count!"
 msgstr "bogus message count!"
 
@@ -480,9 +478,9 @@ msgid "%s error while fetching from %s@%s\n"
 msgstr "%s error while fetching from %s@%s\n"
 
 #: driver.c:1583
-#, c-format
+#, fuzzy, c-format
 msgid "post-connection command terminated with signal %d\n"
-msgstr "post-connection command terminated with signal %d\n"
+msgstr "post-connection command failed with status %d\n"
 
 #: driver.c:1585
 #, c-format
@@ -640,20 +638,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, Robert M. Funk, Graham "
-"Wilson\n"
-"Copyright (C) 2005 - 2006 Sunil Shetye\n"
-"Copyright (C) 2005 - 2009 Matthias Andree\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
+"                   Robert M. Funk, Graham Wilson\n"
+"Copyright (C) 2005 - 2006, 2010 Sunil Shetye\n"
+"Copyright (C) 2005 - 2010 Matthias Andree\n"
 msgstr ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
 "Wilson\n"
-"Copyright (C) 2005 - 2006 Sunil Shetye\n"
-"Copyright (C) 2005 - 2009 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"
@@ -663,64 +661,64 @@ 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:177
 msgid "WARNING: Running as root is discouraged.\n"
 msgstr "WARNING: Running as root is discouraged.\n"
 
-#: fetchmail.c:188
+#: fetchmail.c:189
 msgid "fetchmail: invoked with"
 msgstr "fetchmail: invoked with"
 
-#: fetchmail.c:212
+#: fetchmail.c:213
 msgid "could not get current working directory\n"
 msgstr "could not get current working directory\n"
 
-#: fetchmail.c:283
+#: fetchmail.c:284
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "This is fetchmail release %s"
 
-#: fetchmail.c:403
+#: fetchmail.c:404
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Taking options from command line%s%s\n"
 
-#: fetchmail.c:404
+#: fetchmail.c:405
 msgid " and "
 msgstr " and "
 
-#: fetchmail.c:409
+#: fetchmail.c:410
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "No mailservers set up -- perhaps %s is missing?\n"
 
-#: fetchmail.c:430
+#: fetchmail.c:431
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: no mailservers have been specified.\n"
 
-#: fetchmail.c:442
+#: fetchmail.c:443
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: no other fetchmail is running\n"
 
-#: fetchmail.c:448
+#: fetchmail.c:449
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 
-#: fetchmail.c:449 fetchmail.c:458
+#: fetchmail.c:450 fetchmail.c:459
 msgid "background"
 msgstr "background"
 
-#: fetchmail.c:449 fetchmail.c:458
+#: fetchmail.c:450 fetchmail.c:459
 msgid "foreground"
 msgstr "foreground"
 
-#: fetchmail.c:457
+#: fetchmail.c:458
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr "fetchmail: %s fetchmail at %d killed.\n"
 
-#: fetchmail.c:480
+#: fetchmail.c:481
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -728,230 +726,233 @@ msgstr ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
 
-#: fetchmail.c:486
+#: fetchmail.c:487
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
 msgstr ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
 
-#: fetchmail.c:493
+#: fetchmail.c:494
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr "fetchmail: another foreground fetchmail is running at %d.\n"
 
-#: fetchmail.c:503
+#: fetchmail.c:504
 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:509
+#: fetchmail.c:510
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr "fetchmail: background fetchmail at %d awakened.\n"
 
-#: fetchmail.c:521
+#: fetchmail.c:522
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr "fetchmail: elder sibling at %d died mysteriously.\n"
 
-#: fetchmail.c:536
+#: fetchmail.c:537
 #, 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:540
+#: fetchmail.c:541
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Enter password for %s@%s: "
 
-#: fetchmail.c:582
+#: fetchmail.c:583
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: Cannot detach into background. Aborting.\n"
 
-#: fetchmail.c:586
+#: fetchmail.c:587
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr "starting fetchmail %s daemon \n"
 
-#: fetchmail.c:602 fetchmail.c:604
+#: fetchmail.c:603 fetchmail.c:605
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr "could not open %s to append logs to \n"
 
-#: fetchmail.c:606
+#: fetchmail.c:607
 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:625
+#: fetchmail.c:626
 msgid "--check mode enabled, not fetching mail\n"
-msgstr "--check mode enabled, not fetching mail\n"
+msgstr ""
 
-#: fetchmail.c:647
+#: fetchmail.c:648
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "couldn't time-check %s (error %d)\n"
 
-#: fetchmail.c:652
+#: fetchmail.c:653
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "restarting fetchmail (%s changed)\n"
 
-#: fetchmail.c:657
+#: fetchmail.c:658
 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:684
+#: fetchmail.c:685
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "attempt to re-exec fetchmail failed\n"
 
-#: fetchmail.c:714
+#: fetchmail.c:715
 #, 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:726
+#: fetchmail.c:727
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval not reached, not querying %s\n"
 
-#: fetchmail.c:764
+#: fetchmail.c:765
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Query status=0 (SUCCESS)\n"
 
-#: fetchmail.c:766
+#: fetchmail.c:767
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Query status=1 (NOMAIL)\n"
 
-#: fetchmail.c:768
+#: fetchmail.c:769
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Query status=2 (SOCKET)\n"
 
-#: fetchmail.c:770
+#: fetchmail.c:771
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Query status=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:772
+#: fetchmail.c:773
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Query status=4 (PROTOCOL)\n"
 
-#: fetchmail.c:774
+#: fetchmail.c:775
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Query status=5 (SYNTAX)\n"
 
-#: fetchmail.c:776
+#: fetchmail.c:777
 msgid "Query status=6 (IOERR)\n"
 msgstr "Query status=6 (IOERR)\n"
 
-#: fetchmail.c:778
+#: fetchmail.c:779
 msgid "Query status=7 (ERROR)\n"
 msgstr "Query status=7 (ERROR)\n"
 
-#: fetchmail.c:780
+#: fetchmail.c:781
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Query status=8 (EXCLUDE)\n"
 
-#: fetchmail.c:782
+#: fetchmail.c:783
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Query status=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:784
+#: fetchmail.c:785
 msgid "Query status=10 (SMTP)\n"
 msgstr "Query status=10 (SMTP)\n"
 
-#: fetchmail.c:786
+#: fetchmail.c:787
 msgid "Query status=11 (DNS)\n"
 msgstr "Query status=11 (DNS)\n"
 
-#: fetchmail.c:788
+#: fetchmail.c:789
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Query status=12 (BSMTP)\n"
 
-#: fetchmail.c:790
+#: fetchmail.c:791
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Query status=13 (MAXFETCH)\n"
 
-#: fetchmail.c:792
+#: fetchmail.c:793
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Query status=%d\n"
 
-#: fetchmail.c:834
+#: fetchmail.c:835
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "All connections are wedged.  Exiting.\n"
 
-#: fetchmail.c:842
+#: fetchmail.c:843
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "sleeping at %s for %d seconds\n"
 
-#: fetchmail.c:866
+#: fetchmail.c:867
 #, c-format
 msgid "awakened by %s\n"
 msgstr "awakened by %s\n"
 
-#: fetchmail.c:869
+#: fetchmail.c:870
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "awakened by signal %d\n"
 
-#: fetchmail.c:877
+#: fetchmail.c:878
 #, c-format
 msgid "awakened at %s\n"
 msgstr "awakened at %s\n"
 
-#: fetchmail.c:882
+#: fetchmail.c:883
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normal termination, status %d\n"
 
-#: fetchmail.c:1036
+#: fetchmail.c:1037
 msgid "couldn't time-check the run-control file\n"
 msgstr "couldn't time-check the run-control file\n"
 
-#: fetchmail.c:1069
+#: fetchmail.c:1070
 #, 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:1102
+#: fetchmail.c:1103
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 
-#: fetchmail.c:1224
+#: fetchmail.c:1225
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1231
+#: fetchmail.c:1232
+#, 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:1237
+#: fetchmail.c:1238
+#, 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:1243
+#: fetchmail.c:1244
+#, 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:1273
+#: fetchmail.c:1274
 #, 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:1284
+#: fetchmail.c:1285
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "warning: multidrop for %s requires envelope option!\n"
 
-#: fetchmail.c:1285
+#: fetchmail.c:1286
 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:1302
+#: fetchmail.c:1303
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -960,297 +961,299 @@ msgstr ""
 "fetchmail: %s configuration invalid, specify positive port number for "
 "service or port\n"
 
-#: fetchmail.c:1309
+#: fetchmail.c:1310
 #, 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:1327
+#: fetchmail.c:1328
 #, 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:1341
+#: fetchmail.c:1342
 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:1366
+#: fetchmail.c:1367
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminated with signal %d\n"
 
-#: fetchmail.c:1439
+#: fetchmail.c:1440
 #, 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:1464
+#: fetchmail.c:1465
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 support is not configured.\n"
 
-#: fetchmail.c:1476
+#: fetchmail.c:1477
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 support is not configured.\n"
 
-#: fetchmail.c:1486
+#: fetchmail.c:1487
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP support is not configured.\n"
 
-#: fetchmail.c:1492
+#: fetchmail.c:1493
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN support is not configured.\n"
 
-#: fetchmail.c:1500
+#: fetchmail.c:1501
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR support is not configured.\n"
 
-#: fetchmail.c:1507
+#: fetchmail.c:1508
 msgid "unsupported protocol selected.\n"
 msgstr "unsupported protocol selected.\n"
 
-#: fetchmail.c:1517
+#: fetchmail.c:1518
 #, 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:1534
+#: fetchmail.c:1535
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Poll interval is %d seconds\n"
 
-#: fetchmail.c:1536
+#: fetchmail.c:1537
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Logfile is %s\n"
 
-#: fetchmail.c:1538
+#: fetchmail.c:1539
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile is %s\n"
 
-#: fetchmail.c:1541
+#: fetchmail.c:1542
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Progress messages will be logged via syslog\n"
 
-#: fetchmail.c:1544
+#: fetchmail.c:1545
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail will masquerade and will not generate Received\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1547
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail will show progress dots even in logfiles.\n"
 
-#: fetchmail.c:1548
+#: fetchmail.c:1549
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 
-#: fetchmail.c:1552
+#: fetchmail.c:1553
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail will direct error mail to the postmaster.\n"
 
-#: fetchmail.c:1554
+#: fetchmail.c:1555
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail will direct error mail to the sender.\n"
 
-#: fetchmail.c:1557
-msgid "Fetchmail will treat permanent errors as permanent (drop messsages).\n"
-msgstr "Fetchmail will treat permanent errors as permanent (drop messsages).\n"
+#: fetchmail.c:1558
+#, fuzzy
+msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
+msgstr "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 
-#: fetchmail.c:1559
+#: fetchmail.c:1560
+#, fuzzy
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr "Fetchmail will treat permanent errors as temporary (keep messages).\n"
+msgstr "Fetchmail will direct error mail to the sender.\n"
 
-#: fetchmail.c:1566
+#: fetchmail.c:1567
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Options for retrieving from %s@%s:\n"
 
-#: fetchmail.c:1570
+#: fetchmail.c:1571
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mail will be retrieved via %s\n"
 
-#: fetchmail.c:1573
+#: fetchmail.c:1574
 #, 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:1577
+#: fetchmail.c:1578
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  True name of server is %s.\n"
 
-#: fetchmail.c:1580
+#: fetchmail.c:1581
 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:1581
+#: fetchmail.c:1582
 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:1585
+#: fetchmail.c:1586
 msgid "  Password will be prompted for.\n"
 msgstr "  Password will be prompted for.\n"
 
-#: fetchmail.c:1589
+#: fetchmail.c:1590
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP secret = \"%s\".\n"
 
-#: fetchmail.c:1592
+#: fetchmail.c:1593
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1595
+#: fetchmail.c:1596
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Password = \"%s\".\n"
 
-#: fetchmail.c:1604
+#: fetchmail.c:1605
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protocol is KPOP with Kerberos %s authentication"
 
-#: fetchmail.c:1607
+#: fetchmail.c:1608
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protocol is %s"
 
-#: fetchmail.c:1609
+#: fetchmail.c:1610
 #, c-format
 msgid " (using service %s)"
 msgstr " (using service %s)"
 
-#: fetchmail.c:1611
+#: fetchmail.c:1612
 msgid " (using default port)"
 msgstr " (using default port)"
 
-#: fetchmail.c:1613
+#: fetchmail.c:1614
 msgid " (forcing UIDL use)"
 msgstr " (forcing UIDL use)"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1620
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  All available authentication methods will be tried.\n"
 
-#: fetchmail.c:1622
+#: fetchmail.c:1623
 msgid "  Password authentication will be forced.\n"
 msgstr "  Password authentication will be forced.\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1626
 msgid "  MSN authentication will be forced.\n"
 msgstr "  MSN authentication will be forced.\n"
 
-#: fetchmail.c:1628
+#: fetchmail.c:1629
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM authentication will be forced.\n"
 
-#: fetchmail.c:1631
+#: fetchmail.c:1632
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP authentication will be forced.\n"
 
-#: fetchmail.c:1634
+#: fetchmail.c:1635
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr "  CRAM-Md5 authentication will be forced.\n"
 
-#: fetchmail.c:1637
+#: fetchmail.c:1638
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI authentication will be forced.\n"
 
-#: fetchmail.c:1640
+#: fetchmail.c:1641
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 authentication will be forced.\n"
 
-#: fetchmail.c:1643
+#: fetchmail.c:1644
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 authentication will be forced.\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1647
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  End-to-end encryption assumed.\n"
 
-#: fetchmail.c:1650
+#: fetchmail.c:1651
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Mail service principal is: %s\n"
 
-#: fetchmail.c:1653
+#: fetchmail.c:1654
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL encrypted sessions enabled.\n"
 
-#: fetchmail.c:1655
+#: fetchmail.c:1656
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL protocol: %s.\n"
 
-#: fetchmail.c:1657
+#: fetchmail.c:1658
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL server certificate checking enabled.\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1660
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL trusted certificate directory: %s\n"
 
-#: fetchmail.c:1662
-#, c-format
+#: fetchmail.c:1663
+#, fuzzy, c-format
 msgid "  SSL server CommonName: %s\n"
-msgstr "  SSL server CommonName: %s\n"
+msgstr "Server CommonName: %s\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1665
 #, 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:1667
+#: fetchmail.c:1668
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Server nonresponse timeout is %d seconds"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1670
 msgid " (default).\n"
 msgstr " (default).\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1677
 msgid "  Default mailbox selected.\n"
 msgstr "  Default mailbox selected.\n"
 
-#: fetchmail.c:1681
+#: fetchmail.c:1682
 msgid "  Selected mailboxes are:"
 msgstr "  Selected mailboxes are:"
 
-#: fetchmail.c:1687
+#: fetchmail.c:1688
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  All messages will be retrieved (--all on).\n"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1689
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Only new messages will be retrieved (--all off).\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1691
 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:1691
+#: fetchmail.c:1692
 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:1693
+#: fetchmail.c:1694
 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:1694
+#: fetchmail.c:1695
 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:1696
+#: fetchmail.c:1697
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1258,7 +1261,7 @@ msgstr ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
 
-#: fetchmail.c:1697
+#: fetchmail.c:1698
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1266,319 +1269,319 @@ msgstr ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
 
-#: fetchmail.c:1699
+#: fetchmail.c:1700
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 
-#: fetchmail.c:1700
+#: fetchmail.c:1701
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1703
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Carriage-return stripping is enabled (stripcr on).\n"
 
-#: fetchmail.c:1703
+#: fetchmail.c:1704
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Carriage-return stripping is disabled (stripcr off).\n"
 
-#: fetchmail.c:1705
+#: fetchmail.c:1706
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Carriage-return forcing is enabled (forcecr on).\n"
 
-#: fetchmail.c:1706
+#: fetchmail.c:1707
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Carriage-return forcing is disabled (forcecr off).\n"
 
-#: fetchmail.c:1708
+#: fetchmail.c:1709
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 
-#: fetchmail.c:1709
+#: fetchmail.c:1710
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 
-#: fetchmail.c:1711
+#: fetchmail.c:1712
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME decoding is enabled (mimedecode on).\n"
 
-#: fetchmail.c:1712
+#: fetchmail.c:1713
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME decoding is disabled (mimedecode off).\n"
 
-#: fetchmail.c:1714
+#: fetchmail.c:1715
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Idle after poll is enabled (idle on).\n"
 
-#: fetchmail.c:1715
+#: fetchmail.c:1716
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Idle after poll is disabled (idle off).\n"
 
-#: fetchmail.c:1717
+#: fetchmail.c:1718
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Nonempty Status lines will be discarded (dropstatus on)\n"
 
-#: fetchmail.c:1718
+#: fetchmail.c:1719
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Nonempty Status lines will be kept (dropstatus off)\n"
 
-#: fetchmail.c:1720
+#: fetchmail.c:1721
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To lines will be discarded (dropdelivered on)\n"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1722
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To lines will be kept (dropdelivered off)\n"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1726
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Message size limit is %d octets (--limit %d).\n"
 
-#: fetchmail.c:1728
+#: fetchmail.c:1729
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  No message size limit (--limit 0).\n"
 
-#: fetchmail.c:1730
+#: fetchmail.c:1731
 #, 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:1733
+#: fetchmail.c:1734
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Size warnings on every poll (--warnings 0).\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1737
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Received-message limit is %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1739
+#: fetchmail.c:1740
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  No received-message limit (--fetchlimit 0).\n"
 
-#: fetchmail.c:1741
+#: fetchmail.c:1742
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1744
+#: fetchmail.c:1745
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  No fetch message size limit (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1748
+#: fetchmail.c:1749
 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:1750
+#: fetchmail.c:1751
 #, 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:1753
+#: fetchmail.c:1754
 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:1755
+#: fetchmail.c:1756
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP message batch limit is %d.\n"
 
-#: fetchmail.c:1757
+#: fetchmail.c:1758
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  No SMTP message batch limit (--batchlimit 0).\n"
 
-#: fetchmail.c:1761
+#: fetchmail.c:1762
 #, 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:1763
+#: fetchmail.c:1764
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No forced expunges (--expunge 0).\n"
 
-#: fetchmail.c:1770
+#: fetchmail.c:1771
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domains for which mail will be fetched are:"
 
-#: fetchmail.c:1775 fetchmail.c:1795
+#: fetchmail.c:1776 fetchmail.c:1796
 msgid " (default)"
 msgstr " (default)"
 
-#: fetchmail.c:1780
+#: fetchmail.c:1781
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Messages will be appended to %s as BSMTP\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1783
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Messages will be delivered with \"%s\".\n"
 
-#: fetchmail.c:1789
+#: fetchmail.c:1790
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Messages will be %cMTP-forwarded to:"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1801
 #, 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:1803
+#: fetchmail.c:1804
 #, 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:1812
+#: fetchmail.c:1813
 msgid "  Recognized listener spam block responses are:"
-msgstr "  Recognised listener spam block responses are:"
+msgstr "  Recognized listener spam block responses are:"
 
-#: fetchmail.c:1818
+#: fetchmail.c:1819
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam-blocking disabled\n"
 
-#: fetchmail.c:1821
+#: fetchmail.c:1822
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Server connection will be brought up with \"%s\".\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1825
 msgid "  No pre-connection command.\n"
 msgstr "  No pre-connection command.\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1827
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Server connection will be taken down with \"%s\".\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1830
 msgid "  No post-connection command.\n"
 msgstr "  No post-connection command.\n"
 
-#: fetchmail.c:1832
+#: fetchmail.c:1833
 msgid "  No localnames declared for this host.\n"
 msgstr "  No localnames declared for this host.\n"
 
-#: fetchmail.c:1842
+#: fetchmail.c:1843
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop mode: "
 
-#: fetchmail.c:1844
+#: fetchmail.c:1845
 msgid "  Single-drop mode: "
 msgstr "  Single-drop mode: "
 
-#: fetchmail.c:1846
+#: fetchmail.c:1847
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
-msgstr[0] "%d local name recognised.\n"
-msgstr[1] "%d local names recognised.\n"
+msgstr[0] "%d local name recognized.\n"
+msgstr[1] "%d local names recognized.\n"
 
-#: fetchmail.c:1861
+#: fetchmail.c:1862
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS lookup for multidrop addresses is enabled.\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1863
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS lookup for multidrop addresses is disabled.\n"
 
-#: fetchmail.c:1866
+#: fetchmail.c:1867
 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:1868
+#: fetchmail.c:1869
 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:1871
+#: fetchmail.c:1872
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelope-address routing is disabled\n"
 
-#: fetchmail.c:1874
+#: fetchmail.c:1875
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Envelope header is assumed to be: %s\n"
 
-#: fetchmail.c:1877
+#: fetchmail.c:1878
 #, 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:1880
+#: fetchmail.c:1881
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefix %s will be removed from user id\n"
 
-#: fetchmail.c:1883
+#: fetchmail.c:1884
 msgid "  No prefix stripping\n"
 msgstr "  No prefix stripping\n"
 
-#: fetchmail.c:1890
+#: fetchmail.c:1891
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Predeclared mailserver aliases:"
 
-#: fetchmail.c:1899
+#: fetchmail.c:1900
 msgid "  Local domains:"
 msgstr "  Local domains:"
 
-#: fetchmail.c:1909
+#: fetchmail.c:1910
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Connection must be through interface %s.\n"
 
-#: fetchmail.c:1911
+#: fetchmail.c:1912
 msgid "  No interface requirement specified.\n"
 msgstr "  No interface requirement specified.\n"
 
-#: fetchmail.c:1913
+#: fetchmail.c:1914
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Polling loop will monitor %s.\n"
 
-#: fetchmail.c:1915
+#: fetchmail.c:1916
 msgid "  No monitor interface specified.\n"
 msgstr "  No monitor interface specified.\n"
 
-#: fetchmail.c:1919
+#: fetchmail.c:1920
 #, 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:1921
+#: fetchmail.c:1922
 msgid "  No plugin command specified.\n"
 msgstr "  No plugin command specified.\n"
 
-#: fetchmail.c:1923
+#: fetchmail.c:1924
 #, 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:1925
+#: fetchmail.c:1926
 msgid "  No plugout command specified.\n"
 msgstr "  No plugout command specified.\n"
 
-#: fetchmail.c:1930
+#: fetchmail.c:1931
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No UIDs saved from this host.\n"
 
-#: fetchmail.c:1939
+#: fetchmail.c:1940
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs saved.\n"
 
-#: fetchmail.c:1947
+#: fetchmail.c:1948
 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:1949
+#: fetchmail.c:1950
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
@@ -1586,7 +1589,7 @@ msgstr ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
 
-#: fetchmail.c:1952
+#: fetchmail.c:1953
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Pass-through properties \"%s\".\n"
@@ -1660,102 +1663,122 @@ 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:73
+#, c-format
+msgid "Received BYE response from IMAP server: %s"
+msgstr ""
+
+#: imap.c:91
+#, fuzzy, c-format
+msgid "bogus message count in \"%s\"!"
+msgstr "bogus message count!"
+
+#: imap.c:138
+#, c-format
+msgid "bogus EXPUNGE count in \"%s\"!"
+msgstr ""
+
+#: imap.c:387
 msgid "Protocol identified as IMAP4 rev 1\n"
 msgstr "Protocol identified as IMAP4 rev 1\n"
 
-#: imap.c:332
+#: imap.c:393
 msgid "Protocol identified as IMAP4 rev 0\n"
 msgstr "Protocol identified as IMAP4 rev 0\n"
 
-#: imap.c:339
+#: imap.c:400
 msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
 msgstr "Protocol identified as IMAP2 or IMAP2BIS\n"
 
-#: imap.c:354
+#: imap.c:415
 msgid "will idle after poll\n"
 msgstr "will idle after poll\n"
 
-#: imap.c:446 pop3.c:518
-#, c-format
+#: imap.c:507 pop3.c:518
+#, 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:455 pop3.c:527
-#, c-format
+#: imap.c:516 pop3.c:527
+#, 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:459
-#, c-format
+#: imap.c:520
+#, 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:579
+#: imap.c:640
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Required OTP capability not compiled into fetchmail\n"
 
-#: imap.c:601 pop3.c:385
+#: imap.c:662 pop3.c:385
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Required NTLM capability not compiled into fetchmail\n"
 
-#: imap.c:610
+#: imap.c:671
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Required LOGIN capability not supported by server\n"
 
-#: imap.c:676
+#: imap.c:737
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "mail expunge mismatch (%d actual != %d expected)\n"
 
-#: imap.c:782 imap.c:841
+#: imap.c:876
+#, c-format
+msgid "%lu is unseen\n"
+msgstr "%lu is unseen\n"
+
+#: imap.c:937 pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121
+#, c-format
+msgid "%u is unseen\n"
+msgstr "%u is unseen\n"
+
+#: imap.c:972 imap.c:1031
 msgid "re-poll failed\n"
 msgstr "re-poll failed\n"
 
-#: imap.c:790 imap.c:846
+#: imap.c:980 imap.c:1036
 #, 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:807
+#: imap.c:997
 msgid "mailbox selection failed\n"
 msgstr "mailbox selection failed\n"
 
-#: imap.c:811
+#: imap.c:1001
 #, 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:825
+#: imap.c:1015
 msgid "expunge failed\n"
 msgstr "expunge failed\n"
 
-#: imap.c:829
+#: imap.c:1019
 #, 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:871
+#: imap.c:1058
 msgid "search for unseen messages failed\n"
 msgstr "search for unseen messages failed\n"
 
-#: imap.c:899
-#, c-format
-msgid "%lu is unseen\n"
-msgstr "%lu is unseen\n"
-
-#: imap.c:911 pop3.c:889
+#: imap.c:1063 pop3.c:889
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u is first unseen\n"
 
-#: imap.c:1002
+#: imap.c:1144
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
@@ -2063,15 +2086,12 @@ msgstr "      --nobounce    redirect bounces from user to postmaster.\n"
 msgid ""
 "      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 msgstr ""
-"      --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
 
 #: options.c:621
 msgid ""
 "      --softbounce  keep permanently undeliverable messages on server "
 "(default).\n"
 msgstr ""
-"      --softbounce  keep permanently undeliverable messages on server "
-"(default).\n"
 
 #: options.c:623
 msgid "  -I, --interface   interface required specification\n"
@@ -2105,7 +2125,6 @@ msgstr "      --sslcertpath path to ssl certificates\n"
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
 msgstr ""
-"      --sslcommonname  expect this CommonName from server (discouraged)\n"
 
 #: options.c:633
 msgid ""
@@ -2275,20 +2294,20 @@ msgstr ""
 
 #: pop3.c:454
 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:455
 msgid "The CAPA command is however necessary for TLS.\n"
-msgstr "The CAPA command is however necessary for TLS.\n"
+msgstr ""
 
 #: pop3.c:538
-#, c-format
+#, 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:646
 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:660
 msgid "Required APOP timestamp not found in greeting\n"
@@ -2300,7 +2319,7 @@ msgstr "Timestamp syntax error in greeting\n"
 
 #: pop3.c:685
 msgid "Invalid APOP timestamp.\n"
-msgstr "Invalid APOP timestamp.\n"
+msgstr ""
 
 #: pop3.c:709
 msgid "Undefined protocol request in POP3_auth\n"
@@ -2323,11 +2342,6 @@ msgstr "Server responded with UID for wrong message.\n"
 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:868 pop3.c:880 pop3.c:1114 pop3.c:1121
-#, c-format
-msgid "%u is unseen\n"
-msgstr "%u is unseen\n"
-
 #: pop3.c:965
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Messages inserted into list on server. Cannot handle this.\n"
@@ -2382,9 +2396,9 @@ msgid "File %s must be a regular file.\n"
 msgstr "File %s must be a regular file.\n"
 
 #: rcfile_y.y:433
-#, c-format
+#, fuzzy, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
-msgstr "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:445
 #, c-format
@@ -2396,9 +2410,9 @@ msgid "Unknown system error"
 msgstr "Unknown system error"
 
 #: report.c:92
-#, c-format
+#, fuzzy, c-format
 msgid "%s (log message incomplete)\n"
-msgstr "%s (log message incomplete)\n"
+msgstr "%s (log message incomplete)"
 
 #: rfc822.c:76
 #, c-format
@@ -2600,126 +2614,127 @@ 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:317
 msgid "SMTP: (bounce-message body)\n"
 msgstr "SMTP: (bounce-message body)\n"
 
-#: sink.c:309
+#: sink.c:320
 #, c-format
 msgid "mail from %s bounced to %s\n"
 msgstr "mail from %s bounced to %s\n"
 
-#: sink.c:446
+#: sink.c:457
 #, c-format
 msgid "Saved error is still %d\n"
 msgstr "Saved error is still %d\n"
 
-#: sink.c:506 sink.c:605
+#: sink.c:517 sink.c:616
 #, c-format
 msgid "%cMTP error: %s\n"
 msgstr "%cMTP error: %s\n"
 
-#: sink.c:550
+#: sink.c:561
 msgid "SMTP server requires STARTTLS, keeping message.\n"
-msgstr "SMTP server requires STARTTLS, keeping message.\n"
+msgstr ""
 
-#: sink.c:730
-#, c-format
+#: sink.c:741
+#, fuzzy, c-format
 msgid "BSMTP file open failed: %s\n"
-msgstr "BSMTP file open filed: %s\n"
+msgstr "BSMTP file open or preamble write failed\n"
 
-#: sink.c:776
+#: sink.c:787
+#, fuzzy
 msgid "BSMTP preamble write failed.\n"
-msgstr "BSMTP preamble write failed.\n"
+msgstr "BSMTP file open or preamble write failed\n"
 
-#: sink.c:990
+#: sink.c:1001
 #, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
 msgstr "%cMTP listener doesn't like recipient address `%s'\n"
 
-#: sink.c:997
+#: sink.c:1008
 #, 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:1043
+#: sink.c:1054
 msgid "no address matches; no postmaster set.\n"
 msgstr "no address matches; no postmaster set.\n"
 
-#: sink.c:1055
+#: sink.c:1066
 #, c-format
 msgid "can't even send to %s!\n"
 msgstr "can't even send to %s!\n"
 
-#: sink.c:1061
+#: sink.c:1072
 #, c-format
 msgid "no address matches; forwarding to %s.\n"
 msgstr "no address matches; forwarding to %s.\n"
 
-#: sink.c:1217
+#: sink.c:1228
 #, c-format
 msgid "about to deliver with: %s\n"
 msgstr "about to deliver with: %s\n"
 
-#: sink.c:1241
+#: sink.c:1252
 msgid "MDA open failed\n"
 msgstr "MDA open failed\n"
 
-#: sink.c:1278
+#: sink.c:1289
 #, c-format
 msgid "%cMTP connect to %s failed\n"
 msgstr "%cMTP connect to %s failed\n"
 
-#: sink.c:1302
+#: sink.c:1313
 #, c-format
 msgid "can't raise the listener; falling back to %s"
 msgstr "can't raise the listener; falling back to %s"
 
-#: sink.c:1364
+#: sink.c:1375
 #, c-format
 msgid "Error writing to MDA: %s\n"
 msgstr "Error writing to MDA: %s\n"
 
-#: sink.c:1367
+#: sink.c:1378
 #, c-format
 msgid "MDA died of signal %d\n"
 msgstr "MDA died of signal %d\n"
 
-#: sink.c:1370
+#: sink.c:1381
 #, c-format
 msgid "MDA returned nonzero status %d\n"
 msgstr "MDA returned nonzero status %d\n"
 
-#: sink.c:1373
+#: sink.c:1384
 #, 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:1395
+#: sink.c:1406
 msgid "Message termination or close of BSMTP file failed\n"
 msgstr "Message termination or close of BSMTP file failed\n"
 
-#: sink.c:1417
+#: sink.c:1428
 msgid "SMTP listener refused delivery\n"
 msgstr "SMTP listener refused delivery\n"
 
-#: sink.c:1447
+#: sink.c:1458
 msgid "LMTP delivery error on EOM\n"
 msgstr "LMTP delivery error on EOM\n"
 
-#: sink.c:1450
+#: sink.c:1461
 #, c-format
 msgid "Unexpected non-503 response to LMTP EOM: %s\n"
 msgstr "Unexpected non-503 response to LMTP EOM: %s\n"
 
-#: sink.c:1605
+#: sink.c:1616
 msgid ""
 "-- \n"
 "The Fetchmail Daemon"
@@ -2826,7 +2841,7 @@ msgstr "Issuer Organisation: %s\n"
 
 #: socket.c:619
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
-msgstr "Warning: Issuer Organisation Name too long (possibly truncated).\n"
+msgstr "Warning: Issuer Organsation Name too long (possibly truncated).\n"
 
 #: socket.c:621
 msgid "Unknown Organization\n"
@@ -2855,8 +2870,9 @@ msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Bad certificate: Subject CommonName too long!\n"
 
 #: socket.c:644
+#, fuzzy
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
-msgstr "Bad certificate: Subject CommonName contains NUL, aborting!\n"
+msgstr "Bad certificate: Subject CommonName too long!\n"
 
 #: socket.c:665
 #, c-format
@@ -2864,8 +2880,9 @@ msgid "Subject Alternative Name: %s\n"
 msgstr ""
 
 #: socket.c:671
+#, fuzzy
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
-msgstr "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
+msgstr "Bad certificate: Subject CommonName too long!\n"
 
 #: socket.c:699
 #, c-format