Record what update-po yielded.

1 files changed, 230 insertions, 213 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index 7c276f48..43578a53 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.5\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-09-04 09:17+0200\n"
+"POT-Creation-Date: 2020-10-15 20:10+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"
@@ -698,71 +698,71 @@ msgstr ""
 msgid "WARNING: Compiled without SSL/TLS.\n"
 msgstr ""
 
-#: fetchmail.c:339
+#: fetchmail.c:340
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:346
+#: fetchmail.c:347
 msgid "Not running in daemon mode, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:353
+#: fetchmail.c:354
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
 msgstr ""
 
-#: fetchmail.c:359
+#: fetchmail.c:360
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
 msgstr ""
 
-#: fetchmail.c:377
+#: fetchmail.c:378
 #, c-format
 msgid ""
 "syslog and logfile options are both set, ignoring syslog, and logging to %s"
 msgstr ""
 
-#: fetchmail.c:468
+#: fetchmail.c:469
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "Taking options from command line%s%s\n"
 
-#: fetchmail.c:469
+#: fetchmail.c:470
 msgid " and "
 msgstr " and "
 
-#: fetchmail.c:474
+#: fetchmail.c:475
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "No mailservers set up -- perhaps %s is missing?\n"
 
-#: fetchmail.c:495
+#: fetchmail.c:496
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: no mailservers have been specified.\n"
 
-#: fetchmail.c:507
+#: fetchmail.c:508
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: no other fetchmail is running\n"
 
-#: fetchmail.c:513
+#: fetchmail.c:514
 #, 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:514 fetchmail.c:523
+#: fetchmail.c:515 fetchmail.c:524
 msgid "background"
 msgstr "background"
 
-#: fetchmail.c:514 fetchmail.c:523
+#: fetchmail.c:515 fetchmail.c:524
 msgid "foreground"
 msgstr "foreground"
 
-#: fetchmail.c:522
+#: fetchmail.c:523
 #, fuzzy, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail at %d killed.\n"
 
-#: fetchmail.c:545
+#: fetchmail.c:546
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
@@ -770,7 +770,7 @@ msgstr ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
 
-#: fetchmail.c:551
+#: fetchmail.c:552
 #, fuzzy, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at "
@@ -778,225 +778,225 @@ msgid ""
 msgstr ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
 
-#: fetchmail.c:558
+#: fetchmail.c:559
 #, 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:568
+#: fetchmail.c:569
 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:580
+#: fetchmail.c:581
 #, fuzzy, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: background fetchmail at %d awakened.\n"
 
-#: fetchmail.c:592
+#: fetchmail.c:593
 #, fuzzy, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
 msgstr "fetchmail: elder sibling at %d died mysteriously.\n"
 
-#: fetchmail.c:607
+#: fetchmail.c:608
 #, 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:611
+#: fetchmail.c:612
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr "Enter password for %s@%s: "
 
-#: fetchmail.c:653
+#: fetchmail.c:654
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: Cannot detach into background. Aborting.\n"
 
-#: fetchmail.c:657
+#: fetchmail.c:658
 #, fuzzy, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "starting fetchmail %s daemon \n"
 
-#: fetchmail.c:673 fetchmail.c:675
+#: fetchmail.c:674 fetchmail.c:676
 #, 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:694
+#: fetchmail.c:695
 msgid "--check mode enabled, not fetching mail\n"
 msgstr ""
 
-#: fetchmail.c:716
+#: fetchmail.c:717
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr "couldn't time-check %s (error %d)\n"
 
-#: fetchmail.c:721
+#: fetchmail.c:722
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "restarting fetchmail (%s changed)\n"
 
-#: fetchmail.c:725
+#: fetchmail.c:726
 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:751
+#: fetchmail.c:752
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "attempt to re-exec fetchmail failed\n"
 
-#: fetchmail.c:781
+#: fetchmail.c:782
 #, 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:793
+#: fetchmail.c:794
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "interval not reached, not querying %s\n"
 
-#: fetchmail.c:831
+#: fetchmail.c:832
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "Query status=0 (SUCCESS)\n"
 
-#: fetchmail.c:833
+#: fetchmail.c:834
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "Query status=1 (NOMAIL)\n"
 
-#: fetchmail.c:835
+#: fetchmail.c:836
 msgid "Query status=2 (SOCKET)\n"
 msgstr "Query status=2 (SOCKET)\n"
 
-#: fetchmail.c:837
+#: fetchmail.c:838
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "Query status=3 (AUTHFAIL)\n"
 
-#: fetchmail.c:839
+#: fetchmail.c:840
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "Query status=4 (PROTOCOL)\n"
 
-#: fetchmail.c:841
+#: fetchmail.c:842
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "Query status=5 (SYNTAX)\n"
 
-#: fetchmail.c:843
+#: fetchmail.c:844
 msgid "Query status=6 (IOERR)\n"
 msgstr "Query status=6 (IOERR)\n"
 
-#: fetchmail.c:845
+#: fetchmail.c:846
 msgid "Query status=7 (ERROR)\n"
 msgstr "Query status=7 (ERROR)\n"
 
-#: fetchmail.c:847
+#: fetchmail.c:848
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "Query status=8 (EXCLUDE)\n"
 
-#: fetchmail.c:849
+#: fetchmail.c:850
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "Query status=9 (LOCKBUSY)\n"
 
-#: fetchmail.c:851
+#: fetchmail.c:852
 msgid "Query status=10 (SMTP)\n"
 msgstr "Query status=10 (SMTP)\n"
 
-#: fetchmail.c:853
+#: fetchmail.c:854
 msgid "Query status=11 (DNS)\n"
 msgstr "Query status=11 (DNS)\n"
 
-#: fetchmail.c:855
+#: fetchmail.c:856
 msgid "Query status=12 (BSMTP)\n"
 msgstr "Query status=12 (BSMTP)\n"
 
-#: fetchmail.c:857
+#: fetchmail.c:858
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "Query status=13 (MAXFETCH)\n"
 
-#: fetchmail.c:859
+#: fetchmail.c:860
 #, c-format
 msgid "Query status=%d\n"
 msgstr "Query status=%d\n"
 
-#: fetchmail.c:901
+#: fetchmail.c:902
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "All connections are wedged.  Exiting.\n"
 
-#: fetchmail.c:909
+#: fetchmail.c:910
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "sleeping at %s for %d seconds\n"
 
-#: fetchmail.c:933
+#: fetchmail.c:934
 #, c-format
 msgid "awakened by %s\n"
 msgstr "awakened by %s\n"
 
-#: fetchmail.c:936
+#: fetchmail.c:937
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "awakened by signal %d\n"
 
-#: fetchmail.c:944
+#: fetchmail.c:945
 #, c-format
 msgid "awakened at %s\n"
 msgstr "awakened at %s\n"
 
-#: fetchmail.c:949
+#: fetchmail.c:950
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "normal termination, status %d\n"
 
-#: fetchmail.c:1113
+#: fetchmail.c:1114
 msgid "couldn't time-check the run-control file\n"
 msgstr "couldn't time-check the run-control file\n"
 
-#: fetchmail.c:1147
+#: fetchmail.c:1148
 #, 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:1186
+#: fetchmail.c:1187
 #, fuzzy
 msgid ""
 "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
 "\" is not the first record.\n"
 msgstr "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 
-#: fetchmail.c:1316
+#: fetchmail.c:1317
 msgid "SSL support is not compiled in.\n"
 msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1323
+#: fetchmail.c:1324
 #, fuzzy
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
 msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1329
+#: fetchmail.c:1330
 #, fuzzy
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
 msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1335
+#: fetchmail.c:1336
 #, fuzzy
 msgid "GSSAPI support is configured, but not compiled in.\n"
 msgstr "SSL support is not compiled in.\n"
 
-#: fetchmail.c:1365
+#: fetchmail.c:1366
 #, 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:1376
+#: fetchmail.c:1377
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "warning: multidrop for %s requires envelope option!\n"
 
-#: fetchmail.c:1377
+#: fetchmail.c:1378
 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:1394
+#: fetchmail.c:1395
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
@@ -1005,315 +1005,315 @@ msgstr ""
 "fetchmail: %s configuration invalid, specify positive port number for "
 "service or port\n"
 
-#: fetchmail.c:1401
+#: fetchmail.c:1402
 #, 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:1419
+#: fetchmail.c:1420
 #, 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:1433
+#: fetchmail.c:1434
 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:1443
+#: fetchmail.c:1444
 msgid ""
 "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
 msgstr ""
 
-#: fetchmail.c:1467
+#: fetchmail.c:1468
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "terminated with signal %d\n"
 
-#: fetchmail.c:1540
+#: fetchmail.c:1541
 #, 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:1565
+#: fetchmail.c:1566
 msgid "POP2 support is not configured.\n"
 msgstr "POP2 support is not configured.\n"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1578
 msgid "POP3 support is not configured.\n"
 msgstr "POP3 support is not configured.\n"
 
-#: fetchmail.c:1587
+#: fetchmail.c:1588
 msgid "IMAP support is not configured.\n"
 msgstr "IMAP support is not configured.\n"
 
-#: fetchmail.c:1593
+#: fetchmail.c:1594
 msgid "ETRN support is not configured.\n"
 msgstr "ETRN support is not configured.\n"
 
-#: fetchmail.c:1601
+#: fetchmail.c:1602
 msgid "ODMR support is not configured.\n"
 msgstr "ODMR support is not configured.\n"
 
-#: fetchmail.c:1608
+#: fetchmail.c:1609
 msgid "unsupported protocol selected.\n"
 msgstr "unsupported protocol selected.\n"
 
-#: fetchmail.c:1619
+#: fetchmail.c:1620
 #, 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:1644
+#: fetchmail.c:1645
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "Poll interval is %d seconds\n"
 
-#: fetchmail.c:1646
+#: fetchmail.c:1647
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "Logfile is %s\n"
 
-#: fetchmail.c:1648
+#: fetchmail.c:1649
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile is %s\n"
 
-#: fetchmail.c:1651
+#: fetchmail.c:1652
 msgid "Progress messages will be logged via syslog\n"
 msgstr "Progress messages will be logged via syslog\n"
 
-#: fetchmail.c:1654
+#: fetchmail.c:1655
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail will masquerade and will not generate Received\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1657
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail will show progress dots even in logfiles.\n"
 
-#: fetchmail.c:1658
+#: fetchmail.c:1659
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 
-#: fetchmail.c:1662
+#: fetchmail.c:1663
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail will direct error mail to the postmaster.\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1665
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail will direct error mail to the sender.\n"
 
-#: fetchmail.c:1667
+#: fetchmail.c:1668
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 
-#: fetchmail.c:1669
+#: fetchmail.c:1670
 #, fuzzy
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail will direct error mail to the sender.\n"
 
-#: fetchmail.c:1676
+#: fetchmail.c:1677
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "Options for retrieving from %s@%s:\n"
 
-#: fetchmail.c:1680
+#: fetchmail.c:1681
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  Mail will be retrieved via %s\n"
 
-#: fetchmail.c:1683
+#: fetchmail.c:1684
 #, 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:1687
+#: fetchmail.c:1688
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  True name of server is %s.\n"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1691
 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:1691
+#: fetchmail.c:1692
 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:1695
+#: fetchmail.c:1696
 msgid "  Password will be prompted for.\n"
 msgstr "  Password will be prompted for.\n"
 
-#: fetchmail.c:1699
+#: fetchmail.c:1700
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP secret = \"%s\".\n"
 
-#: fetchmail.c:1702
+#: fetchmail.c:1703
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP id = \"%s\".\n"
 
-#: fetchmail.c:1705
+#: fetchmail.c:1706
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  Password = \"%s\".\n"
 
-#: fetchmail.c:1714
+#: fetchmail.c:1715
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  Protocol is KPOP with Kerberos %s authentication"
 
-#: fetchmail.c:1717
+#: fetchmail.c:1718
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  Protocol is %s"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1720
 #, c-format
 msgid " (using service %s)"
 msgstr " (using service %s)"
 
-#: fetchmail.c:1721
+#: fetchmail.c:1722
 msgid " (using default port)"
 msgstr " (using default port)"
 
-#: fetchmail.c:1723
+#: fetchmail.c:1724
 msgid " (forcing UIDL use)"
 msgstr " (forcing UIDL use)"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1730
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  All available authentication methods will be tried.\n"
 
-#: fetchmail.c:1732
+#: fetchmail.c:1733
 msgid "  Password authentication will be forced.\n"
 msgstr "  Password authentication will be forced.\n"
 
-#: fetchmail.c:1735
+#: fetchmail.c:1736
 msgid "  MSN authentication will be forced.\n"
 msgstr "  MSN authentication will be forced.\n"
 
-#: fetchmail.c:1738
+#: fetchmail.c:1739
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  NTLM authentication will be forced.\n"
 
-#: fetchmail.c:1741
+#: fetchmail.c:1742
 msgid "  OTP authentication will be forced.\n"
 msgstr "  OTP authentication will be forced.\n"
 
-#: fetchmail.c:1744
+#: fetchmail.c:1745
 #, fuzzy
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  CRAM-Md5 authentication will be forced.\n"
 
-#: fetchmail.c:1747
+#: fetchmail.c:1748
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  GSSAPI authentication will be forced.\n"
 
-#: fetchmail.c:1750
+#: fetchmail.c:1751
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  Kerberos V4 authentication will be forced.\n"
 
-#: fetchmail.c:1753
+#: fetchmail.c:1754
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  Kerberos V5 authentication will be forced.\n"
 
-#: fetchmail.c:1756
+#: fetchmail.c:1757
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  End-to-end encryption assumed.\n"
 
-#: fetchmail.c:1760
+#: fetchmail.c:1761
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  Mail service principal is: %s\n"
 
-#: fetchmail.c:1763
+#: fetchmail.c:1764
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  SSL encrypted sessions enabled.\n"
 
-#: fetchmail.c:1765
+#: fetchmail.c:1766
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL protocol: %s.\n"
 
-#: fetchmail.c:1767
+#: fetchmail.c:1768
 msgid "  SSL server certificate checking enabled.\n"
 msgstr "  SSL server certificate checking enabled.\n"
 
-#: fetchmail.c:1769
+#: fetchmail.c:1770
 #, fuzzy
 msgid "  SSL server certificate checking disabled.\n"
 msgstr "  SSL server certificate checking enabled.\n"
 
-#: fetchmail.c:1772
+#: fetchmail.c:1773
 #, fuzzy, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  SSL trusted certificate directory: %s\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1775
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL trusted certificate directory: %s\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1777
 #, fuzzy, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "Server CommonName: %s\n"
 
-#: fetchmail.c:1778
+#: fetchmail.c:1779
 #, 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:1781
+#: fetchmail.c:1782
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  Server nonresponse timeout is %d seconds"
 
-#: fetchmail.c:1783
+#: fetchmail.c:1784
 msgid " (default).\n"
 msgstr " (default).\n"
 
-#: fetchmail.c:1790
+#: fetchmail.c:1791
 msgid "  Default mailbox selected.\n"
 msgstr "  Default mailbox selected.\n"
 
-#: fetchmail.c:1795
+#: fetchmail.c:1796
 msgid "  Selected mailboxes are:"
 msgstr "  Selected mailboxes are:"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1802
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  All messages will be retrieved (--all on).\n"
 
-#: fetchmail.c:1802
+#: fetchmail.c:1803
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  Only new messages will be retrieved (--all off).\n"
 
-#: fetchmail.c:1804
+#: fetchmail.c:1805
 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:1805
+#: fetchmail.c:1806
 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:1807
+#: fetchmail.c:1808
 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:1808
+#: fetchmail.c:1809
 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:1810
+#: fetchmail.c:1811
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
@@ -1321,7 +1321,7 @@ msgstr ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1812
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
@@ -1329,334 +1329,334 @@ msgstr ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1814
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 
-#: fetchmail.c:1814
+#: fetchmail.c:1815
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 
-#: fetchmail.c:1816
+#: fetchmail.c:1817
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  Carriage-return stripping is enabled (stripcr on).\n"
 
-#: fetchmail.c:1817
+#: fetchmail.c:1818
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  Carriage-return stripping is disabled (stripcr off).\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1820
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  Carriage-return forcing is enabled (forcecr on).\n"
 
-#: fetchmail.c:1820
+#: fetchmail.c:1821
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  Carriage-return forcing is disabled (forcecr off).\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1823
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 
-#: fetchmail.c:1823
+#: fetchmail.c:1824
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 
-#: fetchmail.c:1825
+#: fetchmail.c:1826
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  MIME decoding is enabled (mimedecode on).\n"
 
-#: fetchmail.c:1826
+#: fetchmail.c:1827
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  MIME decoding is disabled (mimedecode off).\n"
 
-#: fetchmail.c:1828
+#: fetchmail.c:1829
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  Idle after poll is enabled (idle on).\n"
 
-#: fetchmail.c:1829
+#: fetchmail.c:1830
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  Idle after poll is disabled (idle off).\n"
 
-#: fetchmail.c:1831
+#: fetchmail.c:1832
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  Nonempty Status lines will be discarded (dropstatus on)\n"
 
-#: fetchmail.c:1832
+#: fetchmail.c:1833
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  Nonempty Status lines will be kept (dropstatus off)\n"
 
-#: fetchmail.c:1834
+#: fetchmail.c:1835
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  Delivered-To lines will be discarded (dropdelivered on)\n"
 
-#: fetchmail.c:1835
+#: fetchmail.c:1836
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  Delivered-To lines will be kept (dropdelivered off)\n"
 
-#: fetchmail.c:1839
+#: fetchmail.c:1840
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  Message size limit is %d octets (--limit %d).\n"
 
-#: fetchmail.c:1842
+#: fetchmail.c:1843
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  No message size limit (--limit 0).\n"
 
-#: fetchmail.c:1844
+#: fetchmail.c:1845
 #, 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:1847
+#: fetchmail.c:1848
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  Size warnings on every poll (--warnings 0).\n"
 
-#: fetchmail.c:1850
+#: fetchmail.c:1851
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  Received-message limit is %d (--fetchlimit %d).\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1854
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  No received-message limit (--fetchlimit 0).\n"
 
-#: fetchmail.c:1855
+#: fetchmail.c:1856
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1858
+#: fetchmail.c:1859
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  No fetch message size limit (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1862
+#: fetchmail.c:1863
 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:1864
+#: fetchmail.c:1865
 #, 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:1867
+#: fetchmail.c:1868
 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:1869
+#: fetchmail.c:1870
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  SMTP message batch limit is %d.\n"
 
-#: fetchmail.c:1871
+#: fetchmail.c:1872
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  No SMTP message batch limit (--batchlimit 0).\n"
 
-#: fetchmail.c:1875
+#: fetchmail.c:1876
 #, 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:1877
+#: fetchmail.c:1878
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  No forced expunges (--expunge 0).\n"
 
-#: fetchmail.c:1884
+#: fetchmail.c:1885
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  Domains for which mail will be fetched are:"
 
-#: fetchmail.c:1889 fetchmail.c:1909
+#: fetchmail.c:1890 fetchmail.c:1910
 msgid " (default)"
 msgstr " (default)"
 
-#: fetchmail.c:1894
+#: fetchmail.c:1895
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  Messages will be appended to %s as BSMTP\n"
 
-#: fetchmail.c:1896
+#: fetchmail.c:1897
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  Messages will be delivered with \"%s\".\n"
 
-#: fetchmail.c:1903
+#: fetchmail.c:1904
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  Messages will be %cMTP-forwarded to:"
 
-#: fetchmail.c:1914
+#: fetchmail.c:1915
 #, 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:1917
+#: fetchmail.c:1918
 #, 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:1926
+#: fetchmail.c:1927
 msgid "  Recognized listener spam block responses are:"
 msgstr "  Recognized listener spam block responses are:"
 
-#: fetchmail.c:1932
+#: fetchmail.c:1933
 msgid "  Spam-blocking disabled\n"
 msgstr "  Spam-blocking disabled\n"
 
-#: fetchmail.c:1935
+#: fetchmail.c:1936
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  Server connection will be brought up with \"%s\".\n"
 
-#: fetchmail.c:1938
+#: fetchmail.c:1939
 msgid "  No pre-connection command.\n"
 msgstr "  No pre-connection command.\n"
 
-#: fetchmail.c:1940
+#: fetchmail.c:1941
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  Server connection will be taken down with \"%s\".\n"
 
-#: fetchmail.c:1943
+#: fetchmail.c:1944
 msgid "  No post-connection command.\n"
 msgstr "  No post-connection command.\n"
 
-#: fetchmail.c:1946
+#: fetchmail.c:1947
 msgid "  No localnames declared for this host.\n"
 msgstr "  No localnames declared for this host.\n"
 
-#: fetchmail.c:1956
+#: fetchmail.c:1957
 msgid "  Multi-drop mode: "
 msgstr "  Multi-drop mode: "
 
-#: fetchmail.c:1958
+#: fetchmail.c:1959
 msgid "  Single-drop mode: "
 msgstr "  Single-drop mode: "
 
-#: fetchmail.c:1960
+#: fetchmail.c:1961
 #, 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:1975
+#: fetchmail.c:1976
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  DNS lookup for multidrop addresses is enabled.\n"
 
-#: fetchmail.c:1976
+#: fetchmail.c:1977
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  DNS lookup for multidrop addresses is disabled.\n"
 
-#: fetchmail.c:1980
+#: fetchmail.c:1981
 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:1982
+#: fetchmail.c:1983
 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:1985
+#: fetchmail.c:1986
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  Envelope-address routing is disabled\n"
 
-#: fetchmail.c:1988
+#: fetchmail.c:1989
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Envelope header is assumed to be: %s\n"
 
-#: fetchmail.c:1991
+#: fetchmail.c:1992
 #, 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:1994
+#: fetchmail.c:1995
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  Prefix %s will be removed from user id\n"
 
-#: fetchmail.c:1997
+#: fetchmail.c:1998
 msgid "  No prefix stripping\n"
 msgstr "  No prefix stripping\n"
 
-#: fetchmail.c:2002
+#: fetchmail.c:2003
 msgid "  Predeclared mailserver aliases:"
 msgstr "  Predeclared mailserver aliases:"
 
-#: fetchmail.c:2010
+#: fetchmail.c:2011
 msgid "  Local domains:"
 msgstr "  Local domains:"
 
-#: fetchmail.c:2020
+#: fetchmail.c:2021
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  Connection must be through interface %s.\n"
 
-#: fetchmail.c:2022
+#: fetchmail.c:2023
 msgid "  No interface requirement specified.\n"
 msgstr "  No interface requirement specified.\n"
 
-#: fetchmail.c:2024
+#: fetchmail.c:2025
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  Polling loop will monitor %s.\n"
 
-#: fetchmail.c:2026
+#: fetchmail.c:2027
 msgid "  No monitor interface specified.\n"
 msgstr "  No monitor interface specified.\n"
 
-#: fetchmail.c:2030
+#: fetchmail.c:2031
 #, 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:2032
+#: fetchmail.c:2033
 msgid "  No plugin command specified.\n"
 msgstr "  No plugin command specified.\n"
 
-#: fetchmail.c:2034
+#: fetchmail.c:2035
 #, 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:2036
+#: fetchmail.c:2037
 msgid "  No plugout command specified.\n"
 msgstr "  No plugout command specified.\n"
 
-#: fetchmail.c:2043
+#: fetchmail.c:2044
 msgid "  No UIDs saved from this host.\n"
 msgstr "  No UIDs saved from this host.\n"
 
-#: fetchmail.c:2046
+#: fetchmail.c:2047
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  %d UIDs saved.\n"
 
-#: fetchmail.c:2052
+#: fetchmail.c:2053
 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:2054
+#: fetchmail.c:2055
 #, 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:2059
+#: fetchmail.c:2060
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr ""
 
-#: fetchmail.c:2062
+#: fetchmail.c:2063
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr ""
 
-#: fetchmail.c:2067
+#: fetchmail.c:2068
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  Pass-through properties \"%s\".\n"
@@ -2007,18 +2007,35 @@ msgid "fetchmail: error reading lockfile \"%s\": %s\n"
 msgstr "fetchmail: error reading lockfile \"%s\": %s\n"
 
 #: lock.c:98
-msgid "fetchmail: removing stale lockfile\n"
+#, fuzzy, c-format
+msgid "fetchmail: removing stale lockfile \"%s\"\n"
 msgstr "fetchmail: removing stale lockfile\n"
 
-#: lock.c:122
+#: lock.c:102
+#, fuzzy, c-format
+msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
+msgstr "fetchmail: error opening lockfile \"%s\": %s\n"
+
+#: lock.c:116
+#, fuzzy, c-format
+msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n"
+msgstr "fetchmail: error reading lockfile \"%s\": %s\n"
+
+#: lock.c:126
 #, c-format
 msgid "fetchmail: error opening lockfile \"%s\": %s\n"
 msgstr "fetchmail: error opening lockfile \"%s\": %s\n"
 
-#: lock.c:169
-msgid "fetchmail: lock creation failed.\n"
+#: lock.c:176
+#, fuzzy, c-format
+msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n"
 msgstr "fetchmail: lock creation failed.\n"
 
+#: lock.c:187
+#, fuzzy, c-format
+msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n"
+msgstr "fetchmail: error reading lockfile \"%s\": %s\n"
+
 #: netrc.c:220
 #, c-format
 msgid "%s:%d: warning: found \"%s\" before any host names\n"