Update .pot file after driver.c changes.

svn path=/trunk/; revision=3931

1 files changed, 311 insertions, 358 deletions

diff --git a/po/fetchmail.pot b/po/fetchmail.pot
index 1673323e..41d91aa2 100644
--- a/po/fetchmail.pot
+++ b/po/fetchmail.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) YEAR Eric S. Raymond
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -7,14 +7,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-17 22:56-0400\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2004-08-20 14:58+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: checkalias.c:171
 #, c-format
@@ -29,7 +30,7 @@ msgstr ""
 msgid "No, their IP addresses don't match\n"
 msgstr ""
 
-#: checkalias.c:199 checkalias.c:225
+#: checkalias.c:199 checkalias.c:224
 #, c-format
 msgid "nameserver failure while looking for `%s' during poll of %s.\n"
 msgstr ""
@@ -76,16 +77,6 @@ msgstr ""
 msgid "skipping message %s@%s:%d (%d octets)"
 msgstr ""
 
-#.
-#. * Invalid lengths are produced by Post Office/NT's
-#. * annoying habit of randomly prepending bogus
-#. * LIST items of length -1.  Patrick Audley
-#. * <paudley@pobox.com> tells us: LIST shows a
-#. * size of -1, RETR and TOP return "-ERR
-#. * System error - couldn't open message", and
-#. * DELE succeeds but doesn't actually delete
-#. * the message.
-#.
 #: driver.c:565
 msgid " (length -1)"
 msgstr ""
@@ -141,47 +132,47 @@ msgstr ""
 msgid "fetchlimit %d reached; %d messages left on server %s account %s\n"
 msgstr ""
 
-#: driver.c:869
+#: driver.c:870
 msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
 msgstr ""
 
-#: driver.c:876
+#: driver.c:877
 #, c-format
 msgid "timeout after %d seconds waiting to connect to server %s.\n"
 msgstr ""
 
-#: driver.c:880
+#: driver.c:881
 #, c-format
 msgid "timeout after %d seconds waiting for server %s.\n"
 msgstr ""
 
-#: driver.c:884
+#: driver.c:885
 #, c-format
 msgid "timeout after %d seconds waiting for %s.\n"
 msgstr ""
 
-#: driver.c:889
+#: driver.c:890
 #, c-format
 msgid "timeout after %d seconds waiting for listener to respond.\n"
 msgstr ""
 
-#: driver.c:892
+#: driver.c:893
 #, c-format
 msgid "timeout after %d seconds.\n"
 msgstr ""
 
-#: driver.c:904
+#: driver.c:905
 msgid "Subject: fetchmail sees repeated timeouts\n"
 msgstr ""
 
-#: driver.c:906
+#: driver.c:907
 #, c-format
 msgid ""
 "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%"
 "s.\n"
 msgstr ""
 
-#: driver.c:911
+#: driver.c:912
 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"
@@ -358,7 +349,6 @@ msgstr ""
 msgid "%s at %s"
 msgstr ""
 
-#. only used for ETRN
 #: driver.c:1358
 #, c-format
 msgid "Polling %s\n"
@@ -366,25 +356,23 @@ msgstr ""
 
 #: driver.c:1362
 #, c-format
-msgid "%d %s (%d %s) for %s"
-msgstr ""
-
-#: driver.c:1363 driver.c:1370
-msgid "messages"
-msgstr ""
-
-#: driver.c:1364 driver.c:1371
-msgid "message"
-msgstr ""
+msgid "%d message (%d %s) for %s"
+msgid_plural "%d messages (%d %s) for %s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: driver.c:1366
+#: driver.c:1365
 msgid "seen"
-msgstr ""
+msgid_plural "seen"
+msgstr[0] ""
+msgstr[1] ""
 
-#: driver.c:1369
+#: driver.c:1368
 #, c-format
-msgid "%d %s for %s"
-msgstr ""
+msgid "%d message for %s"
+msgid_plural "%d messages for %s"
+msgstr[0] ""
+msgstr[1] ""
 
 #: driver.c:1375
 #, c-format
@@ -535,24 +523,20 @@ msgstr ""
 msgid "Pending messages for %s started\n"
 msgstr ""
 
-#. Unable to queue messages for node <x>
 #: etrn.c:92
 #, c-format
 msgid "Unable to queue messages for node %s\n"
 msgstr ""
 
-#. Node <x> not allowed: <reason>
 #: etrn.c:96
 #, c-format
 msgid "Node %s not allowed: %s\n"
 msgstr ""
 
-#. Syntax Error
 #: etrn.c:100
 msgid "ETRN syntax error\n"
 msgstr ""
 
-#. Syntax Error in Parameters
 #: etrn.c:104
 msgid "ETRN syntax error in parameters\n"
 msgstr ""
@@ -591,848 +575,844 @@ msgstr ""
 msgid "This is fetchmail release %s"
 msgstr ""
 
-#: fetchmail.c:329
+#: fetchmail.c:332
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr ""
 
-#: fetchmail.c:330
+#: fetchmail.c:333
 msgid " and "
 msgstr ""
 
-#: fetchmail.c:335
+#: fetchmail.c:338
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr ""
 
-#: fetchmail.c:356
+#: fetchmail.c:359
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr ""
 
-#: fetchmail.c:365 fetchmail.c:374
+#: fetchmail.c:368 fetchmail.c:377
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr ""
 
-#: fetchmail.c:380
+#: fetchmail.c:383
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
 msgstr ""
 
-#: fetchmail.c:381 fetchmail.c:387
+#: fetchmail.c:384 fetchmail.c:390
 msgid "background"
 msgstr ""
 
-#: fetchmail.c:381 fetchmail.c:387
+#: fetchmail.c:384 fetchmail.c:390
 msgid "foreground"
 msgstr ""
 
-#: fetchmail.c:386
+#: fetchmail.c:389
 #, c-format
 msgid "fetchmail: %s fetchmail at %d killed.\n"
 msgstr ""
 
-#: fetchmail.c:402
+#: fetchmail.c:405
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
 msgstr ""
 
-#: fetchmail.c:408
+#: fetchmail.c:411
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
 msgstr ""
 
-#: fetchmail.c:415
+#: fetchmail.c:418
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %d.\n"
 msgstr ""
 
-#: fetchmail.c:425
+#: fetchmail.c:428
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr ""
 
-#: fetchmail.c:431
+#: fetchmail.c:434
 #, c-format
 msgid "fetchmail: background fetchmail at %d awakened.\n"
 msgstr ""
 
-#: fetchmail.c:443
+#: fetchmail.c:446
 #, c-format
 msgid "fetchmail: elder sibling at %d died mysteriously.\n"
 msgstr ""
 
-#: fetchmail.c:458
+#: fetchmail.c:461
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr ""
 
-#: fetchmail.c:464
+#: fetchmail.c:467
 #, c-format
 msgid "Enter password for %s@%s: "
 msgstr ""
 
-#: fetchmail.c:495
+#: fetchmail.c:498
 #, c-format
 msgid "starting fetchmail %s daemon \n"
 msgstr ""
 
-#: fetchmail.c:510 fetchmail.c:512
+#: fetchmail.c:513 fetchmail.c:515
 #, c-format
 msgid "could not open %s to append logs to \n"
 msgstr ""
 
-#: fetchmail.c:550
+#: fetchmail.c:553
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
 msgstr ""
 
-#: fetchmail.c:555
+#: fetchmail.c:558
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr ""
 
-#: fetchmail.c:560
+#: fetchmail.c:563
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr ""
 
-#: fetchmail.c:587
+#: fetchmail.c:590
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr ""
 
-#: fetchmail.c:615
+#: fetchmail.c:618
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr ""
 
-#: fetchmail.c:627
+#: fetchmail.c:630
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr ""
 
-#: fetchmail.c:665
+#: fetchmail.c:668
 msgid "Query status=0 (SUCCESS)\n"
 msgstr ""
 
-#: fetchmail.c:667
+#: fetchmail.c:670
 msgid "Query status=1 (NOMAIL)\n"
 msgstr ""
 
-#: fetchmail.c:669
+#: fetchmail.c:672
 msgid "Query status=2 (SOCKET)\n"
 msgstr ""
 
-#: fetchmail.c:671
+#: fetchmail.c:674
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr ""
 
-#: fetchmail.c:673
+#: fetchmail.c:676
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr ""
 
-#: fetchmail.c:675
+#: fetchmail.c:678
 msgid "Query status=5 (SYNTAX)\n"
 msgstr ""
 
-#: fetchmail.c:677
+#: fetchmail.c:680
 msgid "Query status=6 (IOERR)\n"
 msgstr ""
 
-#: fetchmail.c:679
+#: fetchmail.c:682
 msgid "Query status=7 (ERROR)\n"
 msgstr ""
 
-#: fetchmail.c:681
+#: fetchmail.c:684
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr ""
 
-#: fetchmail.c:683
+#: fetchmail.c:686
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr ""
 
-#: fetchmail.c:685
+#: fetchmail.c:688
 msgid "Query status=10 (SMTP)\n"
 msgstr ""
 
-#: fetchmail.c:687
+#: fetchmail.c:690
 msgid "Query status=11 (DNS)\n"
 msgstr ""
 
-#: fetchmail.c:689
+#: fetchmail.c:692
 msgid "Query status=12 (BSMTP)\n"
 msgstr ""
 
-#: fetchmail.c:691
+#: fetchmail.c:694
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr ""
 
-#: fetchmail.c:693
+#: fetchmail.c:696
 #, c-format
 msgid "Query status=%d\n"
 msgstr ""
 
-#: fetchmail.c:739
+#: fetchmail.c:742
 msgid "All connections are wedged.  Exiting.\n"
 msgstr ""
 
-#: fetchmail.c:746
+#: fetchmail.c:749
 #, c-format
 msgid "sleeping at %s\n"
 msgstr ""
 
-#: fetchmail.c:770
+#: fetchmail.c:773
 #, c-format
 msgid "awakened by %s\n"
 msgstr ""
 
-#: fetchmail.c:773
+#: fetchmail.c:776
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr ""
 
-#: fetchmail.c:780
+#: fetchmail.c:783
 #, c-format
 msgid "awakened at %s\n"
 msgstr ""
 
-#: fetchmail.c:786
+#: fetchmail.c:789
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr ""
 
-#: fetchmail.c:939
+#: fetchmail.c:942
 msgid "couldn't time-check the run-control file\n"
 msgstr ""
 
-#: fetchmail.c:972
+#: fetchmail.c:975
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr ""
 
-#: fetchmail.c:1114
+#: fetchmail.c:1117
 msgid "SSL support is not compiled in.\n"
 msgstr ""
 
-#: fetchmail.c:1147
+#: fetchmail.c:1150
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr ""
 
-#: fetchmail.c:1164
+#: fetchmail.c:1167
 #, c-format
 msgid "%s configuration invalid, port number cannot be negative\n"
 msgstr ""
 
-#: fetchmail.c:1171
+#: fetchmail.c:1174
 #, c-format
 msgid "%s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 
-#: fetchmail.c:1187
+#: fetchmail.c:1190
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr ""
 
-#: fetchmail.c:1202
+#: fetchmail.c:1205
 msgid "Both fetchall and keep on in daemon mode is a mistake!\n"
 msgstr ""
 
-#: fetchmail.c:1252
+#: fetchmail.c:1255
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr ""
 
-#: fetchmail.c:1337
+#: fetchmail.c:1340
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr ""
 
-#: fetchmail.c:1362
+#: fetchmail.c:1365
 msgid "POP2 support is not configured.\n"
 msgstr ""
 
-#: fetchmail.c:1374
+#: fetchmail.c:1377
 msgid "POP3 support is not configured.\n"
 msgstr ""
 
-#: fetchmail.c:1384
+#: fetchmail.c:1387
 msgid "IMAP support is not configured.\n"
 msgstr ""
 
-#: fetchmail.c:1390
+#: fetchmail.c:1393
 msgid "ETRN support is not configured.\n"
 msgstr ""
 
-#: fetchmail.c:1396
+#: fetchmail.c:1399
 msgid "Cannot support ETRN without gethostbyname(2).\n"
 msgstr ""
 
-#: fetchmail.c:1403
+#: fetchmail.c:1406
 msgid "ODMR support is not configured.\n"
 msgstr ""
 
-#: fetchmail.c:1409
+#: fetchmail.c:1412
 msgid "Cannot support ODMR without gethostbyname(2).\n"
 msgstr ""
 
-#: fetchmail.c:1415
+#: fetchmail.c:1418
 msgid "unsupported protocol selected.\n"
 msgstr ""
 
-#: fetchmail.c:1425
+#: fetchmail.c:1428
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr ""
 
-#: fetchmail.c:1442
+#: fetchmail.c:1445
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr ""
 
-#: fetchmail.c:1444
+#: fetchmail.c:1447
 #, c-format
 msgid "Logfile is %s\n"
 msgstr ""
 
-#: fetchmail.c:1446
+#: fetchmail.c:1449
 #, c-format
 msgid "Idfile is %s\n"
 msgstr ""
 
-#: fetchmail.c:1449
+#: fetchmail.c:1452
 msgid "Progress messages will be logged via syslog\n"
 msgstr ""
 
-#: fetchmail.c:1452
+#: fetchmail.c:1455
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr ""
 
-#: fetchmail.c:1454
+#: fetchmail.c:1457
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr ""
 
-#: fetchmail.c:1456
+#: fetchmail.c:1459
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr ""
 
-#: fetchmail.c:1460
+#: fetchmail.c:1463
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr ""
 
-#: fetchmail.c:1462
+#: fetchmail.c:1465
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr ""
 
-#: fetchmail.c:1469
+#: fetchmail.c:1472
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr ""
 
-#: fetchmail.c:1473
+#: fetchmail.c:1476
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr ""
 
-#: fetchmail.c:1476
+#: fetchmail.c:1479
 #, c-format
 msgid "  Poll of this server will occur every %d intervals.\n"
 msgstr ""
 
-#: fetchmail.c:1479
+#: fetchmail.c:1482
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr ""
 
-#: fetchmail.c:1481
+#: fetchmail.c:1484
 #, c-format
 msgid "  This host %s be queried when no host is specified.\n"
 msgstr ""
 
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
+#: fetchmail.c:1485 fetchmail.c:1600 fetchmail.c:1603
 msgid "will not"
 msgstr ""
 
-#: fetchmail.c:1482 fetchmail.c:1597 fetchmail.c:1600
+#: fetchmail.c:1485 fetchmail.c:1600 fetchmail.c:1603
 msgid "will"
 msgstr ""
 
-#: fetchmail.c:1486
+#: fetchmail.c:1489
 msgid "  Password will be prompted for.\n"
 msgstr ""
 
-#: fetchmail.c:1490
+#: fetchmail.c:1493
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1493
+#: fetchmail.c:1496
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1496
+#: fetchmail.c:1499
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1509
+#: fetchmail.c:1512
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr ""
 
-#: fetchmail.c:1512
+#: fetchmail.c:1515
 #, c-format
 msgid "  Protocol is %s"
 msgstr ""
 
-#: fetchmail.c:1515
+#: fetchmail.c:1518
 #, c-format
 msgid " (using service %s)"
 msgstr ""
 
-#: fetchmail.c:1517
+#: fetchmail.c:1520
 #, c-format
 msgid " (using network security options %s)"
 msgstr ""
 
-#: fetchmail.c:1520
+#: fetchmail.c:1523
 #, c-format
 msgid " (using port %d)"
 msgstr ""
 
-#: fetchmail.c:1523
+#: fetchmail.c:1526
 msgid " (using default port)"
 msgstr ""
 
-#: fetchmail.c:1525
+#: fetchmail.c:1528
 msgid " (forcing UIDL use)"
 msgstr ""
 
-#: fetchmail.c:1531
+#: fetchmail.c:1534
 msgid "  All available authentication methods will be tried.\n"
 msgstr ""
 
-#: fetchmail.c:1534
+#: fetchmail.c:1537
 msgid "  Password authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1537
+#: fetchmail.c:1540
 msgid "  NTLM authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1540
+#: fetchmail.c:1543
 msgid "  OTP authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1543
+#: fetchmail.c:1546
 msgid "  CRAM-Md5 authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1546
+#: fetchmail.c:1549
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1549
+#: fetchmail.c:1552
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1552
+#: fetchmail.c:1555
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr ""
 
-#: fetchmail.c:1555
+#: fetchmail.c:1558
 msgid "  End-to-end encryption assumed.\n"
 msgstr ""
 
-#: fetchmail.c:1559
+#: fetchmail.c:1562
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr ""
 
-#: fetchmail.c:1562
+#: fetchmail.c:1565
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1564
+#: fetchmail.c:1567
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr ""
 
-#: fetchmail.c:1566
+#: fetchmail.c:1569
 msgid "  SSL server certificate checking enabled.\n"
 msgstr ""
 
-#: fetchmail.c:1568
+#: fetchmail.c:1571
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr ""
 
-#: fetchmail.c:1571
+#: fetchmail.c:1574
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr ""
 
-#: fetchmail.c:1574
+#: fetchmail.c:1577
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr ""
 
-#: fetchmail.c:1576
+#: fetchmail.c:1579
 msgid " (default).\n"
 msgstr ""
 
-#: fetchmail.c:1583
+#: fetchmail.c:1586
 msgid "  Default mailbox selected.\n"
 msgstr ""
 
-#: fetchmail.c:1588
+#: fetchmail.c:1591
 msgid "  Selected mailboxes are:"
 msgstr ""
 
-#: fetchmail.c:1593
+#: fetchmail.c:1596
 #, c-format
 msgid "  %s messages will be retrieved (--all %s).\n"
 msgstr ""
 
-#: fetchmail.c:1594
+#: fetchmail.c:1597
 msgid "All"
 msgstr ""
 
-#: fetchmail.c:1594
+#: fetchmail.c:1597
 msgid "Only new"
 msgstr ""
 
-#: fetchmail.c:1596
+#: fetchmail.c:1599
 #, c-format
 msgid "  Fetched messages %s be kept on the server (--keep %s).\n"
 msgstr ""
 
-#: fetchmail.c:1599
+#: fetchmail.c:1602
 #, c-format
 msgid "  Old messages %s be flushed before message retrieval (--flush %s).\n"
 msgstr ""
 
-#: fetchmail.c:1602
+#: fetchmail.c:1605
 #, c-format
 msgid "  Rewrite of server-local addresses is %s (--norewrite %s).\n"
 msgstr ""
 
-#: fetchmail.c:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
+#: fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612 fetchmail.c:1615
+#: fetchmail.c:1618 fetchmail.c:1621 fetchmail.c:1768
 msgid "enabled"
 msgstr ""
 
-#: fetchmail.c:1603 fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612
-#: fetchmail.c:1615 fetchmail.c:1618 fetchmail.c:1765
+#: fetchmail.c:1606 fetchmail.c:1609 fetchmail.c:1612 fetchmail.c:1615
+#: fetchmail.c:1618 fetchmail.c:1621 fetchmail.c:1768
 msgid "disabled"
 msgstr ""
 
-#: fetchmail.c:1605
+#: fetchmail.c:1608
 #, c-format
 msgid "  Carriage-return stripping is %s (stripcr %s).\n"
 msgstr ""
 
-#: fetchmail.c:1608
+#: fetchmail.c:1611
 #, c-format
 msgid "  Carriage-return forcing is %s (forcecr %s).\n"
 msgstr ""
 
-#: fetchmail.c:1611
+#: fetchmail.c:1614
 #, c-format
 msgid "  Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"
 msgstr ""
 
-#: fetchmail.c:1614
+#: fetchmail.c:1617
 #, c-format
 msgid "  MIME decoding is %s (mimedecode %s).\n"
 msgstr ""
 
-#: fetchmail.c:1617
+#: fetchmail.c:1620
 #, c-format
 msgid "  Idle after poll is %s (idle %s).\n"
 msgstr ""
 
-#: fetchmail.c:1620
+#: fetchmail.c:1623
 #, c-format
 msgid "  Nonempty Status lines will be %s (dropstatus %s)\n"
 msgstr ""
 
-#: fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1624 fetchmail.c:1627
 msgid "discarded"
 msgstr ""
 
-#: fetchmail.c:1621 fetchmail.c:1624
+#: fetchmail.c:1624 fetchmail.c:1627
 msgid "kept"
 msgstr ""
 
-#: fetchmail.c:1623
+#: fetchmail.c:1626
 #, c-format
 msgid "  Delivered-To lines will be %s (dropdelivered %s)\n"
 msgstr ""
 
-#: fetchmail.c:1629
+#: fetchmail.c:1632
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr ""
 
-#: fetchmail.c:1632
+#: fetchmail.c:1635
 msgid "  No message size limit (--limit 0).\n"
 msgstr ""
 
-#: fetchmail.c:1634
+#: fetchmail.c:1637
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr ""
 
-#: fetchmail.c:1637
+#: fetchmail.c:1640
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr ""
 
-#: fetchmail.c:1640
+#: fetchmail.c:1643
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr ""
 
-#: fetchmail.c:1643
+#: fetchmail.c:1646
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr ""
 
-#: fetchmail.c:1645
+#: fetchmail.c:1648
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr ""
 
-#: fetchmail.c:1648
+#: fetchmail.c:1651
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr ""
 
-#: fetchmail.c:1652
+#: fetchmail.c:1655
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr ""
 
-#: fetchmail.c:1654
+#: fetchmail.c:1657
 #, c-format
 msgid "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr ""
 
-#: fetchmail.c:1657
+#: fetchmail.c:1660
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr ""
 
-#: fetchmail.c:1659
+#: fetchmail.c:1662
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr ""
 
-#: fetchmail.c:1661
+#: fetchmail.c:1664
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr ""
 
-#: fetchmail.c:1665
+#: fetchmail.c:1668
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr ""
 
-#: fetchmail.c:1667
+#: fetchmail.c:1670
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr ""
 
-#: fetchmail.c:1674
+#: fetchmail.c:1677
 msgid "  Domains for which mail will be fetched are:"
 msgstr ""
 
-#: fetchmail.c:1679 fetchmail.c:1699
+#: fetchmail.c:1682 fetchmail.c:1702
 msgid " (default)"
 msgstr ""
 
-#: fetchmail.c:1684
+#: fetchmail.c:1687
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr ""
 
-#: fetchmail.c:1686
+#: fetchmail.c:1689
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1693
+#: fetchmail.c:1696
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr ""
 
-#: fetchmail.c:1704
+#: fetchmail.c:1707
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr ""
 
-#: fetchmail.c:1707
+#: fetchmail.c:1710
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr ""
 
-#: fetchmail.c:1716
+#: fetchmail.c:1719
 msgid "  Recognized listener spam block responses are:"
 msgstr ""
 
-#: fetchmail.c:1722
+#: fetchmail.c:1725
 msgid "  Spam-blocking disabled\n"
 msgstr ""
 
-#: fetchmail.c:1725
+#: fetchmail.c:1728
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1728
+#: fetchmail.c:1731
 msgid "  No pre-connection command.\n"
 msgstr ""
 
-#: fetchmail.c:1730
+#: fetchmail.c:1733
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr ""
 
-#: fetchmail.c:1733
+#: fetchmail.c:1736
 msgid "  No post-connection command.\n"
 msgstr ""
 
-#: fetchmail.c:1736
+#: fetchmail.c:1739
 msgid "  No localnames declared for this host.\n"
 msgstr ""
 
-#: fetchmail.c:1746
+#: fetchmail.c:1749
 msgid "  Multi-drop mode: "
 msgstr ""
 
-#: fetchmail.c:1748
+#: fetchmail.c:1751
 msgid "  Single-drop mode: "
 msgstr ""
 
-#: fetchmail.c:1750
+#: fetchmail.c:1753
 #, c-format
 msgid "%d local name(s) recognized.\n"
 msgstr ""
 
-#: fetchmail.c:1764
+#: fetchmail.c:1767
 #, c-format
 msgid "  DNS lookup for multidrop addresses is %s.\n"
 msgstr ""
 
-#: fetchmail.c:1768
+#: fetchmail.c:1771
 msgid "  Server aliases will be compared with multidrop addresses by "
 msgstr ""
 
-#: fetchmail.c:1770
+#: fetchmail.c:1773
 msgid "IP address.\n"
 msgstr ""
 
-#: fetchmail.c:1772
+#: fetchmail.c:1775
 msgid "name.\n"
 msgstr ""
 
-#: fetchmail.c:1775
+#: fetchmail.c:1778
 msgid "  Envelope-address routing is disabled\n"
 msgstr ""
 
-#: fetchmail.c:1778
+#: fetchmail.c:1781
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr ""
 
-#: fetchmail.c:1779
+#: fetchmail.c:1782
 msgid "Received"
 msgstr ""
 
-#: fetchmail.c:1781
+#: fetchmail.c:1784
 #, c-format
 msgid "  Number of envelope header to be parsed: %d\n"
 msgstr ""
 
-#: fetchmail.c:1784
+#: fetchmail.c:1787
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr ""
 
-#: fetchmail.c:1787
+#: fetchmail.c:1790
 msgid "  No prefix stripping\n"
 msgstr ""
 
-#: fetchmail.c:1794
+#: fetchmail.c:1797
 msgid "  Predeclared mailserver aliases:"
 msgstr ""
 
-#: fetchmail.c:1803
+#: fetchmail.c:1806
 msgid "  Local domains:"
 msgstr ""
 
-#: fetchmail.c:1813
+#: fetchmail.c:1816
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr ""
 
-#: fetchmail.c:1815
+#: fetchmail.c:1818
 msgid "  No interface requirement specified.\n"
 msgstr ""
 
-#: fetchmail.c:1817
+#: fetchmail.c:1820
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr ""
 
-#: fetchmail.c:1819
+#: fetchmail.c:1822
 msgid "  No monitor interface specified.\n"
 msgstr ""
 
-#: fetchmail.c:1823
+#: fetchmail.c:1826
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr ""
 
-#: fetchmail.c:1825
+#: fetchmail.c:1828
 msgid "  No plugin command specified.\n"
 msgstr ""
 
-#: fetchmail.c:1827
+#: fetchmail.c:1830
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr ""
 
-#: fetchmail.c:1829
+#: fetchmail.c:1832
 msgid "  No plugout command specified.\n"
 msgstr ""
 
-#: fetchmail.c:1834
+#: fetchmail.c:1837
 msgid "  No UIDs saved from this host.\n"
 msgstr ""
 
-#: fetchmail.c:1843
+#: fetchmail.c:1846
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr ""
 
-#: fetchmail.c:1851
+#: fetchmail.c:1854
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr ""
 
-#: fetchmail.c:1853
+#: fetchmail.c:1856
 msgid ""
 "  No poll trace information will be added to the Received header.\n"
 ".\n"
 msgstr ""
 
-#: fetchmail.c:1856
+#: fetchmail.c:1859
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr ""
 
-#.
-#. * This is a hack to help xgettext which cannot find strings in
-#. * macro definitions like the one for xalloca above.
-#.
-#: fetchmail.h:596 fetchmail.h:602
+#: fetchmail.h:598 fetchmail.h:604
 msgid "alloca failed"
 msgstr ""
 
@@ -1519,55 +1499,55 @@ msgstr ""
 msgid "will idle after poll\n"
 msgstr ""
 
-#: imap.c:460
+#: imap.c:461
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr ""
 
-#: imap.c:482
+#: imap.c:483
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr ""
 
-#: imap.c:491
+#: imap.c:492
 msgid "Required LOGIN capability not supported by server\n"
 msgstr ""
 
-#: imap.c:641 imap.c:707
+#: imap.c:642 imap.c:708
 msgid "expunge failed\n"
 msgstr ""
 
-#: imap.c:663 imap.c:692
+#: imap.c:664 imap.c:693
 msgid "re-poll failed\n"
 msgstr ""
 
-#: imap.c:671
+#: imap.c:672
 #, c-format
 msgid "%d messages waiting after re-poll\n"
 msgstr ""
 
-#: imap.c:681
+#: imap.c:682
 msgid "mailbox selection failed\n"
 msgstr ""
 
-#: imap.c:685
+#: imap.c:686
 #, c-format
 msgid "%d messages waiting after first poll\n"
 msgstr ""
 
-#: imap.c:711
+#: imap.c:712
 #, c-format
 msgid "%d messages waiting after expunge\n"
 msgstr ""
 
-#: imap.c:734
+#: imap.c:735
 msgid "search for unseen messages failed\n"
 msgstr ""
 
-#: imap.c:764 pop3.c:663 pop3.c:675 pop3.c:892 pop3.c:899
+#: imap.c:765 pop3.c:663 pop3.c:675 pop3.c:892 pop3.c:899
 #, c-format
 msgid "%u is unseen\n"
 msgstr ""
 
-#: imap.c:776 pop3.c:684
+#: imap.c:777 pop3.c:684
 #, c-format
 msgid "%u is first unseen\n"
 msgstr ""
@@ -1598,7 +1578,6 @@ msgstr ""
 msgid "Routing message version %d not understood."
 msgstr ""
 
-#. we did not find an interface with a matching name
 #: interface.c:482
 #, c-format
 msgid "No interface found with name %s"
@@ -1709,7 +1688,6 @@ msgstr ""
 msgid "ATRN request refused.\n"
 msgstr ""
 
-#. Unable to process ATRN request now
 #: odmr.c:111
 msgid "Unable to process ATRN request now\n"
 msgstr ""
@@ -1718,12 +1696,10 @@ msgstr ""
 msgid "You have no mail.\n"
 msgstr ""
 
-#. Command not implemented
 #: odmr.c:120
 msgid "Command not implemented\n"
 msgstr ""
 
-#. Authentication required
 #: odmr.c:124
 msgid "Authentication required.\n"
 msgstr ""
@@ -2115,162 +2091,146 @@ msgstr ""
 msgid "File %s must be owned by you.\n"
 msgstr ""
 
-#: report.c:81
+#: report.c:77
 msgid "Unknown system error"
 msgstr ""
 
-#: report.c:108
+#: report.c:104
 #, c-format
 msgid "%s (log message incomplete)"
 msgstr ""
 
-#: report.c:266 report.c:294 report.c:366 report.c:394
+#: report.c:262 report.c:290 report.c:362 report.c:390
 msgid "partial error message buffer overflow"
 msgstr ""
 
-#: rfc822.c:74
+#: rfc822.c:76
 #, c-format
 msgid "About to rewrite %s"
 msgstr ""
 
-#: rfc822.c:210
+#: rfc822.c:212
 #, c-format
 msgid "Rewritten version is %s\n"
 msgstr ""
 
-#: rpa.c:116
-msgid "Success"
-msgstr ""
-
-#: rpa.c:117
-msgid "Restricted user (something wrong with account)"
-msgstr ""
-
-#: rpa.c:118
-msgid "Invalid userid or passphrase"
-msgstr ""
-
-#: rpa.c:119
-msgid "Deity error"
-msgstr ""
-
-#: rpa.c:172
+#: rpa.c:173
 msgid "RPA token 2: Base64 decode error\n"
 msgstr ""
 
-#: rpa.c:183
+#: rpa.c:184
 #, c-format
 msgid "Service chose RPA version %d.%d\n"
 msgstr ""
 
-#: rpa.c:189
+#: rpa.c:190
 #, c-format
 msgid "Service challenge (l=%d):\n"
 msgstr ""
 
-#: rpa.c:198
+#: rpa.c:199
 #, c-format
 msgid "Service timestamp %s\n"
 msgstr ""
 
-#: rpa.c:203
+#: rpa.c:204
 msgid "RPA token 2 length error\n"
 msgstr ""
 
-#: rpa.c:207
+#: rpa.c:208
 #, c-format
 msgid "Realm list: %s\n"
 msgstr ""
 
-#: rpa.c:211
+#: rpa.c:212
 msgid "RPA error in service@realm string\n"
 msgstr ""
 
-#: rpa.c:248
+#: rpa.c:249
 msgid "RPA token 4: Base64 decode error\n"
 msgstr ""
 
-#: rpa.c:259
+#: rpa.c:260
 #, c-format
 msgid "User authentication (l=%d):\n"
 msgstr ""
 
-#: rpa.c:273
+#: rpa.c:274
 #, c-format
 msgid "RPA status: %02X\n"
 msgstr ""
 
-#: rpa.c:279
+#: rpa.c:280
 msgid "RPA token 4 length error\n"
 msgstr ""
 
-#: rpa.c:286
+#: rpa.c:287
 #, c-format
 msgid "RPA rejects you: %s\n"
 msgstr ""
 
-#: rpa.c:288
+#: rpa.c:289
 msgid "RPA rejects you, reason unknown\n"
 msgstr ""
 
-#: rpa.c:294
+#: rpa.c:297
 #, c-format
 msgid "RPA User Authentication length error: %d\n"
 msgstr ""
 
-#: rpa.c:299
+#: rpa.c:302
 #, c-format
 msgid "RPA Session key length error: %d\n"
 msgstr ""
 
-#: rpa.c:305
+#: rpa.c:308
 msgid "RPA _service_ auth fail. Spoof server?\n"
 msgstr ""
 
-#: rpa.c:310
+#: rpa.c:313
 msgid "Session key established:\n"
 msgstr ""
 
-#: rpa.c:341
+#: rpa.c:344
 msgid "RPA authorisation complete\n"
 msgstr ""
 
-#: rpa.c:370
+#: rpa.c:373
 msgid "Get response\n"
 msgstr ""
 
-#: rpa.c:400
+#: rpa.c:403
 #, c-format
 msgid "Get response return %d [%s]\n"
 msgstr ""
 
-#: rpa.c:463
+#: rpa.c:466
 msgid "Hdr not 60\n"
 msgstr ""
 
-#: rpa.c:484
+#: rpa.c:487
 msgid "Token length error\n"
 msgstr ""
 
-#: rpa.c:489
+#: rpa.c:492
 #, c-format
 msgid "Token Length %d disagrees with rxlen %d\n"
 msgstr ""
 
-#: rpa.c:495
+#: rpa.c:498
 msgid "Mechanism field incorrect\n"
 msgstr ""
 
-#: rpa.c:532
+#: rpa.c:535
 #, c-format
 msgid "dec64 error at char %d: %x\n"
 msgstr ""
 
-#: rpa.c:547
+#: rpa.c:550
 msgid "Inbound binary data:\n"
 msgstr ""
 
-#: rpa.c:585
+#: rpa.c:588
 msgid "Outbound data:\n"
 msgstr ""
 
@@ -2282,35 +2242,35 @@ msgstr ""
 msgid "Unicode:\n"
 msgstr ""
 
-#: rpa.c:718
+#: rpa.c:715
 msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
 msgstr ""
 
-#: rpa.c:719
+#: rpa.c:716
 msgid "    prevent you logging in, but means you\n"
 msgstr ""
 
-#: rpa.c:720
+#: rpa.c:717
 msgid "    cannot be sure you are talking to the\n"
 msgstr ""
 
-#: rpa.c:721
+#: rpa.c:718
 msgid "    service that you think you are (replay\n"
 msgstr ""
 
-#: rpa.c:722
+#: rpa.c:719
 msgid "    attacks by a dishonest service are possible.)\n"
 msgstr ""
 
-#: rpa.c:733
+#: rpa.c:730
 msgid "User challenge:\n"
 msgstr ""
 
-#: rpa.c:891
+#: rpa.c:883
 msgid "MD5 being applied to data block:\n"
 msgstr ""
 
-#: rpa.c:904
+#: rpa.c:896
 msgid "MD5 result is: \n"
 msgstr ""
 
@@ -2323,7 +2283,6 @@ msgstr ""
 msgid "SMTP: (bounce-message body)\n"
 msgstr ""
 
-#. this will usually go to sylog...
 #: sink.c:351
 #, c-format
 msgid "mail from %s bounced to %s\n"
@@ -2428,7 +2387,6 @@ msgstr ""
 msgid "ESMTP CRAM-MD5 Authentication...\n"
 msgstr ""
 
-#. Server rejects AUTH
 #: smtp.c:93 smtp.c:153
 msgid "Server rejected the AUTH command.\n"
 msgstr ""
@@ -2454,152 +2412,149 @@ msgstr ""
 msgid "smtp listener protocol error\n"
 msgstr ""
 
-#: socket.c:108 socket.c:134
+#: socket.c:106 socket.c:132
 msgid "fetchmail: malloc failed\n"
 msgstr ""
 
-#: socket.c:166
+#: socket.c:164
 msgid "fetchmail: socketpair failed\n"
 msgstr ""
 
-#. error
-#: socket.c:172
+#: socket.c:170
 msgid "fetchmail: fork failed\n"
 msgstr ""
 
-#: socket.c:180
+#: socket.c:177
 msgid "dup2 failed\n"
 msgstr ""
 
-#: socket.c:186
+#: socket.c:183
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr ""
 
-#: socket.c:189
+#: socket.c:186
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr ""
 
-#: socket.c:280
+#: socket.c:277
 #, c-format
 msgid "fetchmail: getaddrinfo(%s.%s)\n"
 msgstr ""
 
-#: socket.c:427
+#: socket.c:424
 #, c-format
 msgid "fetchmail: illegal address length received for host %s\n"
 msgstr ""
 
-#: socket.c:778
+#: socket.c:775
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr ""
 
-#: socket.c:780
+#: socket.c:777
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:782
+#: socket.c:779
 msgid "Unknown Organization\n"
 msgstr ""
 
-#: socket.c:784
+#: socket.c:781
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr ""
 
-#: socket.c:786
+#: socket.c:783
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 
-#: socket.c:788
+#: socket.c:785
 msgid "Unknown Issuer CommonName\n"
 msgstr ""
 
-#: socket.c:792
+#: socket.c:789
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr ""
 
-#. Possible truncation. In this case, this is a DNS name, so this
-#. * is really bad. We do not tolerate this even in the non-strict case.
-#: socket.c:796
+#: socket.c:793
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr ""
 
-#: socket.c:812
+#: socket.c:809
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr ""
 
-#: socket.c:818
+#: socket.c:815
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 
-#: socket.c:823
+#: socket.c:820
 msgid "Unknown Server CommonName\n"
 msgstr ""
 
-#: socket.c:825
+#: socket.c:822
 msgid "Server name not specified in certificate!\n"
 msgstr ""
 
-#: socket.c:835
+#: socket.c:832
 msgid "EVP_md5() failed!\n"
 msgstr ""
 
-#: socket.c:839
+#: socket.c:836
 msgid "Out of memory!\n"
 msgstr ""
 
-#: socket.c:851
+#: socket.c:848
 msgid "Digest text buffer too small!\n"
 msgstr ""
 
-#: socket.c:857
+#: socket.c:854
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr ""
 
-#: socket.c:861
+#: socket.c:858
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr ""
 
-#: socket.c:864
+#: socket.c:861
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr ""
 
-#: socket.c:872
+#: socket.c:869
 #, c-format
 msgid "Warning: server certificate verification: %s\n"
 msgstr ""
 
-#: socket.c:878
+#: socket.c:875
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr ""
 
-#: socket.c:931
+#: socket.c:927
 msgid "File descriptor out of range for SSL"
 msgstr ""
 
-#: socket.c:948
+#: socket.c:944
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 
-#: socket.c:1008
+#: socket.c:1004
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 
-#: socket.c:1080
+#: socket.c:1074
 msgid "Cygwin socket read retry\n"
 msgstr ""
 
-#: socket.c:1083
+#: socket.c:1077
 msgid "Cygwin socket read retry failed!\n"
 msgstr ""
 
@@ -2639,50 +2594,50 @@ msgstr ""
 msgid "found Received address `%s'\n"
 msgstr ""
 
-#: transact.c:531
+#: transact.c:532
 msgid "message delimiter found while scanning headers\n"
 msgstr ""
 
-#: transact.c:552
+#: transact.c:553
 msgid "incorrect header line found while scanning headers\n"
 msgstr ""
 
-#: transact.c:554
+#: transact.c:555
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: transact.c:1074
+#: transact.c:1075
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr ""
 
-#: transact.c:1089
+#: transact.c:1090
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr ""
 
-#: transact.c:1225
+#: transact.c:1226
 msgid "writing RFC822 msgblk.headers\n"
 msgstr ""
 
-#: transact.c:1246
+#: transact.c:1247
 msgid "no recipient addresses matched declared local names"
 msgstr ""
 
-#: transact.c:1257
+#: transact.c:1258
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr ""
 
-#: transact.c:1271
+#: transact.c:1272
 msgid "message has embedded NULs"
 msgstr ""
 
-#: transact.c:1284
+#: transact.c:1285
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr ""
 
-#: transact.c:1409
+#: transact.c:1410
 msgid "writing message text\n"
 msgstr ""
 
@@ -2704,8 +2659,6 @@ msgstr ""
 msgid "Scratch list of UIDs:"
 msgstr ""
 
-#. this is now a merged list! the mails which were seen in this
-#. * poll are marked here.
 #: uid.c:512 uid.c:563
 #, c-format
 msgid "Merged UID list from %s:"